v.0.13.1 (#89)

- fixes issue where backups couldn't be created #86
pablo03v · Jan 4, 2024 · 5f4972c · 5f4972c
1 parent e3d0a3a
commit 5f4972c
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 34 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "cloud.pablos.overload"
         minSdk = 26
         targetSdk = 34
-        versionCode = 130
-        versionName = "0.13.0"
+        versionCode = 131
+        versionName = "0.13.1"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -41,6 +41,7 @@ android {
             applicationIdSuffix = ".debug"
             versionNameSuffix = ".debug"
             resValue("string", "app_name", "Overload Debug")
+            resValue("string", "app_fileprovider", "cloud.pablos.overload.debug.fileprovider")
         }
 
         named("release") {
@@ -51,6 +52,7 @@ android {
                 "proguard-rules.pro",
             )
             resValue("string", "app_name", "Overload")
+            resValue("string", "app_fileprovider", "cloud.pablos.overload.fileprovider")
         }
     }
 

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 130,
-      "versionName": "0.13.0",
+      "versionCode": 131,
+      "versionName": "0.13.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         </activity>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="cloud.pablos.overload.fileprovider, cloud.pablos.overload.debug.fileprovider"
+            android:authorities="@string/app_fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

diff --git a/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationComponents.kt b/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationComponents.kt
@@ -150,7 +150,6 @@ fun OverloadBottomNavigationBar(
                         }
                         TextView(
                             text = label,
-                            fontSize = MaterialTheme.typography.labelLarge.fontSize,
                             fontWeight =
                             if (selectedDestination == overloadDestination.route) {
                                 FontWeight.Bold

diff --git a/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt b/app/src/main/java/cloud/pablos/overload/ui/navigation/OverloadNavigationFabSmall.kt
@@ -129,7 +129,12 @@ fun OverloadNavigationFabSmall(
                         } else {
                             Icons.Default.PlayArrow
                         },
-                        contentDescription = stringResource(id = R.string.edit),
+                        contentDescription =
+                        if (isOngoing) {
+                            stringResource(id = R.string.stop)
+                        } else {
+                            stringResource(id = R.string.start)
+                        },
                     )
                 }
             }

diff --git a/app/src/main/java/cloud/pablos/overload/ui/tabs/configurations/ConfigurationsTab.kt b/app/src/main/java/cloud/pablos/overload/ui/tabs/configurations/ConfigurationsTab.kt
@@ -351,7 +351,7 @@ fun backup(state: ItemState, context: Context) {
 
         val contentUri = FileProvider.getUriForFile(
             context,
-            "cloud.pablos.overload.fileprovider",
+            context.getString(R.string.app_fileprovider),
             cachePath,
         )
 
@@ -364,7 +364,7 @@ fun backup(state: ItemState, context: Context) {
         val shareIntent = Intent.createChooser(sendIntent, null)
         context.startActivity(shareIntent)
     } catch (e: Exception) {
-        Toast.makeText(context, "Backup and share failed", Toast.LENGTH_SHORT).show()
+        Toast.makeText(context, context.getString(R.string.backup_failed), Toast.LENGTH_SHORT).show()
         e.printStackTrace()
     }
 }

