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 2016-01-27 19:57:01 +01:00
commit 36c92ab22e
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/plus/liveupdates/LiveUpdatesFragment.java
View file

@ -108,7 +108,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
//getSettings().LIVE_UPDATES_PURCHASED.set(true); //getSettings().LIVE_UPDATES_PURCHASED.set(true);
subscriptionHeader = inflater.inflate(R.layout.live_updates_header, listView, false); subscriptionHeader = inflater.inflate(R.layout.live_updates_header, listView, false);
updateHeader(); updateSubscriptionHeader();
listView.addHeaderView(subscriptionHeader); listView.addHeaderView(subscriptionHeader);
@ -116,7 +116,7 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
return view; return view;
} }
public void updateHeader() { public void updateSubscriptionHeader() {
View subscriptionBanner = subscriptionHeader.findViewById(R.id.subscription_banner); View subscriptionBanner = subscriptionHeader.findViewById(R.id.subscription_banner);
View subscriptionInfo = subscriptionHeader.findViewById(R.id.subscription_info); View subscriptionInfo = subscriptionHeader.findViewById(R.id.subscription_info);
if (getSettings().LIVE_UPDATES_PURCHASED.get()) { if (getSettings().LIVE_UPDATES_PURCHASED.get()) {
@ -176,18 +176,6 @@ public class LiveUpdatesFragment extends BaseOsmAndFragment {
} }
} }
public void updateSubscriptionBanner() {
View subscriptionBanner = subscriptionHeader.findViewById(R.id.subscription_banner);
View subscriptionInfo = subscriptionHeader.findViewById(R.id.subscription_info);
if (InAppHelper.isSubscribedToLiveUpdates()) {
subscriptionBanner.setVisibility(View.GONE);
subscriptionInfo.setVisibility(View.VISIBLE);
} else {
subscriptionBanner.setVisibility(View.VISIBLE);
subscriptionInfo.setVisibility(View.GONE);
}
}
@Override @Override
public void onDestroyView() { public void onDestroyView() {
super.onDestroyView(); super.onDestroyView();

5
OsmAnd/src/net/osmand/plus/liveupdates/SubscriptionFragment.java
View file

@ -4,7 +4,6 @@ import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@ -226,7 +225,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
Fragment parent = getParentFragment(); Fragment parent = getParentFragment();
if (parent != null && parent instanceof LiveUpdatesFragment) { if (parent != null && parent instanceof LiveUpdatesFragment) {
((LiveUpdatesFragment) parent).updateHeader(); ((LiveUpdatesFragment) parent).updateSubscriptionHeader();
} }
dismiss(); dismiss();
@ -330,7 +329,7 @@ public class SubscriptionFragment extends BaseOsmAndDialogFragment implements In
if (InAppHelper.getSkuLiveUpdates().equals(sku)) { if (InAppHelper.getSkuLiveUpdates().equals(sku)) {
Fragment parentFragment = getParentFragment(); Fragment parentFragment = getParentFragment();
if (parentFragment instanceof LiveUpdatesFragment) { if (parentFragment instanceof LiveUpdatesFragment) {
((LiveUpdatesFragment) parentFragment).updateSubscriptionBanner(); ((LiveUpdatesFragment) parentFragment).updateSubscriptionHeader();
} }
} }