[android] Implement Light, Dark, and System modes on android(Auto) #8309

SRSAS · 2024-05-27T15:20:34Z

closes #749

Changed from the existing night modes (on, off, auto), to "appearence" modes:
- Light;
- Dark;
- System;

System mode follows whatever mode the user's device is in. This implementation works for both normal android and AndroidAuto.

Main changes:
- added necessary strings to XML files;
- changed the position and option names of the "map style preferences";
- implemented system mode, and some helper methods on ThemeSwitcher.java and ThemeUtils.java;
- added uiMode changes detection to all activities;
- removed "auto" mode implementation;

Co-authored-by: Francisco Nael Salgado [email protected]

Jean-BaptisteC · 2024-05-27T15:35:01Z

Really good changes 🙂
IMO we want to keep auto mode to continue to switch in dark mode when the night is coming

SRSAS · 2024-05-27T15:41:01Z

Thanks!
I can add it in. But should it be kept as a 4th option, a toggle, or automatically activated when the user enters navigation mode?

Jean-BaptisteC · 2024-05-27T15:47:27Z

I prefer 4 options
Others things:

Update translations in string.txt and regenerate translations
I have started to test, switch between dark and light theme require to go back to main screen to refresh theme.

biodranik

Thanks! It would be better to merge this PR first, and implement "Follow the sun" behavior separately, if needed.

biodranik · 2024-05-27T20:52:52Z

android/app/src/main/AndroidManifest.xml

      android:windowSoftInputMode="stateVisible"/>
    <activity
      android:name="app.organicmaps.widget.placepage.PlaceDescriptionActivity"
+      android:configChanges="uiMode"


Is there a way to automatically add it to any activity without explicitly specifying everywhere?

The XML attributes are only inherited by activities that actualy inherit (in java) other activities. So we were able to reduce the number of 'android:configChanges="uiMode"' by adding the BaseMwmFragmentActivity to the manifest and giving it that attribute.
However, any activity that specifies its configChanges, has to have "uiMode" set explicitly

biodranik · 2024-05-27T20:53:08Z

android/app/src/main/java/app/organicmaps/SplashActivity.java

@@ -103,6 +105,11 @@ protected void onDestroy()
    mPermissionRequest = null;
  }

