From 3e082b598f1913dd669a7904cd6b6d3cb7580fa5 Mon Sep 17 00:00:00 2001
From: TheLastProject <TheLastProject@users.noreply.github.com>
Date: Fri, 22 Oct 2021 21:34:15 +0000
Subject: [PATCH 1/9] Update Fastlane changelogs

---
 fastlane/metadata/android/en-US/changelogs/89.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/en-US/changelogs/89.txt b/fastlane/metadata/android/en-US/changelogs/89.txt
index c76b3d372..ab1861373 100644
--- a/fastlane/metadata/android/en-US/changelogs/89.txt
+++ b/fastlane/metadata/android/en-US/changelogs/89.txt
@@ -1,3 +1,4 @@
 - Fix swiping between groups not working on an empty group
 - Allow password-protecting exports
-- Improve usage of space for QR codes
\ No newline at end of file
+- Improve usage of space for QR codes
+- Save the last used zoom level per card
\ No newline at end of file

From 6ab61eb78a157952a3584d5011d2063218d22867 Mon Sep 17 00:00:00 2001
From: mondstern <mondstern@snopyta.org>
Date: Sat, 23 Oct 2021 21:31:36 +0200
Subject: [PATCH 2/9] Added translation using Weblate (Icelandic)

---
 app/src/main/res/values-is/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/src/main/res/values-is/strings.xml

diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-is/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From d774231c05a711a11cf799d4572a45fa1dd79126 Mon Sep 17 00:00:00 2001
From: Still Hsu <dev@stillu.cc>
Date: Sun, 24 Oct 2021 05:54:36 +0800
Subject: [PATCH 3/9] Add zh-tw strings

