Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-11-16 09:32:23 +01:00
commit e5ed378868
5 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -52,13 +52,15 @@ import java.util.Random;
import btools.routingapp.BRouterServiceConnection;
/**
* Created by Denis
* on 03.03.15.
*/
public class AppInitializer implements IProgress {
// 22 - 2.2
private static final int CURRENT_VERSION_FOR_UGPRADE = 22;
public static final boolean TIPS_AND_TRICKS = false;
private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
private static final String VERSION_INSTALLED_NUMBER = "VERSION_INSTALLED_NUMBER"; //$NON-NLS-1$
public static final String NUMBER_OF_STARTS = "NUMBER_OF_STARTS"; //$NON-NLS-1$
public static final String FIRST_INSTALLED = "FIRST_INSTALLED"; //$NON-NLS-1$
private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
@ -130,7 +132,13 @@ public class AppInitializer implements IProgress {
firstTime = true;
startPrefs.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
startPrefs.edit().putInt(VERSION_INSTALLED_NUMBER, CURRENT_VERSION_FOR_UGPRADE).commit();
} else if (!Version.getFullVersion(app).equals(startPrefs.getString(VERSION_INSTALLED, ""))) {
if(startPrefs.getInt(VERSION_INSTALLED_NUMBER, 0) < 22) {
app.getSettings().SHOW_DASHBOARD_ON_START.set(true);
app.getSettings().SHOW_DASHBOARD_ON_MAP_SCREEN.set(true);
app.getSettings().SHOW_CARD_TO_CHOOSE_DRAWER.set(true);
}
startPrefs.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
appVersionChanged = true;
}

4
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -633,6 +633,10 @@ public class OsmandSettings {
}
public final CommonPreference<Boolean> USE_FAST_RECALCULATION = new BooleanPreference("use_fast_recalculation", true).makeGlobal().cache();
public final CommonPreference<Boolean> SHOW_CARD_TO_CHOOSE_DRAWER = new BooleanPreference("show_card_to_choose_drawer", false).makeGlobal();
public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_START = new BooleanPreference("should_show_dashboard_on_start", false).makeGlobal();
public final CommonPreference<Boolean> SHOW_DASHBOARD_ON_MAP_SCREEN = new BooleanPreference("show_dashboard_on_map_screen", false).makeGlobal();
// this value string is synchronized with settings_pref.xml preference name
public final CommonPreference<Boolean> USE_INTERNET_TO_DOWNLOAD_TILES = new BooleanPreference("use_internet_to_download_tiles", true).makeGlobal().cache();

6
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -140,8 +140,6 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
private IMapDownloaderCallback downloaderCallback;
private DrawerLayout drawerLayout;
public static final String SHOULD_SHOW_DASHBOARD_ON_START = "should_show_dashboard_on_start";
private Notification getNotification() {
Intent notificationIndent = new Intent(this, getMyApplication().getAppCustomization().getMapActivity());
notificationIndent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@ -393,9 +391,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents {
long tm = System.currentTimeMillis();
if (app.isApplicationInitializing() || DashboardOnMap.staticVisible) {
if (!dashboardOnMap.isVisible()) {
final OsmandSettings.CommonPreference<Boolean> shouldShowDashboardOnStart =
settings.registerBooleanPreference(MapActivity.SHOULD_SHOW_DASHBOARD_ON_START, true);
if (shouldShowDashboardOnStart.get() || dashboardOnMap.hasCriticalMessages()) {
if (settings.SHOW_DASHBOARD_ON_START.get()) {
dashboardOnMap.setDashboardVisibility(true, DashboardOnMap.staticVisibleType);
} else {
if (ErrorBottomSheetDialog.shouldShow(settings, this)) {

6
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -904,12 +904,6 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks {
transaction.show(frag).commit();
}
// TODO: 11/13/15 Remove
public boolean hasCriticalMessages() {
final OsmandSettings settings = getMyApplication().getSettings();
return rateUsShouldShow.shouldShow(settings, mapActivity, DashRateUsFragment.TAG);
}
View getParentView() {
return dashboardView;
}

9
OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
View file

@ -71,11 +71,10 @@ public class DashboardSettingsDialogFragment extends DialogFragment
R.layout.show_dashboard_on_start_dialog_item, null, false);
final TextView textView = (TextView) view.findViewById(R.id.text);
textView.setText(R.string.show_on_start);
final OsmandSettings.CommonPreference<Boolean> shouldShowDashboardOnStart =
settings.registerBooleanPreference(MapActivity.SHOULD_SHOW_DASHBOARD_ON_START, true);
final CompoundButton compoundButton = (CompoundButton) view.findViewById(R.id.check_item);
compoundButton.setChecked(shouldShowDashboardOnStart.get());
textView.setTextColor(shouldShowDashboardOnStart.get() ? textColorPrimary
// FIXME Yura add settings.SHOW_DASHBOARD_ON_MAP_SCREEN
compoundButton.setChecked(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get());
textView.setTextColor(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get() ? textColorPrimary
: textColorSecondary);
compoundButton.setOnCheckedChangeListener(
new CompoundButton.OnCheckedChangeListener() {
@ -111,7 +110,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
}
}
mapActivity.getDashboard().refreshDashboardFragments();
shouldShowDashboardOnStart.set(compoundButton.isChecked());
settings.SHOW_DASHBOARD_ON_MAP_SCREEN.set(compoundButton.isChecked());
}
})
.setNegativeButton(R.string.shared_string_cancel, null);