This commit is contained in:
LagradOst 2022-02-15 22:31:56 +01:00
parent e244a2bac3
commit 43592e64f8
3 changed files with 219 additions and 194 deletions

View file

@ -36,7 +36,7 @@ android {
targetSdkVersion 30 targetSdkVersion 30
versionCode 42 versionCode 42
versionName "2.6.12" versionName "2.6.13"
resValue "string", "app_version", resValue "string", "app_version",
"${defaultConfig.versionName}${versionNameSuffix ?: ""}" "${defaultConfig.versionName}${versionNameSuffix ?: ""}"

View file

@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:padding="16dp" android:padding="16dp"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/sync_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -108,6 +114,9 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/sync_completed" android:id="@+id/sync_completed"
android:nextFocusRight="@id/sync_on_hold"
android:nextFocusDown="@id/sync_plan_to_watch"
android:layout_row="0" android:layout_row="0"
android:layout_column="0" android:layout_column="0"
android:text="@string/type_completed" android:text="@string/type_completed"
@ -115,6 +124,9 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/sync_on_hold" android:id="@+id/sync_on_hold"
android:nextFocusDown="@id/sync_watching"
android:nextFocusLeft="@id/sync_completed"
android:layout_row="0" android:layout_row="0"
android:layout_column="1" android:layout_column="1"
style="@style/SyncButton" style="@style/SyncButton"
@ -123,17 +135,20 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/sync_plan_to_watch" android:id="@+id/sync_plan_to_watch"
android:nextFocusRight="@id/sync_plan_to_watch" android:nextFocusRight="@id/sync_plan_to_watch"
android:nextFocusDown="@id/sync_dropped"
android:nextFocusUp="@id/sync_completed"
android:layout_row="1" android:layout_row="1"
android:layout_column="0" android:layout_column="0"
android:text="@string/type_plan_to_watch" android:text="@string/type_plan_to_watch"
style="@style/SyncButton" style="@style/SyncButton"
android:backgroundTint="?attr/colorPrimaryDark" />
app:strokeColor="@color/colorPrimary" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/sync_watching" android:id="@+id/sync_watching"
android:nextFocusLeft="@id/sync_plan_to_watch" android:nextFocusLeft="@id/sync_plan_to_watch"
android:nextFocusDown="@id/sync_dropped"
android:nextFocusUp="@id/sync_on_hold"
android:layout_row="1" android:layout_row="1"
android:layout_column="1" android:layout_column="1"
@ -210,11 +225,21 @@
android:contentDescription="@string/home_more_info" /> android:contentDescription="@string/home_more_info" />
</FrameLayout> </FrameLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
style="@style/SyncButton" style="@style/SyncButton"
app:icon="@drawable/baseline_sync_24" app:icon="@drawable/baseline_sync_24"
android:text="@string/upload_sync" /> android:text="@string/upload_sync" />
</LinearLayout> </LinearLayout>
<com.google.android.material.button.MaterialButton
android:visibility="gone"
android:id="@+id/sync_add_tracking"
android:layout_gravity="center"
android:layout_width="match_parent"
style="@style/SyncButton"
app:icon="@drawable/ic_baseline_add_24"
android:text="@string/add_sync" />
</FrameLayout>

View file

@ -445,10 +445,10 @@
<item name="android:layout_rowWeight">1</item> <item name="android:layout_rowWeight">1</item>
<item name="android:layout_width">wrap_content</item> <item name="android:layout_width">wrap_content</item>
<item name="android:textColor">?attr/textColor</item> <item name="android:textColor">?attr/textColor</item>
<item name="backgroundTint">@color/transparent</item> <item name="backgroundTint">@color/toggle_button</item>
<item name="android:layout_marginBottom">10dp</item> <item name="android:layout_marginBottom">10dp</item>
<item name="strokeWidth">1dp</item> <item name="strokeWidth">1dp</item>
<item name="strokeColor">?attr/white</item> <item name="strokeColor">@color/toggle_button_outline</item>
</style> </style>
<style name="VideoButtonTV"> <style name="VideoButtonTV">