From 109f47f43f0133a65664c6d2db2f81558f3f8721 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sun, 14 Aug 2022 17:35:17 +0200
Subject: [PATCH] improve dialog layout

---
 .../main/java/com/github/libretube/MyApp.kt   |  7 ++---
 .../github/libretube/api/ResettableLazy.kt    |  2 +-
 .../libretube/fragments/PlayerFragment.kt     |  2 +-
 .../main/res/layout/dialog_addtoplaylist.xml  |  2 +-
 .../res/layout/dialog_create_playlist.xml     | 12 ++++-----
 .../res/layout/dialog_custom_instance.xml     | 27 +++++++++----------
 .../main/res/layout/dialog_delete_account.xml | 12 ++++-----
 app/src/main/res/layout/dialog_login.xml      | 21 +++++++--------
 app/src/main/res/values/style.xml             | 12 +++------
 9 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/MyApp.kt b/app/src/main/java/com/github/libretube/MyApp.kt
index 45071f592..353a9ecff 100644
--- a/app/src/main/java/com/github/libretube/MyApp.kt
+++ b/app/src/main/java/com/github/libretube/MyApp.kt
@@ -19,7 +19,6 @@ import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.preferences.PreferenceKeys
 import com.github.libretube.util.ExceptionHandler
 import com.github.libretube.util.NotificationHelper
-import java.lang.Exception
 
 class MyApp : Application() {
     override fun onCreate() {
@@ -170,7 +169,8 @@ class MyApp : Application() {
                     DatabaseHolder.db.watchHistoryDao().insertAll(
                         *watchHistoryItems.toTypedArray()
                     )
-                } catch (e: Exception) {}
+                } catch (e: Exception) {
+                }
                 prefs.edit().putString("watch_history", "").commit()
             }
             val legacyWatchPositions = prefs.getString("watch_positions", "")
@@ -181,7 +181,8 @@ class MyApp : Application() {
                     DatabaseHolder.db.watchPositionDao().insertAll(
                         *watchPositions.toTypedArray()
                     )
-                } catch (e: Exception) {}
+                } catch (e: Exception) {
+                }
                 prefs.edit().remove("watch_positions").commit()
             }
             prefs.edit()
diff --git a/app/src/main/java/com/github/libretube/api/ResettableLazy.kt b/app/src/main/java/com/github/libretube/api/ResettableLazy.kt
index 129e27de6..432dff009 100644
--- a/app/src/main/java/com/github/libretube/api/ResettableLazy.kt
+++ b/app/src/main/java/com/github/libretube/api/ResettableLazy.kt
@@ -1,7 +1,7 @@
 package com.github.libretube.util
 
-import java.util.*
 import kotlin.reflect.KProperty
