mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-05 04:32:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Sylvia van Os
2021-04-26 19:23:22 +02:00
parent 6421f09eab
commit b2c57258b3
12 changed files with 188 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/protect/card_locker/ImportURIHelper.java
View File

@@ -146,7 +146,7 @@ public class ImportURIHelper {
text.append(loyaltyCard.store + ": " + toUri(loyaltyCard));
if (i < (loyaltyCardCount - 1)) {
text.append("\n");
text.append("\n\n");
}
}

39
app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
View File

@@ -40,14 +40,13 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
{
super(inputCursor);
settings = new Settings(inputContext);
mSettings = new Settings(inputContext);
mCursor = inputCursor;
this.mContext = inputContext;
this.mListener = inputListener;
mContext = inputContext;
mListener = inputListener;
mSelectedItems = new SparseBooleanArray();
mAnimationItemsIndex = new SparseBooleanArray();
mSettings = new Settings(inputContext);
mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
}
@@ -71,28 +70,24 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
inputHolder.mStoreField.setText(loyaltyCard.store);
inputHolder.mStoreField.setTextSize(mSettings.getMediumFont());
if(!loyaltyCard.note.isEmpty()) {
inputHolder.mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
if (!loyaltyCard.note.isEmpty()) {
inputHolder.mNoteField.setVisibility(View.VISIBLE);
inputHolder.mNoteField.setText(loyaltyCard.note);
inputHolder.mNoteField.setTextSize(mSettings.getSmallFont());
}
else
{
inputHolder.mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
} else {
inputHolder.mNoteField.setVisibility(View.GONE);
}
if(!loyaltyCard.balance.equals(new BigDecimal("0"))) {
if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
inputHolder.mBalanceField.setVisibility(View.VISIBLE);
inputHolder.mBalanceField.setText(mContext.getString(R.string.balanceSentence, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType)));
inputHolder.mBalanceField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
}
else
{
inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
} else {
inputHolder.mBalanceField.setVisibility(View.GONE);
}
if(loyaltyCard.expiry != null)
if (loyaltyCard.expiry != null)
{
inputHolder.mExpiryField.setVisibility(View.VISIBLE);
int expiryString = R.string.expiryStateSentence;
@@ -101,14 +96,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
inputHolder.mExpiryField.setTextColor(mContext.getResources().getColor(R.color.alert));
}
inputHolder.mExpiryField.setText(mContext.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
inputHolder.mExpiryField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
}
else
{
inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
} else {
inputHolder.mExpiryField.setVisibility(View.GONE);
}
inputHolder.mStarIcon.setVisibility(((loyaltyCard.starStatus!=0)) ? View.VISIBLE : View.GONE);
inputHolder.mStarIcon.setVisibility((loyaltyCard.starStatus != 0) ? View.VISIBLE : View.GONE);
inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
@@ -286,8 +279,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
mInformationContainer = inputView.findViewById(R.id.information_container);
mStoreField = inputView.findViewById(R.id.store);
mNoteField = inputView.findViewById(R.id.note);
mBalanceField = inputView.findViewById(R.id.balanceField);
mExpiryField = inputView.findViewById(R.id.expiryField);
mBalanceField = inputView.findViewById(R.id.balance);
mExpiryField = inputView.findViewById(R.id.expiry);
mCardIcon = inputView.findViewById(R.id.thumbnail);
mStarIcon = inputView.findViewById(R.id.star);
inputView.setOnLongClickListener(this);

14
app/src/main/java/protect/card_locker/MainActivity.java
View File

@@ -343,7 +343,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
}
mCardList = findViewById(R.id.list);
RecyclerView.LayoutManager mLayoutManager= new LinearLayoutManager(getApplicationContext());
RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
mCardList.setLayoutManager(mLayoutManager);
mCardList.setItemAnimator(new DefaultItemAnimator());
@@ -352,6 +352,11 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
Cursor cardCursor = mDB.getLoyaltyCardCursor(filterText, group);
mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
mCardList.setAdapter(mAdapter);
registerForContextMenu(mCardList);
if(mDB.getLoyaltyCardCount() > 0)
{
// We want the cardList to be visible regardless of the filtered match count
@@ -359,7 +364,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
// the keyboard
mCardList.setVisibility(View.VISIBLE);
helpText.setVisibility(View.GONE);
if(mDB.getLoyaltyCardCount(filterText) > 0)
if(mAdapter.getItemCount() > 0)
{
noMatchingCardsText.setVisibility(View.GONE);
}
@@ -375,11 +380,6 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
noMatchingCardsText.setVisibility(View.GONE);
}
mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
mCardList.setAdapter(mAdapter);
registerForContextMenu(mCardList);
if (mCurrentActionMode != null) {
mCurrentActionMode.finish();
}