mylife: smoother achievements dark mode (fixes #4197) (#4202)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Aug 21, 2024 · 5358876 · 5358876
1 parent 1690154
commit 5358876
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 85 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1829
-        versionName "0.18.29"
+        versionCode 1830
+        versionName "0.18.30"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/EditAchievementFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/EditAchievementFragment.kt
@@ -193,8 +193,11 @@ class EditAchievementFragment : BaseContainerFragment(), DatePickerDialog.OnDate
             showResourceListDialog(prevList)
         }
         val alertAddAttachmentView: View = alertAddAttachmentBinding.root
-        AlertDialog.Builder(requireActivity()).setTitle(R.string.add_achievement)
-            .setIcon(R.drawable.ic_edit).setView(alertAddAttachmentView).setCancelable(false)
+        AlertDialog.Builder(requireActivity(), R.style.AlertDialogTheme)
+            .setTitle(R.string.add_achievement)
+            .setIcon(R.drawable.ic_edit)
+            .setView(alertAddAttachmentView)
+            .setCancelable(false)
             .setPositiveButton("Submit") { _: DialogInterface?, _: Int ->
                 val desc = alertAddAttachmentBinding.etDesc.text.toString().trim { it <= ' ' }
                 val title = alertAddAttachmentBinding.etTitle.text.toString().trim { it <= ' ' }

diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/DialogUtils.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/DialogUtils.kt
@@ -102,7 +102,7 @@ object DialogUtils {
 
     @JvmStatic
     fun getAlertDialog(context: Context, title: String, v: View): AlertDialog {
-        return AlertDialog.Builder(context)
+        return AlertDialog.Builder(ContextThemeWrapper(context, R.style.AlertDialogTheme))
             .setTitle(title)
             .setIcon(R.drawable.ic_edit)
             .setView(v)

diff --git a/app/src/main/res/layout/alert_add_attachment.xml b/app/src/main/res/layout/alert_add_attachment.xml
@@ -8,16 +8,17 @@
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/title_asterisk" />
+            android:hint="@string/title_asterisk"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
-
     <TextView
         android:id="@+id/tv_date"
         android:layout_width="match_parent"
@@ -29,18 +30,21 @@
         android:padding="@dimen/padding_normal"
         android:text="@string/date"
         android:textSize="@dimen/text_size_mid"
-        app:drawableRightCompat="@drawable/ic_date" />
-
+        android:textColor="@color/daynight_textColor"
+        app:drawableRightCompat="@drawable/ic_date"
+        app:drawableTint="@color/daynight_textColor" />
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_desc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/description" />
+            android:hint="@string/description"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
@@ -51,4 +55,4 @@
         android:background="@drawable/buttongrey"
         android:padding="@dimen/padding_normal"
         android:text="@string/add_resources" />
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/alert_reference.xml b/app/src/main/res/layout/alert_reference.xml
@@ -8,53 +8,56 @@
         android:id="@+id/tl_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/name_asterisk" />
-
+            android:hint="@string/name_asterisk"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_relationship"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/relationship" />
-
+            android:hint="@string/relationship"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_phone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/phone_number" />
-
+            android:hint="@string/phone_number"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="@dimen/padding_normal">
+        android:padding="@dimen/padding_normal"
+        android:textColorHint="@color/hint_color">
 
         <EditText
             android:id="@+id/et_email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/email" />
-
+            android:hint="@string/email"
+            android:textColor="@color/daynight_textColor" />
     </com.google.android.material.textfield.TextInputLayout>
-
-</LinearLayout>
+</LinearLayout>