diff options
Diffstat (limited to 'ui/preferences')
9 files changed, 59 insertions, 68 deletions
diff --git a/ui/preferences/build.gradle b/ui/preferences/build.gradle index fd9684e56..1a76f4c64 100644 --- a/ui/preferences/build.gradle +++ b/ui/preferences/build.gradle @@ -48,13 +48,3 @@ dependencies { implementation "org.greenrobot:eventbus:$eventbusVersion" implementation 'com.github.ByteHamster:SearchPreference:v2.5.0' } - -tasks.register('copyLicense', Copy) { - from "../../LICENSE" - into "src/main/assets/" - rename { String fileName -> - fileName + ".txt" - } -} - -preBuild.dependsOn copyLicense diff --git a/ui/preferences/src/main/assets/.gitignore b/ui/preferences/src/main/assets/.gitignore deleted file mode 100644 index f4de63f77..000000000 --- a/ui/preferences/src/main/assets/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# this file is generated automatically -about.html -LICENSE.txt -CONTRIBUTORS.txt diff --git a/ui/preferences/src/main/assets/LICENSE.txt b/ui/preferences/src/main/assets/LICENSE.txt new file mode 120000 index 000000000..2a64f9d0f --- /dev/null +++ b/ui/preferences/src/main/assets/LICENSE.txt @@ -0,0 +1 @@ +../../../../../LICENSE
\ No newline at end of file diff --git a/ui/preferences/src/main/res/layout/about_teaser.xml b/ui/preferences/src/main/res/layout/about_teaser.xml index 4e7f0454f..a70653be6 100644 --- a/ui/preferences/src/main/res/layout/about_teaser.xml +++ b/ui/preferences/src/main/res/layout/about_teaser.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ImageView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:adjustViewBounds="true" - android:layout_height="wrap_content" - app:srcCompat="@drawable/teaser" - android:importantForAccessibility="no"/>
\ No newline at end of file + 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="wrap_content" + android:adjustViewBounds="true" + android:importantForAccessibility="no" + app:srcCompat="@drawable/teaser" /> diff --git a/ui/preferences/src/main/res/layout/choose_data_folder_dialog.xml b/ui/preferences/src/main/res/layout/choose_data_folder_dialog.xml index bac14a108..7de9362a3 100644 --- a/ui/preferences/src/main/res/layout/choose_data_folder_dialog.xml +++ b/ui/preferences/src/main/res/layout/choose_data_folder_dialog.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <androidx.recyclerview.widget.RecyclerView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/recyclerView" /> + android:id="@+id/recyclerView" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </LinearLayout> diff --git a/ui/preferences/src/main/res/layout/choose_data_folder_dialog_entry.xml b/ui/preferences/src/main/res/layout/choose_data_folder_dialog_entry.xml index addc63f4d..a4c64e5cd 100644 --- a/ui/preferences/src/main/res/layout/choose_data_folder_dialog_entry.xml +++ b/ui/preferences/src/main/res/layout/choose_data_folder_dialog_entry.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root" android:layout_width="match_parent" @@ -38,9 +39,10 @@ <ProgressBar android:id="@+id/used_space" - style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + style="?android:attr/progressBarStyleHorizontal" /> + </LinearLayout> </RelativeLayout> diff --git a/ui/preferences/src/main/res/layout/gpodnetauth_device_row.xml b/ui/preferences/src/main/res/layout/gpodnetauth_device_row.xml index d39c00571..e47182372 100644 --- a/ui/preferences/src/main/res/layout/gpodnetauth_device_row.xml +++ b/ui/preferences/src/main/res/layout/gpodnetauth_device_row.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp"> + + <Button + android:id="@+id/selectDeviceButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingTop="8dp"> + style="?attr/materialButtonOutlinedStyle" /> - <Button - android:id="@+id/selectDeviceButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="?attr/materialButtonOutlinedStyle" /> -</FrameLayout>
\ No newline at end of file +</FrameLayout> diff --git a/ui/preferences/src/main/res/layout/gpodnetauth_finish.xml b/ui/preferences/src/main/res/layout/gpodnetauth_finish.xml index 8eced7304..7abdda3e7 100644 --- a/ui/preferences/src/main/res/layout/gpodnetauth_finish.xml +++ b/ui/preferences/src/main/res/layout/gpodnetauth_finish.xml @@ -24,6 +24,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/gpodnetauth_finish_butsyncnow"/> + android:text="@string/gpodnetauth_finish_butsyncnow" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/ui/preferences/src/main/res/layout/simple_icon_list_item.xml b/ui/preferences/src/main/res/layout/simple_icon_list_item.xml index 7ed129204..4690f7840 100644 --- a/ui/preferences/src/main/res/layout/simple_icon_list_item.xml +++ b/ui/preferences/src/main/res/layout/simple_icon_list_item.xml @@ -1,40 +1,40 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="16dp"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="16dp"> <ImageView - android:layout_width="40dp" - android:layout_height="40dp" - android:id="@+id/icon"/> + android:id="@+id/icon" + android:layout_width="40dp" + android:layout_height="40dp" /> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_marginLeft="16dp" - android:layout_gravity="center_vertical" - android:layout_marginStart="16dp"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_marginLeft="16dp" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dp"> <TextView - tools:text="Title" - android:textColor="?android:attr/textColorPrimary" - android:textSize="16sp" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/title"/> + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorPrimary" + android:textSize="16sp" + tools:text="Title" /> <TextView - tools:text="Subtitle" - android:textColor="?android:attr/textColorSecondary" - android:textSize="14sp" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/subtitle"/> + android:id="@+id/subtitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorSecondary" + android:textSize="14sp" + tools:text="Subtitle" /> </LinearLayout> |