diff --git a/app/src/main/java/cloud/pablos/overload/ui/tabs/home/HomeTabManualDialog.kt b/app/src/main/java/cloud/pablos/overload/ui/tabs/home/HomeTabManualDialog.kt
@@ -188,7 +188,7 @@ fun HomeTabManualDialog(
                 verticalArrangement = Arrangement.spacedBy(8.dp),
             ) {
                 TextView(
-                    stringResource(id = R.string.start),
+                    stringResource(id = R.string.start_label),
                     fontWeight = FontWeight.Bold,
                 )
                 Row(
@@ -219,7 +219,7 @@ fun HomeTabManualDialog(
                     )
                 }
                 TextView(
-                    stringResource(id = R.string.end),
+                    stringResource(id = R.string.end_label),
                     fontWeight = FontWeight.Bold,
                 )
                 Row(

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Искате ли да видите вътрешността? Заповядайте!</string>
     <string name="pause">Пауза</string>
     <string name="delete_items_forever">изтриване на елементи завинаги</string>
-    <string name="edit">Редактиране</string>
     <string name="pick_work_goal">Задайте работна цел</string>
     <string name="acra_mailBody">Открит е срив. Моля, помогнете ни да се подобрим, като изпратите този имейл, за да можем да поправим проблема възможно най-скоро.
 \n Съжаляваме за причинените неудобства! Вашият принос е от съществено значение за отстраняването на този проблем.

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Chcete se podívat dovnitř? Jděte dál!</string>
     <string name="pause">Pauza</string>
     <string name="delete_items_forever">navždy odstranit položky</string>
-    <string name="edit">Upravit</string>
     <string name="pick_work_goal">Stanovení pracovního cíle</string>
     <string name="acra_mailBody">Zjištěna havárie. Pomozte nám prosím zlepšit tento e-mail, abychom mohli co nejdříve provést opravu.
 \n Omlouváme se za způsobené potíže! Váš příspěvek je pro opravu tohoto problému zásadní.

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -20,7 +20,6 @@
     <string name="sourcecode_descr">Möchtest du das Innere sehen? Nur zu!</string>
     <string name="pause">Pause</string>
     <string name="delete_items_forever">Einträge für immer löschen</string>
-    <string name="edit">Bearbeiten</string>
     <string name="pick_work_goal">Arbeitsziel setzen</string>
     <string name="acra_mailBody">Absturz erkannt. Bitte helfe uns, uns zu verbessern, indem du diese E-Mail sendest, damit wir das Problem so schnell wie möglich beheben können.
 \nBitte entschuldige! Das Absenden ist für die Behebung dieses Problems unerlässlich.
@@ -98,6 +97,8 @@
     <string name="no">Nein</string>
     <string name="yes">Ja</string>
     <string name="adjust_end_time">Ende anpassen</string>
-    <string name="end">Ende</string>
+    <string name="end_label">Ende</string>
     <string name="manual_entry">Manueller Eintrag</string>
+    <string name="start_label">Start</string>
+    <string name="acra_mailSubject">Overload Absturz</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
@@ -23,7 +23,6 @@
     <string name="sourcecode_descr">Tahad näha sisemust? Mine edasi!</string>
     <string name="pause">Paus</string>
     <string name="delete_items_forever">kustutada objekte igaveseks</string>
-    <string name="edit">Muuda</string>
     <string name="pick_work_goal">Määra töö eesmärk</string>
     <string name="acra_mailBody">Kokkupõrge tuvastatud. Palun aidake meil parandada, saates selle e-kirja, et saaksime selle võimalikult kiiresti parandada.
 \n Vabandame tekitatud ebamugavuste pärast! Teie panus on selle probleemi lahendamiseks väga oluline.

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Szeretné látni a belsejét? Menj csak!</string>
     <string name="pause">Szünet</string>
     <string name="delete_items_forever">elemek törlése örökre</string>
-    <string name="edit">Szerkesztés</string>
     <string name="pick_work_goal">Munkacél beállítása</string>
     <string name="acra_mailBody">Ütközés észlelve. Kérjük, segítsen nekünk a javításban, küldje el ezt az e-mailt, hogy minél hamarabb kijavíthassuk a hibát.
 \n Elnézést az okozott kellemetlenségekért! Az Ön hozzájárulása elengedhetetlen a probléma javításához.

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="hours">jam</string>
     <string name="save">Simpan</string>
-    <string name="edit">Sunting</string>
     <string name="pick_work_goal">Tetapkan Tujuan Kerja</string>
     <string name="select_year">Pilih Tahun</string>
     <string name="pick_pause_goal">Tetapkan Sasaran Jeda</string>

diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
@@ -23,7 +23,6 @@
     <string name="sourcecode_descr">Viltu skoða hið innra? Áfram víðir!</string>
     <string name="pause">Hlé</string>
     <string name="delete_items_forever">eyða hlutum að eilífu</string>
-    <string name="edit">Breyta</string>
     <string name="pick_work_goal">Settu Þér Markmið Í Vinnunni</string>
     <string name="acra_mailBody">Hrun fannst. Vinsamlegast hjálpaðu okkur að bæta með því að senda þennan tölvupóst, svo við getum fengið þetta fastur eins fljótt og auðið er.
 \n Afsakið óþægindin sem urðu! Inntak þitt er nauðsynlegt til að laga þetta mál.

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Wil je een kijkje achter de schermen nemen? Ga je gang!</string>
     <string name="pause">Pauze</string>
     <string name="delete_items_forever">items permanent verwijderen</string>
-    <string name="edit">Bewerken</string>
     <string name="pick_work_goal">Werkdoel instellen</string>
     <string name="acra_mailBody">Er is een crash geweest. Help ons om de app te verbeteren door deze e-mail te versturen.
 \n Onze excuses voor het ongemak! We waarderen het dat je wilt helpen om dit probleem op te lossen.
@@ -98,6 +97,6 @@
     <string name="today">Vandaag</string>
     <string name="pause_left">Resterende pauzetijd</string>
     <string name="import_ol">Importeren</string>
-    <string name="end">Eindigt</string>
+    <string name="end_label">Eindigt</string>
     <string name="manual_entry">Zelf inplannen</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Chcesz zobaczyć wnętrze? Przejdź dalej!</string>
     <string name="pause">Pauza</string>
     <string name="delete_items_forever">usuwanie elementów na zawsze</string>
-    <string name="edit">Edytuj</string>
     <string name="pick_work_goal">Wyznacz cel pracy</string>
     <string name="acra_mailBody">Wykryto awarię. Prosimy o pomoc w poprawieniu sytuacji poprzez wysłanie tej wiadomości e-mail, abyśmy mogli jak najszybciej to naprawić.
 \n Przepraszamy za spowodowane niedogodności! Twój wkład jest niezbędny do naprawienia tego problemu.
@@ -98,6 +97,7 @@
     <string name="today">Dzisiaj</string>
     <string name="pause_left">Pauza w lewo</string>
     <string name="import_ol">Import</string>
-    <string name="end">Koniec</string>
+    <string name="end_label">Koniec</string>
     <string name="manual_entry">Wpis ręczny</string>
+    <string name="start_label">Start</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Vreți să vedeți interiorul? Mergeți!</string>
     <string name="pause">Pauza</string>
     <string name="delete_items_forever">ștergeți elementele pentru totdeauna</string>
-    <string name="edit">Editează</string>
     <string name="pick_work_goal">Setați obiectivul de lucru</string>
     <string name="acra_mailBody">S-a detectat un accident. Vă rugăm să ne ajutați să ne îmbunătățim trimițând acest e-mail, astfel încât să putem rezolva problema cât mai curând posibil.
 \n Ne cerem scuze pentru neplăcerile cauzate! Contribuția dvs. este esențială pentru remedierea acestei probleme.
@@ -98,4 +97,6 @@
     <string name="today">Astăzi</string>
     <string name="pause_left">Pauză la stânga</string>
     <string name="import_ol">Import</string>
+    <string name="end_label">Sfârșit</string>
+    <string name="manual_entry">Introducere manuală</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="select_all_items_of_selected_day">выбрать всё в этом дне</string>
     <string name="storage">хранилище</string>
-    <string name="delete_pause_descr">Вы не можете удалить происходящий сейчас перерыв. Он здесь только для того, чтобы проинформировать о том, что перерыв будет добавлен как только вы нажмёте Начать. Если вы не нажмёте Начать до завтра, он удалится и не будет засчитан против вашей цели.</string>
+    <string name="delete_pause_descr">Вы не можете удалить текущий перерыв. Он здесь только чтобы показать, что он будет добавлен, когда вы нажмёте Начать. Если вы не нажмёте Начать до завтра, он удалится и не будет засчитан против вашей цели.</string>
     <string name="hours">часов</string>
     <string name="close">Закрыть</string>
     <string name="save">Сохранить</string>
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Хотите заглянуть внутрь? Пожалуйста!</string>
     <string name="pause">Перерывы</string>
     <string name="delete_items_forever">удалить навсегда</string>
-    <string name="edit">Изменить</string>
     <string name="pick_work_goal">Задать цель работы</string>
     <string name="acra_mailBody">Замечен вылет. Пожалуйста, помогите нам улучшить приложение, отправив это письмо, чтобы мы могли исправить эту ошибку как можно скорее.
 \n Извините за доставленные неудобства! Заполнение данных ниже обязательно для того, чтобы мы могли исправить эту ошибку.
@@ -99,4 +98,7 @@
     <string name="today">Сегодня</string>
     <string name="pause_left">Отдыхать осталось</string>
     <string name="import_ol">Импортировать</string>
+    <string name="end_label">Конец</string>
+    <string name="manual_entry">Ручное добавление</string>
+    <string name="start_label">Начало</string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Chcete vidieť vnútro? Choďte!</string>
     <string name="pause">Pauza</string>
     <string name="delete_items_forever">navždy odstrániť položky</string>
-    <string name="edit">Upraviť</string>
     <string name="pick_work_goal">Nastavenie pracovného cieľa</string>
     <string name="acra_mailBody">Zistená havária. Prosím, pomôžte nám to zlepšiť zaslaním tohto e-mailu, aby sme to mohli čo najskôr opraviť.
 \n Ospravedlňujeme sa za spôsobené nepríjemnosti! Vaše príspevky sú nevyhnutné na odstránenie tohto problému.

diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
@@ -22,7 +22,6 @@
     <string name="sourcecode_descr">Si želite ogledati notranjost? Pojdite naprej!</string>
     <string name="pause">Pavza</string>
     <string name="delete_items_forever">za vedno izbrišite elemente</string>
-    <string name="edit">Uredi</string>
     <string name="pick_work_goal">Določite delovni cilj</string>
     <string name="acra_mailBody">Odkrita nesreča. Pomagajte nam izboljšati stanje tako, da nam pošljete to e-poštno sporočilo, da bomo lahko to čim prej odpravili.
 \n Opravičujemo se za povzročene nevšečnosti! Vaš prispevek je bistvenega pomena za odpravo te težave.

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -26,7 +26,6 @@
     <string name="sourcecode_descr">Vill du se insidan? Varsågod!</string>
     <string name="pause">Paus</string>
     <string name="delete_items_forever">radera objekt för alltid</string>
-    <string name="edit">Redigera</string>
     <string name="pick_work_goal">Ange mål för arbetet</string>
     <string name="acra_mailBody">Krasch upptäckt. Hjälp oss att förbättra genom att skicka det här e-postmeddelandet, så att vi kan åtgärda problemet så snart som möjligt.
 \n Vi beklagar de olägenheter som uppstått! Din input är avgörande för att lösa detta problem.

diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -10,7 +10,6 @@
     <string name="tuesday">Вівторок</string>
     <string name="learn_more">Дізнатися більше…</string>
     <string name="delete_items_forever">видалити елементи назавжди</string>
-    <string name="edit">Редагувати</string>
     <string name="acra_mailBody">Виявлено збій. Будь ласка, допоможіть нам покращити програму, надіславши цей лист, щоб ми могли виправити це якнайшвидше.
 \nВибачте за незручності! Ваш внесок дуже важливий для вирішення цієї проблеми.
 \n
@@ -98,6 +97,8 @@
     <string name="no">Ні</string>
     <string name="yes">Так</string>
     <string name="adjust_end_time">Налаштуйте час завершення</string>
-    <string name="end">Кінець</string>
+    <string name="end_label">Кінець</string>
     <string name="manual_entry">Введення вручну</string>
+    <string name="start_label">Початок</string>
+    <string name="acra_mailSubject">Збій Overload</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -41,7 +41,8 @@
     <string name="delete_pause">Delete Pause</string>
     <string name="delete_pause_descr">You cannot delete this ongoing pause. It is only there to indicate a pause will be created once you hit start. If you will not hit start until tomorrow it will be gone and will not count against your goal.</string>
     <!--  cloud.pablos.overload.ui.tabs.home.HomeTabManualDialog -->
-    <string name="end">End</string>
+    <string name="start_label">Start</string>
+    <string name="end_label">End</string>
     <!--  cloud.pablos.overload.ui.tabs.calendar.CalendarTab -->
     <string name="calendar">Calendar</string>
     <!--  cloud.pablos.overload.ui.tabs.configurations.ConfigurationsTab -->
@@ -54,6 +55,7 @@
     <string name="storage">storage</string>
     <string name="backup">Backup</string>
     <string name="backup_descr">Backup all data regularly to a save place!</string>
+    <string name="backup_failed">Creating backup failed</string>
     <string name="import_ol">Import</string>
     <string name="import_descr">Import from a backup</string>
     <string name="import_backup">Import Backup</string>
@@ -75,7 +77,7 @@
     <string name="footer">created with ❤️ by pabloscloud</string>
     <string name="acra_toastText">Crash detected. Please help by sending a mail!</string>
     <string name="acra_mailTo">[email protected]</string>
-    <string name="acra_mailSubject" translatable="false">Overload Crash</string>
+    <string name="acra_mailSubject">Overload Crash</string>
     <string name="acra_mailBody">
         Crash detected. Please help us improve by sending this email, so we can get this fixed as soon as possible.\n
         Sorry for the inconveniences caused! Your input is essential for fixing this issue.\n
@@ -110,7 +112,6 @@
     <string name="pause_left">Pause left</string>
     <!-- cloud.pablos.overload.ui.views.DayViewItem -->
     <string name="arrow_forward">arrow forward describing the direction of both times from start to end</string>
-    <string name="edit">Edit</string>
     <string name="select_year">Select Year</string>
     <string name="translate">Translate</string>
     <string name="translate_descr">Want to translate the app\? Thanks!</string>

diff --git a/fastlane/metadata/android/en-US/changelogs/131.txt b/fastlane/metadata/android/en-US/changelogs/131.txt
@@ -0,0 +1 @@
+- fixes issue where backups couldn't be created
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- fixes issue where backups couldn't be created