Merge pull request #3470 from nextcloud/backport/3466/stable-18.0

[stable-18.0] Bugfix/noid/fix save file dialog
nextcloud · Nov 28, 2023 · ed79a8c · ed79a8c
2 parents f8587e7 + 53f65c5
commit ed79a8c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SaveToStorageDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SaveToStorageDialogFragment.kt
@@ -26,9 +26,6 @@ import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.work.Data
@@ -40,7 +37,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
-import com.nextcloud.talk.databinding.DialogChooseAccountShareToBinding
 import com.nextcloud.talk.jobs.SaveFileToStorageWorker
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import java.util.concurrent.ExecutionException
@@ -51,8 +47,6 @@ class SaveToStorageDialogFragment : DialogFragment() {
 
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
-    private var binding: DialogChooseAccountShareToBinding? = null
-    private var dialogView: View? = null
     lateinit var fileName: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -88,24 +82,6 @@ class SaveToStorageDialogFragment : DialogFragment() {
         return dialog
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        themeViews()
-    }
-
-    private fun themeViews() {
-        viewThemeUtils.platform.themeDialog(binding!!.root)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return dialogView
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        binding = null
-    }
-
     @SuppressLint("LongLogTag")
     private fun saveImageToStorage(
         fileName: String

diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
@@ -9,6 +9,8 @@
         <item name="android:windowActionBar">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="colorSurface">@color/bg_default</item>
+        <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
+        <item name="android:alertDialogTheme">?alertDialogTheme</item>
     </style>
 
     <style name="FullScreenMediaTheme" parent="Theme.AppCompat.Light.NoActionBar">
@@ -19,5 +21,7 @@
         <item name="android:windowActionBar">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <item name="colorSurface">@color/bg_default</item>
+        <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
+        <item name="android:alertDialogTheme">?alertDialogTheme</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -222,6 +222,8 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">true</item>
         <item name="colorSurface">@color/bg_default</item>
+        <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
+        <item name="android:alertDialogTheme">?alertDialogTheme</item>
     </style>
 
     <style name="FullScreenMediaTheme" parent="Theme.AppCompat.Light.NoActionBar">
@@ -231,6 +233,8 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">true</item>
         <item name="colorSurface">@color/bg_default</item>
+        <item name="alertDialogTheme">@style/Theme.AppCompat.DayNight.Dialog</item>
+        <item name="android:alertDialogTheme">?alertDialogTheme</item>
     </style>
 
     <style name="TextInputLayoutTheme" parent="Theme.AppCompat">