+import java.util.*
 
 class ResettableLazyManager {
     // we synchronize to make sure the timing of a reset() call and new inits do not collide
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 3d7d64e4e..54e9363b9 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -92,6 +92,7 @@ import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
 import com.google.android.exoplayer2.util.RepeatModeUtil
 import com.google.android.exoplayer2.video.VideoSize
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlin.math.abs
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -99,7 +100,6 @@ import org.chromium.net.CronetEngine
 import retrofit2.HttpException
 import java.io.IOException
 import java.util.concurrent.Executors
-import kotlin.math.abs
 
 class PlayerFragment : BaseFragment() {
 
diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml
index 04e3bc172..31d353893 100644
--- a/app/src/main/res/layout/dialog_addtoplaylist.xml
+++ b/app/src/main/res/layout/dialog_addtoplaylist.xml
@@ -23,7 +23,7 @@
     <Button
         android:id="@+id/addToPlaylist"
         style="@style/CustomDialogButton"
-        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:text="@string/addToPlaylist" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml
index 4a78eb664..0f60991a3 100644
--- a/app/src/main/res/layout/dialog_create_playlist.xml
+++ b/app/src/main/res/layout/dialog_create_playlist.xml
@@ -14,22 +14,22 @@
         android:text="@string/app_name"
         android:textSize="20sp" />
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/playlistName">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/playlist_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/playlistName"
-            android:inputType="text"
-            android:padding="12dp" />
+            android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="right"
+        android:gravity="end"
         android:orientation="horizontal">
 
         <Button
@@ -40,7 +40,7 @@
         <Button
             android:id="@+id/create_new_playlist"
             style="@style/CustomDialogButton"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:text="@string/createPlaylist" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_custom_instance.xml b/app/src/main/res/layout/dialog_custom_instance.xml
index 2343e3bf5..189b7b217 100644
--- a/app/src/main/res/layout/dialog_custom_instance.xml
+++ b/app/src/main/res/layout/dialog_custom_instance.xml
@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
@@ -14,37 +13,37 @@
         android:text="@string/app_name"
         android:textSize="20sp" />
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/instance_name">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/instanceName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/instance_name"
-            android:inputType="text"
-            android:padding="12dp" />
+            android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/instance_frontend_url">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/instanceFrontendUrl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/instance_frontend_url"
-            android:inputType="text"
-            android:padding="12dp" />
+            android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/instance_api_url">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/instanceApiUrl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/instance_api_url"
-            android:inputType="text"
-            android:padding="12dp" />
+            android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout
@@ -61,7 +60,7 @@
         <Button
             android:id="@+id/addInstance"
             style="@style/CustomDialogButton"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:text="@string/addInstance" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_delete_account.xml b/app/src/main/res/layout/dialog_delete_account.xml
index 8eee7ae87..fb35bc76c 100644
--- a/app/src/main/res/layout/dialog_delete_account.xml
+++ b/app/src/main/res/layout/dialog_delete_account.xml
@@ -13,22 +13,22 @@
         android:text="@string/app_name"
         android:textSize="20sp" />
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/password">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/delete_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/password"
-            android:inputType="textPassword"
-            android:padding="12dp" />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="right"
+        android:gravity="end"
         android:orientation="horizontal">
 
         <Button
@@ -39,7 +39,7 @@
         <Button
             android:id="@+id/delete_account_confirm"
             style="@style/CustomDialogButton"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:text="@string/deleteAccount" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index 14ff19d95..f4224391a 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-
     <TextView
         android:id="@+id/title"
         android:layout_width="match_parent"
@@ -14,33 +13,33 @@
         android:text="@string/app_name"
         android:textSize="20sp" />
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/username">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/username"
-            android:inputType="text"
-            android:padding="12dp" />
+            android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
-    <com.google.android.material.textfield.TextInputLayout style="@style/CustomDialogTextInputLayout">
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/CustomDialogTextInputLayout"
+        android:hint="@string/password">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/password"
-            android:inputType="textPassword"
-            android:padding="12dp" />
+            android:inputType="textPassword" />
     </com.google.android.material.textfield.TextInputLayout>
 
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="right"
+        android:gravity="end"
         android:orientation="horizontal">
 
         <Button
@@ -51,7 +50,7 @@
         <Button
             android:id="@+id/login"
             style="@style/CustomDialogButton"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
             android:text="@string/login" />
 
     </LinearLayout>
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 178e92873..7a478392e 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -63,7 +63,7 @@
 
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">right</item>
+        <item name="android:layout_gravity">end</item>
         <item name="android:layout_marginBottom">8dp</item>
         <item name="android:padding">8dp</item>
 
@@ -73,16 +73,10 @@
 
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="hintEnabled">false</item>
         <item name="android:layout_marginLeft">15dp</item>
         <item name="android:layout_marginRight">15dp</item>
-        <item name="android:layout_marginTop">10dp</item>
-        <item name="android:layout_marginBottom">5dp</item>
-
-        <item name="boxCornerRadiusBottomStart">15dp</item>
-        <item name="boxCornerRadiusBottomEnd">15dp</item>
-        <item name="boxCornerRadiusTopEnd">15dp</item>
-        <item name="boxCornerRadiusTopStart">15dp</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_marginBottom">10dp</item>
 
     </style>