fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-04-14 10:22:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #20, make widget text scaling more dynamic

Browse Source
This commit is contained in:
tibbi 2018-09-18 22:53:15 +02:00
parent 07894ef11b
commit fbb3fc6b7b
3 changed files with 88 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt
View File

@ -18,6 +18,7 @@ import java.util.*
class MyWidgetDateTimeProvider : AppWidgetProvider() { class MyWidgetDateTimeProvider : AppWidgetProvider() {
override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) { override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
super.onUpdate(context, appWidgetManager, appWidgetIds)
performUpdate(context) performUpdate(context)
context.scheduleNextWidgetUpdate() context.scheduleNextWidgetUpdate()
} }
@ -30,13 +31,9 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
private fun performUpdate(context: Context) { private fun performUpdate(context: Context) {
val appWidgetManager = AppWidgetManager.getInstance(context) val appWidgetManager = AppWidgetManager.getInstance(context)
appWidgetManager.getAppWidgetIds(getComponentName(context)).forEach { appWidgetManager.getAppWidgetIds(getComponentName(context)).forEach {
val bundle = appWidgetManager.getAppWidgetOptions(it)
val minHeight = bundle.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)
val isSmallLayout = getCellsForSize(minHeight) == 1
val layout = if (context.config.useTextShadow) R.layout.widget_date_time_with_shadow else R.layout.widget_date_time val layout = if (context.config.useTextShadow) R.layout.widget_date_time_with_shadow else R.layout.widget_date_time
RemoteViews(context.packageName, layout).apply { RemoteViews(context.packageName, layout).apply {
updateTexts(context, this, isSmallLayout) updateTexts(context, this)
updateColors(context, this) updateColors(context, this)
setupAppOpenIntent(context, this) setupAppOpenIntent(context, this)
appWidgetManager.updateAppWidget(it, this) appWidgetManager.updateAppWidget(it, this)
@ -44,33 +41,14 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
} }
} }
private fun updateTexts(context: Context, views: RemoteViews, isSmallLayout: Boolean) { private fun updateTexts(context: Context, views: RemoteViews) {
val calendar = Calendar.getInstance()
val use24HourFormat = context.config.use24HourFormat
val timeText = context.getFormattedTime(getPassedSeconds(), false, false).toString() val timeText = context.getFormattedTime(getPassedSeconds(), false, false).toString()
val dimenResource = if (isSmallLayout) R.dimen.widget_time_text_size_small else R.dimen.widget_time_text_size_big val nextAlarm = getFormattedNextAlarm(context)
val timeTextSize = context.resources.getDimension(dimenResource) / context.resources.displayMetrics.density
val topPadding = if (isSmallLayout) 0 else context.resources.getDimension(R.dimen.tiny_margin).toInt()
val bottomPadding = context.resources.getDimension(if (isSmallLayout) R.dimen.tiny_margin else R.dimen.medium_margin).toInt()
views.apply { views.apply {
setViewPadding(R.id.widget_date_time_holder, 0, topPadding, 0, bottomPadding) setText(R.id.widget_time, timeText)
if (use24HourFormat) { setText(R.id.widget_date, context.getFormattedDate(Calendar.getInstance()))
setText(R.id.widget_time, timeText)
} else {
val timeParts = timeText.split(" ")
setText(R.id.widget_time, timeParts[0])
setText(R.id.widget_time_am_pm, " ${timeParts[1]}")
}
setText(R.id.widget_date, context.getFormattedDate(calendar))
setTextSize(R.id.widget_time, timeTextSize)
setVisibleIf(R.id.widget_time_am_pm, !use24HourFormat)
val nextAlarm = getFormattedNextAlarm(context)
setVisibleIf(R.id.widget_alarm_holder, nextAlarm.isNotEmpty())
setText(R.id.widget_next_alarm, nextAlarm) setText(R.id.widget_next_alarm, nextAlarm)
setVisibleIf(R.id.widget_alarm_holder, nextAlarm.isNotEmpty())
} }
} }
@ -82,7 +60,6 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
views.apply { views.apply {
setBackgroundColor(R.id.widget_date_time_holder, widgetBgColor) setBackgroundColor(R.id.widget_date_time_holder, widgetBgColor)
setTextColor(R.id.widget_time, widgetTextColor) setTextColor(R.id.widget_time, widgetTextColor)
setTextColor(R.id.widget_time_am_pm, widgetTextColor)
setTextColor(R.id.widget_date, widgetTextColor) setTextColor(R.id.widget_date, widgetTextColor)
setTextColor(R.id.widget_next_alarm, widgetTextColor) setTextColor(R.id.widget_next_alarm, widgetTextColor)
@ -140,8 +117,8 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
} }
override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) { override fun onAppWidgetOptionsChanged(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int, newOptions: Bundle?) {
performUpdate(context)
super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions) super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
performUpdate(context)
} }
private fun getMultiplyColoredBitmap(resourceId: Int, newColor: Int, context: Context): Bitmap { private fun getMultiplyColoredBitmap(resourceId: Int, newColor: Int, context: Context): Bitmap {
@ -155,12 +132,4 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
canvas.drawBitmap(bmp, 0f, 0f, paint) canvas.drawBitmap(bmp, 0f, 0f, paint)
return bmp return bmp
} }
private fun getCellsForSize(size: Int): Int {
var n = 2
while (70 * n - 30 < size) {
++n
}
return n - 1
}
} }