---
 app/src/main/res/values-zh-rTW/strings.xml | 207 +++++++++++++++++++++
 app/src/main/res/values/settings.xml       |   1 +
 2 files changed, 208 insertions(+)
 create mode 100644 app/src/main/res/values-zh-rTW/strings.xml

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 000000000..31943016c
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_revision_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="action_search">搜尋</string>
+    <string name="action_add">新增</string>
+    <string name="noGiftCards">點選 + 按鈕以新增卡片\n或從 ⋮ 選單中匯入卡片</string>
+    <string name="noMatchingGiftCards">沒有找到任何東西。試試其他關鍵字。</string>
+    <string name="storeName">名稱</string>
+    <string name="note">註記</string>
+    <string name="cardId">卡片 ID</string>
+    <string name="barcodeType">條碼種類</string>
+    <string name="barcodeNoBarcode">此卡片沒有可用的條碼</string>
+    <string name="noBarcode">無條碼</string>
+    <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）:  我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
+    <string name="star">新增至收藏</string>
+    <string name="app_license">公共版權 (Copylefted) 的自由軟體，許可 GPLv3+</string>
+    <string name="unstar">從收藏中移除</string>
+    <string name="cancel">取消</string>
+    <string name="save">儲存</string>
+    <string name="edit">編輯</string>
+    <string name="delete">刪除</string>
+    <string name="confirm">確認</string>
+    <string name="about">關於</string>
+    <string name="about_title_fmt">關於 <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="accept">接受</string>
+    <string name="addCardTitle">新增卡片</string>
+    <string name="addFromImage">從圖庫中選擇圖片</string>
+    <string name="addManually">手動輸入卡片 ID</string>
+    <string name="all">全部</string>
+    <string name="balance">餘額</string>
+    <string name="balanceSentence">餘額: <xliff:g>%s</xliff:g></string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> 點</string>
+    <string name="app_copyright_old">基於 Loyalty Card Keychain\n著作權所有 © 2016–2020 Branden Archer</string>
+    <string name="barcode">條碼</string>
+    <string name="barcodeId">條碼內容</string>
+    <string name="barcodeImageDescriptionWithType">條碼種類 <xliff:g>%s</xliff:g> 的圖片</string>
+    <string name="card">卡片</string>
+    <string name="card_ids_copied">已複製卡片 ID(s)</string>
+    <string name="cardShortcut">卡片捷徑</string>
+    <string name="chooseExpiryDate">選擇逾期日期</string>
+    <string name="chooseImportType">從哪裡匯入資料？</string>
+    <string name="copy_to_clipboard">已複製 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_multiple_toast">已複製多個卡片 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_toast">已複製卡片 ID 至剪貼簿中</string>
+    <string name="credits">貢獻者</string>
+    <string name="currency">幣別</string>
+    <string name="debug_version_fmt">版本：<xliff:g id="version">%s</xliff:g></string>
+    <string name="deleteConfirmation">永久刪除此卡片？</string>
+    <string name="deleteConfirmationGroup">刪除此群組？</string>
+    <string name="deleteTitle">刪除卡片</string>
+    <string name="editBarcode">編輯條碼</string>
+    <string name="editCardTitle">編輯圖片</string>
+    <string name="enter_group_name">輸入群組名稱</string>
+    <string name="enterBarcodeInstructions">輸入卡片 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
+    <string name="errorReadingImage">無法讀取此圖片</string>
+    <string name="expiryDate">逾期日期</string>
+    <string name="expiryStateSentence">逾期於：<xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">已逾期：<xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">無法匯出卡片</string>
+    <string name="exportFailedTitle">匯出失敗</string>
+    <string name="exporting">匯出中…</string>
+    <string name="exportName">匯出</string>
+    <string name="exportOptionExplanation">資料將寫至您所選的位置。</string>
+    <string name="exportPassword">透過密碼保護您的匯出檔 (選用)</string>
+    <string name="exportPasswordHint">輸入密碼</string>
+    <string name="exportSuccessful">已匯出卡片資訊</string>
+    <string name="exportSuccessfulTitle">已匯出</string>
+    <string name="failedOpeningFileManager">請先安裝檔案管理員。</string>
+    <string name="failedParsingImportUriError">無法讀取匯入 URI</string>
+    <string name="frontImageDescription">卡片 (正面)</string>
+    <string name="groups">群組</string>
+    <string name="groupsList">群組：<xliff:g>%s</xliff:g></string>
+    <string name="help_translate_this_app">幫助翻譯本程式</string>
+    <string name="importExport">匯入/匯出</string>
+    <string name="importFailedTitle">匯入失敗</string>
+    <string name="importFailed">無法匯入卡片</string>
+    <string name="importing">匯入中…</string>
+    <string name="importSuccessfulTitle">已匯入</string>
+    <string name="intent_import_card_from_url_share_multiple_text">我想要分享些卡片給你</string>
+    <string name="intent_import_card_from_url_share_text">我想要分享張卡片給你</string>
+    <string name="leaveWithoutSaveConfirmation">不保存就離開？</string>
+    <string name="leaveWithoutSaveTitle">離開</string>
+    <string name="license">許可</string>
+    <string name="never">永不</string>
+    <string name="no">否</string>
+    <string name="noBarcodeFound">找不到可用的條碼</string>
+    <string name="noCardExistsError">無法找到卡片</string>
+    <string name="noCardIdError">尚未輸入卡片 ID</string>
+    <string name="noCardsMessage">請先新增卡片</string>
+    <string name="sort">排列</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">粉紅</string>
+    <string name="settings_magenta_theme">品紅</string>
+    <string name="settings_violet_theme">紫色</string>
+    <string name="settings_blue_theme">藍色</string>
+    <string name="settings_sky_blue_theme">天空藍</string>
+    <string name="settings_green_theme">綠色</string>
+    <string name="settings_grey_theme">灰色</string>
+    <string name="settings_brown_theme">棕色</string>
+    <string name="sort_by_name">名稱</string>
+    <string name="sort_by_most_recently_used">最近使用</string>
+    <string name="sort_by_expiry">逾期日期</string>
+    <string name="sort_by_balance">餘額</string>
+    <string name="reverse">反序</string>
+    <string name="sort_by">排列方式</string>
+    <string name="version_history">版本歷史</string>
+    <string name="source_repository">原始碼版本庫</string>
+    <string name="on_github">於 GitHub</string>
+    <string name="and_data_usage">及資料使用</string>
+    <string name="rate_this_app">替本 App 評分</string>
+    <string name="on_google_play">於 Google Play</string>
+    <string name="report_error">回報錯誤</string>
+    <string name="setBarcodeId">設定條碼內容</string>
+    <string name="sameAsCardId">與卡片 ID 相同</string>
+    <string name="photos">圖片</string>
+    <string name="setFrontImage">設定正面圖片</string>
+    <string name="setBackImage">設定背面圖片</string>
+    <string name="removeImage">移除圖片</string>
+    <string name="takePhoto">拍照</string>
+    <string name="updateBarcodeQuestionTitle">更新條碼內容？</string>
+    <string name="yes">是</string>
+    <string name="passwordRequired">請輸入密碼</string>
+    <string name="turn_flashlight_on">開啟手電筒</string>
+    <string name="turn_flashlight_off">關閉手電筒</string>
+    <string name="settings_locale">語言</string>
+    <string name="settings_system_locale">系統語言</string>
+    <string name="settings_theme_color">主題顏色</string>
+    <string name="app_contributors">感謝以下貢獻者: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="privacy_policy">隱私權政策</string>
+    <plurals name="selectedCardCount">
+        <item quantity="other">已選取 <xliff:g>%d</xliff:g> 張卡片</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="other">刪除 <xliff:g>%d</xliff:g> 張卡片</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="other">永久刪除 <xliff:g>%d</xliff:g> 張卡片?</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="other"><xliff:g>%d</xliff:g> 張卡片</item>
+    </plurals>
+    <string name="settings">設定</string>
+    <string name="share">分享</string>
+    <string name="settings_system_theme">系統主題</string>
+    <string name="settings_theme">主題</string>
+    <string name="thumbnailDescription">卡片縮圖</string>
+    <string name="noGroupCards">此群組中無任何卡片</string>
+    <string name="settings_category_title_ui">用戶界面</string>
+    <string name="settings_max_font_size_scale">最大字體大小</string>
+    <string name="settings_light_theme">淺色</string>
+    <string name="settings_dark_theme">深色</string>
+    <string name="settings_display_barcode_max_brightness">調高條碼介面螢幕亮度</string>
+    <string name="settings_lock_barcode_orientation">鎖定條碼螢幕方向</string>
+    <string name="settings_keep_screen_on">螢幕恆亮</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">防止螢幕鎖定</string>
+    <string name="importSuccessful">已匯入卡片資訊</string>
+    <string name="moveUp">往上移動</string>
+    <string name="moveDown">往下移動</string>
+    <string name="lockScreen">禁止旋轉</string>
+    <string name="unlockScreen">允許旋轉</string>
+    <string name="ok">OK</string>
+    <string name="sendLabel">送出…</string>
+    <string name="scanCardBarcode">掃描卡片條碼</string>
+    <string name="noStoreError">尚未輸入卡片名稱</string>
+    <string name="importExportHelp">備份您的卡片以將這些卡片移至其他裝置中。</string>
+    <string name="noExternalStoragePermissionError">在匯入及匯出卡片前，請先允許外部儲存裝置存取權限</string>
+    <string name="importOptionFilesystemTitle">自檔案系統中匯入</string>
+    <string name="importOptionFilesystemExplanation">自檔案系統中選取檔案。</string>
+    <string name="importOptionFilesystemButton">自檔案系統</string>
+    <string name="importOptionApplicationTitle">使用其他應用程式</string>
+    <string name="importOptionApplicationButton">使用其他應用程式</string>
+    <string name="importOptionApplicationExplanation">使用任何應用程式選擇您所想要匯入的檔案。</string>
+    <string name="app_copyright_fmt">著作權所有 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="importVoucherVault">自 Voucher Vault 中匯入</string>
+    <string name="importVoucherVaultMessage">選取您自 Voucher Vault 匯出的 <i>vouchervault.json</i> 檔案以進行匯入。
+\n請您先透過 Voucher Vault 進行匯出。</string>
+    <string name="importStocard">自 Stocard 中匯入</string>
+    <string name="importStocardMessage">>選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
+\n請您寫封 Email 至 support@stocardapp.com 索取您的資料。</string>
+    <string name="importLoyaltyCardKeychain">自 Loyalty Card Keychain 中匯入</string>
+    <string name="importLoyaltyCardKeychainMessage">選取您自 Loyalty Card Keychain <i>LoyaltyCardKeychain.csv</i> 檔案以進行匯入。
+\n請您先透過 Loyalty Card Keychain 的匯入/匯出選單進行匯出。</string>
+    <string name="importFidme">自 FidMe 匯入</string>
+    <string name="importFidmeMessage">選取您自 FidMe 匯出的<i>fidme-export-request-xxxxxx.zip</i> 檔案以進行匯入，並手動選擇條碼種類。
+\n請您先透過您的 FidMe 個人檔案選取『Data Protection』，並選擇『Extract my data』。</string>
+    <string name="importCatima">自 Catima 匯入</string>
+    <string name="importCatimaMessage">選取您自 Catima 匯出的 <i>catima.zip</i> 檔案以進行匯入。
+\n您可透過其他裝置的 Catima 程式中的匯入/匯出選單進行匯出。</string>
+    <string name="points">點</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> 似乎不是個可用的餘額數值。</string>
+    <string name="app_revision_fmt">修訂版本資訊：<xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">第三方自由函示庫：<xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">第三方自由資源：<xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">選擇條碼</string>
+    <string name="noGroups">請先點選 + 加號按鈕新增群組。</string>
+    <string name="moveBarcodeToTopOfScreen">將條碼移至螢幕上方</string>
+    <string name="moveBarcodeToCenterOfScreen">將條碼移至螢幕中央</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="unsupportedBarcodeType">尚支援此條碼種類，但未來版本的應用程式可能會支援此條碼種類。</string>
+    <string name="wrongValueForBarcodeType">條碼內容不適用於此條碼種類</string>
+    <string name="backImageDescription">卡片 (背面)</string>
+    <string name="updateBarcodeQuestionText">您已更新了條碼 ID，是否要更新條碼內容以匹配此 ID？</string>
+    <string name="failedGeneratingShareURL">無法建立可分享的 URL，請回報此錯誤。</string>
+    <string name="toggleMoreInfo">切換顯示更多內容</string>
+    <string name="swipeToSwitchImages">滑動或長按以切換圖片</string>
+    <string name="starImage">收藏標示</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index a2fff223d..f9222c39d 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -62,6 +62,7 @@
         <item>sk</item>
         <item>sl</item>
         <item>uk</item>
