RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] add: Automatic day/night switching.

Browse source 
add: App background tracker stolen from GPS-tracker branch.
This commit is contained in:
Alexander Marchuk 2015-12-29 20:45:44 +03:00 • committed by Constantin Shalnev
parent e8af27aeae
commit cb34505034
16 changed files with 185 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -1273,16 +1273,11 @@ extern "C"
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_setMapStyle(JNIEnv * env, jclass thiz, jint mapStyle)
Java_com_mapswithme_maps_Framework_nativeSetMapStyle(JNIEnv * env, jclass thiz, jint mapStyle)
{
MapStyle const val = static_cast<MapStyle>(mapStyle);
g_framework->SetMapStyle(val);
}
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_Framework_getMapStyle(JNIEnv * env, jclass thiz)
{
return static_cast<jint>(g_framework->GetMapStyle());
if (val != g_framework->GetMapStyle())
g_framework->SetMapStyle(val);
}
JNIEXPORT void JNICALL
@ -1333,6 +1328,13 @@ extern "C"
frm()->DeregisterAllMaps();
}
JNIEXPORT jboolean JNICALL
Java_com_mapswithme_maps_Framework_nativeIsDayTime(JNIEnv * env, jclass thiz, jlong currentTimeUtc, jdouble lat, jdouble lon)
{
// TODO: Link to actual implementation
return false;
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_Framework_nativeSet3dMode(JNIEnv * env, jclass thiz, jboolean allow, jboolean allowBuildings)
{

1
android/res/values/donottranslate.xml
View file

@ -52,6 +52,7 @@
<!-- UI themes -->
<string name="theme_default" translatable="false">default</string>
<string name="theme_night" translatable="false">night</string>
<string name="theme_auto" translatable="false">auto</string>
<!-- Tags -->
<string name="tag_menu_collapse" translatable="false">collapse</string>

6
android/res/values/string-arrays.xml
View file

@ -14,12 +14,14 @@
<string-array name="map_style">
<item>@string/pref_map_style_default</item>
<item>@string/pref_map_style_night</item>
<item>@string/pref_map_style_auto</item>
</string-array>
<string-array name="map_style_values"
translatable="false">
<item>2</item>
<item>1</item>
<item>@string/theme_default</item>
<item>@string/theme_night</item>
<item>@string/theme_auto</item>
</string-array>
<string-array name="track_lengths">

6
android/src/com/mapswithme/country/DownloadFragment.java
View file

@ -33,11 +33,11 @@ public class DownloadFragment extends BaseMwmListFragment implements View.OnClic
private static int getTheme()
{
String theme = Config.getUiTheme();
if (ThemeUtils.THEME_DEFAULT.equals(theme))
String theme = Config.getCurrentUiTheme();
if (ThemeUtils.isDefaultTheme(theme))
return R.style.MwmTheme_Downloader;
if (ThemeUtils.THEME_NIGHT.equals(theme))
if (ThemeUtils.isNightTheme(theme))
return R.style.MwmTheme_Night_Downloader;
throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);

16
android/src/com/mapswithme/maps/Framework.java
View file

@ -3,7 +3,6 @@ package com.mapswithme.maps;
import com.mapswithme.maps.MapStorage.Index;
import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.bookmarks.data.MapObject.SearchResult;
import com.mapswithme.maps.routing.RoutingInfo;
import com.mapswithme.util.Constants;
@ -100,7 +99,7 @@ public class Framework
public native static void nativeClearApiPoints();
public native static void injectData(SearchResult searchResult, long index);
public native static void injectData(MapObject.SearchResult searchResult, long index);
public native static void deactivatePopup();
@ -160,9 +159,7 @@ public class Framework
public native static double[] predictLocation(double lat, double lon, double accuracy, double bearing, double speed, double elapsedSeconds);
public native static void setMapStyle(int mapStyle);
public native static int getMapStyle();
public native static void nativeSetMapStyle(int mapStyle);
public native static void nativeSetRouter(int routerType);
@ -186,6 +183,15 @@ public class Framework
public native static void nativeDeregisterMaps();
/**
* Determines if currently is day or night at the given location. Used to switch day/night styles.
* @param currentTimeUtc current Unix time (returned by {@link System#currentTimeMillis()}).
* @param lat latitude of the current location.
* @param lon longitude of the current location.
* @return {@code true} if it is day now or {@code false} otherwise.
*/
public static native boolean nativeIsDayTime(long currentTimeUtc, double lat, double lon);
public native static void nativeGet3dMode(Params3dMode result);
public native static void nativeSet3dMode(boolean allow3d, boolean allow3dBuildings);

4
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -292,10 +292,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public int getThemeResourceId(String theme)
{
if (ThemeUtils.THEME_DEFAULT.equals(theme))
if (ThemeUtils.isDefaultTheme(theme))
return R.style.MwmTheme_MainActivity;
if (ThemeUtils.THEME_NIGHT.equals(theme))
if (ThemeUtils.isNightTheme(theme))
return R.style.MwmTheme_Night_MainActivity;
return super.getThemeResourceId(theme);

2
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -21,6 +21,7 @@ import com.mapswithme.maps.location.TrackRecorder;
import com.mapswithme.maps.sound.TtsPlayer;
import com.mapswithme.util.Config;
import com.mapswithme.util.Constants;
import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Yota;
import com.mapswithme.util.statistics.AlohaHelper;
@ -128,6 +129,7 @@ public class MwmApplication extends Application
initNativeStrings();
BookmarkManager.getIcons(); // init BookmarkManager (automatically loads bookmarks)
TtsPlayer.INSTANCE.init(this);
ThemeSwitcher.restart();
mIsFrameworkInitialized = true;
}

6
android/src/com/mapswithme/maps/background/AppBackgroundTracker.java
View file

@ -117,4 +117,10 @@ public final class AppBackgroundTracker
{
mListeners.unregister(listener);
}
@android.support.annotation.UiThread
public Activity getTopActivity()
{
return (mActivities.size() == 0 ? null : mActivities.get(mActivities.keyAt(0)).get());
}
}

4
android/src/com/mapswithme/maps/base/BaseActivityDelegate.java
View file

@ -18,7 +18,7 @@ public class BaseActivityDelegate
public void onCreate()
{
mThemeName = Config.getUiTheme();
mThemeName = Config.getCurrentUiTheme();
mActivity.get().setTheme(mActivity.getThemeResourceId(mThemeName));
}
@ -56,7 +56,7 @@ public class BaseActivityDelegate
public void onPostResume()
{
if (mThemeName.equals(Config.getUiTheme()))
if (mThemeName.equals(Config.getCurrentUiTheme()))
return;
// Workaround described in https://code.google.com/p/android/issues/detail?id=93731

4
android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java
View file

@ -28,10 +28,10 @@ public class BaseMwmFragmentActivity extends AppCompatActivity
@Override
public int getThemeResourceId(String theme)
{
if (ThemeUtils.THEME_DEFAULT.equals(theme))
if (ThemeUtils.isDefaultTheme(theme))
return R.style.MwmTheme;
if (ThemeUtils.THEME_NIGHT.equals(theme))
if (ThemeUtils.isNightTheme(theme))
return R.style.MwmTheme_Night;
throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);

2
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -331,7 +331,7 @@ public class SearchFragment extends BaseMwmFragment
// change map style for the Map activity
final int mapStyle = isOld ? Framework.MAP_STYLE_LIGHT : (isDark ? Framework.MAP_STYLE_DARK : Framework.MAP_STYLE_CLEAR);
Framework.setMapStyle(mapStyle);
Framework.nativeSetMapStyle(mapStyle);
return true;
}

17
android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
View file

@ -15,7 +15,7 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.R;
import com.mapswithme.maps.location.TrackRecorder;
import com.mapswithme.util.Config;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.ThemeSwitcher;
import com.mapswithme.util.Yota;
import com.mapswithme.util.concurrency.UiThread;
import com.mapswithme.util.statistics.AlohaHelper;
@ -106,24 +106,21 @@ public class MapPrefsFragment extends BaseXmlSettingsFragment
}
});
int style = Framework.getMapStyle();
if (style == Framework.MAP_STYLE_LIGHT)
style = Framework.MAP_STYLE_CLEAR;
pref = findPreference(getString(R.string.pref_map_style));
((ListPreference) pref).setValue(String.valueOf(style));
((ListPreference) pref).setValue(Config.getUiThemeSettings());
pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
{
@Override
public boolean onPreferenceChange(Preference preference, Object newValue)
{
Framework.setMapStyle(Integer.parseInt((String) newValue));
String themeName = (String)newValue;
if (!Config.setUiThemeSettings(themeName))
return true;
String themeName = (String.valueOf(Framework.MAP_STYLE_DARK).equals(newValue) ? ThemeUtils.THEME_NIGHT : ThemeUtils.THEME_DEFAULT);
Config.setUiTheme(themeName);
ThemeSwitcher.restart();
getActivity().recreate();
Statistics.INSTANCE.trackEvent(Statistics.EventName.Settings.MAP_STYLE,
Statistics.params().add(Statistics.EventParam.NAME, themeName));
getActivity().recreate();
return true;
}
});

