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

Simplify font sizing

Browse Source
This commit is contained in:
Sylvia van Os
2021-04-01 17:48:17 +02:00
parent 8504109399
commit 5bce259445
20 changed files with 44 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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)

4
app/src/main/java/protect/card_locker/GroupCursorAdapter.java
View File

@@ -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()));
}
}

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

@@ -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
{

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

@@ -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)

26
app/src/main/java/protect/card_locker/preferences/Settings.java
View File

@@ -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()

4
app/src/main/res/values-de/strings.xml
View File

@@ -62,10 +62,6 @@
<string name="thumbnailDescription">Vorschaubild für die Karte</string>
<string name="settings">Einstellungen</string>
<string name="settings_category_title_ui">Benutzeroberfläche</string>
<string name="settings_card_title_list_font_size">Schriftgröße des Kartentitels (Listenmodus)</string>
<string name="settings_card_note_list_font_size">Schriftgröße der Kartennotiz (Listenmodus)</string>
<string name="settings_card_title_font_size">Schriftgröße des Kartentitels (Vorschau)</string>
<string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
<string name="settings_display_barcode_max_brightness">Helligkeit bei Strichcode Ansicht erhöhen</string>
<string name="settings_lock_barcode_orientation">Strichcodeausrichtung sperren</string>
<string name="exportSuccessful">Kartendaten exportiert</string>

4
app/src/main/res/values-el-rGR/strings.xml
View File

@@ -56,10 +56,6 @@
<string name="thumbnailDescription">Μικρογραφία κάρτας</string>
<string name="settings">Ρυθμίσεις</string>
<string name="settings_category_title_ui">Διεπαφή χρήστη</string>
<string name="settings_card_title_list_font_size">Μέγεθος κειμένου λίστας καρτών</string>
<string name="settings_card_note_list_font_size">Μέγεθος κειμένου λίστας σημειώσεων καρτών</string>
<string name="settings_card_title_font_size">Μέγεθος κειμένου τίτλου κάρτας</string>
<string name="settings_card_id_font_size">Μέγεθος κειμένου κωδικού κάρτας</string>
<string name="settings_dark_theme">Σκοτεινό</string>
<string name="settings_light_theme">Φωτεινό</string>
<string name="settings_system_theme">Σύστημα</string>

4
app/src/main/res/values-es/strings.xml
View File

@@ -52,10 +52,6 @@
<string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
<string name="settings">Configuración</string>
<string name="settings_category_title_ui">Interfaz de usuario</string>
<string name="settings_card_title_list_font_size">Tamaño de fuente del título de la tarjeta (modo lista)</string>
<string name="settings_card_note_list_font_size">Tamaño de fuente de las notas de la tarjeta (modo lista)</string>
<string name="settings_card_title_font_size">Tamaño de fuente del título de la tarjeta (vista previa)</string>
<string name="settings_card_id_font_size">Tamaño de la letra para el ID de la tarjeta</string>
<string name="settings_display_barcode_max_brightness">Iluminar vista del código de barras</string>
<string name="exportSuccessful">Datos de las tarjetas exportados</string>
<string name="importSuccessful">Datos de las tarjetas importados</string>

4
app/src/main/res/values-fr/strings.xml
View File

@@ -58,10 +58,6 @@
<string name="thumbnailDescription">Miniature de la carte</string>
<string name="settings">Paramètres</string>
<string name="settings_category_title_ui">Interface utilisateur</string>
<string name="settings_card_title_list_font_size">Taille du nom des cartes (mode liste)</string>
<string name="settings_card_note_list_font_size">Taille de la description (mode liste)</string>
<string name="settings_card_title_font_size">Taille du nom de la carte (aperçu)</string>
<string name="settings_card_id_font_size">Taille des numéros de carte</string>
<string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
<string name="settings_lock_barcode_orientation">Verrouiller l\'orientation du code-barres</string>
<string name="exportSuccessful">Carte exportée avec succès</string>

4
app/src/main/res/values-it/strings.xml
View File

@@ -68,10 +68,6 @@
<string name="settings_system_theme">Sistema</string>
<string name="settings_light_theme">Chiaro</string>
<string name="settings_dark_theme">Scuro</string>
<string name="settings_card_title_list_font_size">Dimensione caratteri del titolo della carta (modalità elenco)</string>
<string name="settings_card_note_list_font_size">Dimensione caratteri nota della carta (modalità elenco)</string>
<string name="settings_card_title_font_size">Dimensione caratteri del titolo della carta (anteprima)</string>
<string name="settings_card_id_font_size">Dimensione testo dell\'ID carta</string>
<string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
<string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
<string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>

4
app/src/main/res/values-ko/strings.xml
View File

@@ -6,10 +6,6 @@
<string name="groups">그룹</string>
<string name="enter_group_name">그룹 이름 입력</string>
<string name="settings_lock_barcode_orientation">바코드 회전 잠금</string>
<string name="settings_card_id_font_size">카드 ID 글꼴 크기</string>
<string name="settings_card_title_font_size">카드 제목 글꼴 크기 (미리 보기)</string>
<string name="settings_card_note_list_font_size">카드 노트 글꼴 크기 (목록 모드)</string>
<string name="settings_card_title_list_font_size">카드 제목 글꼴 크기 (목록 모드)</string>
<string name="settings_dark_theme">어두움</string>
<string name="settings_light_theme">밝음</string>
<string name="debug_version_fmt">버전: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="version">%s</xliff:g></string>