+        <item>zh-TW</item>
         <item>zh-rCN</item>
     </string-array>
 

From acbd614b507a0de0343cbf9a42a2f4172a738c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Sat, 23 Oct 2021 05:30:27 +0000
Subject: [PATCH 4/9] Translated using Weblate (Turkish)

Currently translated at 17.0% (15 of 88 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/
---
 fastlane/metadata/android/tr-TR/changelogs/89.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fastlane/metadata/android/tr-TR/changelogs/89.txt b/fastlane/metadata/android/tr-TR/changelogs/89.txt
index 94b42df50..3afa883c6 100644
--- a/fastlane/metadata/android/tr-TR/changelogs/89.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/89.txt
@@ -1,3 +1,4 @@
 - Gruplar arasında kaydırmanın boş bir grup üzerinde çalışmaması düzeltildi
 - Parola korumalı dışa aktarmalara izin ver
 - QR kodları için boşluk kullanımını iyileştir
+- Kart başına en son kullanılan yakınlaştırma seviyesini kaydet

From e6ccef8ad08b34f18d19ff4e8dddfa9dced17700 Mon Sep 17 00:00:00 2001
From: mondstern <mondstern@snopyta.org>
Date: Sat, 23 Oct 2021 19:32:10 +0000
Subject: [PATCH 5/9] Translated using Weblate (Icelandic)

Currently translated at 25.6% (57 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/is/
---
 app/src/main/res/values-is/strings.xml | 28 +++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index a6b3daec9..91dff4642 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -1,2 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="action_add">Bæta</string>
+    <string name="noBarcode">Nei strikamerkið</string>
+    <string name="action_search">Leita að</string>
+    <string name="delete">Eyða</string>
+    <string name="unlockScreen">Opna Snúningur</string>
+    <string name="noGiftCards">Smelltu á + plús takka til að bæta kort, eða að flytja inn sumir frá ⋮ matseðill fyrst.</string>
+    <string name="note">Athugið</string>
+    <string name="barcodeType">Strikamerkið tegund</string>
+    <string name="cancel">Hætta</string>
+    <string name="noMatchingGiftCards">Vissi ekki að finna neitt. Reyna að breyta leita.</string>
+    <string name="storeName">Nafnið</string>
+    <string name="barcodeNoBarcode">Þetta kort hefur ekki strikamerkið</string>
+    <string name="star">Bæta við eftirlæti</string>
+    <string name="unstar">Fjarlægja frá eftirlæti</string>
+    <string name="save">Sparaðu</string>
+    <string name="edit">Breyta</string>
+    <string name="confirm">Staðfesta</string>
+    <string name="lockScreen">Blokk Snúningur</string>
+    <string name="ok">OK</string>
+    <string name="sendLabel">Sendu…</string>
+    <string name="deleteConfirmation">Eyða þetta kort til frambúðar\?</string>
+    <string name="share">Deila</string>
+    <string name="editCardTitle">Breyta Kort</string>
+    <string name="addCardTitle">Bæta Kort</string>
+    <string name="scanCardBarcode">Skanna Kort Strikamerkið</string>
+</resources>
\ No newline at end of file

From 6a2f8a630aa5da39723e6ac6e44ebc233ca970d7 Mon Sep 17 00:00:00 2001
From: TheLastProject <TheLastProject@users.noreply.github.com>
Date: Sun, 24 Oct 2021 05:15:59 +0000
Subject: [PATCH 6/9] Update contributors

---
 app/src/main/res/raw/contributors.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/raw/contributors.txt b/app/src/main/res/raw/contributors.txt
index 2e2766214..2571fff86 100644
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -8,25 +8,26 @@ mondstern
 Taco
 IllusiveMan196
 Petr Novák
+Oğuz Ersen
 Gediminas Murauskas
 Joel A
-Oğuz Ersen
 StoyanDimitrov
 Samantaz Fox
 Nyatsuki
 arno-github
-Sergio Paredes
 Ankit Tiwari
+Sergio Paredes
 arshbeerSingh
 huuhaa
 Michael Moroni
 Olivia (Zoe)
 betsythefc
+waffshappen
+Miha Frangež
 K. Herbert
 Quentin PAGÈS
 String E. Fighter
 Yurical
-waffshappen
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
 KovalevArtem
@@ -41,9 +42,8 @@ Thomas Bertels
 inesre
 lgasp
 phlostically
-Kevin Sicong Jiang
-Miha Frangež
 Aditya Das
+Kevin Sicong Jiang
 Airat
 BMN
 Biren
@@ -61,6 +61,7 @@ QuangDNguyen2211
 Rohan Babbar 
 Rose Liverman
 Simone Dotto
+Still Hsu
 Subhashish Anand
 Tymofii Lytvynenko
 Tjipke van der Heide

From 03ec2b4492489c99d0cad99cd5069bb1b26af936 Mon Sep 17 00:00:00 2001
From: Rosdyana Kusuma <rosdyana.kusuma@gmail.com>
Date: Sun, 24 Oct 2021 14:14:57 +0800
Subject: [PATCH 7/9] Add localization for Bahasa Indonesia

---
 app/src/main/res/values-in-rID/strings.xml | 190 +++++++++++++++++++++
 app/src/main/res/values/settings.xml       |   1 +
 2 files changed, 191 insertions(+)
 create mode 100644 app/src/main/res/values-in-rID/strings.xml

diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
new file mode 100644
index 000000000..ba59574d7
--- /dev/null
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_revision_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="storeName">Nama</string>
+    <string name="note">Keterangan</string>
+    <string name="delete">Hapus</string>
+    <string name="edit">Ubah</string>
+    <string name="save">Simpan</string>
+    <string name="deleteTitle">Hapus kartu</string>
+    <string name="cardId">Kartu ID</string>
+    <string name="barcodeType">Tipe barcode</string>
+    <string name="star">Tambahkan ke favorit</string>
+    <string name="unstar">Hapus dari favorit</string>
+    <string name="action_add">Tambah</string>
+    <string name="action_search">Cari</string>
+    <string name="sort_by_name">Nama</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by">Sortir dengan</string>
+    <string name="sort">Sortir</string>
+    <string name="credits">Kredit</string>
+    <string name="license">Lisensi</string>
+    <string name="settings">Pengaturan</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="selectBarcodeTitle">Pilih Barcode</string>
+    <string name="deleteConfirmation">Hapus kartu ini secara permanen?</string>
+    <string name="ok">OK</string>
+    <string name="share">Bagikan</string>
+    <string name="editCardTitle">Ubah Kartu</string>
+    <string name="addCardTitle">Tambah Kartu</string>
+    <string name="scanCardBarcode">Pindai Kartu Barcode</string>
+    <string name="barcodeNoBarcode">Kartu ini tidak memiliki barcode</string>
+    <string name="cancel">Batalkan</string>
+    <string name="importExport">Import/Ekspor</string>
+    <string name="settings_category_title_ui">Tampilan Pengguna</string>
+    <string name="settings_theme">Tema</string>
+    <string name="all">Semua</string>
+    <string name="leaveWithoutSaveTitle">Keluar</string>
+    <string name="card">Kartu</string>
+    <string name="barcode">Barcode</string>
+    <string name="chooseExpiryDate">Pilih masa berlaku</string>
+    <string name="noBarcodeFound">Barcode tidak ditemukan</string>
+    <string name="errorReadingImage">TIdak dapat membaca gambar</string>
+    <string name="balance">Saldo</string>
+    <string name="currency">Mata uang</string>
+    <string name="chooseImportType">Impor data dari?</string>
+    <string name="accept">Terima</string>
+    <string name="importCatima">Impor dari Catima</string>
+    <string name="importFidme">Impor dari FidMe</string>
+    <string name="barcodeId">Nilai barcode</string>
+    <string name="sameAsCardId">Sama denga kartu ID</string>
+    <string name="setBarcodeId">Tentukan nilai barcode</string>
+    <string name="photos">Foto</string>
+    <string name="setFrontImage">Atur gambar bagian depan</string>
+    <string name="report_error">Lapor Kesalahan</string>
+    <string name="rate_this_app">Beri nilai pada aplikasi ini</string>
+    <string name="sort_by_expiry">Masa berlaku</string>
+    <string name="sort_by_most_recently_used">Paling banyak digunakan</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Merah Muda</string>
+    <string name="settings_blue_theme">Biru</string>
+    <string name="settings_green_theme">Hijau</string>
+    <string name="settings_sky_blue_theme">Biru Langit</string>
+    <string name="settings_grey_theme">Abu-abu</string>
+    <string name="settings_brown_theme">Cokelat</string>
+    <string name="settings_violet_theme">Ungu</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_theme_color">Warna tema</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_locale">Bahasa</string>
+    <string name="turn_flashlight_on">Hidupkan lampu flash</string>
+    <string name="turn_flashlight_off">Matikan lampu flash</string>
+    <string name="exportPasswordHint">Masukan kata sandi</string>
+    <string name="yes">Ya</string>
+    <string name="no">Tidak</string>
+    <string name="takePhoto">Ambil foto</string>
+    <string name="removeImage">Hapus gambar</string>
+    <string name="setBackImage">Atur gambar bagian belakang</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Saya ingin berbagi kartu dengan anda</string>
+    <string name="noGiftCards">Klik tanda + tombol tambah untuk menambahkan kartu, atau mengimpor beberapa kartu melalui menu ⋮ terlebih dahulu.</string>
+    <string name="noMatchingGiftCards">Tidak menemukan apapun. Coba untuk mengubah pencarian anda.</string>
+    <string name="noBarcode">Bukan barcode</string>
+    <string name="confirm">Konfirmasi</string>
+    <string name="copy_to_clipboard">Salin ID</string>
+    <string name="sendLabel">Kirim…</string>
+    <string name="noCardsMessage">Tambah kartu terlebih dahulu</string>
+    <string name="noStoreError">Nama masih kosong</string>
+    <string name="noCardIdError">Kartu ID masih kosong</string>
+    <string name="noCardExistsError">Tidak dapat menemukan kartu</string>
+    <string name="failedParsingImportUriError">Tidak dapat menguraikan alamat impor situs web</string>
+    <string name="exportName">Ekspor</string>
+    <string name="importSuccessfulTitle">Sudah diimpor</string>
+    <string name="importFailedTitle">Impor gagal</string>
+    <string name="importFailed">Tidak dapat mengimpor kartu</string>
+    <string name="exportSuccessfulTitle">Sudah diekspor</string>
+    <string name="exportFailedTitle">Ekspor gagal</string>
+    <string name="exportFailed">Tidak dapat mengekspor kartu</string>
+    <string name="importing">Mengimpor…</string>
+    <string name="exporting">Mengekspor…</string>
+    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor kartu terlebih dahulu</string>
+    <string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
+    <string name="importOptionFilesystemTitle">Impor dari sistem</string>
+    <string name="importOptionFilesystemExplanation">Pilih file dari sistem</string>
+    <string name="importOptionFilesystemButton">Dari sistem</string>
+    <string name="importOptionApplicationTitle">Gunakan aplikasi lain</string>
+    <string name="importOptionApplicationExplanation">Gunakan aplikasi lain atau pengelola file favorit anda untuk membuka file.</string>
+    <string name="importOptionApplicationButton">Gunakan aplikasi lain</string>
+    <string name="about">Tentang</string>
+    <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Berdasarkan Loyalty Card Keychain hak cipta © 2016–2020 Branden Archer</string>
+    <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
+    <string name="about_title_fmt">Tentang <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Info Revisi: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="enterBarcodeInstructions">Masukkan ID kartu, dan pilih jenis barcodenya di bawah atau \"Kartu ini tidak memiliki barcode\".</string>
+    <string name="copy_to_clipboard_toast">ID kartu telah disalin</string>
+    <string name="thumbnailDescription">Gambar tampilan untuk kartu</string>
+    <string name="starImage">Favorit</string>
+    <string name="settings_light_theme">Terang</string>
+    <string name="settings_dark_theme">Gelap</string>
+    <string name="settings_max_font_size_scale">Ukuran maksimal huruf</string>
+    <string name="settings_display_barcode_max_brightness">Terangkan tampilan barcode</string>
+    <string name="settings_lock_barcode_orientation">Kunci orientasi barcode</string>
+    <string name="settings_keep_screen_on">Biarkan layar menyala</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Mencegah layar menyala</string>
+    <string name="intent_import_card_from_url_share_text">Saya ingin berbagi kartu dengan anda</string>
+    <string name="importSuccessful">Data kartu terimpor</string>
+    <string name="exportSuccessful">Data kartu terekspor</string>
+    <string name="enter_group_name">Masukan nama grup</string>
+    <string name="groups">Grup</string>
+    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup atau kategori terlebih dahulu.</string>
+    <string name="noGroupCards">Grup ini tidak memilik kartu</string>
+    <string name="deleteConfirmationGroup">Hapus grup?</string>
+    <string name="failedOpeningFileManager">Instal aplikasi pengelola file terlebih dahulu.</string>
+    <string name="moveUp">Pindah ke atas</string>
+    <string name="moveDown">Pindah ke bawah</string>
+    <string name="leaveWithoutSaveConfirmation">Keluar tanpa menyimpan?</string>
+    <string name="addManually">Masukan ID kartu</string>
+    <string name="addFromImage">Pilih gambar dari galeri</string>
+    <string name="groupsList">Grup: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Masa ber: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Kadaluwarsa: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> poin</string>
+    <string name="editBarcode">Ubah barcode</string>
+    <string name="expiryDate">Tanggal masa berlaku</string>
+    <string name="never">Tidak pernah</string>
+    <string name="moveBarcodeToTopOfScreen">Pindah barcode ke bagian paling depan</string>
+    <string name="moveBarcodeToCenterOfScreen">Pusatkan barcode pada layar</string>
+    <string name="points">Poin</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sepertinya bukan saldo yang valid.</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">Kebijakan Privasi</string>
+    <string name="privacy_policy_popup_text">Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): TIDAK ADA DATA YANG DIKUMPULKAN SAMA SEKALI, yang dapat dikonfirmasi oleh siapa pun karena aplikasi kami adalah perangkat lunak gratis.</string>
+    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor. Buat dari menu Impor/Ekspor aplikasi Catima lain dengan menekan Ekspor di sana terlebih dahulu.</string>
+    <string name="importFidmeMessage">Pilih ekspor <i>fidme-export-request-xxxxxx.zip</i> Anda dari FidMe untuk diimpor, dan pilih jenis barcode secara manual setelahnya. Buat dari profil FidMe Anda dengan memilih Perlindungan Data lalu tekan Ekstrak data saya terlebih dahulu.</string>
+    <string name="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor. Buat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
+    <string name="importStocard">Impor dari Stocard</string>
+    <string name="importStocardMessage">Pilih ekspor <i>***-sync.zip</i> Anda dari Stocard untuk diimpor. Dapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
+    <string name="importVoucherVault">Impor dari Voucher Vault</string>
+    <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Vault Voucher untuk diimpor. Buat dengan menekan Ekspor di Vault Voucher terlebih dahulu.</string>
+    <string name="unsupportedBarcodeType">Jenis barcode ini belum dapat ditampilkan. Ini mungkin didukung di versi aplikasi yang lebih baru.</string>
+    <string name="wrongValueForBarcodeType">Nilai tidak berlaku untuk jenis barcode yang dipilih</string>
+    <string name="copy_to_clipboard_multiple_toast">ID kartu telah disalin</string>
+    <string name="frontImageDescription">Gambar depan kartu</string>
+    <string name="backImageDescription">Gambar belakang kartu</string>
+    <string name="updateBarcodeQuestionTitle">Perbarui barcode?</string>
+    <string name="updateBarcodeQuestionText">Anda mengubah ID kartu. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama?</string>
+    <string name="passwordRequired">Silahkan masukan kata sandi</string>
+    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
+    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
+    <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="toggleMoreInfo">Tampilkan info selengkapnya</string>
+    <string name="swipeToSwitchImages">Geser atau tekan yang lama untuk mengganti gambar</string>
+    <string name="reverse">Ubah urutan</string>
+    <string name="version_history">Riwayat Versi</string>
+    <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
+    <string name="source_repository">Sumber Repositori</string>
+    <string name="on_github">di GitHub</string>
+    <string name="and_data_usage">dan penggunaan data</string>
+    <string name="on_google_play">di Google Play</string>
+    <string name="lockScreen">Blokir rotasi</string>
+    <string name="unlockScreen">Buka blokir rotasi</string>
+    <string name="cardShortcut">Pintasan kartu</string>
+    <string name="card_ids_copied">ID kartu yang tersalin</string>
+    <string name="barcodeImageDescriptionWithType">Gambar dari jenis barcode <xliff:g>%s</xliff:g></string>
+    <string name="importExportHelp">Mencadangkan kartu memungkinkan anda memindahkannya ke perangkat lain.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index f9222c39d..17728238a 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -49,6 +49,7 @@
         <item>fi</item>
         <item>fr</item>
         <item>he-rIL</item>
+        <item>in-rID</item>
         <item>it</item>
         <item>ja</item>
         <item>ko</item>

From f7af4169a362ad2a3ef5c3c6f18986df4984c848 Mon Sep 17 00:00:00 2001
From: Nyatsuki <Odamaki@yandex.ru>
Date: Sun, 24 Oct 2021 05:15:01 +0000
Subject: [PATCH 8/9] Translated using Weblate (Japanese)

Currently translated at 98.6% (219 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ja/
---
 app/src/main/res/values-ja/strings.xml | 29 +++++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 25e83f827..70da4619a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -76,10 +76,10 @@
     <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
+    <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
     <string name="app_copyright_old">Based on Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="about">Catimaについて</string>
     <string name="importOptionApplicationButton">外部のアプリを使う</string>
@@ -95,7 +95,7 @@
     <string name="exportFailed">カードをエクスポートできませんでした</string>
     <string name="exportFailedTitle">エクスポートに失敗しました</string>
     <string name="exportSuccessfulTitle">エクスポートしました</string>
-    <string name="sameAsCardId">カードの表記と同一</string>
+    <string name="sameAsCardId">カード番号に合わせる</string>
     <string name="barcodeId">バーコード番号</string>
     <string name="importVoucherVaultMessage">Voucher Vaultでエクスポートした <i>vouchervault.json</i>ファイルを選択してください。
 \nファイルがない場合、Voucher Vaultでファイルをエクスポートしてください。</string>
@@ -152,10 +152,10 @@
     <string name="takePhoto">写真を撮影する</string>
     <string name="removeImage">画像を削除</string>
     <string name="setBackImage">裏面の画像を設定</string>
-    <string name="setFrontImage">表面の画像を設定</string>
+    <string name="setFrontImage">オモテ面の画像を設定</string>
     <string name="photos">フォト</string>
-    <string name="backImageDescription">裏面</string>
-    <string name="frontImageDescription">表面</string>
+    <string name="backImageDescription">カードの裏面</string>
+    <string name="frontImageDescription">カードのオモテ面</string>
     <string name="importStocardMessage">Stocardでエクスポートした<i>***-sync.zip</i>ファイルを選択してください。
 \nファイルがない場合、e-mailing support@stocardapp.comにデータのエクスポートを要求してください。</string>
     <string name="importStocard">Stocardからインポート</string>
@@ -183,7 +183,7 @@
     <string name="settings_pink_theme">Pink</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">テーマカラー</string>
-    <string name="settings_system_locale">システム</string>
+    <string name="settings_system_locale">システムに従う</string>
     <string name="settings_locale">言語</string>
     <string name="noGroupCards">このグループにはカードがありません</string>
     <string name="swipeToSwitchImages">画像を切り替えるには長押し、またはスワイプ</string>
@@ -192,5 +192,18 @@
     <string name="sort_by_expiry">期限</string>
     <string name="sort_by_most_recently_used">最近使用したカード</string>
     <string name="sort_by_name">名前</string>
-    <string name="sort">ソート</string>
+    <string name="sort">並び替え</string>
+    <string name="rate_this_app">このアプリを評価する</string>
+    <string name="on_github">GitHub</string>
+    <string name="source_repository">ソースリポジトリ</string>
+    <string name="exportPassword">パスワードを設定してエクスポートしたファイルを保護する(任意)</string>
+    <string name="exportPasswordHint">パスワードを入力してください</string>
+    <string name="version_history">更新履歴</string>
+    <string name="credits">貢献者</string>
+    <string name="help_translate_this_app">このアプリの翻訳を手伝う</string>
+    <string name="license">ライセンス</string>
+    <string name="on_google_play">Google Play</string>
+    <string name="report_error">エラーを報告する</string>
+    <string name="reverse">逆順</string>
+    <string name="and_data_usage">and data usage</string>
 </resources>
\ No newline at end of file

From 8f81d2d14178a2e5b7f0c27b1d20b0db21348eb8 Mon Sep 17 00:00:00 2001
From: Ronak Upadhyay <51999411+developer-nobita@users.noreply.github.com>
Date: Mon, 25 Oct 2021 01:56:41 +0530
Subject: [PATCH 9/9] Fixes #516 Image scale according to text size (#517)

---
 .../card_locker/LoyaltyCardCursorAdapter.java | 61 +++++++++++++++++--
 .../main/res/layout/loyalty_card_layout.xml   | 35 ++++++++---
 2 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
index 430ac5657..1e974ae0f 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -1,10 +1,12 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.util.SparseBooleanArray;
+import android.util.TypedValue;
 import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -71,6 +73,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         // Invisible until we want to show something more
         inputHolder.mDivider.setVisibility(View.GONE);
 
+        int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+
         if (mDarkModeEnabled) {
             inputHolder.mStarIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
         }
@@ -82,27 +86,34 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         if (!loyaltyCard.note.isEmpty()) {
             inputHolder.mNoteField.setVisibility(View.VISIBLE);
             inputHolder.mNoteField.setText(loyaltyCard.note);
-            inputHolder.mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            inputHolder.mNoteField.setTextSize(size);
         } else {
             inputHolder.mNoteField.setVisibility(View.GONE);
         }
 
         if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            int drawableSize = dpToPx((size*24)/14, mContext);
             inputHolder.mDivider.setVisibility(View.VISIBLE);
             inputHolder.mBalanceField.setVisibility(View.VISIBLE);
+            Drawable balanceIcon = inputHolder.mBalanceField.getCompoundDrawables()[0];
+            balanceIcon.setBounds(0,0,drawableSize,drawableSize);
+            inputHolder.mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
             if (mDarkModeEnabled) {
-                inputHolder.mBalanceField.getCompoundDrawables()[0].setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
             }
             inputHolder.mBalanceField.setText(Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType));
-            inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            inputHolder.mBalanceField.setTextSize(size);
         } else {
             inputHolder.mBalanceField.setVisibility(View.GONE);
         }
 
         if (loyaltyCard.expiry != null) {
+            int drawableSize = dpToPx((size*24)/14, mContext);
             inputHolder.mDivider.setVisibility(View.VISIBLE);
             inputHolder.mExpiryField.setVisibility(View.VISIBLE);
             Drawable expiryIcon = inputHolder.mExpiryField.getCompoundDrawables()[0];
+            expiryIcon.setBounds(0,0, drawableSize, drawableSize);
+            inputHolder.mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
             if (Utils.hasExpired(loyaltyCard.expiry)) {
                 expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
                 inputHolder.mExpiryField.setTextColor(Color.RED);
@@ -110,13 +121,44 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
             }
             inputHolder.mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry));