4
android/src/com/mapswithme/maps/settings/SettingsActivity.java
View file

@ -48,10 +48,10 @@ public class SettingsActivity extends PreferenceActivity
@Override
public int getThemeResourceId(String theme)
{
if (ThemeUtils.THEME_DEFAULT.equals(theme))
if (ThemeUtils.isDefaultTheme(theme))
return R.style.MwmTheme_Settings;
if (ThemeUtils.THEME_NIGHT.equals(theme))
if (ThemeUtils.isNightTheme(theme))
return R.style.MwmTheme_Night_Settings;
throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);

34
android/src/com/mapswithme/util/Config.java
View file

@ -3,6 +3,7 @@ package com.mapswithme.util;
import android.support.v4.app.DialogFragment;
import android.text.TextUtils;
import android.text.format.DateUtils;
import com.mapswithme.maps.BuildConfig;
public final class Config
@ -26,6 +27,7 @@ public final class Config
private static final String KEY_MISC_KITKAT_MIGRATED = "KitKatMigrationCompleted";
private static final String KEY_MISC_NEWS_LAST_VERSION = "WhatsNewShownVersion";
private static final String KEY_MISC_UI_THEME = "UiTheme";
private static final String KEY_MISC_UI_THEME_SETTINGS = "UiThemeSettings";
private Config() {}
@ -261,14 +263,40 @@ public final class Config
setInt(KEY_MISC_NEWS_LAST_VERSION, BuildConfig.VERSION_CODE);
}
public static String getUiTheme()
public static String getCurrentUiTheme()
{
return getString(KEY_MISC_UI_THEME, ThemeUtils.THEME_DEFAULT);
String res = getString(KEY_MISC_UI_THEME, ThemeUtils.THEME_DEFAULT);
if (!ThemeUtils.isValidTheme(res))
res = ThemeUtils.THEME_DEFAULT;
return res;
}
public static void setUiTheme(String theme)
public static void setCurrentUiTheme(String theme)
{
if (getCurrentUiTheme().equals(theme))
return;
setString(KEY_MISC_UI_THEME, theme);
ThemeSwitcher.changeMapStyle(theme);
}
public static String getUiThemeSettings()
{
String res = getString(KEY_MISC_UI_THEME_SETTINGS, ThemeUtils.THEME_DEFAULT);
if (!ThemeUtils.isValidTheme(res) && !ThemeUtils.isAutoTheme(res))
res = ThemeUtils.THEME_DEFAULT;
return res;
}
public static boolean setUiThemeSettings(String theme)
{
if (getUiThemeSettings().equals(theme))
return false;
setString(KEY_MISC_UI_THEME_SETTINGS, theme);
return true;
}
private static native boolean nativeGetBoolean(String name, boolean defaultValue);

