all: smoother dialogs (fixes #3729) (#3730)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Jul 1, 2024 · b8ff436 · b8ff436
1 parent 45a922b
commit b8ff436
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 1638
-        versionName "0.16.38"
+        versionCode 1639
+        versionName "0.16.39"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseDialogFragment.kt b/app/src/main/java/org/ole/planet/myplanet/base/BaseDialogFragment.kt
@@ -1,6 +1,6 @@
 package org.ole.planet.myplanet.base
 
-import android.R
+import org.ole.planet.myplanet.R
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 
@@ -9,7 +9,7 @@ abstract class BaseDialogFragment : DialogFragment() {
     var id: String? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.Theme_Holo_Light_Dialog_NoActionBar_MinWidth)
+        setStyle(STYLE_NO_TITLE, R.style.AppTheme_Dialog_NoActionBar_MinWidth)
         if (arguments != null) {
             id = requireArguments().getString(key)
         }

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/feedback/FeedbackFragment.kt
@@ -38,7 +38,7 @@ class FeedbackFragment : DialogFragment(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, android.R.style.Theme_Holo_Light_Dialog_NoActionBar_MinWidth)
+        setStyle(STYLE_NO_TITLE, R.style.AppTheme_Dialog_NoActionBar_MinWidth)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/rating/RatingFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/rating/RatingFragment.kt
@@ -17,7 +17,6 @@ import org.ole.planet.myplanet.databinding.FragmentRatingBinding
 import org.ole.planet.myplanet.datamanager.DatabaseService
 import org.ole.planet.myplanet.model.RealmRating
 import org.ole.planet.myplanet.model.RealmUserModel
-import org.ole.planet.myplanet.ui.sync.SyncActivity
 import org.ole.planet.myplanet.utilities.Constants.PREFS_NAME
 import org.ole.planet.myplanet.utilities.Utilities
 import java.util.Date
@@ -40,7 +39,7 @@ class RatingFragment : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, android.R.style.Theme_Holo_Light_Dialog_NoActionBar_MinWidth)
+        setStyle(STYLE_NO_TITLE, R.style.AppTheme_Dialog_NoActionBar_MinWidth)
         if (arguments != null) {
             id = requireArguments().getString("id")
             type = requireArguments().getString("type")

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/resources/CollectionsFragment.kt b/app/src/main/java/org/ole/planet/myplanet/ui/resources/CollectionsFragment.kt
@@ -19,6 +19,7 @@ import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
 import kotlin.collections.List
 import io.realm.Realm
+import org.ole.planet.myplanet.R
 
 class CollectionsFragment : DialogFragment(), TagExpandableAdapter.OnClickTagItem, CompoundButton.OnCheckedChangeListener {
     private lateinit var fragmentCollectionsBinding: FragmentCollectionsBinding
@@ -32,7 +33,7 @@ class CollectionsFragment : DialogFragment(), TagExpandableAdapter.OnClickTagIte
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, android.R.style.Theme_Holo_Light_Dialog_NoActionBar_MinWidth)
+        setStyle(STYLE_NO_TITLE, R.style.AppTheme_Dialog_NoActionBar_MinWidth)
         dbType = arguments?.getString("dbType")
     }
 

diff --git a/app/src/main/res/layout/fragment_feedback.xml b/app/src/main/res/layout/fragment_feedback.xml
@@ -112,15 +112,17 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/button_cancel"
-                android:textSize="@dimen/text_size_mid" />
+                android:textSize="@dimen/text_size_mid"
+                android:textColor="@color/primary" />
 
             <Button
                 android:id="@+id/btn_submit"
                 style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/button_submit"
-                android:textSize="@dimen/text_size_mid" />
+                android:textSize="@dimen/text_size_mid"
+                android:textColor="@color/primary" />
 
         </LinearLayout>
 

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -32,4 +32,6 @@
     <dimen name="_30dp">30dp</dimen>
     <dimen name="_50dp">50dp</dimen>
     <dimen name="_1000dp">1000dp</dimen>
+    <dimen name="dialog_min_width_major">65%</dimen>
+    <dimen name="dialog_min_width_minor">95%</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -157,4 +157,10 @@
     <style name="MyMaterialTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="MyMaterialTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="AppTheme.Dialog.NoActionBar.MinWidth" parent="Theme.AppCompat.Light.Dialog">
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowMinWidthMajor">@dimen/dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@dimen/dialog_min_width_minor</item>
+    </style>
 </resources>