-            inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            inputHolder.mExpiryField.setTextSize(size);
         } else {
             inputHolder.mExpiryField.setVisibility(View.GONE);
         }
 
         inputHolder.mStarIcon.setVisibility(loyaltyCard.starStatus != 0 ? View.VISIBLE : View.GONE);
         inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        int imageSize = dpToPx( (size*46)/14, mContext);
+        inputHolder.mCardIcon.getLayoutParams().height = imageSize;
+        inputHolder.mCardIcon.getLayoutParams().width = imageSize;
+        inputHolder.mStarIcon.getLayoutParams().height = imageSize;
+        inputHolder.mStarIcon.getLayoutParams().width = imageSize;
+        inputHolder.mTickIcon.getLayoutParams().height = imageSize;
+        inputHolder.mTickIcon.getLayoutParams().width = imageSize;
+
+        /* Changing Padding and Mragin of different views according to font size
+        * Views Included:
+        * a) InformationContainer padding
+        * b) Store left padding
+        * c) Divider Margin
+        * d) note top margin
+        * e) row margin
+        * */
+        int marginPaddingSize = dpToPx((size*16)/14, mContext );
+        inputHolder.mInformationContainer.setPadding(marginPaddingSize, marginPaddingSize, marginPaddingSize, marginPaddingSize);
+        inputHolder.mStoreField.setPadding(marginPaddingSize, 0, 0, 0);
+        LinearLayout.LayoutParams lpDivider = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT );
+        lpDivider.setMargins(0, marginPaddingSize, 0, marginPaddingSize);
+        inputHolder.mDivider.setLayoutParams(lpDivider);
+        LinearLayout.LayoutParams lpNoteField = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT );
+        lpNoteField.setMargins(0, marginPaddingSize/2, 0, 0);
+        inputHolder.mNoteField.setLayoutParams(lpNoteField);
+        LinearLayout.LayoutParams lpRow = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT );
+        lpRow.setMargins(marginPaddingSize/2, marginPaddingSize/2, marginPaddingSize/2, marginPaddingSize/2);
+        inputHolder.mRow.setLayoutParams(lpRow);
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -223,7 +265,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
         public LinearLayout mInformationContainer;
