Merge remote-tracking branch 'origin/development' into development

Crazy-Marvin · Jan 10, 2025 · d475a1d · d475a1d
2 parents 73169db + 41b13e1
commit d475a1d
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - name: "🧪 Code coverage"
         run: ./gradlew test
       - name: "📤 Upload code coverage"
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: "🧪 Android LINT"

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,7 +23,7 @@ jobs:
       - name: "🧪 Code coverage"
         run: ./gradlew jacocoTestReport
       - name: "📤 Upload code coverage"
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           yml: .codecov.yml

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 *.aar
 *.ap_
 *.aab
+app/release
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -49,7 +50,7 @@ render.experimental.xml
 .idea/gradle.xml
 .idea/assetWizardSettings.xml
 .idea/dictionaries
-.idea/libraries
+.idea/libraries/
 # Android Studio 3 in .gitignore file.
 .idea/caches
 .idea/modules.xml
@@ -92,4 +93,7 @@ lint/tmp/
 
 # Android Profiling
 *.hprof
-*.dm
+*.dm
+
+# Kotlin
+.kotlin/sessions/
diff --git a/.idea/icon.png b/.idea/icon.png
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/Crazy-Marvin/ToDont/CI/development)](https://github.com/Crazy-Marvin/ToDont/actions)
 [![License](https://img.shields.io/github/license/Crazy-Marvin/ToDont.svg)](https://github.com/Crazy-Marvin/ToDont/blob/development/LICENSE)
+[![Figma Mockups](https://img.shields.io/badge/Figma-black?logo=figma)](https://www.figma.com/file/RoX4IQYdduFH1TxXV3fxla/To-Don%E2%80%99t?node-id=0%3A1)
 [![Last commit](https://img.shields.io/github/last-commit/Crazy-Marvin/ToDont.svg?style=flat)](https://github.com/Crazy-Marvin/ToDont/commits)
 [![Releases](https://img.shields.io/github/downloads/Crazy-Marvin/ToDont/total.svg?style=flat)](https://github.com/Crazy-Marvin/ToDont/releases)
 [![Latest tag](https://img.shields.io/github/tag/Crazy-Marvin/ToDont.svg?style=flat)](https://github.com/Crazy-Marvin/ToDont/tags)

diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "rocks.poopjournal.todont"
         minSdkVersion 26
         targetSdkVersion 35
-        versionCode 401
-        versionName "4.0.1"
+        versionCode 400
+        versionName "4.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -62,7 +62,7 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.core:core:1.10.1' // Check for the latest version
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'

diff --git a/app/src/main/res/values-dum/strings.xml b/app/src/main/res/values-dum/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -10,7 +10,6 @@
         <item>Italiano</item>
         <item>Francés</item>
     </string-array>
-
     <string-array name="month_names">
         <item>Enero</item>
         <item>Febrero</item>
@@ -25,7 +24,6 @@
         <item>Noviembre</item>
         <item>Diciembre</item>
     </string-array>
-
     <string name="delete_habit">¿Estás seguro de que quieres eliminar este hábito?</string>
     <string name="LightMode">To Don\'t</string>
     <string name="onboarding_reverse">Invertir la lista To Do</string>
@@ -79,12 +77,10 @@
         <item>Comida y Bebidas</item>
         <item>Estudio</item>
     </string-array>
-
     <!-- Toasts -->
     <string name="toast_system">To Don\'t ahora sigue tu sistema.</string>
     <string name="toast_light">To Don\'t ahora está en modo claro.</string>
     <string name="toast_dark">To Don\'t ahora está en modo oscuro.</string>
-
     <!-- Here are the non-translateable strings -->
 
     <!-- Here are the contentDescription strings -->
@@ -136,4 +132,4 @@
     <string name="back_up">Respaldo</string>
     <string name="restore">Restaurar</string>
     <string name="dracula">Dracula</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -10,7 +10,6 @@
         <item>Italiano</item>
         <item>Francese</item>
     </string-array>
-
     <string-array name="month_names">
         <item>Gennaio</item>
         <item>Febbraio</item>
@@ -25,7 +24,6 @@
         <item>Novembre</item>
         <item>Dicembre</item>
     </string-array>
-
     <string name="delete_habit">Sei sicuro di voler eliminare questa abitudine?</string>
     <string name="LightMode">To Don\'t</string>
     <string name="onboarding_reverse">Inverti la lista To Do</string>
@@ -79,12 +77,10 @@
         <item>Cibo e Bevande</item>
         <item>Studio</item>
     </string-array>
-
     <!-- Toasts -->
     <string name="toast_system">To Don\'t ora segue il tuo sistema.</string>
     <string name="toast_light">To Don\'t ora è in modalità chiara.</string>
     <string name="toast_dark">To Don\'t ora è in modalità scura.</string>
-
     <!-- Here are the non-translateable strings -->
 
     <!-- Here are the contentDescription strings -->
@@ -136,4 +132,4 @@
     <string name="back_up">Backup</string>
     <string name="restore">Ripristina</string>
     <string name="dracula">Dracula</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "2.0.20"
+    ext.kotlin_version = "2.1.0"
     repositories {
         jcenter()
         google()
         mavenCentral()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0"
         // classpath 'com.google.gms:google-services:4.4.1'
 
 

diff --git a/fastlane/metadata/android/en-US/changelogs/300.txt b/fastlane/metadata/android/en-US/changelogs/300.txt
@@ -0,0 +1,13 @@
+Enhanced:
+- Extended Tutorial 🦮
+- Android 15 Support 🤖
+- Translation Updates 🗺️
+- Refined UX 🎨
+
+New features:
+- Multiple avoids & dones per day 🪬
+- Notifications 🛎️
+- Local Backup & Restore 🛟
+
+A huge thank you to all contributors and translators. 😘
+Feel welcome to report issues and submit fixes on https://github.com/Crazy-Marvin/ToDont/ or translations on https://hosted.weblate.org/engage/todont/. 🚀
diff --git a/fastlane/metadata/android/en-US/changelogs/400.txt b/fastlane/metadata/android/en-US/changelogs/400.txt
@@ -0,0 +1 @@
+Rewrite of To Don't in Kotlin to enhance maintainablity, performance, efficiency, UX and security 💣
diff --git a/fastlane/metadata/android/en-US/changelogs/410.txt b/fastlane/metadata/android/en-US/changelogs/410.txt
@@ -0,0 +1,9 @@
+New feature: add a cover image for entries 🖼️
+New feature: homescreen widget 🏡
+Translation updates 🗺️
+Bug fixes 🤢
+Updated dependencies 🔩
+Housekeeping 🧹
+
+A huge thank you to all contributors and translators, especially @theftzoku. 😘
+Feel welcome to report issues and submit fixes on https://github.com/Crazy-Marvin/ToDont/ or translations on https://hosted.weblate.org/engage/todont/. 🚀
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Sep 06 00:28:53 BST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<resources></resources>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Rewrite of To Don't in Kotlin to enhance maintainablity, performance, efficiency, UX and security 💣