Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Commit b149081

Browse files
JizzuJizzu
committed
Merge dev branch
2 parents 4f76715 + 72f3c38 commit b149081

9 files changed

Lines changed: 175 additions & 32 deletions

File tree

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎app/src/main/java/apps/jizzu/simpletodo/ui/view/EditTaskActivity.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import apps.jizzu.simpletodo.utils.toast
1515
import apps.jizzu.simpletodo.utils.visible
1616
import apps.jizzu.simpletodo.vm.EditTaskViewModel
1717
import kotlinx.android.synthetic.main.activity_task_details.*
18+
import kotlinx.android.synthetic.main.toolbar.*
1819
import java.util.*
1920

2021
class EditTaskActivity : BaseTaskActivity() {
@@ -28,6 +29,9 @@ class EditTaskActivity : BaseTaskActivity() {
2829
super.onCreate(savedInstanceState)
2930

3031
initToolbar(getString(R.string.edit_task))
32+
if (Locale.getDefault().displayLanguage == "français") {
33+
toolbarTitle.textSize = 18F
34+
}
3135
mViewModel = createViewModel()
3236

3337
// Get Intent data

‎app/src/main/java/apps/jizzu/simpletodo/ui/view/settings/fragment/FragmentSettings.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,18 @@ class FragmentSettings : Fragment() {
6262

6363
try {
6464
startActivity(Intent.createChooser(email, getString(R.string.settings_feedback)))
65-
} catch (ex: android.content.ActivityNotFoundException) {
65+
} catch (exception: android.content.ActivityNotFoundException) {
6666
toast(getString(R.string.settings_no_email_apps))
6767
}
6868
}
6969

70-
private fun openUri(uri: String) = startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri)))
70+
private fun openUri(uri: String) {
71+
try {
72+
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri)))
73+
} catch (exception: android.content.ActivityNotFoundException) {
74+
toast(getString(R.string.settings_no_browser_apps))
75+
}
76+
}
7177