-        public ImageView mCardIcon, mStarIcon;
+        public ImageView mCardIcon, mStarIcon, mTickIcon;
         public MaterialCardView mRow;
         public View mDivider;
         public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
@@ -241,6 +283,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mExpiryField = inputView.findViewById(R.id.expiry);
             mCardIcon = inputView.findViewById(R.id.thumbnail);
             mStarIcon = inputView.findViewById(R.id.star);
+            mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
             inputView.setOnLongClickListener(view -> {
                 inputListener.onRowClicked(getAdapterPosition());
                 inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
@@ -248,4 +291,10 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             });
         }
     }
-}
\ No newline at end of file
+
+    public int dpToPx(int dp, Context mContext){
+        Resources r = mContext.getResources();
+        int px = (int)TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+        return px;
+    }
+}
diff --git a/app/src/main/res/layout/loyalty_card_layout.xml b/app/src/main/res/layout/loyalty_card_layout.xml
index 0456b8340..261b5d516 100644
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -27,20 +27,27 @@
 
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/thumbnail_container"
-                    android:layout_width="@dimen/cardThumbnailSize"
-                    android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     app:cardCornerRadius="4dp"
-                    android:layout_alignParentStart="true">
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    >
 
                     <RelativeLayout
                         android:id="@+id/thumbnail_front"
