diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
index daf1b5acd..6f22ca789 100644
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt
@@ -31,7 +31,7 @@ import org.tasks.time.DateTime
import org.tasks.time.DateTimeUtils.currentTimeMillis
import org.tasks.ui.HiddenTopArrayAdapter
import org.tasks.ui.OnItemSelected
-import org.tasks.ui.TaskEditControlFragment
+import org.tasks.ui.TaskEditControlViewFragment
import javax.inject.Inject
/**
@@ -40,7 +40,7 @@ import javax.inject.Inject
* @author Tim Su @todoroo.com>
*/
@AndroidEntryPoint
-class RepeatControlSet : TaskEditControlFragment() {
+class RepeatControlSet : TaskEditControlViewFragment() {
private val repeatTypes: MutableList = ArrayList()
@Inject lateinit var activity: Activity
diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt b/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt
index a2b7e5539..740a0b727 100644
--- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt
+++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt
@@ -26,12 +26,11 @@ import org.tasks.files.ImageHelper
import org.tasks.preferences.Device
import org.tasks.preferences.Preferences
import org.tasks.themes.ThemeColor
-import org.tasks.ui.TaskEditControlFragment
-import java.util.*
+import org.tasks.ui.TaskEditControlViewFragment
import javax.inject.Inject
@AndroidEntryPoint
-class CommentBarFragment : TaskEditControlFragment() {
+class CommentBarFragment : TaskEditControlViewFragment() {
@Inject lateinit var activity: Activity
@Inject lateinit var dialogBuilder: DialogBuilder
@Inject lateinit var device: Device
diff --git a/app/src/main/java/org/tasks/ui/DescriptionControlSet.kt b/app/src/main/java/org/tasks/ui/DescriptionControlSet.kt
index d5170758c..88fde69e0 100644
--- a/app/src/main/java/org/tasks/ui/DescriptionControlSet.kt
+++ b/app/src/main/java/org/tasks/ui/DescriptionControlSet.kt
@@ -13,7 +13,7 @@ import org.tasks.preferences.Preferences
import javax.inject.Inject
@AndroidEntryPoint
-class DescriptionControlSet : TaskEditControlFragment() {
+class DescriptionControlSet : TaskEditControlViewFragment() {
@Inject lateinit var linkify: Linkify
@Inject lateinit var preferences: Preferences
@Inject lateinit var markdownProvider: MarkdownProvider
diff --git a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt
index c756b8783..45c308708 100644
--- a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt
+++ b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt
@@ -162,7 +162,9 @@ class SubtaskControlSet : TaskEditControlComposeFragment() {
override fun Icon() {
TaskEditIcon(
id = icon,
- modifier = Modifier.padding(start = 16.dp, top = 20.dp, end = 20.dp, bottom = 20.dp),
+ modifier = Modifier
+ .padding(start = 16.dp, top = 20.dp, end = 20.dp, bottom = 20.dp)
+ .alpha(ContentAlpha.medium),
)
}
diff --git a/app/src/main/java/org/tasks/ui/TaskEditControlComposeFragment.kt b/app/src/main/java/org/tasks/ui/TaskEditControlComposeFragment.kt
index 22c92562e..0f7caba38 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditControlComposeFragment.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditControlComposeFragment.kt
@@ -5,8 +5,10 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.compose.foundation.layout.padding
+import androidx.compose.material.ContentAlpha
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.unit.dp
import androidx.lifecycle.ViewModelProvider
@@ -49,7 +51,8 @@ abstract class TaskEditControlComposeFragment : TaskEditControlFragment() {
TaskEditIcon(
id = icon,
modifier = Modifier
- .padding(start = 16.dp, top = 20.dp, end = 32.dp, bottom = 20.dp),
+ .padding(start = 16.dp, top = 20.dp, end = 32.dp, bottom = 20.dp)
+ .alpha(ContentAlpha.medium),
)
}
diff --git a/app/src/main/java/org/tasks/ui/TaskEditControlFragment.kt b/app/src/main/java/org/tasks/ui/TaskEditControlFragment.kt
index b73abd571..c4216a8da 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditControlFragment.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditControlFragment.kt
@@ -1,34 +1,13 @@
package org.tasks.ui
import android.os.Bundle
-import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.ImageView
import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
-import org.tasks.R
abstract class TaskEditControlFragment : Fragment() {
lateinit var viewModel: TaskEditViewModel
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- val view = inflater.inflate(R.layout.control_set_template, null)
- viewModel = ViewModelProvider(requireParentFragment())[TaskEditViewModel::class.java]
- val content = view.findViewById(R.id.content)
- bind(content)
- val icon = view.findViewById(R.id.icon)
- icon.setImageResource(this.icon)
- if (isClickable) {
- content.setOnClickListener { onRowClick() }
- }
-
- createView(savedInstanceState)
-
- return view
- }
-
protected open fun createView(savedInstanceState: Bundle?) {}
protected open fun onRowClick() {}
diff --git a/app/src/main/java/org/tasks/ui/TaskEditControlViewFragment.kt b/app/src/main/java/org/tasks/ui/TaskEditControlViewFragment.kt
new file mode 100644
index 000000000..23373f400
--- /dev/null
+++ b/app/src/main/java/org/tasks/ui/TaskEditControlViewFragment.kt
@@ -0,0 +1,28 @@
+package org.tasks.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.lifecycle.ViewModelProvider
+import org.tasks.R
+
+abstract class TaskEditControlViewFragment : TaskEditControlFragment() {
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.control_set_template, null)
+ viewModel = ViewModelProvider(requireParentFragment())[TaskEditViewModel::class.java]
+ val content = view.findViewById(R.id.content)
+ bind(content)
+ val icon = view.findViewById(R.id.icon)
+ icon.setImageResource(this.icon)
+ if (isClickable) {
+ content.setOnClickListener { onRowClick() }
+ }
+
+ createView(savedInstanceState)
+
+ return view
+ }
+}
\ No newline at end of file