mirror of
				https://github.com/SimpleMobileTools/Simple-App-Launcher.git
				synced 2025-06-05 21:49:21 +02:00 
			
		
		
		
	replace launcher Delete with Remove to emphasize that it isnt uninstall
This commit is contained in:
		| @@ -51,7 +51,7 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppL | ||||
|     override fun actionItemPressed(id: Int) { | ||||
|         when (id) { | ||||
|             R.id.cab_edit -> showEditDialog() | ||||
|             R.id.cab_delete -> askConfirmDelete() | ||||
|             R.id.cab_remove -> askConfirmRemove() | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @@ -64,23 +64,23 @@ class LaunchersAdapter(activity: SimpleActivity, val launchers: MutableList<AppL | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun askConfirmDelete() { | ||||
|         ConfirmationDialog(activity, "", R.string.delete_explanation, R.string.ok, R.string.cancel) { | ||||
|             deleteItems() | ||||
|     private fun askConfirmRemove() { | ||||
|         ConfirmationDialog(activity, "", R.string.remove_explanation, R.string.ok, R.string.cancel) { | ||||
|             removeItems() | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     private fun deleteItems() { | ||||
|         val deleteIds = ArrayList<String>(selectedPositions.size) | ||||
|     private fun removeItems() { | ||||
|         val removeIds = ArrayList<String>(selectedPositions.size) | ||||
|         val removeLaunchers = ArrayList<AppLauncher>(selectedPositions.size) | ||||
|         selectedPositions.sortedDescending().forEach { | ||||
|             val launcher = launchers[it] | ||||
|             deleteIds.add(launcher.id.toString()) | ||||
|             removeIds.add(launcher.id.toString()) | ||||
|             removeLaunchers.add(launcher) | ||||
|         } | ||||
|  | ||||
|         launchers.removeAll(removeLaunchers) | ||||
|         activity.dbHelper.deleteLaunchers(deleteIds) | ||||
|         activity.dbHelper.deleteLaunchers(removeIds) | ||||
|         removeSelectedItems() | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -7,8 +7,8 @@ | ||||
|         android:title="@string/rename" | ||||
|         app:showAsAction="ifRoom"/> | ||||
|     <item | ||||
|         android:id="@+id/cab_delete" | ||||
|         android:icon="@drawable/ic_delete" | ||||
|         android:title="@string/delete" | ||||
|         android:id="@+id/cab_remove" | ||||
|         android:icon="@drawable/ic_minus_circle" | ||||
|         android:title="@string/remove" | ||||
|         app:showAsAction="ifRoom"/> | ||||
| </menu> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">درج التطبيقات البسيط</string> | ||||
|     <string name="app_launcher_name">مشغل التطبيق</string> | ||||
|     <string name="enter_launcher_name">الرجاء ادراج اسم للإختصار</string> | ||||
|     <string name="delete_explanation">هذا سيقوم بحذف الايقونة فقط من الواجهة الحالية,ولن يقوم بإلغاء تثبيت حزمة التطبيق.</string> | ||||
|     <string name="remove_explanation">هذا سيقوم بحذف الايقونة فقط من الواجهة الحالية,ولن يقوم بإلغاء تثبيت حزمة التطبيق.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">الحاسبة</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Schlichter AppLauncher</string> | ||||
|     <string name="app_launcher_name">App Launcher</string> | ||||
|     <string name="enter_launcher_name">Bitte gib einen Namen für die Verknüpfung ein</string> | ||||
|     <string name="delete_explanation">Diese Aktion wird das App-Icon nur aus dem Raster löschen, nicht die eigentliche App deinstallieren.</string> | ||||
|     <string name="remove_explanation">Diese Aktion wird das App-Icon nur aus dem Raster löschen, nicht die eigentliche App deinstallieren.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Rechner</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Simple App Launcher</string> | ||||
|     <string name="app_launcher_name">Lanzador de aplicaciones</string> | ||||
|     <string name="enter_launcher_name">Por favor, introduzca un nombre para el lanzador</string> | ||||
|     <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Calculadora</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Simple App Launcher</string> | ||||
|     <string name="app_launcher_name">App Launcher</string> | ||||
|     <string name="enter_launcher_name">Veuillez entrer un nom de launcher</string> | ||||
|     <string name="delete_explanation">Cette action ne fera que supprimer l\'icône du launcher de cette liste et ne désinstallere pas l\'application.</string> | ||||
|     <string name="remove_explanation">Cette action ne fera que supprimer l\'icône du launcher de cette liste et ne désinstallere pas l\'application.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Calculatrice</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">シンプル アプリ ランチャー</string> | ||||
|     <string name="app_launcher_name">アプリ ランチャー</string> | ||||
|     <string name="enter_launcher_name">ランチャーの名前を入力してください</string> | ||||
|     <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">電卓</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Prosty Launcher Aplikacji</string> | ||||
|     <string name="app_launcher_name">Launcher Aplikacji</string> | ||||
|     <string name="enter_launcher_name">Proszę wpisać nazwę launchera</string> | ||||
|     <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Kalkulator</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Simple App Launcher</string> | ||||
|     <string name="app_launcher_name">Lançador de aplicações</string> | ||||
|     <string name="enter_launcher_name">Por favor digite um nome para o lançador</string> | ||||
|     <string name="delete_explanation">Esta ação remove o ícone da grelha mas não desinstala a aplicação.</string> | ||||
|     <string name="remove_explanation">Esta ação remove o ícone da grelha mas não desinstala a aplicação.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Calculadora</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Simple App Launcher</string> | ||||
|     <string name="app_launcher_name">Лаунчер</string> | ||||
|     <string name="enter_launcher_name">Пожалуйста, введите название лаунчера</string> | ||||
|     <string name="delete_explanation">Это только удалит иконку лаунчера с сетки, но не удалит само приложение.</string> | ||||
|     <string name="remove_explanation">Это только удалит иконку лаунчера с сетки, но не удалит само приложение.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Калькулятор</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Jednoduchý spúšťač aplikácií</string> | ||||
|     <string name="app_launcher_name">Spúšťač aplikácií</string> | ||||
|     <string name="enter_launcher_name">Prosím zadajte názov pre spúšťač</string> | ||||
|     <string name="delete_explanation">Toto iba odstráni spúšťačku z tejto mriežky, neodinštaluje to samotnú apku.</string> | ||||
|     <string name="remove_explanation">Toto iba odstráni spúšťačku z tejto mriežky, neodinštaluje to samotnú apku.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Kalkulačka</string> | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|     <string name="app_name">Simple App Launcher</string> | ||||
|     <string name="app_launcher_name">App Launcher</string> | ||||
|     <string name="enter_launcher_name">Please enter a launcher name</string> | ||||
|     <string name="delete_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string> | ||||
|  | ||||
|     <!-- Apps --> | ||||
|     <string name="calculator">Calculator</string> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user