diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index f8d60e581f..62ba89d994 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -1091,7 +1091,6 @@ public class MwmActivity extends BaseMwmFragmentActivity protected void onResume() { super.onResume(); - ThemeSwitcher.INSTANCE.restart(isMapRendererActive()); refreshSearchToolbar(); setFullscreen(isFullscreen()); if (Framework.nativeGetChoosePositionMode() != Framework.ChoosePositionMode.NONE) diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java index 2c1ddbcd79..7d85f6cf85 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java @@ -69,11 +69,6 @@ public class BookmarkListAdapter extends RecyclerView.Adapter= 0) mCategory = categories.get(index); } - - @Override - public void invalidate() - { - onChanged(); - } } diff --git a/android/app/src/main/java/app/organicmaps/content/DataSource.java b/android/app/src/main/java/app/organicmaps/content/DataSource.java index de246bb6b7..dbeb5a2601 100644 --- a/android/app/src/main/java/app/organicmaps/content/DataSource.java +++ b/android/app/src/main/java/app/organicmaps/content/DataSource.java @@ -6,6 +6,4 @@ public interface DataSource { @NonNull D getData(); - - void invalidate(); } diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java index ec56c2c842..3a6f48b1fd 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java @@ -57,8 +57,6 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment registerButton.setOnClickListener((v) -> Utils.openUrl(requireActivity(), Constants.Url.OSM_REGISTER)); mProgress = view.findViewById(R.id.osm_login_progress); final String dataVersion = DateUtils.getShortDateFormatter().format(Framework.getDataVersion()); - ((TextView) view.findViewById(R.id.osm_presentation)) - .setText(getString(R.string.osm_presentation, dataVersion)); if (BuildConfig.FLAVOR.equals("google")) { diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java index 775ddd0009..3018ac65e6 100644 --- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java @@ -469,8 +469,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment { DEFAULT(R.string.theme_default), NIGHT(R.string.theme_night), - AUTO(R.string.theme_auto), - NAV_AUTO(R.string.theme_nav_auto); + AUTO(R.string.theme_auto); private final int mModeStringId; diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java index 155eed9c96..75b3a1b503 100644 --- a/android/app/src/main/java/app/organicmaps/util/Config.java +++ b/android/app/src/main/java/app/organicmaps/util/Config.java @@ -257,7 +257,7 @@ public final class Config { String autoTheme = MwmApplication.from(context).getString(R.string.theme_auto); String res = getString(KEY_MISC_UI_THEME_SETTINGS, autoTheme); - if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res) || ThemeUtils.isNavAutoTheme(context, res)) + if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res)) return res; return autoTheme; diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java index d70055b0f9..86d7d4497c 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java @@ -32,18 +32,18 @@ public enum ThemeSwitcher String nightTheme = MwmApplication.from(mContext).getString(R.string.theme_night); String defaultTheme = MwmApplication.from(mContext).getString(R.string.theme_default); String theme = defaultTheme; - Location last = LocationHelper.from(mContext).getSavedLocation(); - boolean navAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext); - - if (navAuto || ThemeUtils.isAutoTheme(mContext)) + if (RoutingController.get().isNavigating()) { + Location last = LocationHelper.from(mContext).getSavedLocation(); if (last == null) + { theme = Config.getCurrentUiTheme(mContext); + } else { - long currentTime = System.currentTimeMillis() / 1000; - boolean day = Framework.nativeIsDayTime(currentTime, last.getLatitude(), last.getLongitude()); + boolean day = Framework.nativeIsDayTime(System.currentTimeMillis() / 1000, + last.getLatitude(), last.getLongitude()); theme = (day ? defaultTheme : nightTheme); } } @@ -51,7 +51,7 @@ public enum ThemeSwitcher setThemeAndMapStyle(theme); UiThread.cancelDelayedTasks(mAutoThemeChecker); - if (navAuto || ThemeUtils.isAutoTheme(mContext)) + if (ThemeUtils.isAutoTheme(mContext)) UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS); } }; @@ -79,7 +79,7 @@ public enum ThemeSwitcher { mRendererActive = isRendererActive; String theme = Config.getUiThemeSettings(mContext); - if (ThemeUtils.isAutoTheme(mContext, theme) || ThemeUtils.isNavAutoTheme(mContext, theme)) + if (ThemeUtils.isAutoTheme(mContext, theme)) { mAutoThemeChecker.run(); return; diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java index c121c8d313..cd82d02c48 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java @@ -69,7 +69,7 @@ public final class ThemeUtils public static boolean isAutoTheme(@NonNull Context context) { - return isAutoTheme(context, Config.getUiThemeSettings(context)); + return isAutoTheme(context, Config.getCurrentUiTheme(context)); } public static boolean isAutoTheme(@NonNull Context context, String theme) @@ -78,17 +78,6 @@ public final class ThemeUtils return autoTheme.equals(theme); } - public static boolean isNavAutoTheme(@NonNull Context context) - { - return isNavAutoTheme(context, Config.getUiThemeSettings(context)); - } - - public static boolean isNavAutoTheme(@NonNull Context context, String theme) - { - String navAutoTheme = context.getString(R.string.theme_nav_auto); - return navAutoTheme.equals(theme); -} - public static boolean isValidTheme(@NonNull Context context, String theme) { String defaultTheme = context.getString(R.string.theme_default); diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml index f95650d7dc..b764563d97 100644 --- a/android/app/src/main/res/layout-land/fragment_osm_login.xml +++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml @@ -24,161 +24,141 @@ android:clipChildren="false" android:clipToPadding="false" android:orientation="vertical" - android:padding="@dimen/margin_base" tools:ignore="ScrollViewSize"> - - - - - - - + - - - + + + + + + + - - - - - + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical" + android:padding="@dimen/margin_base"> + + + + + + + +