diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 17ca53e..fdd364b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -37,6 +37,11 @@ android { buildFeatures { compose = true } + lint { + lintConfig = file("lint.xml") + warningsAsErrors = false + abortOnError = false + } } dependencies { diff --git a/app/lint.xml b/app/lint.xml new file mode 100644 index 0000000..fb11f6e --- /dev/null +++ b/app/lint.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ba0b5ae..0f517d7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,6 @@ diff --git a/app/src/main/java/com/manalejandro/motivame/ui/screens/SettingsScreen.kt b/app/src/main/java/com/manalejandro/motivame/ui/screens/SettingsScreen.kt index 33ddbe0..da5a8ac 100644 --- a/app/src/main/java/com/manalejandro/motivame/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/manalejandro/motivame/ui/screens/SettingsScreen.kt @@ -4,8 +4,8 @@ import android.Manifest import android.app.Activity import android.content.Intent import android.content.pm.PackageManager -import android.net.Uri import android.os.Build +import androidx.core.net.toUri import androidx.activity.compose.BackHandler import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -361,7 +361,7 @@ fun SettingsScreen( color = MaterialTheme.colorScheme.onTertiaryContainer, textDecoration = TextDecoration.Underline, modifier = Modifier.clickable { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://manalejandro.com")) + val intent = Intent(Intent.ACTION_VIEW, "https://manalejandro.com".toUri()) context.startActivity(intent) } ) @@ -391,7 +391,7 @@ fun SettingsScreen( color = MaterialTheme.colorScheme.onTertiaryContainer, textDecoration = TextDecoration.Underline, modifier = Modifier.clickable { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(githubUrl)) + val intent = Intent(Intent.ACTION_VIEW, githubUrl.toUri()) context.startActivity(intent) } ) diff --git a/app/src/main/java/com/manalejandro/motivame/util/LocaleHelper.kt b/app/src/main/java/com/manalejandro/motivame/util/LocaleHelper.kt index d115203..4e69f08 100644 --- a/app/src/main/java/com/manalejandro/motivame/util/LocaleHelper.kt +++ b/app/src/main/java/com/manalejandro/motivame/util/LocaleHelper.kt @@ -1,5 +1,6 @@ package com.manalejandro.motivame.util +import android.annotation.SuppressLint import android.content.Context import android.content.res.Configuration import java.util.Locale @@ -19,6 +20,7 @@ object LocaleHelper { Language("ko", "🇰🇷", "한국어") ) + @SuppressLint("AppBundleLocaleChanges") fun applyLocale(context: Context, languageCode: String): Context { val locale = Locale(languageCode) Locale.setDefault(locale) diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 0000000..0ce4976 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/app/src/main/res/layout/widget_motivame.xml b/app/src/main/res/layout/widget_motivame.xml index b0313cc..1ca9837 100644 --- a/app/src/main/res/layout/widget_motivame.xml +++ b/app/src/main/res/layout/widget_motivame.xml @@ -6,7 +6,8 @@ android:orientation="vertical" android:background="@drawable/widget_background" android:padding="16dp" - android:clickable="true"> + android:clickable="true" + android:focusable="true"> + android:textSize="11sp" /> @@ -41,7 +42,7 @@ android:id="@+id/widget_task_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Tarea" + android:text="@string/widget_task_default" android:textColor="#FFFFFF" android:textSize="16sp" android:textStyle="bold" @@ -55,7 +56,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:text="🎯 Meta" + android:text="@string/widget_goal_default" android:textColor="#FFFFFF" android:textSize="13sp" android:alpha="0.85" @@ -67,9 +68,9 @@ android:id="@+id/widget_hint" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Toca para abrir →" + android:text="@string/widget_tap_to_open" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.55" android:gravity="end" android:layout_marginTop="4dp" /> diff --git a/app/src/main/res/layout/widget_motivame_large.xml b/app/src/main/res/layout/widget_motivame_large.xml index c2eef1a..3c5bd0b 100644 --- a/app/src/main/res/layout/widget_motivame_large.xml +++ b/app/src/main/res/layout/widget_motivame_large.xml @@ -7,7 +7,8 @@ android:orientation="vertical" android:background="@drawable/widget_background" android:padding="14dp" - android:clickable="true"> + android:clickable="true" + android:focusable="true"> + android:textSize="11sp" /> @@ -96,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.6" android:layout_marginTop="3dp" android:visibility="gone" /> @@ -162,7 +163,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.6" android:layout_marginTop="3dp" android:visibility="gone" /> @@ -228,7 +229,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.6" android:layout_marginTop="3dp" android:visibility="gone" /> @@ -240,7 +241,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.5" android:gravity="end" /> diff --git a/app/src/main/res/layout/widget_motivame_medium.xml b/app/src/main/res/layout/widget_motivame_medium.xml index 9fe5bdd..9d09a4d 100644 --- a/app/src/main/res/layout/widget_motivame_medium.xml +++ b/app/src/main/res/layout/widget_motivame_medium.xml @@ -7,7 +7,9 @@ android:orientation="vertical" android:background="@drawable/widget_background" android:padding="14dp" - android:clickable="true"> + android:clickable="true" + android:focusable="true"> + android:focusable="true"> + android:textSize="11sp" /> @@ -154,7 +156,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.5" android:gravity="end" /> diff --git a/app/src/main/res/layout/widget_motivame_small.xml b/app/src/main/res/layout/widget_motivame_small.xml index e32bf2e..7f0ec63 100644 --- a/app/src/main/res/layout/widget_motivame_small.xml +++ b/app/src/main/res/layout/widget_motivame_small.xml @@ -7,7 +7,8 @@ android:orientation="vertical" android:background="@drawable/widget_background" android:padding="12dp" - android:clickable="true"> + android:clickable="true" + android:focusable="true"> + android:textSize="11sp" /> @@ -98,7 +99,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="#FFFFFF" - android:textSize="10sp" + android:textSize="11sp" android:alpha="0.5" android:gravity="end" android:layout_marginTop="4dp" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd..1084c24 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 7353dbd..1084c24 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8be3cc7..4c1abf7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -10,7 +10,6 @@ Füge deine erste Aufgabe und Ziele hinzu, um motiviert zu bleiben 🎯 Ziele: ⏸️ Pausiert - Aufgabe aktivieren/pausieren Löschen Aufgabe löschen Möchtest du \'%1$s\' wirklich löschen? @@ -72,15 +71,17 @@ 🌐 Sprache Wähle die Sprache der Anwendung - Die App wird neu gestartet, um die Sprache anzuwenden Denke daran, diese Aufgabe abzuschließen! 📝 Aufgabe: %1$s\n\n🎯 Denk daran: %2$s + ⭐ Motivier mich + + Aufgabe + 🎯 Ziel Zeigt deine aktive Aufgabe und ein motivierendes Ziel Keine aktiven Aufgaben.\nÖffne Motivier mich, um eine hinzuzufügen. Tippen zum Öffnen → - aktiv diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 6da3a5b..9137f99 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -11,7 +11,6 @@ Add your first task and goals to stay motivated 🎯 Goals: ⏸️ Paused - Toggle task active Delete Delete task Are you sure you want to delete \'%1$s\'? @@ -76,17 +75,20 @@ 🌐 Language Select the application language - The app will restart to apply the language Remember to complete this task! 📝 Task: %1$s\n\n🎯 Remember: %2$s + + ⭐ Motivate Me + + Task + 🎯 Goal Shows your active task and a motivational goal No active tasks.\nOpen Motivate Me to add one. Tap to open → - active diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3d314b0..8c0adb4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -10,7 +10,6 @@ Ajoutez votre première tâche et vos objectifs pour rester motivé 🎯 Objectifs : ⏸️ En pause - Activer/mettre en pause la tâche Supprimer Supprimer la tâche Voulez-vous vraiment supprimer \'%1$s\' ? @@ -72,15 +71,17 @@ 🌐 Langue Sélectionnez la langue de l\'application - L\'app redémarrera pour appliquer la langue N\'oubliez pas de terminer cette tâche ! 📝 Tâche : %1$s\n\n🎯 Rappel : %2$s + ⭐ Motivez-moi + + Tâche + 🎯 Objectif Affiche votre tâche active et un objectif motivationnel Aucune tâche active.\nOuvrez Motivez-moi pour en ajouter une. Toucher pour ouvrir → - active diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7d65e33..b0272ca 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -10,7 +10,6 @@ 最初のタスクと目標を追加してモチベーションを維持しよう 🎯 目標: ⏸️ 一時停止中 - タスクの有効/一時停止を切り替え 削除 タスクを削除 \'%1$s\' を削除してもよろしいですか? @@ -72,15 +71,17 @@ 🌐 言語 アプリケーションの言語を選択してください - 言語を適用するためにアプリが再起動します このタスクを完了することを忘れずに! 📝 タスク:%1$s\n\n🎯 リマインダー:%2$s + ⭐ やる気アップ + + タスク + 🎯 目標 アクティブなタスクとモチベーション目標を表示 アクティブなタスクがありません。\nやる気アップを開いて追加してください。 タップして開く → - アクティブ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 55d4621..477fb2d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -10,7 +10,6 @@ 첫 번째 작업과 목표를 추가하여 동기를 유지하세요 🎯 목표: ⏸️ 일시 중지됨 - 작업 활성화/일시 중지 삭제 작업 삭제 \'%1$s\'을(를) 정말 삭제하시겠습니까? @@ -72,15 +71,17 @@ 🌐 언어 애플리케이션 언어를 선택하세요 - 언어 적용을 위해 앱이 재시작됩니다 이 작업을 완료하는 것을 잊지 마세요! 📝 작업: %1$s\n\n🎯 알림: %2$s + ⭐ 동기부여 + + 작업 + 🎯 목표 활성 작업과 동기 부여 목표를 표시합니다 활성 작업이 없습니다.\n동기부여 앱을 열어 추가하세요. 탭하여 열기 → - 활성 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d0ebab3..c33fb75 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -10,7 +10,6 @@ Adicione sua primeira tarefa e metas para se manter motivado 🎯 Metas: ⏸️ Pausada - Ativar/pausar tarefa Excluir Excluir tarefa Tem certeza que deseja excluir \'%1$s\'? @@ -72,15 +71,17 @@ 🌐 Idioma Selecione o idioma do aplicativo - O app será reiniciado para aplicar o idioma Lembre-se de completar esta tarefa! 📝 Tarefa: %1$s\n\n🎯 Lembre-se: %2$s + ⭐ Motiva-me + + Tarefa + 🎯 Meta Mostra sua tarefa ativa e uma meta motivacional Sem tarefas ativas.\nAbra Motiva-me para adicionar uma. Toque para abrir → - ativa diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 84d853a..5df4375 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -11,7 +11,6 @@ 添加你的第一个任务和目标,保持动力 🎯 目标: ⏸️ 已暂停 - 切换任务状态 删除 删除任务 确定要删除 \'%1$s\' 吗? @@ -76,14 +75,19 @@ 🌐 语言 选择应用程序语言 - 应用将重启以应用语言更改 + 记得完成这个任务! + 📝 任务:%1$s\n\n🎯 提醒:%2$s + + ⭐ 激励我 + + 任务 + 🎯 目标 显示您的活跃任务和激励目标 没有活跃任务。\n打开激励我来添加一个。 点击打开 → - 活跃 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..55344e5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,3 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 397b439..bd1b264 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,7 +10,6 @@ Agrega tu primera tarea y metas para mantenerte motivado 🎯 Metas: ⏸️ Pausada - Activar/pausar tarea Eliminar Eliminar tarea ¿Estás seguro de que quieres eliminar \'%1$s\'? @@ -75,15 +74,17 @@ 🌐 Idioma Selecciona el idioma de la aplicación - La app se reiniciará para aplicar el idioma ¡Recuerda completar esta tarea! 📝 Tarea: %1$s\n\n🎯 Recuerda: %2$s + ⭐ Motívame + + Tarea + 🎯 Meta Muestra tu tarea activa y una meta motivacional Sin tareas activas.\nAbre Motívame para añadir una. Toca para abrir → - activa \ No newline at end of file diff --git a/app/src/main/res/xml/motivame_widget_info.xml b/app/src/main/res/xml/motivame_widget_info.xml index 15f17f1..86c9297 100644 --- a/app/src/main/res/xml/motivame_widget_info.xml +++ b/app/src/main/res/xml/motivame_widget_info.xml @@ -1,5 +1,6 @@ + android:previewLayout="@layout/widget_motivame" + tools:ignore="UnusedAttribute" />