diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-04-09 00:30:03 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-04-09 00:30:03 +0300 |
commit | 941e5439a01cee24487362fca75fb38e8f71aefc (patch) | |
tree | 6f13a5761aa0584bc4890f5212647ba7dccf3d01 | |
parent | e9fc505ae098d33ca9dab61f478c60ca150a35b8 (diff) | |
parent | 8997e9759f1a6089887d409795db27a3054fd5f1 (diff) |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
-rw-r--r-- | app/build.gradle | 8 | ||||
-rw-r--r-- | app/src/main/res/drawable/note_list_widget_preview.png | bin | 249967 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable/note_list_widget_preview.webp | bin | 0 -> 193812 bytes | |||
-rw-r--r-- | app/src/main/res/drawable/single_note_widget.png | bin | 265445 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable/single_note_widget.webp | bin | 0 -> 204888 bytes | |||
-rw-r--r-- | app/src/main/res/values-cs-rCZ/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-it/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-nl/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-pl/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-pt-rBR/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-tr/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rCN/strings.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values-zh-rHK/strings.xml | 5 | ||||
-rw-r--r-- | fastlane/metadata/android/en-US/changelogs/3003000.txt | 4 |
15 files changed, 35 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle index 889e8dd2..c4f8ef19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "it.niedermann.owncloud.notes" minSdkVersion 21 targetSdkVersion 29 - versionCode 3002005 - versionName "3.2.5" + versionCode 3003000 + versionName "3.3.0" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { @@ -35,7 +35,7 @@ android { } release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -89,7 +89,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.2.0" implementation "androidx.fragment:fragment:1.3.2" implementation "androidx.preference:preference:1.1.1" - implementation "androidx.recyclerview:recyclerview:1.1.0" + implementation "androidx.recyclerview:recyclerview:1.2.0" implementation 'androidx.recyclerview:recyclerview-selection:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.work:work-runtime:2.5.0' diff --git a/app/src/main/res/drawable/note_list_widget_preview.png b/app/src/main/res/drawable/note_list_widget_preview.png Binary files differdeleted file mode 100644 index 7e8d086c..00000000 --- a/app/src/main/res/drawable/note_list_widget_preview.png +++ /dev/null diff --git a/app/src/main/res/drawable/note_list_widget_preview.webp b/app/src/main/res/drawable/note_list_widget_preview.webp Binary files differnew file mode 100644 index 00000000..e0ffc49f --- /dev/null +++ b/app/src/main/res/drawable/note_list_widget_preview.webp diff --git a/app/src/main/res/drawable/single_note_widget.png b/app/src/main/res/drawable/single_note_widget.png Binary files differdeleted file mode 100644 index 7d1f126d..00000000 --- a/app/src/main/res/drawable/single_note_widget.png +++ /dev/null diff --git a/app/src/main/res/drawable/single_note_widget.webp b/app/src/main/res/drawable/single_note_widget.webp Binary files differnew file mode 100644 index 00000000..5ba84722 --- /dev/null +++ b/app/src/main/res/drawable/single_note_widget.webp diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index e0d62453..6dc44ea6 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">Zámek aplikace (zatím vyvíjeno)</string> <string name="settings_lock_summary">Přihlašovací údaje zařízení</string> <string name="settings_background_sync">Synchronizace na pozadí</string> + <string name="settings_prevent_screen_capture">Bránit pořizování snímků obrazovky</string> + <string name="error_sync">Synchronizace se nezdařila: %1$s</string> <string name="error_synchronization">Synchronizace se nezdařila</string> <string name="error_no_network">Žádné síťové spojení</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Opatření vlastním logem</string> <string name="settings_gridview">Zobrazení v mřížce</string> <string name="simple_security">Zabezpečení</string> + <string name="appearance_and_behavior">Vzhled a chování</string> <string name="simple_synchronization">Synchronizace</string> <string name="simple_behavior">Chování</string> <string name="manage_accounts">Spravovat účty</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3fa46d45..9f7e63bd 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">App-Sperre (Beta)</string> <string name="settings_lock_summary">Geräte-Anmeldedaten</string> <string name="settings_background_sync">Hintergrundsynchronisierung</string> + <string name="settings_prevent_screen_capture">Bildschirmaufnahme verhindern</string> + <string name="error_sync">Synchronisierung fehlgeschlagen: %1$s</string> <string name="error_synchronization">Synchronisierung fehlgeschlagen</string> <string name="error_no_network">Keine Netzwerkverbindung</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Branding</string> <string name="settings_gridview">Kachelansicht</string> <string name="simple_security">Sicherheit</string> + <string name="appearance_and_behavior">Aussehen und Verhalten</string> <string name="simple_synchronization">Synchronisierung</string> <string name="simple_behavior">Verhalten</string> <string name="manage_accounts">Konten verwalten</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b6dba215..625a9f87 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">Blocco applicazione (Beta)</string> <string name="settings_lock_summary">Credenziali dispositivo</string> <string name="settings_background_sync">Sincronizzazione in background</string> + <string name="settings_prevent_screen_capture">Impedisci cattura schermo</string> + <string name="error_sync">Sincronizzazione non riuscita: %1$s</string> <string name="error_synchronization">Sincronizzazione non riuscita</string> <string name="error_no_network">Nessuna connessione di rete</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Marchio</string> <string name="settings_gridview">Vista griglia</string> <string name="simple_security">Sicurezza</string> + <string name="appearance_and_behavior">Aspetto e comportamento</string> <string name="simple_synchronization">Sincronizzazione</string> <string name="simple_behavior">Comportamento</string> <string name="manage_accounts">Gestisci account</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 07f52969..a3e4a857 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">App slot (Beta)</string> <string name="settings_lock_summary">Apparaatinloggegevens</string> <string name="settings_background_sync">Achtergrondsynchronisatie</string> + <string name="settings_prevent_screen_capture">Voorkomen schermafdruk</string> + <string name="error_sync">Synchronisatie mislukt: %1$s</string> <string name="error_synchronization">Synchronisatie mislukt</string> <string name="error_no_network">Geen netwerkverbinding</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Brandmerken</string> <string name="settings_gridview">Rasterweergave</string> <string name="simple_security">Beveiliging</string> + <string name="appearance_and_behavior">Uiterlijk en gedrag</string> <string name="simple_synchronization">Synchronisatie</string> <string name="simple_behavior">Gedrag</string> <string name="manage_accounts">Accounts beheren </string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 4bd291cf..08689a8a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">Blokada aplikacji (Beta)</string> <string name="settings_lock_summary">Poświadczenia urządzenia</string> <string name="settings_background_sync">Synchronizacja w tle</string> + <string name="settings_prevent_screen_capture">Uniemożliwiaj przechwytywanie ekranu</string> + <string name="error_sync">Synchronizacja nie powiodła się: %1$s</string> <string name="error_synchronization">Synchronizacja nie powiodła się</string> <string name="error_no_network">Brak połączenia sieciowego</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Motyw serwera</string> <string name="settings_gridview">Widok siatki</string> <string name="simple_security">Bezpieczeństwo</string> + <string name="appearance_and_behavior">Wygląd i zachowanie</string> <string name="simple_synchronization">Synchronizacja</string> <string name="simple_behavior">Zachowanie</string> <string name="manage_accounts">Zarządzaj kontami</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7731c772..57faf051 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">Bloqueio de aplicativo (Beta)</string> <string name="settings_lock_summary">Credenciais de dispositivo</string> <string name="settings_background_sync">Sincronização em segundo plano</string> + <string name="settings_prevent_screen_capture">Proibir captura de tela</string> + <string name="error_sync">A sincronização falhou: %1$s</string> <string name="error_synchronization">A sincronização falhou</string> <string name="error_no_network">Sem conexão de rede</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Marcação</string> <string name="settings_gridview">Visualização em grade</string> <string name="simple_security">Segurança</string> + <string name="appearance_and_behavior">Aparência e comportamento</string> <string name="simple_synchronization">Sincronização</string> <string name="simple_behavior">Comportamento</string> <string name="manage_accounts">Gerenciar contas</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4b37a5f3..b99bc454 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">Uygulama kilidi (Beta)</string> <string name="settings_lock_summary">Aygıt kimlik doğrulama bilgileri</string> <string name="settings_background_sync">Arka planda eşitleme</string> + <string name="settings_prevent_screen_capture">Ekran görüntüsü alınamasın</string> + <string name="error_sync">Eşitlenemedi: %1$s</string> <string name="error_synchronization">Eşitlenemedi</string> <string name="error_no_network">Ağ bağlantısı yok</string> @@ -136,6 +138,7 @@ <string name="settings_branding">Markalama</string> <string name="settings_gridview">Tablo görünümü</string> <string name="simple_security">Güvenlik</string> + <string name="appearance_and_behavior">Görünüm ve davranış</string> <string name="simple_synchronization">Eşitleme</string> <string name="simple_behavior">Davranış</string> <string name="manage_accounts">Hesap yönetimi</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 27401e4a..48cbe39d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">应用锁 (测试版)</string> <string name="settings_lock_summary">设备凭据</string> <string name="settings_background_sync">后台同步</string> + <string name="settings_prevent_screen_capture">防止截屏</string> + <string name="error_sync">同步失败:%1$s</string> <string name="error_synchronization">同步失败</string> <string name="error_no_network">没有网络连接</string> @@ -136,6 +138,7 @@ <string name="settings_branding">创建标签</string> <string name="settings_gridview">网格视图</string> <string name="simple_security">安全</string> + <string name="appearance_and_behavior">外观和行为</string> <string name="simple_synchronization">同步</string> <string name="simple_behavior">行为</string> <string name="manage_accounts">管理账号</string> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index f87a6f3d..05e59745 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -45,6 +45,8 @@ <string name="settings_lock">應用程式上鎖 (Beta)</string> <string name="settings_lock_summary">裝置身份驗證</string> <string name="settings_background_sync">背景同步</string> + <string name="settings_prevent_screen_capture">防止屏幕截圖</string> + <string name="error_sync">同步失敗:%1$s</string> <string name="error_synchronization">同步失敗</string> <string name="error_no_network">沒有網路連線</string> @@ -67,7 +69,7 @@ <string name="about_app_license">此程式依照 GNU GENERAL PUBLIC LICENSE v3+ 方式授權使用</string> <string name="about_app_license_button">檢視授權條款</string> <string name="about_icons_disclaimer_title">圖示</string> - <string name="about_icons_disclaimer"><p>原創圖示由 %1$s 製作</p><p>其他 App 使用的圖示均為 Google Inc。製作的 <a href=\"https://materialdesignicons。com/\">Material Design 圖示</a>,並依 Apache 2。0 條款授權。</p></string> + <string name="about_icons_disclaimer"><p>原創圖示由 %1$s 製作</p><p>其他 App 使用的圖示均為 Google Inc。製作的 <a href=\"https://materialdesignicons。com/\">Material Design 圖示</a>,並依 Apache 2.0 條款授權。</p></string> <string name="about_credits_tab_title">致謝</string> <string name="about_contribution_tab_title">貢獻</string> <string name="about_license_tab_title">授權條款</string> @@ -136,6 +138,7 @@ <string name="settings_branding">品牌化</string> <string name="settings_gridview">網格檢視</string> <string name="simple_security">安全性</string> + <string name="appearance_and_behavior">外觀與行為</string> <string name="simple_synchronization">同步</string> <string name="simple_behavior">行為</string> <string name="manage_accounts">賬戶管理</string> diff --git a/fastlane/metadata/android/en-US/changelogs/3003000.txt b/fastlane/metadata/android/en-US/changelogs/3003000.txt index 12c785ee..f52abc09 100644 --- a/fastlane/metadata/android/en-US/changelogs/3003000.txt +++ b/fastlane/metadata/android/en-US/changelogs/3003000.txt @@ -1 +1,3 @@ -- 🔒 Prevent screen capture (#1098)
\ No newline at end of file +- 🔒 Prevent screen capture (#1098) +- 🖼 Convert widget previews to WebP to reduce app size (#1120) by @connyduck +- 🖼 Enable code minification (#1119)
\ No newline at end of file |