From d463a985951825fee5e4f2aff783c46ddef425fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Dec 2022 08:11:53 +0000 Subject: [PATCH 1/8] Bump kotlin_version from 1.7.21 to 1.7.22 Bumps `kotlin_version` from 1.7.21 to 1.7.22. Updates `kotlin-gradle-plugin` from 1.7.21 to 1.7.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22) Updates `kotlin-stdlib` from 1.7.21 to 1.7.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.21...v1.7.22) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 41753368..0d4e7d51 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.7.21" + ext.kotlin_version = "1.7.22" repositories { google() jcenter() From 54ccb591129dea26479db94fef4e69a27f5e1bd7 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 13 Dec 2022 12:34:52 +0000 Subject: [PATCH 2/8] Translated using Weblate (Ukrainian) Currently translated at 76.9% (10 of 13 strings) Translation: To Don't/Metadata Translate-URL: https://hosted.weblate.org/projects/todont/metadata/uk/ --- fastlane/metadata/android/uk/changelogs/6.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fastlane/metadata/android/uk/changelogs/6.txt b/fastlane/metadata/android/uk/changelogs/6.txt index a558d4f7..079deb68 100644 --- a/fastlane/metadata/android/uk/changelogs/6.txt +++ b/fastlane/metadata/android/uk/changelogs/6.txt @@ -1,4 +1,3 @@ -- Покращення корист. досвіду 🦋 -- Малі виправлення помилок 🐛 +- Покращення перекладу 🦋 Не соромтеся надсилати відгуки електронною поштою, зазначати помилки на GitHub або допомагати в перекладі. 💓 From 5f7612b6f613f67cb2874d3c626e278a28adf701 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 13 Dec 2022 12:39:29 +0000 Subject: [PATCH 3/8] Translated using Weblate (Ukrainian) Currently translated at 100.0% (55 of 55 strings) Translation: To Don't/To Don't Translate-URL: https://hosted.weblate.org/projects/todont/to-dont/uk/ --- app/src/main/res/values-uk/strings.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 921e4ca6..f2dc89ec 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -37,4 +37,20 @@ JUnit Eclipse Public License 1.0 Feather Icons + Світлий + To Don\'t тепер на темному боці. + # Here are the non-translateable strings + Обернений список справ + Запишіть свої погані звички. Щодня, викреслюйте + ті, яким піддалися. А наступного + ранку почніть з новим списком. + Продовжити + Додати задачу + Нотатка + Зберегти + Темний + Оновити + To Don\'t тепер слідкує за вашою системою. + To Don\'t тепер на світлому боці. + Додати новий пункт To Don\'t \ No newline at end of file From fced07dd2d4b28a2ce4c94530a221a125ec2a543 Mon Sep 17 00:00:00 2001 From: Translator-3000 Date: Sun, 18 Dec 2022 18:12:21 +0000 Subject: [PATCH 4/8] Translated using Weblate (Italian) Currently translated at 100.0% (13 of 13 strings) Translation: To Don't/Metadata Translate-URL: https://hosted.weblate.org/projects/todont/metadata/it/ --- fastlane/metadata/android/it/changelogs/3.txt | 2 ++ fastlane/metadata/android/it/changelogs/4.txt | 2 ++ fastlane/metadata/android/it/changelogs/5.txt | 1 + fastlane/metadata/android/it/changelogs/6.txt | 3 +++ fastlane/metadata/android/it/changelogs/7.txt | 5 +++++ fastlane/metadata/android/it/changelogs/8.txt | 1 + fastlane/metadata/android/it/changelogs/9.txt | 4 ++++ fastlane/metadata/android/it/full_description.txt | 9 +++------ 8 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 fastlane/metadata/android/it/changelogs/3.txt create mode 100644 fastlane/metadata/android/it/changelogs/4.txt create mode 100644 fastlane/metadata/android/it/changelogs/5.txt create mode 100644 fastlane/metadata/android/it/changelogs/6.txt create mode 100644 fastlane/metadata/android/it/changelogs/7.txt create mode 100644 fastlane/metadata/android/it/changelogs/8.txt create mode 100644 fastlane/metadata/android/it/changelogs/9.txt diff --git a/fastlane/metadata/android/it/changelogs/3.txt b/fastlane/metadata/android/it/changelogs/3.txt new file mode 100644 index 00000000..f03ec2e8 --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/3.txt @@ -0,0 +1,2 @@ +Piccoli miglioramenti +Risolta configurazione fastlane diff --git a/fastlane/metadata/android/it/changelogs/4.txt b/fastlane/metadata/android/it/changelogs/4.txt new file mode 100644 index 00000000..3a3d265a --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/4.txt @@ -0,0 +1,2 @@ +- Aggiornamenti delle traduzioni 🗺️ +- Restate sintonizzati per le correzioni di bug 🦟 diff --git a/fastlane/metadata/android/it/changelogs/5.txt b/fastlane/metadata/android/it/changelogs/5.txt new file mode 100644 index 00000000..8f794679 --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/5.txt @@ -0,0 +1 @@ +- Aggiornate dipendenze 🔩 diff --git a/fastlane/metadata/android/it/changelogs/6.txt b/fastlane/metadata/android/it/changelogs/6.txt new file mode 100644 index 00000000..6f98838b --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/6.txt @@ -0,0 +1,3 @@ +- Aggiornamenti delle traduzioni 🗺️ + +Sentiti il benvenuto per inviare feedback via e-mail, aprire issue su GitHub o aiutare a tradurre. 💓 diff --git a/fastlane/metadata/android/it/changelogs/7.txt b/fastlane/metadata/android/it/changelogs/7.txt new file mode 100644 index 00000000..64e12f63 --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/7.txt @@ -0,0 +1,5 @@ +- Miglioramenti UX 🦋 +- Piccole correzioni di bug 🐛 +- Aggiornamento delle traduzioni 🗺️ + +Sentiti il benvenuto per inviare feedback via e-mail, aprire issue su GitHub o aiutare a tradurre. 💓 diff --git a/fastlane/metadata/android/it/changelogs/8.txt b/fastlane/metadata/android/it/changelogs/8.txt new file mode 100644 index 00000000..3e003ce9 --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/8.txt @@ -0,0 +1 @@ +- Risolti i problemi di linting 🐛 diff --git a/fastlane/metadata/android/it/changelogs/9.txt b/fastlane/metadata/android/it/changelogs/9.txt new file mode 100644 index 00000000..b13f4ede --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/9.txt @@ -0,0 +1,4 @@ +- Molti bug risolti grazie a subeep 🐛 +- Passare alla grafica vettoriale per una visione più nitida grazie a karthikayya 🎨 +- Aggiornamenti delle dipendenze ⚙️ +- Aggiornamenti delle traduzioni 🗺️ diff --git a/fastlane/metadata/android/it/full_description.txt b/fastlane/metadata/android/it/full_description.txt index 2e2710ce..33d9283f 100644 --- a/fastlane/metadata/android/it/full_description.txt +++ b/fastlane/metadata/android/it/full_description.txt @@ -7,9 +7,6 @@ Tieni d'occhio i tuoi progressi Il Diario ti dà un'idea delle tue percentuali complessive di successo e individua la cattiva abitudine a cui sei stato più legato — nel corso di una settimana, un mese o un anno. Così puoi facilmente lavorare per migliorare la tua persona. -Pagina web: -https://www.crazymarvin.com/todont -Traduci per non farlo: -https://hosted.weblate.org/engage/todont/ -Fonte su GitHub: -https://github.com/Crazy-Marvin/ToDont +Pagina web: https://www.crazymarvin.com/todont +Traduci To Don't: https://hosted.weblate.org/engage/todont/ +Fonte su GitHub: https://github.com/Crazy-Marvin/ToDont From 6fd09c7eb68a8552bbe4e1204fbaf5b631a2e795 Mon Sep 17 00:00:00 2001 From: Translator-3000 Date: Sun, 18 Dec 2022 18:05:29 +0000 Subject: [PATCH 5/8] Translated using Weblate (Italian) Currently translated at 100.0% (55 of 55 strings) Translation: To Don't/To Don't Translate-URL: https://hosted.weblate.org/projects/todont/to-dont/it/ --- app/src/main/res/values-it/strings.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 38c8fb5b..4774d1e1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -37,4 +37,20 @@ Contribuisci Sviluppatore Licenza Apache 2.0 + La lista delle cose da fare inversa + Annota le tue cattive abitudini. Ogni giorno, segna + quelle a cui hai ceduto. E la prossima + mattina inizia con la nuova lista. + Continua + Inserisci attività + Nota + Salva + Scuro + Chiaro + Aggiorna + To Don\'t ora segue il tuo sistema. + To Don\'t ora segue il tema chiaro. + To Don\'t ora segue il tema scuro. + # Here are the non-translateable strings + Aggiungi un nuovo oggetto To Don\'t \ No newline at end of file From a9a61db2e03e974bd7148611b00d86369fd29381 Mon Sep 17 00:00:00 2001 From: Arafaat Ahmad Qureshi <60616384+arafaatqureshi@users.noreply.github.com> Date: Tue, 20 Dec 2022 13:27:42 +0500 Subject: [PATCH 6/8] label issue fixed added a toast message to add label first --- .../todont/Fragments/HabitsFragment.java | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java b/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java index d3d6892c..d3618b07 100644 --- a/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java +++ b/app/src/main/java/rocks/poopjournal/todont/Fragments/HabitsFragment.java @@ -89,32 +89,36 @@ else if(Helper.habitsdata.size()==0){ floatingActionButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + if(Helper.labels_array.size()==0){ + Toast.makeText(getActivity(), "Please Add a Label First", + Toast.LENGTH_LONG).show(); + } + else{ final SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()); final String formattedDate = df.format(c); final Dialog d = new Dialog(getActivity()); d.requestWindowFeature(Window.FEATURE_NO_TITLE); d.setContentView(R.layout.dialogbox_floatingbutton); - Button btndone=d.findViewById(R.id.btndone); + Button btndone = d.findViewById(R.id.btndone); WindowManager.LayoutParams lp = d.getWindow().getAttributes(); - lp.dimAmount=0.9f; + lp.dimAmount = 0.9f; d.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); Window window = d.getWindow(); window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT); d.getWindow().setAttributes(lp); final Spinner spinner = d.findViewById(R.id.spinner); - final TextView txt=d.findViewById(R.id.txt); - if(Helper.labels_array.size()==0){ + final TextView txt = d.findViewById(R.id.txt); + if (Helper.labels_array.size() == 0) { txt.setVisibility(View.VISIBLE); spinner.setVisibility(View.INVISIBLE); - } - else{ + } else { txt.setVisibility(View.INVISIBLE); spinner.setVisibility(View.VISIBLE); } - ArrayAdapter arrayAdapter = new ArrayAdapter(getActivity(),android.R.layout.simple_spinner_item,Helper.labels_array); + ArrayAdapter arrayAdapter = new ArrayAdapter(getActivity(), android.R.layout.simple_spinner_item, Helper.labels_array); arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinner.setAdapter(arrayAdapter); @@ -124,7 +128,7 @@ public void onClick(View view) { public void onItemSelected(AdapterView adapterView, View view, int i, long l) { catagoryselected = adapterView.getItemAtPosition(i).toString(); // if(Helper.isnightmodeon.equals("no")){ - ((TextView) adapterView.getChildAt(0)).setTextColor(getResources().getColor(R.color.textcolor)); + ((TextView) adapterView.getChildAt(0)).setTextColor(getResources().getColor(R.color.textcolor)); // // } // else if(Helper.isnightmodeon.equals("yes")){ @@ -154,16 +158,16 @@ public void onClick(View view) { } catch (SQLiteException e) { } - if(habit_text.equals("")){ + if (habit_text.equals("")) { } - db.insert_habits(Helper.habitsdata.size(),formattedDate, habit_text, detail_text, catagoryselected); + db.insert_habits(Helper.habitsdata.size(), formattedDate, habit_text, detail_text, catagoryselected); db.show_habits_data(); - Helper.SelectedButtonOfTodayTab=0; - Intent i=new Intent(getActivity(), MainActivity.class); + Helper.SelectedButtonOfTodayTab = 0; + Intent i = new Intent(getActivity(), MainActivity.class); startActivity(i); - getActivity().overridePendingTransition(0,0); + getActivity().overridePendingTransition(0, 0); d.dismiss(); } @@ -171,11 +175,10 @@ public void onClick(View view) { spinner.setAdapter(arrayAdapter); d.show(); - + } } }); - // floatingActionButton.setOnClickListener(new View.OnClickListener() { // @SuppressLint("ResourceAsColor") // @Override @@ -335,4 +338,4 @@ public void onClick(DialogInterface dialog, int id) { } }; -} \ No newline at end of file +} From 3cd34ecb7f298d8b07f7479275f155cf9bca394a Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Tue, 20 Dec 2022 19:01:10 +0100 Subject: [PATCH 7/8] 1.9 --> 2.0 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b5c71e2e..c9a1558e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "rocks.poopjournal.todont" minSdkVersion 21 targetSdkVersion 33 - versionCode 9 - versionName "1.9" + versionCode 10 + versionName "2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } From 08485a3a8b16125472e6608ac88e106f41d48440 Mon Sep 17 00:00:00 2001 From: CrazyMarvin Date: Tue, 20 Dec 2022 19:03:11 +0100 Subject: [PATCH 8/8] Add Changelog For To Don't v2.0 --- fastlane/metadata/android/en-US/changelogs/10.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/10.txt diff --git a/fastlane/metadata/android/en-US/changelogs/10.txt b/fastlane/metadata/android/en-US/changelogs/10.txt new file mode 100644 index 00000000..3688c3a3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/10.txt @@ -0,0 +1 @@ +- 🐛 Prevent users from creating bad habits without a label to prevent app crashes (#187)