mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-01 21:56:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace rotation lock icon with barcode orientation setting (#901)

Browse Source
This commit is contained in:
Sylvia van Os
2022-06-19 00:20:56 +02:00
committed by GitHub
parent d3487cc535
commit 4ad73a754e
44 changed files with 50 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -981,10 +981,9 @@ public class LoyaltyCardViewActivityTest {
final Menu menu = shadowOf(activity).getOptionsMenu();
assertTrue(menu != null);
// The share, settings, star and duplicate options should be present
assertEquals(menu.size(), 4);
// The share, star and overflow options should be present
assertEquals(menu.size(), 3);
assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
@@ -1148,40 +1147,6 @@ public class LoyaltyCardViewActivityTest {
database.close();
}
@Test
public void checkScreenOrientationLockSetting() {
for (boolean locked : new boolean[]{false, true}) {
ActivityController activityController = createActivityWithLoyaltyCard(false);
Activity activity = (Activity) activityController.get();
SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null,0);
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
settings.edit()
.putBoolean(activity.getResources().getString(R.string.settings_key_lock_barcode_orientation), locked)
.apply();
activityController.start();
activityController.resume();
activityController.visible();
assertEquals(false, activity.isFinishing());
MenuItem item = shadowOf(activity).getOptionsMenu().findItem(R.id.action_lock_unlock);
if (locked) {
assertEquals(item.isVisible(), false);
} else {
assertEquals(item.isVisible(), true);
String title = item.getTitle().toString();
assertEquals(title, activity.getString(R.string.lockScreen));
}
database.close();
}
}
@Test
public void checkPushStarIcon() {
ActivityController activityController = createActivityWithLoyaltyCard(false);
@@ -1200,8 +1165,8 @@ public class LoyaltyCardViewActivityTest {
final Menu menu = shadowOf(activity).getOptionsMenu();
assertTrue(menu != null);
// The share, settings, star and duplicate options should be present
assertEquals(menu.size(), 4);
// The share, star and overflow options should be present
assertEquals(menu.size(), 3);
assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());