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

Comma-separate group names in loyalty card view

Browse Source
This commit is contained in:
Sylvia van Os
2021-08-01 23:03:56 +02:00
parent c5b1718e8e
commit 6a13dbf66a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
@@ -32,6 +33,7 @@ import com.google.zxing.BarcodeFormat;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -380,14 +382,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
if(loyaltyCardGroups.size() > 0) {
StringBuilder groupsString = new StringBuilder();
List<String> groupNames = new ArrayList<>();
for (Group group : loyaltyCardGroups) {
groupsString.append(group._id);
groupsString.append(" ");
groupNames.add(group._id);
}
groupsView.setVisibility(View.VISIBLE);
groupsView.setText(getString(R.string.groupsList, groupsString.toString()));
groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
}
else