From 80168565d8234cdb0b9f68794709b2ad73f4d68c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 23 Feb 2025 08:22:38 -0600 Subject: [PATCH] Don't update Android task description --- .../todoroo/astrid/activity/MainActivity.kt | 18 ------------------ app/src/main/java/org/tasks/themes/Theme.kt | 4 ---- .../main/java/org/tasks/themes/ThemeColor.java | 6 ------ 3 files changed, 28 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt index 2ca00c716..e906a7d75 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt @@ -407,12 +407,6 @@ class MainActivity : AppCompatActivity() { } logIntent("onCreate") handleIntent() - - lifecycleScope.launch { - lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) { - updateSystemBars(viewModel.state.value.filter) - } - } } @Deprecated("Deprecated in Java") @@ -489,18 +483,6 @@ class MainActivity : AppCompatActivity() { } } - private fun updateSystemBars(filter: Filter) { - with (getFilterColor(filter)) { - applyTaskDescription(this@MainActivity, filter.title ?: getString(R.string.app_name)) - } - } - - private fun getFilterColor(filter: Filter) = - if (filter.tint != 0) - colorProvider.getThemeColor(filter.tint, true) - else - theme.themeColor - override fun onResume() { super.onResume() if (currentNightMode != nightMode || currentPro != inventory.hasPro) { diff --git a/app/src/main/java/org/tasks/themes/Theme.kt b/app/src/main/java/org/tasks/themes/Theme.kt index 4d4b0663d..169e8139b 100644 --- a/app/src/main/java/org/tasks/themes/Theme.kt +++ b/app/src/main/java/org/tasks/themes/Theme.kt @@ -4,7 +4,6 @@ import android.app.Activity import android.content.Context import android.graphics.PixelFormat import android.view.LayoutInflater -import org.tasks.R import javax.inject.Inject class Theme @Inject constructor( @@ -12,15 +11,12 @@ class Theme @Inject constructor( val themeColor: ThemeColor, private val themeAccent: ThemeAccent ) { - fun withThemeColor(themeColor: ThemeColor) = Theme(themeBase, themeColor, themeAccent) - fun getLayoutInflater(context: Context) = wrap(context).getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater fun applyThemeAndStatusBarColor(activity: Activity) { applyTheme(activity) themeColor.applyToNavigationBar(activity) - themeColor.applyTaskDescription(activity, activity.getString(R.string.app_name)) } fun applyTheme(activity: Activity) { diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java index 1b2c30452..119687cff 100644 --- a/app/src/main/java/org/tasks/themes/ThemeColor.java +++ b/app/src/main/java/org/tasks/themes/ThemeColor.java @@ -4,7 +4,6 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo; import static org.tasks.themes.ColorUtilsKt.calculateContrast; import android.app.Activity; -import android.app.ActivityManager; import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -214,11 +213,6 @@ public class ThemeColor implements Pickable { theme.applyStyle(isDark ? R.style.BlackToolbarTheme : R.style.WhiteToolbarTheme, true); } - public void applyTaskDescription(Activity activity, String description) { - activity.setTaskDescription( - new ActivityManager.TaskDescription(description, null, getPrimaryColor())); - } - @Override public int getPickerColor() { return colorPrimary;