mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
Merge pull request #3466 from nextcloud/bugfix/noid/fixSaveFileDialog
Bugfix/noid/fix save file dialog
This commit is contained in:
commit
da5d47b9c4
@ -26,9 +26,6 @@ import android.app.Dialog
|
|||||||
import android.content.DialogInterface
|
import android.content.DialogInterface
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.work.Data
|
import androidx.work.Data
|
||||||
@ -40,7 +37,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
|||||||
import com.nextcloud.talk.R
|
import com.nextcloud.talk.R
|
||||||
import com.nextcloud.talk.application.NextcloudTalkApplication
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
||||||
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
|
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
|
||||||
import com.nextcloud.talk.databinding.DialogChooseAccountShareToBinding
|
|
||||||
import com.nextcloud.talk.jobs.SaveFileToStorageWorker
|
import com.nextcloud.talk.jobs.SaveFileToStorageWorker
|
||||||
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
||||||
import java.util.concurrent.ExecutionException
|
import java.util.concurrent.ExecutionException
|
||||||
@ -51,8 +47,6 @@ class SaveToStorageDialogFragment : DialogFragment() {
|
|||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
lateinit var viewThemeUtils: ViewThemeUtils
|
lateinit var viewThemeUtils: ViewThemeUtils
|
||||||
private var binding: DialogChooseAccountShareToBinding? = null
|
|
||||||
private var dialogView: View? = null
|
|
||||||
lateinit var fileName: String
|
lateinit var fileName: String
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@ -88,24 +82,6 @@ class SaveToStorageDialogFragment : DialogFragment() {
|
|||||||
return dialog
|
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")
|
@SuppressLint("LongLogTag")
|
||||||
private fun saveImageToStorage(
|
private fun saveImageToStorage(
|
||||||
fileName: String
|
fileName: String
|
||||||
|
@ -9,6 +9,8 @@
|
|||||||
<item name="android:windowActionBar">true</item>
|
<item name="android:windowActionBar">true</item>
|
||||||
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
||||||
<item name="colorSurface">@color/bg_default</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>
|
||||||
|
|
||||||
<style name="FullScreenMediaTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
<style name="FullScreenMediaTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||||
@ -19,5 +21,7 @@
|
|||||||
<item name="android:windowActionBar">true</item>
|
<item name="android:windowActionBar">true</item>
|
||||||
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
|
||||||
<item name="colorSurface">@color/bg_default</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>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -222,6 +222,8 @@
|
|||||||
<item name="android:windowNoTitle">true</item>
|
<item name="android:windowNoTitle">true</item>
|
||||||
<item name="android:windowActionBar">true</item>
|
<item name="android:windowActionBar">true</item>
|
||||||
<item name="colorSurface">@color/bg_default</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>
|
||||||
|
|
||||||
<style name="FullScreenMediaTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
<style name="FullScreenMediaTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||||
@ -231,6 +233,8 @@
|
|||||||
<item name="android:windowNoTitle">true</item>
|
<item name="android:windowNoTitle">true</item>
|
||||||
<item name="android:windowActionBar">true</item>
|
<item name="android:windowActionBar">true</item>
|
||||||
<item name="colorSurface">@color/bg_default</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>
|
||||||
|
|
||||||
<style name="TextInputLayoutTheme" parent="Theme.AppCompat">
|
<style name="TextInputLayoutTheme" parent="Theme.AppCompat">
|
||||||
|
Loading…
Reference in New Issue
Block a user