7278
private companion object {
7379
const val GOOGLE_PLAY_PAGE = "https://play.google.com/store/apps/developer?id=Ilya+Ponomarenko"

‎app/src/main/res/layout/dialog_rate_this_app.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
android:gravity="center"
1919
android:paddingTop="10dp"
2020
android:text="@string/rate_dialog_title"
21-
android:textColor="?android:attr/android:textColorPrimary"
21+
android:textAppearance="?android:attr/android:textAppearance"
2222
android:textSize="20sp"
2323
android:textStyle="bold" />
2424

@@ -28,7 +28,7 @@
2828
android:gravity="center"
2929
android:padding="10dp"
3030
android:text="@string/rate_dialog_message"
31-
android:textColor="?android:attr/android:textColorPrimary"
31+
android:textAppearance="?android:attr/android:textAppearance"
3232
android:textSize="18sp" />
3333
</LinearLayout>
3434

‎app/src/main/res/layout/toolbar.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
android:layout_width="wrap_content"
1111
android:layout_height="wrap_content"
1212
android:layout_gravity="center"
13+
android:ellipsize="marquee"
14+
android:focusable="true"
15+
android:focusableInTouchMode="true"
16+
android:marqueeRepeatLimit="marquee_forever"
17+
android:scrollHorizontally="true"
18+
android:singleLine="true"
1319
android:textColor="?android:attr/android:textColorPrimary"
1420
android:textSize="20sp"
1521
android:textStyle="bold"

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
<resources>
2+
<string name="app_name">To-Do</string>
3+
<string name="simple_todo_title">S I M P L E \u0020\u0020 T O D O</string>
4+
<string name="empty_view_title">Pas de tâches</string>
5+
<string name="empty_view_text">Vous pouvez créer de nouvelles tâches \n en utilisant le bouton +</string>
6+
<string name="search_view_empty_text">Rechercher des tâches particulières</string>
7+
<string name="search_view_not_found_text">Aucune tâche trouvée :(</string>
8+
<string name="create_task">N O U V E L L E \u0020\u0020 T Â C H E</string>
9+
<string name="set_reminder">Définir un rappel</string>
10+
<string name="set_reminder_short">Rappel</string>
11+
<string name="hint_title">Titre</string>
12+
<string name="hint_date">Date</string>
13+
<string name="hint_time">Heure</string>
14+
<string name="add_task">A J O U T E R</string>
15+
<string name="update_task">M I S E \u0020\u0020 À \u0020\u0020 J O U R</string>
16+
<string name="edit_task">M O D I F I E R \u0020\u0020 L A \u0020\u0020 T Â C H E</string>
17+
18+
<string name="toast_incorrect_time">Erreur ! Vous avez sélectionné un temps incorrect !</string>
19+
<string name="error_text_input">S\'il vous plaît, entrez un titre !</string>
20+
<string name="error_spaces">S\'il vous plaît, entrez un titre valide !</string>
21+
22+
<string name="preferences_animation_title">Activer les animations</string>
23+
<string name="preferences_animation_summary">Activer les animations de l\'interface utilisateur</string>
24+
<string name="preferences_theme_title">Sélectionnez un thème</string>
25+
<string name="preferences_theme_summary">Modifier le mode de couleurs de l\'application</string>
26+
<string name="preferences_general_notification_title">Activer la notification générale</string>
27+
<string name="preferences_general_notification_summary">Afficher une notification avec votre liste de tâches actuelle</string>
28+
<string name="preferences_notification_channel_title">Options des notifications</string>
29+
<string name="preferences_notification_channel_summary">Régler le son, les vibrations, etc.</string>
30+
<string name="preferences_date_format_title">Format de date</string>
31+
<string name="preferences_date_format_summary">Définir le format de date</string>
32+
<string name="preferences_time_format_title">Format de l\'heure</string>
33+
<string name="preferences_time_format_summary">Définir le format de l\'heure</string>
34+
<string name="preferences_backup_create_title">Créer une sauvegarde</string>
35+
<string name="preferences_backup_create_summary">Exporter les tâches vers le stockage de l\'appareil</string>
36+
<string name="preferences_backup_restore_title">Restaurer une sauvegarde</string>
37+
<string name="preferences_backup_restore_summary">Importer les tâches depuis le stockage de l\'appareil</string>
38+
39+
<string name="feedback_title">Simple ToDo - Commentaires</string>
40+
<string name="feedback_device_info">Mes informations d\'appareil : </string>
41+
<string name="feedback_app_version">Version de l\'appli : </string>
42+
<string name="feedback">Commentaire : </string>
43+
44+
<string name="settings_user_interface">Apparence</string>
45+
<string name="settings_notifications">Notifications</string>
46+
<string name="settings_date_and_time">Date &amp; Heure</string>
47+
<string name="settings_backup_and_restore">Sauvegarde &amp; Restauration</string>
48+
<string name="settings_rate">Évaluer l\'application</string>
49+
<string name="settings_feedback">Envoyer des commentaires</string>
50+
<string name="settings_other_apps">Autres applis</string>
51+
<string name="settings_git_hub">Page GitHub</string>
52+
<string name="settings_privacy_policy">Politique de confidentialité</string>
53+
<string name="settings_licenses">Licenses</string>
54+
<string name="settings_no_email_apps">Aucune application email n\'est installée !</string>
55+
<string name="settings_no_browser_apps">Aucune application navigateur n\'est installée !</string>
56+
57+
<string name="settings">R E G L A G E S</string>
58+
<string name="settings_page_title_user_interface">A P P A R E N C E</string>
59+
<string name="settings_page_title_notifications">N O T I F I C A T I O N S</string>
60+
<string name="settings_page_title_date_and_time">D A T E \u0020\u0020 &amp; \u0020\u0020 H E U R E</string>
61+
<string name="settings_page_title_backup_and_restore">S A U V E G A R D E \u0020\u0020 &amp; \u0020\u0020 R E S T A U R A T I O N</string>
62+
<string name="settings_page_title_licenses">L I C E N S E S</string>
63+
64+
<string name="settings_menu">Réglages</string>
65+
<string name="search">Rechercher</string>
66+
67+
<string name="reminder_text">Rappel</string>
68+
<string name="reminder_today">Aujourd\'hui à %1$s</string>
69+
<string name="reminder_yesterday">Hier à %1$s</string>
70+
<string name="reminder_tomorrow">Demain à %1$s</string>
71+
72+
<string name="snackbar_remove_task">Tâche supprimée !</string>
73+
<string name="snackbar_undo">Annuler</string>
74+
<string name="action_cancel">Annuler</string>
75+
<string name="action_delete">Supprimer</string>
76+
<string name="dialog_title"><b>Êtes-vous sûr?</b></string>
77+
<string name="dialog_message">La tâche supprimée ne peut pas être restaurée</string>
78+
79+
<string name="backup_create_dialog_message">Le fichier de sauvegarde précédent sera supprimé</string>
80+
<string name="backup_create_dialog_button">Créer une sauvegarde</string>
81+
<string name="backup_restore_dialog_message">Toutes les tâches en cours seront supprimées</string>
82+
<string name="backup_restore_dialog_button">Restaurer une sauvegarde</string>
83+
84+
<string name="backup_create_message_success">Sauvegarde créée avec succès !</string>
85+
<string name="backup_create_message_failure">Échec de la création de la sauvegarde !</string>
86+
<string name="backup_restore_message_success">La sauvegarde est restaurée !</string>
87+
<string name="backup_restore_message_failure">La restauration de la sauvegarde a échoué !</string>
88+
<string name="backup_restore_message_nothing">Rien à restaurer</string>
89+
90+
<string name="settings_permission_denied_toast">Autorisation de stockage refusée</string>
91+
<string name="settings_permission_settings_toast">Ouvrez "Autorisations" et accordez "Stockage"</string>
92+
<string name="settings_permission_snackbar_with_rationale">L\'autorisation de stockage est nécessaire pour écrire une sauvegarde dans un fichier</string>
93+
<string name="settings_permission_snackbar_button_grant">CONTINUER</string>
94+
<string name="settings_permission_snackbar_no_permission">L\'autorisation de stockage n\'est pas accordée</string>
95+
<string name="settings_permission_snackbar_button_settings">PARAMÈTRES</string>
96+
97+
<string name="general_notification_1">Vous avez</string>
98+
<string name="general_notification_2">une tâche active :</string>
99+
<string name="general_notification_3">des tâches actives :</string>
100+
<string name="general_notification_4">des tâches actives :</string>
101+
102+
<string name="notification_channel">Notifications</string>
103+
<string name="general_notification_channel">Notification générale</string>
104+
105+
<string name="widget_title">TODO LIST</string>
106+
<string name="author_gmail">ilya.ponomarenko.dev@gmail.com</string>
107+
108+
////////////////<!-- "What's New?" page -->////////////////
109+
<string name="whats_new_title">Q U O I \u0020\u0020 D E \u0020\u0020 N E U F ?</string>
110+
<string name="whats_new_button_text">Bien!</string>
111+
<string name="whats_new_item_1_text">Correction de bugs</string>
112+
<string name="whats_new_item_2_text">Ajout de la traduction française</string>
113+
114+
///////////////<!-- Rate this app dialog -->///////////////
115+
<string name="rate_dialog_title">Noter cette appli</string>
116+
<string name="rate_dialog_message">Si vous aimez utiliser cette application, pourriez-vous prendre un moment pour l\'évaluer ? Ca ne prendra pas plus d\'une minute. Merci de votre soutien !</string>
117+
<string name="rate_dialog_ok">Évaluer maintenant</string>
118+
<string name="rate_dialog_cancel">Plus tard</string>
119+
<string name="rate_dialog_no">Non, merci</string>
120+
121+
////////////////<!-- Date/Time format dialog -->/////////////////
122+
<string name="date_format_dialog_title">Choisir le format de date :</string>
123+
<string name="date_format_at">"%1$s à %2$s"</string>
124+
<string-array name="date_format_list">
125+
<item>Jour.Mois.Année</item>
126+
<item>Année.Mois.Jour</item>
127+
<item>Mois.Jour.Année</item>
128+
<item>Année.Jour.Mois</item>
129+
</string-array>
130+
131+
<string name="time_format_dialog_title">Choisir le format de l\'heure :</string>
132+
<string-array name="time_format_list">
133+
<item>Format 24 heures</item>
134+
<item>Format 12 heures</item>
135+
</string-array>
136+
137+
<string name="app_theme_dialog_title">Choisir un thème :</string>
138+
<string-array name="app_theme">
139+
<item>Clair</item>
140+
<item>Sombre</item>
141+
<item>Noir</item>
142+
</string-array>
143+
144+
///////////////<!-- Shortcuts -->///////////////
145+
<string name="shortcut_add_new_task">Ajouter une nouvelle tâche</string>
146+
<string name="shortcut_search">Rechercher</string>
147+
</resources>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
<string name="preferences_general_notification_summary">Показывать отдельное уведомление с вашим текущим списком задач</string>
2626
<string name="preferences_notification_channel_title">Параметры уведомлений</string>
2727
<string name="preferences_notification_channel_summary">Настройка звука, вибрации и т.д.</string>
28-
<string name="preferences_notification_sound_title">Звук уведомления</string>
29-
<string name="preferences_notification_sound_summary">Настройка звука уведомления</string>
3028
<string name="preferences_date_format_title">Формат даты</string>
3129
<string name="preferences_date_format_summary">Изменить формат даты</string>
3230
<string name="preferences_time_format_title">Формат времени</string>
@@ -35,15 +33,6 @@
3533
<string name="preferences_backup_create_summary">Экспорт задач в память устройства</string>
3634
<string name="preferences_backup_restore_title">Восстановить резервную копию</string>
3735
<string name="preferences_backup_restore_summary">Импорт задач из памяти устройства</string>
38-
<string name="preferences_rate_app_title">Оценить приложение</string>
39-
<string name="preferences_rate_app_summary">Оцените это приложение в Google Play</string>
40-
<string name="preferences_send_feedback_title">Написать автору</string>
41-
<string name="preferences_send_feedback_summary">Предлагайте свои идеи и сообщайте о багах</string>
42-
<string name="preferences_other_apps_title">Другие приложения</string>
43-
<string name="preferences_other_apps_summary">Другие приложения разработчика в Google Play</string>
44-
<string name="preferences_about_version_title">Версия</string>
45-
<string name="preferences_about_licenses_title">Лицензии</string>
46-
<string name="preferences_about_licenses_summary">Использованные библиотеки</string>
4736

4837
<string name="feedback_title">Simple ToDo - Отзыв</string>
4938
<string name="feedback_device_info">Информация о моём устройстве: </string>
@@ -58,9 +47,10 @@
5847
<string name="settings_feedback">Написать автору</string>
5948
<string name="settings_other_apps">Другие приложения</string>
6049
<string name="settings_git_hub">Страница на GitHub</string>
61-
<string name="settings_privacy_policy">Политика конфиденциальности</string>
50+
<string name="settings_privacy_policy">Конфиденциальность</string>
6251
<string name="settings_licenses">Лицензии</string>
6352
<string name="settings_no_email_apps">Приложения для электронной почты не установлены!</string>
53+
<string name="settings_no_browser_apps">Приложения для просмотра веб-страниц не установлены!</string>
6454

6555
<string name="settings">Н А С Т Р О Й К И</string>
6656
<string name="settings_page_title_user_interface">И Н Т Е Р Ф Е Й С</string>
@@ -116,7 +106,7 @@
116106
<string name="whats_new_title">Ч Т О \u0020\u0020 Н О В О Г О ?</string>
117107
<string name="whats_new_button_text">Далее</string>
118108
<string name="whats_new_item_1_text">Исправление ошибок</string>
119-
<string name="whats_new_item_2_text">Добавлена политика\nконфиденциальности</string>
109+
<string name="whats_new_item_2_text">Добавлен перевод на французский</string>
120110

121111
///////////////<!-- Rate this app dialog -->///////////////
122112
<string name="rate_dialog_title">Оцените это приложение</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
<string name="preferences_general_notification_summary">Show notification with you current task list</string>
2828
<string name="preferences_notification_channel_title">Notifications options</string>
2929
<string name="preferences_notification_channel_summary">Set custom sound, vibration and etc.</string>
30-
<string name="preferences_notification_sound_title">Notification sound</string>
31-
<string name="preferences_notification_sound_summary">Set the notification sound</string>
3230
<string name="preferences_date_format_title">Date format</string>
3331
<string name="preferences_date_format_summary">Change date format</string>
3432
<string name="preferences_time_format_title">Time format</string>
@@ -37,15 +35,6 @@
3735
<string name="preferences_backup_create_summary">Export tasks to the device storage</string>
3836
<string name="preferences_backup_restore_title">Restore backup</string>
3937
<string name="preferences_backup_restore_summary">Import tasks from the device storage</string>
40-
<string name="preferences_rate_app_title">Rate this app</string>
41-
<string name="preferences_rate_app_summary">Rate this app on Google Play store</string>
42-
<string name="preferences_send_feedback_title">Send feedback</string>
43-
<string name="preferences_send_feedback_summary">Suggest ideas or tell about bugs</string>
44-
<string name="preferences_other_apps_title">Other apps</string>
45-
<string name="preferences_other_apps_summary">Other developer\'s apps on Google Play</string>
46-
<string name="preferences_about_version_title">Version</string>
47-
<string name="preferences_about_licenses_title">Licenses</string>
48-
<string name="preferences_about_licenses_summary">Used libraries</string>
4938
<string name="preferences_kotter_knife_title">KotterKnife</string>
5039
<string name="preferences_kotter_knife_summary">JakeWharton</string>
5140
<string name="preferences_circular_anim_title">CircularAnim</string>
@@ -72,6 +61,7 @@
7261
<string name="settings_privacy_policy">Privacy policy</string>
7362
<string name="settings_licenses">Licenses</string>
7463
<string name="settings_no_email_apps">No email apps installed!</string>
64+
<string name="settings_no_browser_apps">No browser apps installed!</string>
7565

7666
<string name="settings">S E T T I N G S</string>
7767
<string name="settings_page_title_user_interface">I N T E R F A C E</string>
@@ -128,7 +118,7 @@
128118
<string name="whats_new_title">W H A T \' S \u0020\u0020 N E W ?</string>
129119
<string name="whats_new_button_text">Okay</string>
130120
<string name="whats_new_item_1_text">Bug fixes</string>
131-
<string name="whats_new_item_2_text">Added privacy policy</string>
121+
<string name="whats_new_item_2_text">Added French translation</string>
132122

133123
///////////////<!-- Rate this app dialog -->///////////////
134124
<string name="rate_dialog_title">Rate this app</string>

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
dependencies {
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
1212
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
13-
classpath 'com.android.tools.build:gradle:3.3.1'
13+
classpath 'com.android.tools.build:gradle:3.3.2'
1414
classpath 'com.google.gms:google-services:4.2.0'
1515
classpath 'io.fabric.tools:gradle:1.27.1'
1616
}
@@ -32,8 +32,8 @@ ext {
3232
buildToolsVersion = '28.0.3'
3333
minSdkVersion = 21
3434
targetSdkVersion = 28
35-
versionCode = 14
36-
versionName = "1.6.5"
35+
versionCode = 15
36+
versionName = "1.6.7"
3737

3838
// App dependencies
3939
appcompatVersion = "1.0.2"

0 commit comments

Comments
 (0)