74
app/src/main/res/layout/widget_date_time.xml
View File

@ -1,70 +1,70 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widget_date_time_holder" android:id="@+id/widget_date_time_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/small_margin"
android:paddingLeft="@dimen/small_margin"
android:paddingRight="@dimen/small_margin">
<RelativeLayout <TextView
android:id="@+id/widget_time_holder" android:id="@+id/widget_time"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:gravity="center_horizontal"> android:layout_weight="4"
android:autoSizeMaxTextSize="300sp"
<TextView android:autoSizeMinTextSize="2sp"
android:id="@+id/widget_time" android:autoSizeStepGranularity="1sp"
android:layout_width="wrap_content" android:autoSizeTextType="uniform"
android:layout_height="wrap_content" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="@dimen/widget_time_text_size_small" android:maxLines="1"
tools:text="00:00"/> android:textSize="@dimen/normal_text_size"
tools:text="00:00"/>
<TextView
android:id="@+id/widget_time_am_pm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/widget_time"
android:layout_toRightOf="@+id/widget_time"
android:includeFontPadding="false"
android:textSize="@dimen/widget_details_text_size"
tools:text=" a.m."/>
</RelativeLayout>
<TextView <TextView
android:id="@+id/widget_date" android:id="@+id/widget_date"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_below="@+id/widget_time_holder" android:layout_weight="1"
android:layout_centerHorizontal="true" android:autoSizeMinTextSize="2sp"
android:gravity="center_horizontal" android:autoSizeStepGranularity="1sp"
android:autoSizeTextType="uniform"
android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textSize="@dimen/widget_details_text_size" android:maxLines="1"
android:textSize="@dimen/normal_text_size"
tools:text="Mon, 1 January"/> tools:text="Mon, 1 January"/>
<RelativeLayout <RelativeLayout
android:id="@+id/widget_alarm_holder" android:id="@+id/widget_alarm_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/widget_alarm_icon_size" android:layout_height="0dp"
android:layout_below="@+id/widget_date" android:layout_weight="1"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<ImageView <ImageView
android:id="@+id/widget_next_alarm_image" android:id="@+id/widget_next_alarm_image"
android:layout_width="@dimen/widget_alarm_icon_size" android:layout_width="@dimen/widget_alarm_icon_size"
android:layout_height="@dimen/widget_alarm_icon_size" android:layout_height="@dimen/widget_alarm_icon_size"
android:layout_alignBottom="@+id/widget_next_alarm"
android:layout_alignTop="@+id/widget_next_alarm"
android:src="@drawable/ic_clock"/> android:src="@drawable/ic_clock"/>
<TextView <TextView
android:id="@+id/widget_next_alarm" android:id="@+id/widget_next_alarm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/widget_next_alarm_image" android:layout_toRightOf="@+id/widget_next_alarm_image"
android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1"
android:paddingLeft="@dimen/small_margin" android:paddingLeft="@dimen/small_margin"
android:textSize="@dimen/widget_details_text_size" android:textSize="@dimen/normal_text_size"
tools:text="Tue, 18:30"/> tools:text="Tue, 18:30"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </LinearLayout>

