From b73c2507057e906a732f9733b703d0fca12af65f Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Mon, 27 Nov 2023 13:51:57 +0100 Subject: [PATCH 1/2] remove unnecessary code (seemed to be caused by c&p) Signed-off-by: Marcel Hibbe --- .../ui/dialog/SaveToStorageDialogFragment.kt | 24 ------------------- 1 file changed, 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 index c429e94660..70c270ae6b 100644 --- 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 From 53f65c51fddcaa74c7068443d0fd909a4e1bea4f Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Mon, 27 Nov 2023 14:05:25 +0100 Subject: [PATCH 2/2] fix text color for dark mode fix text color for dark mode in save file dialog from FullScreen*Activity Signed-off-by: Marcel Hibbe --- app/src/main/res/values-v27/styles.xml | 4 ++++ app/src/main/res/values/styles.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index ac4db7e6e8..e62af63b45 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -9,6 +9,8 @@ true shortEdges @color/bg_default + @style/Theme.AppCompat.DayNight.Dialog + ?alertDialogTheme diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e5aed48791..bd1570d13a 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -222,6 +222,8 @@ true true @color/bg_default + @style/Theme.AppCompat.DayNight.Dialog + ?alertDialogTheme