65
android/src/com/mapswithme/util/ThemeSwitcher.java Normal file
View file

@ -0,0 +1,65 @@
package com.mapswithme.util;
import android.app.Activity;
import android.location.Location;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.util.concurrency.UiThread;
public final class ThemeSwitcher
{
private static final long CHECK_INTERVAL_MS = 30 * 60 * 1000;
private static final Runnable sCheckProc = new Runnable()
{
@Override
public void run()
{
Location last = LocationHelper.INSTANCE.getLastLocation();
String theme = ThemeUtils.THEME_DEFAULT;
if (last != null)
{
boolean day = Framework.nativeIsDayTime(System.currentTimeMillis(), last.getLatitude(), last.getLongitude());
theme = (day ? ThemeUtils.THEME_DEFAULT : ThemeUtils.THEME_NIGHT);
}
Config.setCurrentUiTheme(theme);
UiThread.cancelDelayedTasks(sCheckProc);
if (ThemeUtils.isAutoTheme())
UiThread.runLater(sCheckProc, CHECK_INTERVAL_MS);
}
};
private ThemeSwitcher() {}
@android.support.annotation.UiThread
public static void restart()
{
String theme = Config.getUiThemeSettings();
if (ThemeUtils.isAutoTheme(theme))
{
sCheckProc.run();
return;
}
UiThread.cancelDelayedTasks(sCheckProc);
Config.setCurrentUiTheme(theme);
}
@android.support.annotation.UiThread
public static void changeMapStyle(String theme)
{
int style = Framework.MAP_STYLE_CLEAR;
if (ThemeUtils.isNightTheme(theme))
style = Framework.MAP_STYLE_DARK;
Framework.nativeSetMapStyle(style);
Activity a = MwmApplication.backgroundTracker().getTopActivity();
if (a != null && !a.isFinishing())
a.recreate();
}
}

