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

Fix free version banner expanding

Browse source
This commit is contained in:
Alexey Kulish 2016-08-19 10:34:11 +03:00
parent c6652cf0f2
commit d15b3388bb
2 changed files with 36 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/free_version_banner.xml
View file

@ -241,6 +241,8 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/list_header_height"
android:layout_marginLeft="40dp"
android:paddingLeft="14dp"
android:paddingRight="14dp"
android:text="@string/later"
android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size"/>

81
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -330,40 +330,6 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
fragment.show(activity.getSupportFragmentManager(), "dialog");
}
private static class ToggleCollapseFreeVersionBanner implements OnClickListener {
private final View freeVersionDescriptionTextView;
private final View buttonsLinearLayout;
private final View freeVersionTitle;
private final View priceInfoLayout;
private final OsmandSettings settings;
private ToggleCollapseFreeVersionBanner(View freeVersionDescriptionTextView,
View buttonsLinearLayout, View freeVersionTitle,
View priceInfoLayout, OsmandSettings settings) {
this.freeVersionDescriptionTextView = freeVersionDescriptionTextView;
this.buttonsLinearLayout = buttonsLinearLayout;
this.freeVersionTitle = freeVersionTitle;
this.priceInfoLayout = priceInfoLayout;
this.settings = settings;
}
@Override
public void onClick(View v) {
if (freeVersionDescriptionTextView.getVisibility() == View.VISIBLE
&& isDownlodingPermitted(settings)) {
freeVersionDescriptionTextView.setVisibility(View.GONE);
buttonsLinearLayout.setVisibility(View.GONE);
priceInfoLayout.setVisibility(View.GONE);
} else {
freeVersionDescriptionTextView.setVisibility(View.VISIBLE);
buttonsLinearLayout.setVisibility(View.VISIBLE);
freeVersionTitle.setVisibility(View.VISIBLE);
priceInfoLayout.setVisibility(View.VISIBLE);
}
}
}
public static boolean isDownlodingPermitted(OsmandSettings settings) {
final Integer mapsDownloaded = settings.NUMBER_OF_FREE_DOWNLOADS.get();
int downloadsLeft = DownloadValidationManager.MAXIMUM_AVAILABLE_FREE_DOWNLOADS - mapsDownloaded;
@ -394,6 +360,20 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
private boolean showSpace;
private boolean updatingPrices;
private static boolean wasCollapsed;
private OnClickListener onCollapseListener = new OnClickListener() {
@Override
public void onClick(View v) {
if (freeVersionDescriptionTextView.getVisibility() == View.VISIBLE
&& isDownlodingPermitted(application.getSettings())) {
collapseBanner();
wasCollapsed = true;
} else {
expandBanner();
}
}
};
public BannerAndDownloadFreeVersion(View view, final DownloadActivity ctx, boolean showSpace) {
this.ctx = ctx;
this.showSpace = showSpace;
@ -473,6 +453,20 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
}
}
private void collapseBanner() {
freeVersionDescriptionTextView.setVisibility(View.GONE);
buttonsLinearLayout.setVisibility(View.GONE);
priceInfoLayout.setVisibility(View.GONE);
freeVersionBannerTitle.setVisibility(View.VISIBLE);
}
private void expandBanner() {
freeVersionDescriptionTextView.setVisibility(View.VISIBLE);
buttonsLinearLayout.setVisibility(View.VISIBLE);
priceInfoLayout.setVisibility(View.VISIBLE);
freeVersionBannerTitle.setVisibility(View.VISIBLE);
}
public void hideDownloadProgressLayout() {
downloadProgressLayout.setVisibility(View.GONE);
}
@ -510,10 +504,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
ctx.startActivity(intent);
}
});
ToggleCollapseFreeVersionBanner clickListener =
new ToggleCollapseFreeVersionBanner(freeVersionDescriptionTextView,
buttonsLinearLayout, freeVersionBannerTitle, priceInfoLayout, application.getSettings());
laterButton.setOnClickListener(clickListener);
laterButton.setOnClickListener(onCollapseListener);
LinearLayout marksLinearLayout = (LinearLayout) freeVersionBanner.findViewById(R.id.marksLinearLayout);
Space spaceView = new Space(ctx);
@ -536,8 +527,10 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
marksLinearLayout.addView(spaceView);
}
updateFreeVersionBanner();
if (wasCollapsed) {
collapseBanner();
}
}
private void updateFreeVersionBanner() {
@ -554,8 +547,7 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
laterButton.setVisibility(View.GONE);
}
downloadsLeftTextView.setText(ctx.getString(R.string.downloads_left_template, downloadsLeft));
freeVersionBanner.findViewById(R.id.bannerTopLayout).setOnClickListener(new ToggleCollapseFreeVersionBanner(freeVersionDescriptionTextView,
buttonsLinearLayout, freeVersionBannerTitle, priceInfoLayout, settings));
freeVersionBanner.findViewById(R.id.bannerTopLayout).setOnClickListener(onCollapseListener);
if (InAppHelper.hasPrices() || !updatingPrices) {
if (!InAppHelper.hasPrices()) {
@ -586,15 +578,10 @@ public class DownloadActivity extends AbstractDownloadActivity implements Downlo
private void setMinimizedFreeVersionBanner(boolean minimize) {
if (minimize && isDownlodingPermitted(application.getSettings())) {
freeVersionDescriptionTextView.setVisibility(View.GONE);
buttonsLinearLayout.setVisibility(View.GONE);
collapseBanner();
freeVersionBannerTitle.setVisibility(View.GONE);
priceInfoLayout.setVisibility(View.GONE);
} else {
freeVersionDescriptionTextView.setVisibility(View.VISIBLE);
buttonsLinearLayout.setVisibility(View.VISIBLE);
freeVersionBannerTitle.setVisibility(View.VISIBLE);
priceInfoLayout.setVisibility(View.VISIBLE);
}
}
}