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

Fix text for different versions

Browse source
This commit is contained in:
PavelRatushny 2017-07-20 17:29:32 +03:00
parent 0f8190c3fb
commit 439758211d
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -100,12 +100,9 @@ public class SecondSplashScreenFragment extends Fragment {
logoLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL); logoLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
ImageView text = new ImageView(activity); ImageView text = new ImageView(activity);
if (Version.isFreeVersion(app)) { if (Version.isFreeVersion(app)) {
if (InAppHelper.isSubscribedToLiveUpdates()) { if ((InAppHelper.isSubscribedToLiveUpdates() && InAppHelper.isFullVersionPurchased()) || InAppHelper.isSubscribedToLiveUpdates()) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_osmlive)); text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_osmlive));
} else if (OsmandPlugin.getPlugin(ParkingPositionPlugin.class) != null } else if (InAppHelper.isFullVersionPurchased()) {
|| OsmandPlugin.getPlugin(SkiMapsPlugin.class) != null
|| OsmandPlugin.getPlugin(NauticalMapsPlugin.class) != null
|| InAppHelper.isDepthContoursPurchased()) {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_inapp)); text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand_inapp));
} else { } else {
text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand)); text.setImageDrawable(getResources().getDrawable(R.drawable.image_text_osmand));
@ -165,7 +162,6 @@ public class SecondSplashScreenFragment extends Fragment {
@Override @Override
public void run() { public void run() {
android.util.Log.d("Splash", "dismisssplashinsplash");
if (activity instanceof MapActivity && !((MapActivity) activity).isActivityDestroyed()) { if (activity instanceof MapActivity && !((MapActivity) activity).isActivityDestroyed()) {
((MapActivity)activity).dismissSecondSplashScreen(); ((MapActivity)activity).dismissSecondSplashScreen();
} }