4
app/src/main/res/values-nb-rNO/strings.xml
View File

@@ -61,10 +61,6 @@
<string name="thumbnailDescription">Miniatyrbilde for kort</string>
<string name="settings">Innstillinger</string>
<string name="settings_category_title_ui">Brukergrensesnitt</string>
<string name="settings_card_title_list_font_size">Korttittelskriftstørrelse (listemodus)</string>
<string name="settings_card_note_list_font_size">Skriftstørrelse for kortmerknadsliste (listemodus)</string>
<string name="settings_card_title_font_size">Skriftstørrelse for korttittel (forhåndsvisning)</string>
<string name="settings_card_id_font_size">Skriftstørrelse for kort-ID</string>
<string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
<string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
<string name="exportSuccessful">Kortdata eksportert</string>

4
app/src/main/res/values-nl/strings.xml
View File

@@ -70,10 +70,6 @@
<string name="settings_system_theme">Systeem</string>
<string name="settings_light_theme">Licht</string>
<string name="settings_dark_theme">Donker</string>
<string name="settings_card_title_list_font_size">Lettergrootte van kaartnamen (lijstmodus)</string>
<string name="settings_card_note_list_font_size">Lettergrootte van aantekeningen (lijstmodus)</string>
<string name="settings_card_title_font_size">Lettergrootte van kaartnamen (voorvertoning)</string>
<string name="settings_card_id_font_size">Lettergrootte van kaartnummer</string>
<string name="settings_display_barcode_max_brightness">Scherm helderder maken bij tonen van barcode</string>
<string name="settings_lock_barcode_orientation">Barcode-oriëntatie vergrendelen</string>
<string name="intent_import_card_from_url_share_text">Ik wil een klantenkaart met je delen</string>

4
app/src/main/res/values-pl/strings.xml
View File

@@ -66,10 +66,6 @@
<string name="settings_system_theme">Systemowy</string>
<string name="settings_light_theme">Jasny</string>
<string name="settings_dark_theme">Ciemny</string>
<string name="settings_card_title_list_font_size">Rozmiar czcionki listy tytułów kart</string>
<string name="settings_card_note_list_font_size">Rozmiar czcionki listy kart</string>
<string name="settings_card_title_font_size">Rozmiar czcionki tytułu karty</string>
<string name="settings_card_id_font_size">Rozmiar czcionki identyfikatora karty</string>
<string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
<string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
<string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>

4
app/src/main/res/values-ru/strings.xml
View File

@@ -70,10 +70,6 @@
<string name="settings_system_theme">Системная</string>
<string name="settings_light_theme">Светлая</string>
<string name="settings_dark_theme">Тёмная</string>
<string name="settings_card_title_list_font_size">Размер шрифта названия карты (список)</string>
<string name="settings_card_note_list_font_size">Размер шрифта примечания (список)</string>
<string name="settings_card_title_font_size">Размер шрифта названия карты (просмотр)</string>
<string name="settings_card_id_font_size">Размер шрифта номера карты</string>
<string name="settings_display_barcode_max_brightness">Максимальная яркость при показе карты</string>
<string name="settings_lock_barcode_orientation">Портретная ориентация экрана при показе карты</string>
<string name="intent_import_card_from_url_share_text">Я хочу поделиться картой с вами</string>

4
app/src/main/res/values-sk/strings.xml
View File

@@ -64,10 +64,6 @@
<string name="settings">Nastavenia</string>
<string name="settings_category_title_ui">Používateľské prostredie</string>
<string name="settings_card_title_list_font_size">Veľkosť názvu karty v zozname</string>
<string name="settings_card_note_list_font_size">Veľkosť poznámky v zozname</string>
<string name="settings_card_title_font_size">Veľkosť názvu karty</string>
<string name="settings_card_id_font_size">Veľkosť ID karty pod čiarovým kódom</string>
<string name="settings_display_barcode_max_brightness">Zvýšiť jas pri zobrazení čiarového kódu </string>
<string name="settings_lock_barcode_orientation">Uzamkni orientáciu čiarového kódu</string>
</resources>

4
app/src/main/res/values-sl/strings.xml
View File

@@ -64,10 +64,6 @@
<string name="settings">Nastavitve</string>
<string name="settings_category_title_ui">Uporabniški vmesnik</string>
<string name="settings_card_title_list_font_size">Velikost pisave seznama naslovov kartic</string>
<string name="settings_card_note_list_font_size">Velikost pisave seznama zabeležk </string>
<string name="settings_card_title_font_size">Velikost pisave imen kartic</string>
<string name="settings_card_id_font_size">Velikost pisave številke kartice</string>
<string name="settings_display_barcode_max_brightness">Povečaj osvetljenost prikaza črtne kode</string>
<string name="settings_lock_barcode_orientation">Zakleni orientacijo črtne kode</string>
</resources>