38
android/src/com/mapswithme/util/ThemeUtils.java
View file

@ -11,13 +11,16 @@ import android.view.LayoutInflater;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.R;
public class ThemeUtils
public final class ThemeUtils
{
public static final String THEME_DEFAULT = MwmApplication.get().getString(R.string.theme_default);
public static final String THEME_NIGHT = MwmApplication.get().getString(R.string.theme_night);
public static final String THEME_AUTO = MwmApplication.get().getString(R.string.theme_auto);
private static final TypedValue VALUE_BUFFER = new TypedValue();
private ThemeUtils() {}
public static @ColorInt int getColor(Context context, @AttrRes int attr)
{
if (!context.getTheme().resolveAttribute(attr, VALUE_BUFFER, true))
@ -40,8 +43,39 @@ public class ThemeUtils
return src.cloneInContext(wrapper);
}
public static boolean isDefaultTheme()
{
return isDefaultTheme(Config.getCurrentUiTheme());
}
public static boolean isDefaultTheme(String theme)
{
return THEME_DEFAULT.equals(theme);
}
public static boolean isNightTheme()
{
return THEME_NIGHT.equals(Config.getUiTheme());
return isNightTheme(Config.getCurrentUiTheme());
}
public static boolean isNightTheme(String theme)
{
return THEME_NIGHT.equals(theme);
}
public static boolean isAutoTheme()
{
return THEME_AUTO.equals(Config.getUiThemeSettings());
}
public static boolean isAutoTheme(String theme)
{
return THEME_AUTO.equals(theme);
}
public static boolean isValidTheme(String theme)
{
return (THEME_DEFAULT.equals(theme) ||
THEME_NIGHT.equals(theme));
}
}