Sort by usage #1212
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -53,6 +53,8 @@ public void onBindViewHolder(GroupListItemViewHolder inputHolder, Cursor inputCu | |||
| int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id); | ||||
| int archivedCardCount = DBHelper.getArchivedCardsCount(mDatabase, group._id); | ||||
|
|
||||
| System.out.println("Try to find 1"); | ||||
|
|
||||
|
Comment on lines
+56
to
+57
There was a problem hiding this comment. Unnecessary debug statement.
Suggested change
|
||||
| Resources resources = mContext.getResources(); | ||||
|
|
||||
| String cardCountText; | ||||
|
|
||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,8 @@ public class ImportURIHelper { | |
| private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE; | ||
| private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR; | ||
|
|
||
| private static final String USAGE_NUMBER = DBHelper.LoyaltyCardDbIds.USAGE_NUMBER; | ||
|
|
||
|
Comment on lines
+30
to
+31
There was a problem hiding this comment. There is no need to add this to ImportURIHelper. I don't think that someone else using a card a lot should affect how often it is considered used in your installation. |
||
| private final Context context; | ||
| private final String[] hosts = new String[3]; | ||
| private final String[] paths = new String[3]; | ||
|
|
@@ -92,6 +94,7 @@ public LoyaltyCard parse(Uri uri) throws InvalidObjectException { | |
| String note = kv.get(NOTE); | ||
| String cardId = kv.get(CARD_ID); | ||
| String barcodeId = kv.get(BARCODE_ID); | ||
| int usage_number = Integer.parseInt(kv.get(USAGE_NUMBER)); | ||
| if (store == null || note == null || cardId == null) | ||
| throw new InvalidObjectException("Not a valid import URI: " + uri.toString()); | ||
|
|
||
|
|
@@ -122,7 +125,7 @@ public LoyaltyCard parse(Uri uri) throws InvalidObjectException { | |
| headerColor = Integer.parseInt(unparsedHeaderColor); | ||
| } | ||
|
|
||
| return new LoyaltyCard(-1, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100, 0, usage_number); | ||
| } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) { | ||
| throw new InvalidObjectException("Not a valid import URI"); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,12 +34,14 @@ public class LoyaltyCard implements Parcelable { | |
| public final long lastUsed; | ||
| public int zoomLevel; | ||
|
|
||
| public int usage_number; | ||
|
There was a problem hiding this comment. Can't this be final like the rest? Also, please use camel-case like everywhere else. |
||
|
|
||
| public LoyaltyCard(final int id, final String store, final String note, final Date validFrom, | ||
| final Date expiry, final BigDecimal balance, final Currency balanceType, | ||
| final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType, | ||
| @Nullable final Integer headerColor, final int starStatus, | ||
| final long lastUsed, final int zoomLevel, final int archiveStatus, | ||
| int usage_number) { | ||
|
There was a problem hiding this comment. Can't this be final like the rest? Also, please use camel-case like everywhere else. |
||
| this.id = id; | ||
| this.store = store; | ||
| this.note = note; | ||
|
|
@@ -55,6 +57,7 @@ public LoyaltyCard(final int id, final String store, final String note, final Da | |
| this.lastUsed = lastUsed; | ||
| this.zoomLevel = zoomLevel; | ||
| this.archiveStatus = archiveStatus; | ||
| this.usage_number = usage_number; | ||
|
There was a problem hiding this comment. Please use camel-case like everywhere else. |
||
| } | ||
|
|
||
| protected LoyaltyCard(Parcel in) { | ||
|
|
@@ -110,6 +113,7 @@ public static LoyaltyCard toLoyaltyCard(Cursor cursor) { | |
| int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)); | ||
| long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED)); | ||
| int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL)); | ||
| int usage_number = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.USAGE_NUMBER)); | ||
|
There was a problem hiding this comment. Please use camel-case like everywhere else. |
||
| int archived = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS)); | ||
|
|
||
| int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE); | ||
|
|
@@ -142,7 +146,7 @@ public static LoyaltyCard toLoyaltyCard(Cursor cursor) { | |
| headerColor = cursor.getInt(headerColorColumn); | ||
| } | ||
|
|
||
| return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId ,barcodeType, headerColor, starred, lastUsed, zoomLevel, archived, usage_number); | ||
|
There was a problem hiding this comment. Please use camel-case like everywhere else. |
||
| } | ||
|
|
||
| @Override | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| package protect.card_locker; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.app.Activity; | ||
| import android.app.DatePickerDialog; | ||
|
|
@@ -73,7 +72,6 @@ | |
| import androidx.annotation.NonNull; | ||
| import androidx.annotation.Nullable; | ||
| import androidx.annotation.StringRes; | ||
| import androidx.appcompat.app.AlertDialog; | ||
| import androidx.appcompat.widget.AppCompatTextView; | ||
| import androidx.appcompat.widget.Toolbar; | ||
|
|
@@ -222,7 +220,8 @@ private static LoyaltyCard updateTempState(LoyaltyCard loyaltyCard, LoyaltyCardF | |
| (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus), | ||
| 0, // Unimportant, always set to null in doSave so the DB updates it to the current timestamp | ||
| 100, // Unimportant, not updated in doSave, defaults to 100 for new cards | ||
| (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus), | ||
| (int) (fieldName == LoyaltyCardField.usage_number ? value : 0) | ||
|
There was a problem hiding this comment. This should use the variable, I think otherwise the usage will be reset to 0 every time you edit the card. Also, please use camel-case like everywhere else. |
||
| ); | ||
| } | ||
|
|
||
|
|
@@ -755,7 +754,7 @@ public void onResume() { | |
| } | ||
| } else { | ||
| // New card, use default values | ||
| tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100,0, 0); | ||
|
|
||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ public enum LoyaltyCardField { | |
| cardId, | ||
| barcodeId, | ||
| barcodeType, | ||
| usage_number, | ||
|
There was a problem hiding this comment. Please use camel-case like everywhere else. And please keep the same order as in the database class (so, below archiveStatus) |
||
| headerColor, | ||
| starStatus, | ||
| archiveStatus | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -308,6 +308,7 @@ private void setCenterGuideline(int zoomLevel) { | |||
|
|
||||
| @Override | ||||
| protected void onCreate(Bundle savedInstanceState) { | ||||
|
|
||||
|
There was a problem hiding this comment. Unnecessary whitespace change.
Suggested change
|
||||
| if (savedInstanceState == null) { | ||||
| Bundle incomingIntentExtras = getIntent().getExtras(); | ||||
|
|
||||
|
|
@@ -428,6 +429,8 @@ public void onStopTrackingTouch(SeekBar seekBar) { | |||
| maximizeButton.setOnClickListener(v -> setFullscreen(true)); | ||||
| minimizeButton.setOnClickListener(v -> setFullscreen(false)); | ||||
|
|
||||
| DBHelper.updateLoyaltyCardUsageNumber(database, loyaltyCardId); | ||||
|
|
||||
|
Comment on lines
+432
to
+433
There was a problem hiding this comment. Would be nice to put this either near the top or all the way at the bottom for clarity. There was a problem hiding this comment. Hi, i don't know where to put this function, i think it going to be null :/ |
||||
| editButton = binding.fabEdit; | ||||
| editButton.setOnClickListener(v -> { | ||||
| Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class); | ||||
|
|
@@ -466,7 +469,10 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int | |||
| iconImage.setClipBounds(new Rect(left, top, right, bottom)); | ||||
| } | ||||
| }); | ||||
|
|
||||
|
There was a problem hiding this comment. Unnecessary whitespace change.
Suggested change
|
||||
| this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN); | ||||
| //this.database | ||||
|
|
||||
|
Comment on lines
+474
to
+475
There was a problem hiding this comment. Unnecessary debug comment.
Suggested change
|
||||
| } | ||||
|
|
||||
| private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) { | ||||
|
|
||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard | |
| private int mLoyaltyCardCount = 0; | ||
| protected String mFilter = ""; | ||
| protected Object mGroup = null; | ||
| protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.UsageNumber; | ||
|
There was a problem hiding this comment. Please don't change the default sorting style. |
||
| protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending; | ||
| protected int selectedTab = 0; | ||
| private RecyclerView mCardList; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,5 +12,6 @@ | |
| <item>@string/sort_by_name</item> | ||
| <item>@string/sort_by_most_recently_used</item> | ||
| <item>@string/sort_by_expiry</item> | ||
| <item>@string/sort_by_usage</item> | ||
| </string-array> | ||
| </resources> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -263,6 +263,7 @@ | |
| <string name="sort_by_balance">Balance</string> | ||
| <!-- \"Reversed order\" is also OK. This is an option in the card sorting list --> | ||
| <string name="reverse">…in reversed order</string> | ||
| <string name="sort_by_usage">Usage</string> | ||
| <string name="sort_by">Sort by</string> | ||
| <string name="version_history">Version History</string> | ||
| <string name="arrow" translatable="false"><![CDATA[>]]></string> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I'd much prefer this to be named
USAGE_COUNTandusagecount. To me that is more logical.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done :)