From 2399f35cc18f65b7b6ed81db5ee01bb59871bc3a Mon Sep 17 00:00:00 2001
From: Finn M Glas <finnmglas@gmail.com>
Date: Sat, 30 May 2020 00:58:33 +0200
Subject: [PATCH] Add translations for three dot menu

And adjust variable names
---
 .../com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt  | 8 ++++----
 app/src/main/res/layout/recycler_apps_row.xml             | 4 ++--
 app/src/main/res/menu/menu_app.xml                        | 4 ++--
 app/src/main/res/values-de/strings.xml                    | 5 ++++-
 app/src/main/res/values-fr/strings.xml                    | 5 ++++-
 app/src/main/res/values/strings.xml                       | 3 +++
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt
index 3e1e88a..c70f59a 100644
--- a/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt
+++ b/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt
@@ -27,7 +27,7 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
         View.OnClickListener {
         var textView: TextView = itemView.findViewById(R.id.choose_row_app_name)
         var img: ImageView = itemView.findViewById(R.id.choose_row_app_icon) as ImageView
-        var delete: FontAwesome = itemView.findViewById(R.id.choose_row_app_delete)
+        var menuDots: FontAwesome = itemView.findViewById(R.id.choose_row_app_menu)
 
         override fun onClick(v: View) {
             val pos = adapterPosition
@@ -62,9 +62,9 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
         viewHolder.textView.text = appLabel
         viewHolder.img.setImageDrawable(appIcon)
 
-        viewHolder.delete.setOnClickListener{ //creating a popup menu
+        viewHolder.menuDots.setOnClickListener{ //creating a popup menu
 
-            val popup = PopupMenu(activity, viewHolder.delete)
+            val popup = PopupMenu(activity, viewHolder.menuDots)
             popup.inflate(R.menu.menu_app)
 
             popup.setOnMenuItemClickListener {
@@ -88,7 +88,7 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp
             popup.show()
         }
 
-        viewHolder.delete.visibility = if(isSystemApp || action == "pick") View.INVISIBLE else View.VISIBLE
+        viewHolder.menuDots.visibility = if(isSystemApp || action == "pick") View.INVISIBLE else View.VISIBLE
     }
 
     override fun getItemCount(): Int { return appsList.size }
diff --git a/app/src/main/res/layout/recycler_apps_row.xml b/app/src/main/res/layout/recycler_apps_row.xml
index 51f50b5..b5146df 100644
--- a/app/src/main/res/layout/recycler_apps_row.xml
+++ b/app/src/main/res/layout/recycler_apps_row.xml
@@ -27,12 +27,12 @@
         android:text=""
         android:textSize="20sp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/choose_row_app_delete"
+        app:layout_constraintEnd_toStartOf="@+id/choose_row_app_menu"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.finnmglas.launcher.extern.FontAwesome
-        android:id="@+id/choose_row_app_delete"
+        android:id="@+id/choose_row_app_menu"
         android:layout_width="20sp"
         android:layout_height="wrap_content"
         android:gravity="center"
diff --git a/app/src/main/res/menu/menu_app.xml b/app/src/main/res/menu/menu_app.xml
index eabf26f..ade9778 100644
--- a/app/src/main/res/menu/menu_app.xml
+++ b/app/src/main/res/menu/menu_app.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/app_menu_delete"
-        android:title="Delete" />
+        android:title="@string/app_menu_delete_text" />
     <item android:id="@+id/app_menu_info"
-        android:title="Info" />
+        android:title="@string/app_menu_info_text" />
 </menu>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ad8e44d..ef3a368 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,8 +23,11 @@
     <string name="settings_choose_vol_down">Lautstärke -</string>
     <string name="settings_choose_double_click">Doppelklick</string>
     <string name="settings_choose_long_click">Langer Klick</string>
-
     <string name="settings_choose_btn">App wählen</string>
+
+    <string name="app_menu_delete_text">Deinstallieren</string>
+    <string name="app_menu_info_text">App Info</string>
+
     <string name="settings_select_launcher">Launcher wählen</string>
     <string name="settings_reset">Zurücksetzen</string>
     <string name="settings_reset_message">All deine Einstellungen gehen verloren. Weitermachen?</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 23362b9..97bd459 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -23,8 +23,11 @@
     <string name="settings_choose_vol_down">Baisser volume</string>
     <string name="settings_choose_double_click">Double clic</string>
     <string name="settings_choose_long_click">Clic long</string>
-
     <string name="settings_choose_btn">Choisir App</string>
+
+    <string name="app_menu_delete_text">Désinstaller</string>
+    <string name="app_menu_info_text">Informations</string>
+
     <string name="settings_select_launcher">Choisir Launcher</string>
     <string name="settings_reset">Réinitialiser</string>
     <string name="settings_reset_message">Vous allez supprimer toutes vos préférences. Continuer?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4e29162..9e65424 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,9 @@
     <string name="settings_choose_long_click">Long Click</string>
     <string name="settings_choose_btn">Choose App</string>
 
+    <string name="app_menu_delete_text">Uninstall</string>
+    <string name="app_menu_info_text">App Info</string>
+
     <string name="settings_select_launcher">Select Launcher</string>
     <string name="settings_reset">Reset Settings</string>
     <string name="settings_reset_message">You are going to discard all your preferences. Continue?</string>