forked from amazingfate/loongoffice
70cb4955f1
Replace the no longer maintained Android Support Library with the Android Jetpack libraries. Quoting [1]: > Version 28.0.0 is the last release of the Support Library. There will be > no more android.support library releases. All new feature development > will be in the androidx namespace. Most porting was done automatically by using Android Studio's "Refactor" -> "Migrate to AndroidX..." function. In `android/source/res/layout/toolbar_bottom.xml` and `android/source/res/layout/toolbar_color_picker.xml`, the uses of `app:layout_behavior="android.support.design.widget.BottomSheetBehavior"` had to be replaced manually as described at [2], because the app would crash when using the old "android.support" values. Also drop the Android Support Library related bits from configure.ac In a quick test, this worked fine and no obvious difference was visible when running this in various AVDs. When trying to test this in an x86 AVD still using SDK 16 (Android 4.1), which is currently specified as Android Viewer's `minSdkVersion`, only various unrelated issues showed up, some of which will be handled in follow-up commits. After the migration, many weird errors showed up in Android Studio, which disappeared after invalidating the caches (via "File" -> "Invalidate Caches..."). [1] https://developer.android.com/jetpack/androidx [2] https://stackoverflow.com/questions/45100963/runtimeexception-could-not-inflate-behavior-subclass Change-Id: I2a57f0ebd56e7ecc09b7d65aae17fd15088a633b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133002 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
131 lines
5.1 KiB
XML
131 lines
5.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:padding="15dp"
|
|
android:id="@+id/numberpickerLayout">
|
|
|
|
<TextView
|
|
android:id="@+id/textView11"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="30dp"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginLeft="8dp"
|
|
android:layout_marginTop="8dp"
|
|
android:text="Rows:"
|
|
android:gravity="center"
|
|
android:textSize="18sp"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
<TextView
|
|
android:id="@+id/number_picker_rows_positive"
|
|
android:layout_width="30dp"
|
|
android:layout_height="30dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginRight="8dp"
|
|
android:layout_marginTop="8dp"
|
|
android:background="@drawable/image_button_background"
|
|
android:clickable="true"
|
|
android:gravity="center"
|
|
android:text="+"
|
|
android:textSize="18sp"
|
|
android:textStyle="bold"
|
|
app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
|
|
app:layout_constraintTop_toTopOf="@+id/numberpickerLayout" />
|
|
|
|
<TextView
|
|
android:id="@+id/number_picker_row_count"
|
|
android:layout_width="30dp"
|
|
android:layout_height="30dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginTop="8dp"
|
|
android:text="3"
|
|
android:gravity="center"
|
|
android:textSize="18sp"
|
|
android:textStyle="bold"
|
|
app:layout_constraintEnd_toStartOf="@+id/number_picker_rows_positive"
|
|
app:layout_constraintStart_toEndOf="@+id/number_picker_rows_negative"
|
|
app:layout_constraintTop_toTopOf="@+id/numberpickerLayout" />
|
|
|
|
<TextView
|
|
android:id="@+id/number_picker_rows_negative"
|
|
android:layout_width="30dp"
|
|
android:layout_height="30dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginTop="8dp"
|
|
android:text="-"
|
|
android:gravity="center"
|
|
android:textSize="18sp"
|
|
android:textStyle="bold"
|
|
android:clickable="true"
|
|
android:background="@drawable/image_button_background"
|
|
app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
|
|
app:layout_constraintStart_toStartOf="@+id/numberpickerLayout"
|
|
app:layout_constraintTop_toTopOf="@+id/numberpickerLayout" />
|
|
|
|
<TextView
|
|
android:id="@+id/textView12"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="30dp"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginLeft="8dp"
|
|
android:layout_marginTop="24dp"
|
|
android:text="Columns:"
|
|
android:gravity="center"
|
|
android:textSize="18sp"
|
|
app:layout_constraintStart_toStartOf="@+id/numberpickerLayout"
|
|
app:layout_constraintTop_toBottomOf="@+id/textView11" />
|
|
|
|
<TextView
|
|
android:id="@+id/number_picker_cols_negative"
|
|
android:layout_width="30dp"
|
|
android:layout_height="30dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginTop="24dp"
|
|
android:text="-"
|
|
android:gravity="center"
|
|
android:textSize="18sp"
|
|
android:textStyle="bold"
|
|
android:background="@drawable/image_button_background"
|
|
android:clickable="true"
|
|
app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
|
|
app:layout_constraintStart_toStartOf="@+id/numberpickerLayout"
|
|
app:layout_constraintTop_toBottomOf="@+id/number_picker_rows_negative" />
|
|
|
|
<TextView
|
|
android:id="@+id/number_picker_col_count"
|
|
android:layout_width="30dp"
|
|
android:layout_height="30dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginStart="8dp"
|
|
android:layout_marginTop="24dp"
|
|
android:gravity="center"
|
|
android:text="3"
|
|
android:textSize="18sp"
|
|
android:textStyle="bold"
|
|
app:layout_constraintEnd_toStartOf="@+id/number_picker_cols_positive"
|
|
app:layout_constraintStart_toEndOf="@+id/number_picker_cols_negative"
|
|
app:layout_constraintTop_toBottomOf="@+id/number_picker_row_count" />
|
|
|
|
<TextView
|
|
android:id="@+id/number_picker_cols_positive"
|
|
android:layout_width="30dp"
|
|
android:layout_height="30dp"
|
|
android:layout_marginEnd="8dp"
|
|
android:layout_marginRight="8dp"
|
|
android:layout_marginTop="24dp"
|
|
android:text="+"
|
|
android:gravity="center"
|
|
android:textSize="18sp"
|
|
android:textStyle="bold"
|
|
android:clickable="true"
|
|
android:background="@drawable/image_button_background"
|
|
app:layout_constraintEnd_toEndOf="@+id/numberpickerLayout"
|
|
app:layout_constraintTop_toBottomOf="@+id/number_picker_rows_positive" />
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|