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

Various minor fixes

Browse Source
This commit is contained in:
Sylvia van Os
2022-05-25 21:06:21 +02:00
parent 00b0502a6a
commit 05f3b77a73
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Changelog
## Unreleased - 108
- Add card duplication feature
## v2.16.3 - 107 (2022-04-15)
- Stocard import fixes

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

@@ -777,9 +777,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
}
if (!initDone) {
if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
if (updateLoyaltyCard) {
setTitle(R.string.editCardTitle);
} else {
setTitle(R.string.addCardTitle);
}
if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
if (!mFrontImageUnsaved && !croppedFrontImage() && !mFrontImageRemoved) {
setCardImage(cardImageFront, Utils.retrieveCardImage(this, tempLoyaltyCard.id, ImageLocationType.front), true);
}

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

@@ -981,8 +981,8 @@ public class LoyaltyCardViewActivityTest {
final Menu menu = shadowOf(activity).getOptionsMenu();
assertTrue(menu != null);
// The share, settings, add and star button should be present
assertEquals(menu.size(), 3);
// The share, settings, star and duplicate options should be present
assertEquals(menu.size(), 4);
assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
@@ -1200,8 +1200,8 @@ public class LoyaltyCardViewActivityTest {
final Menu menu = shadowOf(activity).getOptionsMenu();
assertTrue(menu != null);
// The share, settings and star button should be present
assertEquals(menu.size(), 3);
// The share, settings, star and duplicate options should be present
assertEquals(menu.size(), 4);
assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());