dm1sh/another-widget
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix all day events widget date

Browse Source
This commit is contained in:
Tommaso Berlose 2020-05-18 12:44:46 +02:00
parent 5d9bd11abb
commit f7fc31d968
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt
View File

@ -263,7 +263,7 @@ class MainWidget : AppWidgetProvider() {
views.setViewVisibility(R.id.empty_layout_rect, View.GONE) views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE) views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
} else if (GlanceProviderHelper.showGlanceProviders(context)) { } else if (GlanceProviderHelper.showGlanceProviders(context) && v.second_row_icon.isVisible) {
loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) { loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
when (provider) { when (provider) {
Constants.GlanceProviderId.PLAYING_SONG -> { Constants.GlanceProviderId.PLAYING_SONG -> {
@ -530,14 +530,14 @@ class MainWidget : AppWidgetProvider() {
} else { } else {
val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH val flags: Int = DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_NO_YEAR or DateUtils.FORMAT_ABBREV_MONTH
v.next_event_date.text = DateUtils.formatDateTime(context, now.timeInMillis, flags) v.next_event_date.text = DateUtils.formatDateTime(context, nextEvent.startDate, flags)
} }
} }
v.empty_layout.visibility = View.GONE v.empty_layout.visibility = View.GONE
v.calendar_layout.visibility = View.VISIBLE v.calendar_layout.visibility = View.VISIBLE
} else if (GlanceProviderHelper.showGlanceProviders(context)) { } else if (GlanceProviderHelper.showGlanceProviders(context)) {
v.second_row_icon.isVisible = true var showSomething = false
loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) { loop@ for (provider:Constants.GlanceProviderId in GlanceProviderHelper.getGlanceProviders(context)) {
when (provider) { when (provider) {
Constants.GlanceProviderId.PLAYING_SONG -> { Constants.GlanceProviderId.PLAYING_SONG -> {
@ -549,6 +549,7 @@ class MainWidget : AppWidgetProvider() {
) )
) )
v.next_event_date.text = MediaPlayerHelper.getMediaInfo() v.next_event_date.text = MediaPlayerHelper.getMediaInfo()
showSomething = true
break@loop break@loop
} }
} }
@ -561,6 +562,7 @@ class MainWidget : AppWidgetProvider() {
) )
) )
v.next_event_date.text = AlarmHelper.getNextAlarm(context) v.next_event_date.text = AlarmHelper.getNextAlarm(context)
showSomething = true
break@loop break@loop
} }
} }
@ -575,11 +577,13 @@ class MainWidget : AppWidgetProvider() {
} else { } else {
v.next_event_date.text = context.getString(R.string.charging) v.next_event_date.text = context.getString(R.string.charging)
} }
showSomething = true
break@loop break@loop
} else if (Preferences.isBatteryLevelLow) { } else if (Preferences.isBatteryLevelLow) {
v.second_row_icon.isVisible = false v.second_row_icon.isVisible = false
v.next_event_date.text = v.next_event_date.text =
context.getString(R.string.battery_low_warning) context.getString(R.string.battery_low_warning)
showSomething = true
break@loop break@loop
} }
} }
@ -590,6 +594,7 @@ class MainWidget : AppWidgetProvider() {
v.next_event_date.text = Preferences.customNotes v.next_event_date.text = Preferences.customNotes
v.next_event_date.gravity v.next_event_date.gravity
v.next_event_date.maxLines = 2 v.next_event_date.maxLines = 2
showSomething = true
break@loop break@loop
} }
} }
@ -597,15 +602,19 @@ class MainWidget : AppWidgetProvider() {
if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) { if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) {
v.second_row_icon.isVisible = false v.second_row_icon.isVisible = false
v.next_event_date.text = context.getString(R.string.daily_steps_counter).format(Preferences.googleFitSteps) v.next_event_date.text = context.getString(R.string.daily_steps_counter).format(Preferences.googleFitSteps)
showSomething = true
break@loop break@loop
} }
} }
} }
} }
v.next_event.text = DateHelper.getDateText(context, now) if (showSomething) {
v.empty_layout.visibility = View.GONE v.second_row_icon.isVisible = true
v.calendar_layout.visibility = View.VISIBLE v.next_event.text = DateHelper.getDateText(context, now)
v.empty_layout.visibility = View.GONE
v.calendar_layout.visibility = View.VISIBLE
}
} }

2
app/src/main/res/layout/the_widget.xml
View File

@ -183,7 +183,7 @@
android:layout_width="18dp" android:layout_width="18dp"
android:layout_height="18dp" android:layout_height="18dp"
android:id="@+id/weather_icon" android:id="@+id/weather_icon"
android:layout_marginEnd="8dp" android:layout_marginEnd="4dp"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:src="@drawable/clear_night"/> android:src="@drawable/clear_night"/>
<TextView <TextView