diff --git a/app/src/main/java/de/jrpie/android/launcher/actions/Gesture.kt b/app/src/main/java/de/jrpie/android/launcher/actions/Gesture.kt index f231658..6270eba 100644 --- a/app/src/main/java/de/jrpie/android/launcher/actions/Gesture.kt +++ b/app/src/main/java/de/jrpie/android/launcher/actions/Gesture.kt @@ -34,7 +34,7 @@ enum class Gesture( ), TIME("action.time", R.string.settings_gesture_time, - R.string.settings_gesture_time, + R.string.settings_gesture_description_time, R.array.default_time), DATE("action.date", R.string.settings_gesture_date, diff --git a/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt b/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt index 4f7c901..c061716 100644 --- a/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt +++ b/app/src/main/java/de/jrpie/android/launcher/ui/settings/actions/SettingsFragmentActionsRecycler.kt @@ -84,6 +84,7 @@ 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 descriptionTextView: TextView = itemView.findViewById(R.id.settings_actions_row_description) 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) @@ -115,12 +116,16 @@ class ActionsRecyclerAdapter(val activity: Activity) : override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) { val gesture = gesturesList[i] viewHolder.textView.text = gesture.getLabel(activity) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - val description = gesture.getDescription(activity) + val description = gesture.getDescription(activity) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { viewHolder.textView.tooltipText = description viewHolder.img.tooltipText = description viewHolder.chooseButton.tooltipText = description + } else { + viewHolder.descriptionTextView.visibility = View.VISIBLE + viewHolder.descriptionTextView.text = description } if (LauncherPreferences.theme().monochromeIcons()) transformGrayscale(viewHolder.img) diff --git a/app/src/main/res/layout/settings_actions_row.xml b/app/src/main/res/layout/settings_actions_row.xml index 645cc44..ee943b9 100644 --- a/app/src/main/res/layout/settings_actions_row.xml +++ b/app/src/main/res/layout/settings_actions_row.xml @@ -7,19 +7,34 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + app:layout_constraintTop_toTopOf="parent"> + + + + +