Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
theftzoku committed Sep 2, 2024
2 parents 3a1cd72 + 87d8653 commit a25bf81
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codacy-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@v4.4.0
uses: codacy/codacy-analysis-cli-action@v4.4.5
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
Expand Down
Binary file added .idea/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.cardview:cardview:1.0.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
//noinspection GradleCompatible
implementation 'com.android.support:design:28.0.0'
implementation 'com.jaredrummler:material-spinner:1.3.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'
// implementation 'com.ornach.nobobutton:nobobutton:1.5'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
Expand Down
Binary file modified app/src/debug/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/debug/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/debug/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 9 additions & 8 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
<string name="m">M</string>
<string name="y">Y</string>
<string name="out_of">" out of "</string>
<string name="habits_are_avoided">" habits are avoided"</string>
<string name="habits_are_avoided_way_to_go">" habits are avoided, way to go!"</string>
<string name="avoided_">Avoided</string>
<string name="habits_">Habits</string>
<string name="habits_are_avoided">" se evitan los hábitos"</string>
<string name="habits_are_avoided_way_to_go">" se evitan los hábitos, ¡así se hace!"</string>
<string name="avoided_">Evitado</string>
<string name="habits_">Hábitos</string>
<string name="no">No</string>
<string name="deletes">Do you really want to delete this?</string>
<string name="yes">Yes</string>
<string name="please_add_a_label_first">Please Add a Label First</string>
<string name="do_you_really_want_to_delete_this">Do you really want to delete this?</string>
<string name="deletes">¿Realmente quiere borrar esto?</string>
<string name="yes"></string>
<string name="please_add_a_label_first">Añada una etiqueta primero</string>
<string name="do_you_really_want_to_delete_this">¿Realmente quieres borrar esto?</string>
<string name="january">January</string>
<string name="february">February</string>
<string name="march">March</string>
Expand All @@ -79,4 +79,5 @@
<string name="october">October</string>
<string name="november">November</string>
<string name="december">December</string>
<string name="delete">¿De verdad quieres borrar esto?</string>
</resources>
13 changes: 7 additions & 6 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
<string name="out_of">" out of "</string>
<string name="habits_are_avoided">" habits are avoided"</string>
<string name="habits_are_avoided_way_to_go">" habits are avoided, way to go!"</string>
<string name="avoided_">Avoided</string>
<string name="habits_">Habits</string>
<string name="avoided_">Kaçınıldı</string>
<string name="habits_">Alışkanlıklar</string>
<string name="no">No</string>
<string name="deletes">Do you really want to delete this?</string>
<string name="yes">Yes</string>
<string name="please_add_a_label_first">Please Add a Label First</string>
<string name="do_you_really_want_to_delete_this">Do you really want to delete this?</string>
<string name="deletes">Bunu gerçekten silmek istiyor musunuz?</string>
<string name="yes">Evet</string>
<string name="please_add_a_label_first">Lütfen Önce Etiket Ekleyin</string>
<string name="do_you_really_want_to_delete_this">Bunu gerçekten silmek istiyor musunuz?</string>
<string name="january">January</string>
<string name="february">February</string>
<string name="march">March</string>
Expand All @@ -79,4 +79,5 @@
<string name="october">October</string>
<string name="november">November</string>
<string name="december">December</string>
<string name="delete">Bunu gerçekten silmek istiyor musunuz?</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.9.10"
ext.kotlin_version = "2.0.0"
repositories {
jcenter()
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.1'
classpath 'com.android.tools.build:gradle:8.5.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// classpath 'com.google.gms:google-services:4.4.1'

Expand Down
8 changes: 8 additions & 0 deletions fastlane/metadata/android/es/changelogs/210.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- Objetivo Android 14 🤖
- Soporte de preferencias de idioma por aplicación 🗺
- Hacer traducibles las cadenas de una librería externa 🗺
- Actualizaciones de traducción 🗺
- Refinar la interfaz de usuario 🎨

Un enorme agradecimiento a todos los colaboradores y traductores. 😘
Siéntase bienvenido a reportar problemas y enviar correcciones en https://github.com/Crazy-Marvin/ToDont/ o traducciones en https://hosted.weblate.org/engage/todont/. 🚀
8 changes: 8 additions & 0 deletions fastlane/metadata/android/tr/changelogs/210.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- Android 14 hedeflendi 🤖
- Uygulama Başına Dil Tercihleri Desteği 🗺
- Harici kütüphanedeki dizgeler çevrilebilir hale getirildi 🗺
- Çeviri Güncellemeleri 🗺
- Kullanıcı Arayüzü İyileştirmesi 🎨

Katkıda bulunan herkese ve çevirenlere çok teşekkür ederiz. 😘
Sorunları bildirmekten ve https://github.com/Crazy-Marvin/ToDont/ adresinde düzeltmeler veya https://hosted.weblate.org/engage/todont/ adresinde çeviriler göndermekten çekinmeyin. 🚀

0 comments on commit a25bf81

Please sign in to comment.