diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17e889253..4b65906fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
Changes:
- Add option to set a separate barcode value from card ID
+- Simplify font sizing configuration
## v1.12 (2021-03-30)
diff --git a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
index 54a96a9a2..1aa4da2cb 100644
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -50,7 +50,7 @@ class GroupCursorAdapter extends CursorAdapter
countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
- nameField.setTextSize(settings.getCardTitleListFontSize());
- countField.setTextSize(settings.getCardNoteListFontSize());
+ nameField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+ countField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
}
}
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index e20a03769..e828ddfce 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -52,13 +52,13 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
// Populate fields with extracted properties
storeField.setText(loyaltyCard.store);
- storeField.setTextSize(settings.getCardTitleListFontSize());
+ storeField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
if(!loyaltyCard.note.isEmpty())
{
noteField.setVisibility(View.VISIBLE);
noteField.setText(loyaltyCard.note);
- noteField.setTextSize(settings.getCardNoteListFontSize());
+ noteField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
}
else
{
@@ -68,6 +68,7 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
if(!loyaltyCard.balance.equals(new BigDecimal("0"))) {
balanceField.setVisibility(View.VISIBLE);
balanceField.setText(context.getString(R.string.balanceSentence, Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)));
+ balanceField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
}
else
{
@@ -83,7 +84,7 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
expiryField.setTextColor(context.getResources().getColor(R.color.alert));
}
expiryField.setText(context.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
- expiryField.setTextSize(settings.getCardNoteListFontSize());
+ expiryField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
}
else
{
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 332edf417..9fe6d63d2 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -275,13 +275,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
cardIdFieldView.setText(loyaltyCard.cardId);
TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
- getResources().getInteger(R.integer.settings_card_id_min_font_size_sp)-1, settings.getCardIdFontSize(),
+ settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
1, TypedValue.COMPLEX_UNIT_SP);
if(loyaltyCard.note.length() > 0)
{
noteView.setVisibility(View.VISIBLE);
noteView.setText(loyaltyCard.note);
+ noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
}
else
{
@@ -299,6 +300,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
groupsView.setVisibility(View.VISIBLE);
groupsView.setText(getString(R.string.groupsList, groupsString.toString()));
+ groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
}
else
{
@@ -308,6 +310,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
if(!loyaltyCard.balance.equals(new BigDecimal(0))) {
balanceView.setVisibility(View.VISIBLE);
balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
+ balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
}
else
{
@@ -323,6 +326,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
expiryView.setTextColor(getResources().getColor(R.color.alert));
}
expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
+ expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
}
else
{
@@ -335,7 +339,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
}
storeName.setText(loyaltyCard.store);
- storeName.setTextSize(settings.getCardTitleFontSize());
+ storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
int backgroundHeaderColor;
if(loyaltyCard.headerColor != null)
diff --git a/app/src/main/java/protect/card_locker/preferences/Settings.java b/app/src/main/java/protect/card_locker/preferences/Settings.java
index ab5bc96cb..0fb8336f0 100644
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -61,24 +61,34 @@ public class Settings
return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
}
- public int getCardTitleListFontSize()
+ public double getFontSizeScale()
{
- return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
+ return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
}
- public int getCardNoteListFontSize()
+ public int getSmallFont()
{
- return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
+ return 14;
}
- public int getCardTitleFontSize()
+ public int getMediumFont()
{
- return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
+ return 28;
}
- public int getCardIdFontSize()
+ public int getLargeFont()
{
- return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
+ return 40;
+ }
+
+ public int getFontSizeMin(int fontSize)
+ {
+ return Math.round(fontSize / 2) - 1;
+ }
+
+ public int getFontSizeMax(int fontSize)
+ {
+ return (int) Math.round(fontSize * getFontSizeScale());
}
public boolean useMaxBrightnessDisplayingBarcode()
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2bb565b40..72d42b15d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -62,10 +62,6 @@
Vorschaubild für die Karte
Einstellungen
Benutzeroberfläche
- Schriftgröße des Kartentitels (Listenmodus)
- Schriftgröße der Kartennotiz (Listenmodus)
- Schriftgröße des Kartentitels (Vorschau)
- Schriftgröße der Kartennummer
Helligkeit bei Strichcode Ansicht erhöhen
Strichcodeausrichtung sperren
Kartendaten exportiert
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 798f091d6..7c1d45566 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -56,10 +56,6 @@
Μικρογραφία κάρτας
Ρυθμίσεις
Διεπαφή χρήστη
- Μέγεθος κειμένου λίστας καρτών
- Μέγεθος κειμένου λίστας σημειώσεων καρτών
- Μέγεθος κειμένου τίτλου κάρτας
- Μέγεθος κειμένου κωδικού κάρτας
Σκοτεινό
Φωτεινό
Σύστημα
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ba1e55784..64d5df0cc 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -52,10 +52,6 @@
Versión: %s
Configuración
Interfaz de usuario
- Tamaño de fuente del título de la tarjeta (modo lista)
- Tamaño de fuente de las notas de la tarjeta (modo lista)
- Tamaño de fuente del título de la tarjeta (vista previa)
- Tamaño de la letra para el ID de la tarjeta
Iluminar vista del código de barras
Datos de las tarjetas exportados
Datos de las tarjetas importados
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a4e4e2bcd..5e6be8a49 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -58,10 +58,6 @@
Miniature de la carte
Paramètres
Interface utilisateur
- Taille du nom des cartes (mode liste)
- Taille de la description (mode liste)
- Taille du nom de la carte (aperçu)
- Taille des numéros de carte
Augmenter la luminosité du code-barres
Verrouiller l\'orientation du code-barres
Carte exportée avec succès
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index fce1c44d1..c376e1a4a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -68,10 +68,6 @@
Sistema
Chiaro
Scuro
- Dimensione caratteri del titolo della carta (modalità elenco)
- Dimensione caratteri nota della carta (modalità elenco)
- Dimensione caratteri del titolo della carta (anteprima)
- Dimensione testo dell\'ID carta
Aumenta luminosità dello schermo quando apro un codice a barre
Blocca orientamento del codice a barre
Voglio condividere una carta fedeltà con te
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 4e5da5960..766689e32 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -6,10 +6,6 @@
그룹
그룹 이름 입력
바코드 회전 잠금
- 카드 ID 글꼴 크기
- 카드 제목 글꼴 크기 (미리 보기)
- 카드 노트 글꼴 크기 (목록 모드)
- 카드 제목 글꼴 크기 (목록 모드)
어두움
밝음
버전: %s
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 77cf28b46..ec03b4a75 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -61,10 +61,6 @@
Miniatyrbilde for kort
Innstillinger
Brukergrensesnitt
- Korttittelskriftstørrelse (listemodus)
- Skriftstørrelse for kortmerknadsliste (listemodus)
- Skriftstørrelse for korttittel (forhåndsvisning)
- Skriftstørrelse for kort-ID
Lysere strekkodevisning
Lås strekkodesideretning
Kortdata eksportert
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 147b65246..fa5a24361 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -70,10 +70,6 @@
Systeem
Licht
Donker
- Lettergrootte van kaartnamen (lijstmodus)
- Lettergrootte van aantekeningen (lijstmodus)
- Lettergrootte van kaartnamen (voorvertoning)
- Lettergrootte van kaartnummer
Scherm helderder maken bij tonen van barcode
Barcode-oriëntatie vergrendelen
Ik wil een klantenkaart met je delen
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c5d3ba292..38e503829 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -66,10 +66,6 @@
Systemowy
Jasny
Ciemny
- Rozmiar czcionki listy tytułów kart
- Rozmiar czcionki listy kart
- Rozmiar czcionki tytułu karty
- Rozmiar czcionki identyfikatora karty
Rozjaśnij widok kodu kreskowego
Zablokuj autoobracanie kodów kreskowych
Chcę udostępnić Ci kartę lojalnościową
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3cd0f8990..b2c769849 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -70,10 +70,6 @@
Системная
Светлая
Тёмная
- Размер шрифта названия карты (список)
- Размер шрифта примечания (список)
- Размер шрифта названия карты (просмотр)
- Размер шрифта номера карты
Максимальная яркость при показе карты
Портретная ориентация экрана при показе карты
Я хочу поделиться картой с вами
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d675d748f..4f6fc90bf 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -64,10 +64,6 @@
Nastavenia
Používateľské prostredie
- Veľkosť názvu karty v zozname
- Veľkosť poznámky v zozname
- Veľkosť názvu karty
- Veľkosť ID karty pod čiarovým kódom
Zvýšiť jas pri zobrazení čiarového kódu
Uzamkni orientáciu čiarového kódu
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 74ca7d549..239b90a22 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -64,10 +64,6 @@
Nastavitve
Uporabniški vmesnik
- Velikost pisave seznama naslovov kartic
- Velikost pisave seznama zabeležk
- Velikost pisave imen kartic
- Velikost pisave številke kartice
Povečaj osvetljenost prikaza črtne kode
Zakleni orientacijo črtne kode
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 5bdb7365f..6cde783a8 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -24,18 +24,9 @@
- 28
- 14
- 40
- 50
+ 100
- 40
- 16
- 25
- 10
- 50
- 16
- 50
- 16
+ 50
+ 200
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4ae32439f..4d35a9eb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -91,14 +91,9 @@
light
Dark
dark
- Card title font size (list mode)
- pref_card_title_list_font_size_sp
- Card note font size (list mode)
- pref_card_note_list_font_size_sp
- Card title font size (preview)
- pref_card_title_font_size_sp
- Card ID font size
- pref_card_id_font_size_sp
+ pref_max_font_size_scale
+ Maximum font size scale
+
Brighten barcode view
pref_display_card_max_brightness
Lock barcode orientation
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index e8b14331d..e55224d55 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -16,35 +16,13 @@
app:iconSpaceReserved="false" />
-
-
-
-
-
-