+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig) {


Suggested change

public void onConfigurationChanged(@NonNull Configuration newConfig) {

public void onConfigurationChanged(@NonNull Configuration newConfig)

{

biodranik · 2024-05-27T20:53:28Z

android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java

@@ -128,6 +130,12 @@ public void onPostResume()
    }
  }

+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig) {


Suggested change

public void onConfigurationChanged(@NonNull Configuration newConfig) {

public void onConfigurationChanged(@NonNull Configuration newConfig)

{

biodranik · 2024-05-27T20:54:02Z

android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java

+    if (themeMode.equals(followSystemTheme)) {
+      return ThemeMode.FOLLOW_SYSTEM;
+    }


One-liners don't need braces.

Suggested change

if (themeMode.equals(followSystemTheme)) {

return ThemeMode.FOLLOW_SYSTEM;

}

if (themeMode.equals(followSystemTheme))

return ThemeMode.FOLLOW_SYSTEM;

biodranik · 2024-05-27T20:54:30Z

android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java

-      mAutoThemeChecker.run();
-      return;
-    }
+    System.out.println("theme:" + theme);


We really need to add a formatter. A lot of time and effort is spent on these nit comments.

biodranik · 2024-05-27T20:56:10Z

android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java

-    @Framework.MapStyle
-    int oldStyle = Framework.nativeGetMapStyle();
-
+  private int getStyle(@NonNull String theme) {


Suggested change

private int getStyle(@NonNull String theme) {

private int getStyle(@NonNull String theme)

{

biodranik · 2024-05-27T20:56:18Z

android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java

-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-
+    if (ThemeUtils.isNightTheme(mContext, theme)) {


Suggested change

if (ThemeUtils.isNightTheme(mContext, theme)) {

if (ThemeUtils.isNightTheme(mContext, theme))

{

biodranik · 2024-05-27T20:56:31Z

android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java

-      else
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-
+    } else {


Suggested change

} else {

}

else

{

biodranik · 2024-05-27T20:56:49Z

android/app/src/main/java/app/organicmaps/util/ThemeUtils.java

@@ -45,6 +47,25 @@ public static int getResource(@NonNull Context context, @AttrRes int style, @Att
    return VALUE_BUFFER.resourceId;
  }

+  public static String getAndroidTheme(@NonNull Context context) {


Please fix braces in other places.

biodranik · 2024-05-27T20:58:05Z

android/app/src/main/res/xml/prefs_main.xml

@@ -97,39 +97,39 @@
      android:summary="@string/enable_show_on_lock_screen_description"
      android:defaultValue="true"
      android:order="17"/>
+    <ListPreference
+        android:key="@string/pref_map_style"


Wrong indentation?

closes organicmaps#749 Changed from the existing night modes (on, off, auto), to "appearence" modes: - Light; - Dark; - System; System mode follows whatever mode the user's device is in. This implementation works for both normal android and AndroidAuto. Main changes: - added necessary strings to XML files; - changed the position and option names of the "map style preferences"; - implemented system mode, and some helper methods on ThemeSwitcher.java and ThemeUtils.java; - added uiMode changes detection to all activities; - removed "auto" mode implementation; Signed-off-by: Sebastiao Sousa <[email protected]> Co-authored-by: Francisco Nael Salgado <[email protected]>

Added system, light, and dark to strings.txt. Modified pref_map_style_title from Night Mode to Appearance Signed-off-by: Sebastiao Sousa <[email protected]> Co-authored-by: Francisco Nael Salgado <[email protected]>

SRSAS · 2024-05-28T00:43:26Z

Sorry for the formatting mistakes!
We think we've corrected the bug. We also have added the strings to strings.txt and regenerated.

Signed-off-by: Sebastião Andrade e Sousa <[email protected]> Co-authored-by: Francisco Nael Salgado <[email protected]>

Jean-BaptisteC · 2024-05-28T04:36:33Z

data/strings/strings.txt

+    eu = Argi
+    fa = نور
+    fi = Vaalea
+    fr = Claire


Suggested change

fr = Claire

fr = Clair

rtsisyk · 2024-06-09T12:34:46Z

Hi, thanks for contributing. This PR is my backlog and I will try to review and test it quickly. Please be patient.

biodranik · 2024-06-26T16:28:10Z

@SRSAS can you please rebase your PR? It's easy to avoid conflicts by removing the strings regeneration commit, and then by regenerating strings again.

@rtsisyk can you please test this PR? Many users asked for it.

Jean-BaptisteC

❌ Pixel 6 - Android 14
How system value works on device using Android 8 or Android 5 (In this version native settings to update theme device doesn't exist) ?
Change Android theme settings is not seen by the app when users is in OSM profile fragment and about fragment

biodranik · 2024-06-27T21:03:14Z

Change Android theme settings is not seen by the app when users is in OSM profile fragment and about fragment

Are these fragments recolored when they are closed/opened again?

Jean-BaptisteC · 2024-06-28T04:36:34Z

To refresh theme, that's require switch to another screen on app.
Maybe it's missing property in manifest for thes activities?

SRSAS · 2024-06-29T16:04:37Z

@SRSAS can you please rebase your PR? It's easy to avoid conflicts by removing the strings regeneration commit, and then by regenerating strings again.

@rtsisyk can you please test this PR? Many users asked for it.

Will do

SRSAS · 2024-06-29T16:06:55Z

❌ Pixel 6 - Android 14 How system value works on device using Android 8 or Android 5 (In this version native settings to update theme device doesn't exist) ? Change Android theme settings is not seen by the app when users is in OSM profile fragment and about fragment

I will look into it!

biodranik reviewed May 27, 2024

View reviewed changes

SRSAS and others added 2 commits May 28, 2024 01:21

[strings] Modified android strings

8f33814

Added system, light, and dark to strings.txt. Modified pref_map_style_title from Night Mode to Appearance Signed-off-by: Sebastiao Sousa <[email protected]> Co-authored-by: Francisco Nael Salgado <[email protected]>

SRSAS force-pushed the systemUIMode branch from 780df8c to c5425e3 Compare May 28, 2024 00:36

SRSAS force-pushed the systemUIMode branch from c5425e3 to 7cb6592 Compare May 28, 2024 00:47

[strings] Regenerated

7e38051

Signed-off-by: Sebastião Andrade e Sousa <[email protected]> Co-authored-by: Francisco Nael Salgado <[email protected]>

SRSAS force-pushed the systemUIMode branch from 7cb6592 to 7e38051 Compare May 28, 2024 00:50

Jean-BaptisteC reviewed May 28, 2024

View reviewed changes

data/strings/strings.txt

eu = Argi

fa = نور

fi = Vaalea

fr = Claire

Copy link

Member

Jean-BaptisteC May 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

fr = Claire

fr = Clair

biodranik added this to the Needs alpha/beta testing milestone May 28, 2024

rtsisyk self-assigned this Jun 9, 2024

Jean-BaptisteC requested changes Jun 26, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[android] Implement Light, Dark, and System modes on android(Auto) #8309

[android] Implement Light, Dark, and System modes on android(Auto) #8309

SRSAS commented May 27, 2024 •

edited

Loading

Jean-BaptisteC commented May 27, 2024

SRSAS commented May 27, 2024

Jean-BaptisteC commented May 27, 2024 •

edited

Loading

biodranik left a comment

biodranik May 27, 2024

SRSAS May 28, 2024

biodranik May 27, 2024

biodranik May 27, 2024

biodranik May 27, 2024

biodranik May 27, 2024

rtsisyk Jun 9, 2024

biodranik May 27, 2024

biodranik May 27, 2024

biodranik May 27, 2024

biodranik May 27, 2024

biodranik May 27, 2024

SRSAS commented May 28, 2024

Jean-BaptisteC May 28, 2024

rtsisyk commented Jun 9, 2024

biodranik commented Jun 26, 2024

Jean-BaptisteC left a comment

biodranik commented Jun 27, 2024

Jean-BaptisteC commented Jun 28, 2024

SRSAS commented Jun 29, 2024

SRSAS commented Jun 29, 2024

	public void onConfigurationChanged(@NonNull Configuration newConfig) {
	public void onConfigurationChanged(@NonNull Configuration newConfig)
	{

	private int getStyle(@NonNull String theme) {
	private int getStyle(@NonNull String theme)
	{

	if (ThemeUtils.isNightTheme(mContext, theme)) {
	if (ThemeUtils.isNightTheme(mContext, theme))
	{

[android] Implement Light, Dark, and System modes on android(Auto) #8309

Are you sure you want to change the base?

[android] Implement Light, Dark, and System modes on android(Auto) #8309

Conversation

SRSAS commented May 27, 2024 • edited Loading

Jean-BaptisteC commented May 27, 2024

SRSAS commented May 27, 2024

Jean-BaptisteC commented May 27, 2024 • edited Loading

biodranik left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SRSAS commented May 28, 2024

Choose a reason for hiding this comment

rtsisyk commented Jun 9, 2024

biodranik commented Jun 26, 2024

Jean-BaptisteC left a comment

Choose a reason for hiding this comment

biodranik commented Jun 27, 2024

Jean-BaptisteC commented Jun 28, 2024

SRSAS commented Jun 29, 2024

SRSAS commented Jun 29, 2024

SRSAS commented May 27, 2024 •

edited

Loading

Jean-BaptisteC commented May 27, 2024 •

edited

Loading