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

add text "Powered by OpenStreetMap data." to the second splash screen

Browse source 
(cherry picked from commit 805fc00e0b)
This commit is contained in:
Nazar 2019-07-17 11:59:41 +03:00
parent 5e5ecdf154
commit 80db67a8be
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/res/values-land/sizes.xml
View file

@ -2,8 +2,9 @@
<resources> <resources>
<dimen name="map_go_button_width">200dp</dimen> <dimen name="map_go_button_width">200dp</dimen>
<dimen name="splash_screen_logo_top">24dp</dimen> <dimen name="splash_screen_logo_top">12dp</dimen>
<dimen name="splash_screen_text_bottom">48dp</dimen> <dimen name="splash_screen_text_bottom">12dp</dimen>
<dimen name="splash_screen_osm_text_bottom">12dp</dimen>
<dimen name="empty_state_image_margin_top">39dp</dimen> <dimen name="empty_state_image_margin_top">39dp</dimen>
<dimen name="empty_state_image_margin_bottom">39dp</dimen> <dimen name="empty_state_image_margin_bottom">39dp</dimen>

44
OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
View file

@ -22,6 +22,10 @@ import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.inapp.InAppPurchaseHelper; import net.osmand.plus.inapp.InAppPurchaseHelper;
public class SecondSplashScreenFragment extends BaseOsmAndFragment { public class SecondSplashScreenFragment extends BaseOsmAndFragment {
private final static int LOGO_ID = 1001;
private final static int TEXT_ID = 1002;
private final static int OSM_TEXT_ID = 1003;
public static final String TAG = "SecondSplashScreenFragment"; public static final String TAG = "SecondSplashScreenFragment";
public static boolean SHOW = true; public static boolean SHOW = true;
public static boolean VISIBLE = false; public static boolean VISIBLE = false;
@ -86,6 +90,7 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
view.setBackgroundColor(getResources().getColor(R.color.map_background_color_light)); view.setBackgroundColor(getResources().getColor(R.color.map_background_color_light));
ImageView logo = new ImageView(getContext()); ImageView logo = new ImageView(getContext());
logo.setId(LOGO_ID);
if (Version.isFreeVersion(app)) { if (Version.isFreeVersion(app)) {
logo.setImageDrawable(getResources().getDrawable(R.drawable.ic_logo_splash_osmand)); logo.setImageDrawable(getResources().getDrawable(R.drawable.ic_logo_splash_osmand));
} else if (Version.isPaidVersion(app) || Version.isDeveloperVersion(app)) { } else if (Version.isPaidVersion(app) || Version.isDeveloperVersion(app)) {
@ -94,7 +99,9 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
RelativeLayout.LayoutParams logoLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT); RelativeLayout.LayoutParams logoLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
logoLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP); logoLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_TOP);
logoLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL); logoLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
ImageView text = new ImageView(activity); ImageView text = new ImageView(activity);
text.setId(TEXT_ID);
if (Version.isFreeVersion(app)) { if (Version.isFreeVersion(app)) {
if (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) { if (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_osmlive)); text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_osmlive));
@ -111,37 +118,44 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
} }
} }
RelativeLayout.LayoutParams textLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT); RelativeLayout.LayoutParams textLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
textLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); textLayoutParams.addRule(RelativeLayout.ABOVE, OSM_TEXT_ID);
textLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL); textLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
ImageView osmText = new ImageView(activity);
osmText.setId(OSM_TEXT_ID);
osmText.setImageDrawable(getResources().getDrawable(R.drawable.image_text_openstreetmap));
RelativeLayout.LayoutParams osmTextLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
osmTextLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
osmTextLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
int defaultLogoMarginTop = (int) getResources().getDimension(R.dimen.splash_screen_logo_top); int defaultLogoMarginTop = (int) getResources().getDimension(R.dimen.splash_screen_logo_top);
int logoMarginTop = defaultLogoMarginTop - (Build.VERSION.SDK_INT >= 21 ? 0 : getStatusBarHeight()); int logoMarginTop = defaultLogoMarginTop - (Build.VERSION.SDK_INT >= 21 ? 0 : getStatusBarHeight());
int logoPaddingLeft = 0; int textMarginBottom = (int) getResources().getDimension(R.dimen.splash_screen_text_bottom);
int logoPaddingRight = 0; int osmTextMarginBottom = (int) getResources().getDimension(R.dimen.splash_screen_osm_text_bottom);
int defaultTextMarginBottom = (int) getResources().getDimension(R.dimen.splash_screen_text_bottom); int elementsPaddingLeft = 0;
int textMarginBottom = defaultTextMarginBottom - getNavigationBarHeight(); int elementsPaddingRight = 0;
int textPaddingLeft = 0;
int textPaddingRight = 0;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1) {
int screenOrientation = AndroidUiHelper.getScreenOrientation(activity); int screenOrientation = AndroidUiHelper.getScreenOrientation(activity);
if (screenOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { if (screenOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
logoPaddingLeft = getNavigationBarWidth(); elementsPaddingLeft = getNavigationBarWidth();
textPaddingLeft = getNavigationBarWidth();
} else if (screenOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) { } else if (screenOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
logoPaddingRight = getNavigationBarWidth(); elementsPaddingRight = getNavigationBarWidth();
textPaddingRight = getNavigationBarWidth();
} }
} else { } else {
logoPaddingLeft = getNavigationBarWidth(); elementsPaddingLeft = getNavigationBarWidth();
textPaddingLeft = getNavigationBarWidth();
} }
logoLayoutParams.setMargins(0, logoMarginTop, 0, 0); logoLayoutParams.setMargins(0, logoMarginTop, 0, 0);
logo.setPadding(logoPaddingLeft, 0, logoPaddingRight, 0); logo.setPadding(elementsPaddingLeft, 0, elementsPaddingRight, 0);
logo.setLayoutParams(logoLayoutParams); logo.setLayoutParams(logoLayoutParams);
view.addView(logo); view.addView(logo);
textLayoutParams.setMargins(0, 0, 0, textMarginBottom); textLayoutParams.setMargins(0, 0, 0, textMarginBottom);
text.setPadding(textPaddingLeft, 0, textPaddingRight, 0); text.setPadding(elementsPaddingLeft, 0, elementsPaddingRight, 0);
text.setLayoutParams(textLayoutParams); text.setLayoutParams(textLayoutParams);
view.addView(text); view.addView(text);
osmTextLayoutParams.setMargins(0, 0, 0, osmTextMarginBottom);
osmText.setPadding(elementsPaddingLeft, 0, elementsPaddingRight, 0);
osmText.setLayoutParams(osmTextLayoutParams);
view.addView(osmText);
return view; return view;
} }