89
app/src/main/res/layout/widget_date_time_with_shadow.xml
View File

@ -1,82 +1,79 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widget_date_time_holder" android:id="@+id/widget_date_time_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent"
android:orientation="vertical"
<RelativeLayout android:paddingBottom="@dimen/small_margin"
android:id="@+id/widget_time_holder" android:paddingLeft="@dimen/small_margin"
android:layout_width="match_parent" android:paddingRight="@dimen/small_margin">
android:layout_height="wrap_content"
android:gravity="center_horizontal">
<TextView
android:id="@+id/widget_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:shadowColor="@android:color/black"
android:shadowDy="1"
android:shadowRadius="1"
android:textSize="@dimen/widget_time_text_size_small"
tools:text="00:00"/>
<TextView
android:id="@+id/widget_time_am_pm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/widget_time"
android:layout_toRightOf="@+id/widget_time"
android:includeFontPadding="false"
android:shadowColor="@android:color/black"
android:shadowDy="1"
android:shadowRadius="1"
android:textSize="@dimen/widget_details_text_size"
tools:text=" a.m."/>
</RelativeLayout>
<TextView <TextView
android:id="@+id/widget_date" android:id="@+id/widget_time"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_below="@+id/widget_time_holder" android:layout_weight="4"
android:layout_centerHorizontal="true" android:autoSizeMaxTextSize="300sp"
android:gravity="center_horizontal" android:autoSizeMinTextSize="2sp"
android:autoSizeStepGranularity="1sp"
android:autoSizeTextType="uniform"
android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1"
android:shadowColor="@android:color/black" android:shadowColor="@android:color/black"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="1" android:shadowRadius="1"
android:textSize="@dimen/widget_details_text_size" android:textSize="@dimen/normal_text_size"
tools:text="00:00"/>
<TextView
android:id="@+id/widget_date"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:autoSizeMinTextSize="2sp"
android:autoSizeStepGranularity="1sp"
android:autoSizeTextType="uniform"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:shadowColor="@android:color/black"
android:shadowDy="1"
android:shadowRadius="1"
android:textSize="@dimen/normal_text_size"
tools:text="Mon, 1 January"/> tools:text="Mon, 1 January"/>
<RelativeLayout <RelativeLayout
android:id="@+id/widget_alarm_holder" android:id="@+id/widget_alarm_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/widget_alarm_icon_size" android:layout_height="0dp"
android:layout_below="@+id/widget_date" android:layout_weight="1"
android:gravity="center_horizontal"> android:gravity="center_horizontal">
<ImageView <ImageView
android:id="@+id/widget_next_alarm_image" android:id="@+id/widget_next_alarm_image"
android:layout_width="@dimen/widget_alarm_icon_size" android:layout_width="@dimen/widget_alarm_icon_size"
android:layout_height="@dimen/widget_alarm_icon_size" android:layout_height="@dimen/widget_alarm_icon_size"
android:layout_alignBottom="@+id/widget_next_alarm"
android:layout_alignTop="@+id/widget_next_alarm"
android:src="@drawable/ic_clock"/> android:src="@drawable/ic_clock"/>
<TextView <TextView
android:id="@+id/widget_next_alarm" android:id="@+id/widget_next_alarm"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/widget_next_alarm_image" android:layout_toRightOf="@+id/widget_next_alarm_image"
android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1"
android:paddingLeft="@dimen/small_margin" android:paddingLeft="@dimen/small_margin"
android:shadowColor="@android:color/black" android:shadowColor="@android:color/black"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="1" android:shadowRadius="1"
android:textSize="@dimen/widget_details_text_size" android:textSize="@dimen/normal_text_size"
tools:text="Tue, 18:30"/> tools:text="Tue, 18:30"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </LinearLayout>