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

Hide buttons containers, not text views

Browse source
This commit is contained in:
Alex Sytnyk 2018-04-25 17:40:19 +03:00
parent 7ca3ab24c9
commit 7c6db07e8f
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,6 +127,7 @@
android:layout_marginRight="@dimen/bottom_sheet_content_margin_small">
<FrameLayout
android:id="@+id/secondary_btn_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -156,6 +157,7 @@
android:layout_height="match_parent"/>
<FrameLayout
android:id="@+id/primary_btn_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"

28
OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
View file

@ -35,8 +35,8 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
holder.fileIcon.setImageDrawable(getFileIcon());
holder.fileTitle.setText(getFileTitle());
holder.fileDescription.setText(getFileDescription());
boolean primaryBtnVisible = updatePrimaryButton(holder.primaryButton);
boolean secondaryBtnVisible = updateSecondaryButton(holder.secondaryBtn);
boolean primaryBtnVisible = updatePrimaryButton(holder);
boolean secondaryBtnVisible = updateSecondaryButton(holder);
holder.buttonsDivider.setVisibility(primaryBtnVisible && secondaryBtnVisible ? View.VISIBLE : View.GONE);
}
}
@ -81,11 +81,11 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
/**
* @return true if button is visible, false otherwise.
*/
private boolean updateSecondaryButton(TextView btn) {
private boolean updateSecondaryButton(DownloadUpdateVH vh) {
if (loadingInProgress || !download) {
btn.setText(loadingInProgress ? R.string.shared_string_cancel : R.string.later);
btn.setVisibility(View.VISIBLE);
btn.setOnClickListener(new View.OnClickListener() {
vh.secondaryBtn.setText(loadingInProgress ? R.string.shared_string_cancel : R.string.later);
vh.secondaryBtn.setVisibility(View.VISIBLE);
vh.secondaryBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onSecondaryBtnClick();
@ -93,18 +93,18 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
});
return true;
}
btn.setVisibility(View.GONE);
vh.secondaryBtnContainer.setVisibility(View.GONE);
return false;
}
/**
* @return true if button is visible, false otherwise.
*/
private boolean updatePrimaryButton(TextView btn) {
private boolean updatePrimaryButton(DownloadUpdateVH vh) {
if (!loadingInProgress) {
btn.setText(download ? R.string.shared_string_download : R.string.shared_string_update);
btn.setVisibility(View.VISIBLE);
btn.setOnClickListener(new View.OnClickListener() {
vh.primaryButton.setText(download ? R.string.shared_string_download : R.string.shared_string_update);
vh.primaryButton.setVisibility(View.VISIBLE);
vh.primaryButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
onPrimaryBtnClick();
@ -112,7 +112,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
});
return true;
}
btn.setVisibility(View.GONE);
vh.primaryBtnContainer.setVisibility(View.GONE);
return false;
}
@ -133,8 +133,10 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
final TextView fileTitle;
final TextView fileDescription;
final ProgressBar progressBar;
final View secondaryBtnContainer;
final TextView secondaryBtn;
final View buttonsDivider;
final View primaryBtnContainer;
final TextView primaryButton;
@SuppressWarnings("RedundantCast")
@ -147,8 +149,10 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
fileTitle = (TextView) itemView.findViewById(R.id.file_title);
fileDescription = (TextView) itemView.findViewById(R.id.file_description);
progressBar = (ProgressBar) itemView.findViewById(R.id.progress_bar);
secondaryBtnContainer = itemView.findViewById(R.id.secondary_btn_container);
secondaryBtn = (TextView) itemView.findViewById(R.id.secondary_button);
buttonsDivider = itemView.findViewById(R.id.buttons_divider);
primaryBtnContainer = itemView.findViewById(R.id.primary_btn_container);
primaryButton = (TextView) itemView.findViewById(R.id.primary_button);
}
}