Skip to content

Commit

Permalink
Merge pull request #177 from ashutoshgngwr/fix/presets/empty-indicator
Browse files Browse the repository at this point in the history
Adds descriptive text to empty list indicator in Preset Fragment
  • Loading branch information
ashutoshgngwr authored May 23, 2020
2 parents 17a691b + c19e054 commit 23e695b
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 28 deletions.
11 changes: 11 additions & 0 deletions app/src/main/res/drawable/ic_info_48dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:alpha="0.87"
android:tint="#FFFFFF"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
</vector>
17 changes: 0 additions & 17 deletions app/src/main/res/drawable/ic_warning.xml

This file was deleted.

9 changes: 5 additions & 4 deletions app/src/main/res/layout/fragment_preset_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@
android:layout_marginBottom="10dp"
android:tint="@color/material_on_background_disabled"
android:tintMode="src_in"
android:src="@drawable/ic_warning"
android:contentDescription="@string/nothing_saved_yet" />
android:src="@drawable/ic_info_48dp"
android:contentDescription="@string/preset_info" />

<TextView
style="@style/TextAppearance.AppCompat.Title.Inverse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/material_on_background_disabled"
android:text="@string/nothing_saved_yet" />
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:text="@string/preset_info__description" />

</LinearLayout>

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<string name="preset_delete_confirmation">%s löschen?</string>
<string name="delete">Löschen</string>
<string name="preset_deleted">Voreinstellung gelöscht!</string>
<string name="nothing_saved_yet">Noch nichts gespeichert!</string>
<string name="sleep_timer">Einschlaftimer</string>
<string name="reset">Zurücksetzen</string>
<string name="auto_sleep_schedule_cancelled">Automatischer Schlaftimer abgebrochen!</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-es-rAR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<string name="preset_delete_confirmation">¿Confirma borrar %s?</string>
<string name="delete">Borrar</string>
<string name="preset_deleted">¡Preajuste borrado!</string>
<string name="nothing_saved_yet">¡Nada ha sido guardado aún!</string>
<string name="sleep_timer">Temporizador</string>
<string name="reset">Reiniciar</string>
<string name="auto_sleep_schedule_cancelled">¡Temporizador cancelado!</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<string name="preset_delete_confirmation">Confirmer la suppression de %s ?</string>
<string name="delete">Supprimer</string>
<string name="preset_deleted">Réglage supprimé !</string>
<string name="nothing_saved_yet">Aucun réglage sauvegardé !</string>
<string name="sleep_timer">Minuterie</string>
<string name="reset">Réinitialiser</string>
<string name="auto_sleep_schedule_cancelled">Minuterie annulée !</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
<string name="preset_delete_confirmation">%s को हटाने की पुष्टि करें?</string>
<string name="delete">हटाएं</string>
<string name="preset_deleted">प्रीसेट को हटा दिया गया है!</string>
<string name="nothing_saved_yet">अभी तक कुछ भी नहीं सहेजा गया है!</string>
<string name="sleep_timer">स्लीप टाइमर</string>
<string name="reset">रद्द करें</string>
<string name="auto_sleep_schedule_cancelled">ऑटो स्लीप टाइमर रद्द हो गया है!</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-it-rIT/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<string name="preset_delete_confirmation">Confermi rimozione di %s?</string>
<string name="delete">Rimuovi</string>
<string name="preset_deleted">Preimpostazione rimossa!</string>
<string name="nothing_saved_yet">Niente ancora salvato!</string>
<string name="sleep_timer">Timer di spegnimento </string>
<string name="reset">Ripristina</string>
<string name="auto_sleep_schedule_cancelled">Timer di spegnimento rimosso!</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<string name="preset_delete_confirmation">Подтвердите удаление %s?</string>
<string name="delete">Увалить</string>
<string name="preset_deleted">Пресет удален!</string>
<string name="nothing_saved_yet">Пока пресетов нет!</string>
<string name="sleep_timer">Таймер</string>
<string name="reset">Сброс</string>
<string name="auto_sleep_schedule_cancelled">Таймер автоотключения отменен!</string>
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@
<string name="preset_delete_confirmation">Confirm delete %s?</string>
<string name="delete">Delete</string>
<string name="preset_deleted">Preset deleted!</string>
<string name="nothing_saved_yet">Nothing saved yet!</string>
<string name="preset_info">Info about Presets</string>
<string name="preset_info__description">
You haven\'t created any presets yet. To create a preset, go to the Library and play sounds.
Then click on the Save button that appears on the bottom corner of the screen.
</string>
<string name="sleep_timer">Sleep Timer</string>
<string name="sleep_timer_description">Noice will shutdown itself when the timer ends. Use the buttons below to add time and start the timer.</string>
<string name="reset">Reset</string>
Expand Down

0 comments on commit 23e695b

Please sign in to comment.