drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Remove call to fullscreen theme

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-10-24 18:02:07 +02:00
committed by x7z4w
parent 495d3e91fd
commit 73accecfd4
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
View File

@@ -7,15 +7,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StyleRes; import androidx.annotation.StyleRes;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import app.organicmaps.R;
public class BaseMwmDialogFragment extends DialogFragment public class BaseMwmDialogFragment extends DialogFragment
{ {
@StyleRes
protected final int getFullscreenTheme()
{
return R.style.MwmTheme_DialogFragment_Fullscreen;
}
protected int getStyle() protected int getStyle()
{ {

14
android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
View File

@@ -1,5 +1,6 @@
package app.organicmaps.widget.placepage; package app.organicmaps.widget.placepage;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@@ -14,6 +15,7 @@ import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat; import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentFactory; import androidx.fragment.app.FragmentFactory;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import app.organicmaps.R; import app.organicmaps.R;
@@ -103,9 +105,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
public EditBookmarkFragment() {} public EditBookmarkFragment() {}
@Override @Override
protected int getCustomTheme() public void onCreate(@Nullable Bundle savedInstanceState) {
{ super.onCreate(savedInstanceState);
return getFullscreenTheme(); setStyle(DialogFragment.STYLE_NORMAL, R.style.MwmTheme_FullScreenDialog);
} }
@Nullable @Nullable
@@ -181,6 +183,12 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
public void onStart() public void onStart()
{ {
super.onStart(); super.onStart();
Dialog dialog = getDialog();
if (dialog != null) {
dialog.getWindow().setLayout(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT);
}
// Focus name and show keyboard for "Unknown Place" bookmarks // Focus name and show keyboard for "Unknown Place" bookmarks
if (mBookmark != null if (mBookmark != null

5
android/app/src/main/res/values/themes.xml
View File

@@ -210,6 +210,11 @@
<item name="android:navigationBarColor">@android:color/transparent</item> <item name="android:navigationBarColor">@android:color/transparent</item>
</style> </style>
<style name="MwmTheme.FullScreenDialog">
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/white</item>
</style>
<style name="MwmMain.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker"> <style name="MwmMain.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
<item name="colorAccent">@color/base_accent</item> <item name="colorAccent">@color/base_accent</item>
<item name="colorSecondary">@color/base_accent</item> <item name="colorSecondary">@color/base_accent</item>