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

Reset state on paused to prevent layout glitches

Browse Source
This commit is contained in:
Sylvia van Os
2020-01-19 19:07:06 +01:00
parent 2c12c312e3
commit 4a7e8b6eba
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,6 +145,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
Log.i(TAG, "To view card: " + loyaltyCardId);
if(barcodeIsFullscreen)
{
// Properly reset state to prevent any issues
recreate();
}
// The brightness value is on a scale from [0, ..., 1], where
// '1' is the brightest. We attempt to maximize the brightness
// to help barcode readers scan the barcode.

15
app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
View File

@@ -738,6 +738,21 @@ public class LoyaltyCardViewActivityTest
assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
// Resuming the activity should revert the state to normal view
activityController.pause();
activityController.resume();
uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
// Clicking the barcode should still work to fullscreen again
barcodeImage.performClick();
uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
assertEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
// In full screen mode, back button should disable fullscreen
activity.onBackPressed();
uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();