From 5ff244dd1bbaa31cf9520e58b142832a3b6f118f Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Wed, 15 Dec 2021 18:59:49 +0100
Subject: [PATCH] Rename smart widget -> clock widget
---
.../ui/legacy/activity/LauncherActivity.kt | 12 ++++++------
.../widget/{SmartWidget.kt => ClockWidget.kt} | 16 ++++++++--------
ui/src/main/res/layout/activity_launcher.xml | 4 ++--
ui/src/main/res/layout/view_date_time.xml | 4 ++--
4 files changed, 18 insertions(+), 18 deletions(-)
rename ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/{SmartWidget.kt => ClockWidget.kt} (94%)
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/activity/LauncherActivity.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/activity/LauncherActivity.kt
index 236972bc..3df774be 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/activity/LauncherActivity.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/activity/LauncherActivity.kt
@@ -95,7 +95,7 @@ class LauncherActivity : AppCompatActivity() {
field = value
if (value) {
binding.widgetSpacer.visibility = View.GONE
- binding.smartWidget.visibility = View.GONE
+ binding.clockWidget.visibility = View.GONE
binding.searchBar.setRightIcon(R.drawable.ic_done)
binding.scrollView.setOnTouchListener(null)
for (v in binding.widgetList.iterator()) {
@@ -146,7 +146,7 @@ class LauncherActivity : AppCompatActivity() {
binding.scrollContainer.layoutTransition = ChangingLayoutTransition()
binding.searchBar.setRightIcon(R.drawable.ic_more_vert)
binding.scrollView.setOnTouchListener(scrollViewOnTouchListener)
- binding.smartWidget.visibility = View.VISIBLE
+ binding.clockWidget.visibility = View.VISIBLE
for (v in binding.widgetList.iterator()) {
if (v is WidgetView) {
v.editMode = false
@@ -256,10 +256,10 @@ class LauncherActivity : AppCompatActivity() {
binding.searchBar.raise()
} else binding.searchBar.drop()
if (scrollY == 0) {
- binding.smartWidget.translucent = true
+ binding.clockWidget.translucent = true
if (!searchVisibility) binding.searchBar.hide()
} else {
- binding.smartWidget.translucent = false
+ binding.clockWidget.translucent = false
binding.searchBar.show()
}
@@ -459,7 +459,7 @@ class LauncherActivity : AppCompatActivity() {
}
private fun adjustWidgetSpace() {
- val firstWidget = binding.smartWidget
+ val firstWidget = binding.clockWidget
if (firstWidget == null) {
val m = binding.scrollContainer.paddingTop
val params = binding.widgetSpacer.layoutParams as LinearLayout.LayoutParams
@@ -675,7 +675,7 @@ class LauncherActivity : AppCompatActivity() {
?: 0f
).start()
}
- binding.smartWidget.compactView = compactView
+ binding.clockWidget.compactView = compactView
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/SmartWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ClockWidget.kt
similarity index 94%
rename from ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/SmartWidget.kt
rename to ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ClockWidget.kt
index cd63d1b0..eee5e049 100644
--- a/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/SmartWidget.kt
+++ b/ui/src/main/java/de/mm20/launcher2/ui/legacy/widget/ClockWidget.kt
@@ -29,7 +29,7 @@ import de.mm20.launcher2.ui.databinding.ViewDateTimeBinding
import de.mm20.launcher2.ui.legacy.view.LauncherCardView
import java.util.*
-class SmartWidget : LauncherCardView {
+class ClockWidget : LauncherCardView {
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
@@ -96,10 +96,10 @@ class SmartWidget : LauncherCardView {
AnimatorSet().apply {
duration = 200
playTogether(
- ObjectAnimator.ofInt(this@SmartWidget, "backgroundOpacity", 0).apply {
+ ObjectAnimator.ofInt(this@ClockWidget, "backgroundOpacity", 0).apply {
interpolator = AccelerateInterpolator(3f)
},
- ObjectAnimator.ofFloat(this@SmartWidget, "translationZ", -elevation).apply {
+ ObjectAnimator.ofFloat(this@ClockWidget, "translationZ", -elevation).apply {
interpolator = DecelerateInterpolator(3f)
}
)
@@ -111,11 +111,11 @@ class SmartWidget : LauncherCardView {
AnimatorSet().apply {
duration = 200
playTogether(
- ObjectAnimator.ofFloat(this@SmartWidget, "translationZ", 0f).apply {
+ ObjectAnimator.ofFloat(this@ClockWidget, "translationZ", 0f).apply {
interpolator = AccelerateInterpolator(3f)
},
ObjectAnimator.ofInt(
- this@SmartWidget,
+ this@ClockWidget,
"backgroundOpacity",
LauncherPreferences.instance.cardOpacity
).apply {
@@ -131,7 +131,7 @@ class SmartWidget : LauncherCardView {
var compactView: CompactView? = getDefaultCompactView()
set(value) {
- binding.smartWidgetContainer.removeView(field as? View)
+ binding.clockWidgetContainer.removeView(field as? View)
if (value == null) {
field = getDefaultCompactView()
} else {
@@ -139,7 +139,7 @@ class SmartWidget : LauncherCardView {
}
(field as? View)?.let {
it.layoutParams = getCompactViewLayoutParams()
- binding.smartWidgetContainer.addView(it)
+ binding.clockWidgetContainer.addView(it)
}
field?.setTranslucent(translucent)
}
@@ -155,7 +155,7 @@ class SmartWidget : LauncherCardView {
)
params.addRule(RelativeLayout.CENTER_VERTICAL, RelativeLayout.TRUE)
params.addRule(RelativeLayout.ALIGN_PARENT_START, RelativeLayout.TRUE)
- params.addRule(RelativeLayout.START_OF, R.id.smartWidgetDivider)
+ params.addRule(RelativeLayout.START_OF, R.id.clockWidgetDivider)
params.marginStart = (16 * dp).toInt()
params.marginEnd = (16 * dp).toInt()
return params
diff --git a/ui/src/main/res/layout/activity_launcher.xml b/ui/src/main/res/layout/activity_launcher.xml
index b958497f..de429d0e 100644
--- a/ui/src/main/res/layout/activity_launcher.xml
+++ b/ui/src/main/res/layout/activity_launcher.xml
@@ -137,8 +137,8 @@
android:src="@drawable/ic_arrow_up"
android:tint="#fff" />
-
diff --git a/ui/src/main/res/layout/view_date_time.xml b/ui/src/main/res/layout/view_date_time.xml
index d7b21a3d..c85f5362 100644
--- a/ui/src/main/res/layout/view_date_time.xml
+++ b/ui/src/main/res/layout/view_date_time.xml
@@ -2,7 +2,7 @@