From 960c645010d230e938ee673760caa0d9e7e1d607 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Wed, 15 Dec 2021 20:09:19 +0100 Subject: [PATCH] More widget cleanup --- .../ui/legacy/component/WidgetView.kt | 6 -- .../launcher2/ui/legacy/widget/CompactView.kt | 9 -- .../ui/legacy/widget/ExternalWidget.kt | 1 - .../ui/legacy/widget/LauncherWidget.kt | 7 -- .../launcher2/ui/legacy/widget/MusicWidget.kt | 99 ------------------- .../ui/legacy/widget/WeatherWidget.kt | 12 --- 6 files changed, 134 deletions(-) delete mode 100644 ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/CompactView.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/WidgetView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/WidgetView.kt index d87f8d7f..aaab89e5 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/WidgetView.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/component/WidgetView.kt @@ -44,7 +44,6 @@ class WidgetView : LauncherCardView { val widget = binding.widgetWrapper[2] as LauncherWidget widget.visibility = View.VISIBLE binding.widgetName.visibility = View.GONE - visibility = if (widget.show) View.VISIBLE else View.GONE layoutTransition = ChangingLayoutTransition() widgetView?.layoutTransition = ChangingLayoutTransition() binding.widgetWrapper.layoutTransition = ChangingLayoutTransition() @@ -111,7 +110,6 @@ class WidgetView : LauncherCardView { binding.widgetResizeDragHandle.resizeView = widgetView binding.widgetWrapper.addView(widgetView, 2) binding.widgetName.text = widgetView?.name - visibility = if (widgetView?.show == true) View.VISIBLE else View.GONE } else { widgetView = ExternalWidget(context, widget, widgetHost) binding.widgetResizeDragHandle.resizeView = widgetView @@ -121,10 +119,6 @@ class WidgetView : LauncherCardView { binding.widgetWrapper.addView(widgetView, 2) binding.widgetName.text = widgetView?.name binding.widgetActionResize.visibility = View.VISIBLE - visibility = if (widgetView?.show == true) View.VISIBLE else View.GONE - } - widgetView?.onVisibilityChanged = { - visibility = if (it) View.VISIBLE else View.GONE } widgetView?.layoutTransition = LayoutTransition().apply { enableTransitionType(LayoutTransition.CHANGING) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/CompactView.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/CompactView.kt deleted file mode 100644 index e6d4b189..00000000 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/CompactView.kt +++ /dev/null @@ -1,9 +0,0 @@ -package de.mm20.launcher2.ui.legacy.widget - -interface CompactView { - - fun setTranslucent(translucent: Boolean) - fun update() {} - - var goToParent: (() -> Unit)? -} \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ExternalWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ExternalWidget.kt index 16c08d95..2c5a54d1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ExternalWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ExternalWidget.kt @@ -27,7 +27,6 @@ class ExternalWidget( init { val id = widget.data.toInt() widgetInfo = AppWidgetManager.getInstance(context.applicationContext).getAppWidgetInfo(id) - show = widgetInfo != null val widgetView = host.createView(context.applicationContext, id, widgetInfo) ?: View(context) if (widgetView is AppWidgetHostView && widgetView.childCount > 0) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/LauncherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/LauncherWidget.kt index 4a92548f..d479bf92 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/LauncherWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/LauncherWidget.kt @@ -18,12 +18,5 @@ abstract class LauncherWidget : FrameLayout { } abstract val canResize: Boolean abstract val name: String - var show: Boolean = true - set(value) { - onVisibilityChanged?.invoke(value) - field = value - } - - var onVisibilityChanged: ((Boolean) -> Unit)? = null } \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/MusicWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/MusicWidget.kt index 7df21aae..d231e818 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/MusicWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/MusicWidget.kt @@ -61,102 +61,3 @@ class MusicWidget : LauncherWidget { } } -class MusicCompactView : FrameLayout, CompactView { - - - private val viewModel: MusicViewModel by (context as AppCompatActivity).viewModel() - - private val binding = CompactMusicBinding.inflate(LayoutInflater.from(context), this) - - override fun setTranslucent(translucent: Boolean) { - if (translucent) { - binding.musicCompactTitle.setTextColor(Color.WHITE) - binding.musicCompactArtist.setTextColor(Color.WHITE) - binding.musicCompactNext.elevation = 2 * dp - binding.musicCompactPlay.elevation = 2 * dp - binding.musicCompactNext.alpha = 1f - binding.musicCompactPlay.alpha = 1f - binding.musicCompactNext.imageTintList = ColorStateList.valueOf(Color.WHITE) - binding.musicCompactPlay.imageTintList = ColorStateList.valueOf(Color.WHITE) - val shadowY = resources.getDimension(R.dimen.elevation_shadow_1dp_y) - val shadowR = resources.getDimension(R.dimen.elevation_shadow_1dp_radius) - val shadowC = Color.argb(66, 0, 0, 0) - binding.musicCompactTitle.setShadowLayer(shadowR, 0f, shadowY, shadowC) - binding.musicCompactArtist.setShadowLayer(shadowR, 0f, shadowY, shadowC) - } else { - val primaryColor = ContextCompat.getColorStateList(context, R.color.text_color_primary)!! - binding.musicCompactTitle.setTextColor(primaryColor) - binding.musicCompactArtist.setTextColor(ContextCompat.getColorStateList(context, R.color.text_color_secondary)) - binding.musicCompactNext.elevation = 0f - binding.musicCompactPlay.elevation = 0f - binding.musicCompactNext.alpha = primaryColor.defaultColor.alpha / 255f - binding.musicCompactPlay.alpha = primaryColor.defaultColor.alpha / 255f - binding.musicCompactNext.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.icon_color)) - binding.musicCompactPlay.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.icon_color)) - binding.musicCompactTitle.setShadowLayer(0f, 0f, 0f, 0) - binding.musicCompactArtist.setShadowLayer(0f, 0f, 0f, 0) - } - } - - private var playPauseIcon = if (viewModel.playbackState.value == PlaybackState.Playing) R.drawable.ic_pause else R.drawable.ic_play - set(value) { - if (value != field) { - val icon = context.getDrawable(value) - binding.musicCompactPlay.setImageDrawable(icon) - (icon as? AnimatedVectorDrawable)?.start() - field = value - } - } - - - override var goToParent: (() -> Unit)? = null - - constructor(context: Context) : super(context) - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) - constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int) : super(context, attrs, defStyleRes) - - init { - clipChildren = false - binding.musicCompactNext.setOnClickListener { - viewModel.next() - (binding.musicCompactNext.drawable as AnimatedVectorDrawable).start() - } - binding.musicCompactPlay.setOnClickListener { _ -> - viewModel.togglePause() - } - binding.musicCompactMeta.setOnClickListener { - ActivityStarter.start(context, this, pendingIntent = viewModel.getLaunchIntent(context)) - } - viewModel.title.observe(context as AppCompatActivity, Observer { - binding.musicCompactTitle.text = it - }) - - viewModel.artist.observe(context as AppCompatActivity, Observer { - binding.musicCompactArtist.text = it - }) - - viewModel.playbackState.observe(context as AppCompatActivity, Observer { - if (it == PlaybackState.Playing) { - playPauseIcon = R.drawable.ic_play_to_pause - binding.musicCompactPlay.setOnClickListener { - viewModel.pause() - } - binding.musicCompactTitle.isSelected = true - binding.musicCompactArtist.isSelected = true - } else { - playPauseIcon = R.drawable.ic_pause_to_play - binding.musicCompactPlay.setOnClickListener { - viewModel.play() - } - binding.musicCompactTitle.isSelected = false - binding.musicCompactArtist.isSelected = false - } - }) - } - - override fun update() { - binding.musicCompactTitle.text = viewModel.title.value - binding.musicCompactArtist.text = viewModel.artist.value - playPauseIcon = if (viewModel.playbackState.value == PlaybackState.Playing) R.drawable.ic_pause else R.drawable.ic_play - } -} diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt index 719103f9..55c19fe9 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/WeatherWidget.kt @@ -49,15 +49,3 @@ class WeatherWidget : LauncherWidget { } -class WeatherCompactView(context: Context) : FrameLayout(context), CompactView { - override var goToParent: (() -> Unit)? = null - - init { - View.inflate(context, R.layout.compact_weather, this) - } - - override fun setTranslucent(translucent: Boolean) { - - } - -}