15
app/src/main/res/values/settings.xml
View File

@@ -24,18 +24,9 @@
</array>
<!-- Default values -->
<integer name="settings_card_title_list_font_size_sp">28</integer>
<integer name="settings_card_note_list_font_size_sp">14</integer>
<integer name="settings_card_title_font_size_sp">40</integer>
<integer name="settings_card_id_font_size_sp">50</integer>
<integer name="settings_max_font_size_scale_pct">100</integer>
<!-- Constraints -->
<integer name="settings_card_title_list_max_font_size_sp">40</integer>
<integer name="settings_card_title_list_min_font_size_sp">16</integer>
<integer name="settings_card_note_list_max_font_size_sp">25</integer>
<integer name="settings_card_note_list_min_font_size_sp">10</integer>
<integer name="settings_card_title_max_font_size_sp">50</integer>
<integer name="settings_card_title_min_font_size_sp">16</integer>
<integer name="settings_card_id_max_font_size_sp">50</integer>
<integer name="settings_card_id_min_font_size_sp">16</integer>
<integer name="settings_max_font_size_scale_pct_min">50</integer>
<integer name="settings_max_font_size_scale_pct_max">200</integer>
</resources>

11
app/src/main/res/values/strings.xml
View File

@@ -91,14 +91,9 @@
<string name="settings_key_light_theme" translatable="false">light</string>
<string name="settings_dark_theme">Dark</string>
<string name="settings_key_dark_theme" translatable="false">dark</string>
<string name="settings_card_title_list_font_size">Card title font size (list mode)</string>
<string name="settings_key_card_title_list_font_size" translatable="false">pref_card_title_list_font_size_sp</string>
<string name="settings_card_note_list_font_size">Card note font size (list mode)</string>
<string name="settings_key_card_note_list_font_size" translatable="false">pref_card_note_list_font_size_sp</string>
<string name="settings_card_title_font_size">Card title font size (preview)</string>
<string name="settings_key_card_title_font_size" translatable="false">pref_card_title_font_size_sp</string>
<string name="settings_card_id_font_size">Card ID font size</string>
<string name="settings_key_card_id_font_size" translatable="false">pref_card_id_font_size_sp</string>
<string name="settings_key_max_font_size_scale" translatable="false">pref_max_font_size_scale</string>
<string name="settings_max_font_size_scale">Maximum font size scale</string>
<string name="settings_display_barcode_max_brightness">Brighten barcode view</string>
<string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
<string name="settings_lock_barcode_orientation">Lock barcode orientation</string>

36
app/src/main/res/xml/preferences.xml
View File

@@ -16,35 +16,13 @@
app:iconSpaceReserved="false" />
<nl.invissvenska.numberpickerpreference.NumberDialogPreference
android:key="@string/settings_key_card_title_list_font_size"
android:title="@string/settings_card_title_list_font_size"
app:defaultValue="@integer/settings_card_title_list_font_size_sp"
app:numberPickerPreference_maxValue="@integer/settings_card_title_list_max_font_size_sp"
app:numberPickerPreference_minValue="@integer/settings_card_title_list_min_font_size_sp"
app:iconSpaceReserved="false" />
<nl.invissvenska.numberpickerpreference.NumberDialogPreference
android:key="@string/settings_key_card_note_list_font_size"
android:title="@string/settings_card_note_list_font_size"
app:defaultValue="@integer/settings_card_note_list_font_size_sp"
app:numberPickerPreference_maxValue="@integer/settings_card_note_list_max_font_size_sp"
app:numberPickerPreference_minValue="@integer/settings_card_note_list_min_font_size_sp"
app:iconSpaceReserved="false" />
<nl.invissvenska.numberpickerpreference.NumberDialogPreference
android:key="@string/settings_key_card_title_font_size"
android:title="@string/settings_card_title_font_size"
app:defaultValue="@integer/settings_card_title_font_size_sp"
app:numberPickerPreference_maxValue="@integer/settings_card_title_max_font_size_sp"
app:numberPickerPreference_minValue="@integer/settings_card_title_min_font_size_sp"
app:iconSpaceReserved="false" />
<nl.invissvenska.numberpickerpreference.NumberDialogPreference
android:key="@string/settings_key_card_id_font_size"
android:title="@string/settings_card_id_font_size"
app:defaultValue="@integer/settings_card_id_font_size_sp"
app:numberPickerPreference_maxValue="@integer/settings_card_id_max_font_size_sp"
app:numberPickerPreference_minValue="@integer/settings_card_id_min_font_size_sp"
android:key="@string/settings_key_max_font_size_scale"
android:title="@string/settings_max_font_size_scale"
app:defaultValue="@integer/settings_max_font_size_scale_pct"
app:numberPickerPreference_maxValue="@integer/settings_max_font_size_scale_pct_max"
app:numberPickerPreference_minValue="@integer/settings_max_font_size_scale_pct_min"
app:numberPickerPreference_stepValue="10"
app:numberPickerPreference_unitText="%"
app:iconSpaceReserved="false" />
<SwitchPreferenceCompat