-                        android:layout_width="@dimen/cardThumbnailSize"
-                        android:layout_height="@dimen/cardThumbnailSize">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignTop="@+id/storeContainer"
+                        android:layout_alignBottom="@+id/storeContainer"
+                        android:layout_gravity="center_vertical">
 
                         <ImageView
                             android:id="@+id/thumbnail"
+                            android:scaleType="centerCrop"
                             android:layout_width="@dimen/cardThumbnailSize"
                             android:layout_height="@dimen/cardThumbnailSize"
+                            android:layout_centerVertical="true"
                             android:contentDescription="@string/thumbnailDescription"
                             android:src="@mipmap/ic_launcher" />
 
@@ -48,25 +55,29 @@
 
                     <RelativeLayout
                         android:id="@+id/thumbnail_back"
-                        android:layout_width="@dimen/cardThumbnailSize"
-                        android:layout_height="@dimen/cardThumbnailSize">
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical">
 
                         <ImageView
+                            android:id="@+id/selected_thumbnail"
                             android:layout_width="@dimen/cardThumbnailSize"
                             android:layout_height="@dimen/cardThumbnailSize"
-                            android:layout_centerHorizontal="true"
+                            android:layout_centerInParent="true"
                             android:contentDescription="@string/thumbnailDescription"
