diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 9faaba0..c76d4cd 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 85c017f..6e0c3e3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 29 - versionCode 91 + versionCode 92 versionName "2.0.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/app-release.aab b/app/release/app-release.aab index 43e5701..8a99ec3 100644 Binary files a/app/release/app-release.aab and b/app/release/app-release.aab differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 89c42be..ab72527 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,8 +23,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme" - tools:ignore="LockedOrientationActivity" - android:fullBackupContent="@xml/backup_descriptor"> + tools:ignore="LockedOrientationActivity"> diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt index a179cc0..7306878 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt @@ -67,7 +67,7 @@ object GlanceProviderHelper { Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> { GlanceProvider(providerId.id, context.getString(R.string.settings_daily_steps_title), - R.drawable.round_steps + R.drawable.round_directions_walk ) } } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt index 130060d..e9b1148 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt @@ -86,7 +86,22 @@ object SettingsStringHelper { return context.getString(R.string.now) } TimeUnit.MILLISECONDS.toHours(difference) < 12 -> { - return DateUtils.getRelativeTimeSpanString(start, now, DateUtils.HOUR_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE).toString() + val minutes = TimeUnit.MILLISECONDS.toMinutes(difference) - 60 * TimeUnit.MILLISECONDS.toHours(difference) + return if (minutes < 1 || minutes > 30) { + DateUtils.getRelativeTimeSpanString( + start, + now - 1000 * 60 * 40, + DateUtils.HOUR_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ).toString() + } else { + DateUtils.getRelativeTimeSpanString( + start, + now, + DateUtils.HOUR_IN_MILLIS, + DateUtils.FORMAT_ABBREV_RELATIVE + ).toString() + } } eventDate.dayOfYear == nowDate.plusDays(1).dayOfYear -> { return String.format("%s", context.getString(R.string.tomorrow)) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt index f9c4e85..acfe878 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt @@ -105,7 +105,7 @@ class UpdatesReceiver : BroadcastReceiver() { } else { setExact( AlarmManager.RTC, - event.startDate - diff.hours * 1000 * 60 * 60, + event.startDate - diff.hours * 1000 * 60 * 60 + if (diff.minutes > 30) (- 30) else (+ 30), PendingIntent.getBroadcast( context, event.eventID.toInt(), diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt index 68f8038..803b698 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt @@ -565,7 +565,6 @@ class MainWidget : AppWidgetProvider() { } } Constants.GlanceProviderId.BATTERY_LEVEL_LOW -> { - Log.d("ciao", "isChargin: ${Preferences.isCharging} ") if (Preferences.showBatteryCharging) { BatteryHelper.updateBatteryInfo(context) if (Preferences.isCharging) { @@ -589,18 +588,14 @@ class MainWidget : AppWidgetProvider() { if (Preferences.customNotes.isNotEmpty()) { v.second_row_icon.isVisible = false v.next_event_date.text = Preferences.customNotes + v.next_event_date.gravity v.next_event_date.maxLines = 2 break@loop } } Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> { if (Preferences.showDailySteps && Preferences.googleFitSteps > 0) { - v.second_row_icon.setImageDrawable( - ContextCompat.getDrawable( - context, - R.drawable.round_steps - ) - ) + v.second_row_icon.isVisible = false v.next_event_date.text = context.getString(R.string.daily_steps_counter).format(Preferences.googleFitSteps) break@loop } diff --git a/app/src/main/res/layout/fragment_calendar_settings.xml b/app/src/main/res/layout/fragment_calendar_settings.xml index 43abe08..7e30fce 100644 --- a/app/src/main/res/layout/fragment_calendar_settings.xml +++ b/app/src/main/res/layout/fragment_calendar_settings.xml @@ -89,6 +89,18 @@ android:id="@+id/calendar_settings" android:alpha="@{isCalendarEnabled ? 1f : 0.2f, default=1}" android:orientation="vertical"> + + + + + + + + + - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_weather_settings.xml b/app/src/main/res/layout/fragment_weather_settings.xml index 694f74e..ca97241 100644 --- a/app/src/main/res/layout/fragment_weather_settings.xml +++ b/app/src/main/res/layout/fragment_weather_settings.xml @@ -112,6 +112,18 @@ android:id="@+id/weather_settings" android:alpha="@{isWeatherVisible ? 1f : 0.2f, default=1}" android:orientation="vertical"> + - - - - - - - + + + + + + + + + Default Minimal Capitalize the date + Providers + First row style + Second row style + Global style + Style + Event filters + Event detail + Actions + Provider + Clock text + Preferences