mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-04 15:43:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #817 from Kethen/card_view_color_fix

Browse Source 
#803 cardView appbar icon fix
This commit is contained in:
Sylvia van Os
2022-02-19 17:02:57 +01:00
committed by GitHub
parent 3466ba6591 8423ea9b59
commit 446131a87d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
View File

@@ -400,7 +400,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
private void adjustLayoutHeights() {
// use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated
if (iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
if (appBarLayout.getHeight() != 0 && iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight());
iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
@@ -925,6 +925,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
// Or the barcode will be centered instead of on top of the screen
// Don't ask me why...
appBarLayout.setVisibility(View.INVISIBLE);
iconImage.setVisibility(View.INVISIBLE);
collapsingToolbarLayout.setVisibility(View.GONE);
landscapeToolbar.setVisibility(View.GONE);
@@ -966,6 +967,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
// And restore 24dp paddingTop for appBarLayout
appBarLayout.setVisibility(View.VISIBLE);
setupOrientation();
iconImage.setVisibility(View.VISIBLE);
// Show other UI elements
cardIdFieldView.setVisibility(View.VISIBLE);