From e06e62c771127e833b1e015f1738ebf42af7c532 Mon Sep 17 00:00:00 2001 From: Josia Pietsch Date: Sat, 6 Jul 2024 22:23:16 +0200 Subject: [PATCH] NOP dummy action --- .../de/jrpie/android/launcher/Functions.kt | 7 ++-- .../list/other/OtherRecyclerAdapter.kt | 32 ++++++++++--------- .../SettingsFragmentActionsRecycler.kt | 22 ++++++------- .../drawable/baseline_not_interested_24.xml | 5 +++ .../main/res/layout/settings_actions_row.xml | 12 ------- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 9 files changed, 40 insertions(+), 42 deletions(-) create mode 100644 app/src/main/res/drawable/baseline_not_interested_24.xml diff --git a/app/src/main/java/de/jrpie/android/launcher/Functions.kt b/app/src/main/java/de/jrpie/android/launcher/Functions.kt index 4ee7ad2..fb3b9ae 100644 --- a/app/src/main/java/de/jrpie/android/launcher/Functions.kt +++ b/app/src/main/java/de/jrpie/android/launcher/Functions.kt @@ -117,10 +117,8 @@ var vibrantColor = 0 /* REQUEST CODES */ -const val REQUEST_PICK_IMAGE = 1 -const val REQUEST_CHOOSE_APP = 2 -const val REQUEST_UNINSTALL = 3 -const val REQUEST_PERMISSION_STORAGE = 4 +const val REQUEST_CHOOSE_APP = 1 +const val REQUEST_UNINSTALL = 2 /* Animate */ @@ -174,6 +172,7 @@ fun launch( "nextTrack" -> audioNextTrack(activity) "previousTrack" -> audioPreviousTrack(activity) "tutorial" -> openTutorial(activity) + "nop" -> {} } else launchApp(data, activity) // app diff --git a/app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt b/app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt index 8382d5e..1a1e933 100644 --- a/app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/other/OtherRecyclerAdapter.kt @@ -78,23 +78,25 @@ class OtherRecyclerAdapter(val activity: Activity): "launcher:volumeDown", R.drawable.baseline_volume_down_24) ) - - if (Build.VERSION.SDK_INT >= 19) { // requires Android KitKat + - othersList.add( - OtherInfo( - activity.getString(R.string.list_other_track_next), - "launcher:nextTrack", - R.drawable.baseline_skip_next_24 - ) + othersList.add( + OtherInfo( + activity.getString(R.string.list_other_track_next), + "launcher:nextTrack", + R.drawable.baseline_skip_next_24 ) - othersList.add( - OtherInfo( - activity.getString(R.string.list_other_track_previous), - "launcher:previousTrack", - R.drawable.baseline_skip_previous_24 - ) + ) + othersList.add( + OtherInfo( + activity.getString(R.string.list_other_track_previous), + "launcher:previousTrack", + R.drawable.baseline_skip_previous_24 ) - } + ) + othersList.add( + OtherInfo(activity.getString(R.string.list_other_nop), + "launcher:nop", + R.drawable.baseline_not_interested_24) + ) } private fun returnChoiceIntent(forApp: String, value: String) { diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt index 86110c6..be17014 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt @@ -59,7 +59,6 @@ class ActionsRecyclerAdapter(val activity: Activity): inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener { var textView: TextView = itemView.findViewById(R.id.settings_actions_row_name) - var actionIcon: ImageView = itemView.findViewById(R.id.settings_actions_row_icon) var img: ImageView = itemView.findViewById(R.id.settings_actions_row_icon_img) var chooseButton: Button = itemView.findViewById(R.id.settings_actions_row_button_choose) var removeAction: ImageView = itemView.findViewById(R.id.settings_actions_row_remove) @@ -84,7 +83,6 @@ class ActionsRecyclerAdapter(val activity: Activity): loadSettings() // apply new settings to the app - viewHolder.actionIcon.visibility = View.INVISIBLE viewHolder.img.visibility = View.INVISIBLE viewHolder.removeAction.visibility = View.GONE viewHolder.chooseButton.visibility = View.VISIBLE @@ -94,23 +92,25 @@ class ActionsRecyclerAdapter(val activity: Activity): } if (content.startsWith("launcher")) { - // Set fontAwesome icon - viewHolder.actionIcon.visibility = View.VISIBLE - viewHolder.actionIcon.setOnClickListener{ chooseApp(actionName.toString()) } + + viewHolder.img.visibility = View.VISIBLE + viewHolder.img.setOnClickListener{ chooseApp(actionName.toString()) } when (content.split(":")[1]) { "settings" -> - viewHolder.actionIcon.setImageResource(R.drawable.baseline_settings_24) + viewHolder.img.setImageResource(R.drawable.baseline_settings_24) "choose" -> - viewHolder.actionIcon.setImageResource(R.drawable.baseline_menu_24) + viewHolder.img.setImageResource(R.drawable.baseline_menu_24) "volumeUp" -> - viewHolder.actionIcon.setImageResource(R.drawable.baseline_volume_up_24) + viewHolder.img.setImageResource(R.drawable.baseline_volume_up_24) "volumeDown" -> - viewHolder.actionIcon.setImageResource(R.drawable.baseline_volume_down_24) + viewHolder.img.setImageResource(R.drawable.baseline_volume_down_24) "nextTrack" -> - viewHolder.actionIcon.setImageResource(R.drawable.baseline_skip_next_24) + viewHolder.img.setImageResource(R.drawable.baseline_skip_next_24) "previousTrack" -> - viewHolder.actionIcon.setImageResource(R.drawable.baseline_skip_previous_24) + viewHolder.img.setImageResource(R.drawable.baseline_skip_previous_24) + "nop" -> + viewHolder.img.setImageResource(R.drawable.baseline_not_interested_24) } } else { // Set image icon (by packageName) diff --git a/app/src/main/res/drawable/baseline_not_interested_24.xml b/app/src/main/res/drawable/baseline_not_interested_24.xml new file mode 100644 index 0000000..dabcefb --- /dev/null +++ b/app/src/main/res/drawable/baseline_not_interested_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/settings_actions_row.xml b/app/src/main/res/layout/settings_actions_row.xml index 048155a..cfae024 100644 --- a/app/src/main/res/layout/settings_actions_row.xml +++ b/app/src/main/res/layout/settings_actions_row.xml @@ -32,18 +32,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - Musik: Leiser Musik: Weiter Musik: Zurück + Nichts tun