diff --git a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt b/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt index 4d31f4f..09150de 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt @@ -60,10 +60,10 @@ class ListActivity : AppCompatActivity(), UIObject { super.onActivityResult(requestCode, resultCode, data) if (requestCode == REQUEST_UNINSTALL) { if (resultCode == Activity.RESULT_OK) { - Toast.makeText(this, getString(R.string.choose_removed_toast), Toast.LENGTH_LONG).show() + Toast.makeText(this, getString(R.string.list_removed_toast), Toast.LENGTH_LONG).show() finish() } else if (resultCode == Activity.RESULT_FIRST_USER) { - Toast.makeText(this, getString(R.string.choose_not_removed_toast), Toast.LENGTH_LONG).show() + Toast.makeText(this, getString(R.string.list_not_removed_toast), Toast.LENGTH_LONG).show() finish() } } @@ -96,8 +96,8 @@ class ListActivity : AppCompatActivity(), UIObject { } when (intention) { - "view" -> list_heading.text = getString(R.string.choose_title_view) - "pick" -> list_heading.text = getString(R.string.choose_title) + "view" -> list_heading.text = getString(R.string.list_title_view) + "pick" -> list_heading.text = getString(R.string.list_title_pick) } val sectionsPagerAdapter = ListSectionsPagerAdapter(this, supportFragmentManager) @@ -109,8 +109,8 @@ class ListActivity : AppCompatActivity(), UIObject { } private val TAB_TITLES = arrayOf( - R.string.choose_tab_app, - R.string.choose_tab_other + R.string.list_tab_app, + R.string.list_tab_other ) /** diff --git a/app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt index e8c9bc6..1e7eb71 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt +++ b/app/src/main/java/com/finnmglas/launcher/list/other/OtherRecyclerAdapter.kt @@ -59,11 +59,11 @@ class OtherRecyclerAdapter(val activity: Activity): init { othersList = ArrayList() othersList.add( - OtherInfo("Launcher Settings", + OtherInfo(activity.getString(R.string.list_other_settings), "launcher:settings", activity.getString(R.string.fas_settings))) othersList.add( - OtherInfo("Launcher AppsList", + OtherInfo(activity.getString(R.string.list_other_list), "launcher:choose", activity.getString(R.string.fas_bars))) } diff --git a/app/src/main/res/layout/list.xml b/app/src/main/res/layout/list.xml index fdca6f4..5656b68 100644 --- a/app/src/main/res/layout/list.xml +++ b/app/src/main/res/layout/list.xml @@ -30,7 +30,7 @@ android:gravity="center" android:minHeight="?actionBarSize" android:padding="@dimen/appbar_padding" - android:text="@string/choose_title" + android:text="@string/list_title_pick" android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" android:textSize="30sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/list_apps.xml b/app/src/main/res/layout/list_apps.xml index 94f3fa3..cf950c8 100644 --- a/app/src/main/res/layout/list_apps.xml +++ b/app/src/main/res/layout/list_apps.xml @@ -23,7 +23,7 @@ android:layout_margin="8sp" android:iconifiedByDefault="false" app:iconifiedByDefault="false" - app:queryHint="Search Applications" + app:queryHint="@string/list_apps_search_hint" app:searchHintIcon="@android:drawable/ic_menu_search" app:searchIcon="@android:drawable/ic_menu_search" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 88ab667..7e33a3f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -49,13 +49,21 @@ Finanziell unterstützen - App wählen - Alle Apps + App wählen + Alle Apps - Zurück + Apps + Andere - Die App wurde entfernt - Die App konnte nicht entfernt werden + Zurück + + Die App wurde entfernt + Die App konnte nicht entfernt werden + + Anwendungen suchen + + Launcher Einstellungen + Launcher Apps Liste Tutorial diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 900aff7..f09cc2e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -49,13 +49,21 @@ Faire un don - Choisir App - Applications + Choisir App + Applications - Retourner + Apps + Autre - Application supprimée - Impossible de supprimer l\'application + Retourner + + Application supprimée + Impossible de supprimer l\'application + + rechercher des applications + + Launcher Réglages + Launcher Liste des apps Le Tutoriel diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9f30827..964cbcf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,16 +58,21 @@ https://sponsor.finnmglas.com - Choose App - All Apps + Choose App + All Apps - Apps - Other + Apps + Other - Back to Settings + Back to Settings - Removed the selected application - Unable to remove application + Removed the selected application + Unable to remove application + + Search Applications + + Launcher Settings + Launcher AppsList Tutorial