+                            android:scaleType="centerCrop"
                             app:srcCompat="@drawable/ic_done" />
 
                     </RelativeLayout>
                 </com.google.android.material.card.MaterialCardView>
 
                 <LinearLayout
-                    android:minHeight="@dimen/cardThumbnailSize"
+                    android:id="@+id/storeContainer"
                     android:layout_height="wrap_content"
                     android:layout_width="wrap_content"
                     android:orientation="vertical"
                     android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
                     android:layout_toEndOf="@+id/thumbnail_container">
 
                     <TextView
@@ -82,6 +93,8 @@
                     android:id="@+id/star"
                     android:layout_width="@dimen/cardThumbnailSize"
                     android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
                     app:srcCompat="@drawable/ic_starred_white"
                     android:contentDescription="@string/starImage"
                     app:tint="?attr/colorControlNormal"
@@ -114,6 +127,8 @@
                     android:id="@+id/balance"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
                     android:paddingEnd="8dp"
                     android:textAppearance="?attr/textAppearanceBody2"
                     android:textColor="?android:attr/textColorSecondary"
@@ -125,6 +140,8 @@
                     android:id="@+id/expiry"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
                     android:textAppearance="?attr/textAppearanceBody2"
                     android:textColor="?android:attr/textColorSecondary"
                     app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"