From 1dc050e77f63b48660e8291c69094e264a059a89 Mon Sep 17 00:00:00 2001 From: Tommaso Berlose Date: Wed, 13 May 2020 18:58:45 +0200 Subject: [PATCH] Update event repository --- app/src/main/AndroidManifest.xml | 1 - .../anotherwidget/db/EventRepository.kt | 16 ++++++++++++++-- .../anotherwidget/helpers/CalendarHelper.kt | 1 - .../receivers/ActivityDetectionReceiver.kt | 1 - .../receivers/BatteryLevelReceiver.kt | 2 -- .../anotherwidget/ui/fragments/MainFragment.kt | 6 +++++- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 15a772e..dfc784b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -131,7 +131,6 @@ - diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt index a7a86a1..55c1a31 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt @@ -40,7 +40,7 @@ class EventRepository(val context: Context) { fun getNextEvent(): Event? { val nextEvent = getEventByEventId(Preferences.nextEventId) - return if (nextEvent != null && nextEvent.endDate > Calendar.getInstance().timeInMillis) { + val event = if (nextEvent != null && nextEvent.endDate > Calendar.getInstance().timeInMillis) { nextEvent } else { val events = getEvents() @@ -53,9 +53,21 @@ class EventRepository(val context: Context) { null } } + return try { + realm.copyFromRealm(event!!) + } catch (ex: Exception) { + event + } } - fun getEventByEventId(id: Long): Event? = realm.where(Event::class.java).equalTo("eventID", id).findFirst() + fun getEventByEventId(id: Long): Event? { + val event = realm.where(Event::class.java).equalTo("eventID", id).findFirst() + return try { + realm.copyFromRealm(event!!) + } catch (ex: Exception) { + event + } + } fun goToNextEvent() { val eventList = getEvents() diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt index a140935..b96f456 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt @@ -68,7 +68,6 @@ object CalendarHelper { for (instance in instances) { try { val e = provider.getEvent(instance.eventId) - Log.d("ciao", "evento: $instance") if (e != null && !e.deleted && instance.begin <= limit.timeInMillis && now.timeInMillis < instance.end && (Preferences.calendarAllDay || !e.allDay) && !getFilteredCalendarIdList().contains( e.calendarId ) && (Preferences.showDeclinedEvents || e.selfAttendeeStatus.toInt() != CalendarContract.Attendees.ATTENDEE_STATUS_DECLINED) diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt index 14d5fa2..eac6de1 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt @@ -30,7 +30,6 @@ class ActivityDetectionReceiver : BroadcastReceiver() { val result = ActivityTransitionResult.extractResult(intent)!! val lastEvent = result.transitionEvents.last() - Log.d("ciao", "activity detected: $lastEvent") if (lastEvent.activityType == DetectedActivity.WALKING || lastEvent.activityType == DetectedActivity.RUNNING && lastEvent.transitionType == ActivityTransition.ACTIVITY_TRANSITION_EXIT) { requestDailySteps(context) } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt index b2944c9..9acba62 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/receivers/BatteryLevelReceiver.kt @@ -15,8 +15,6 @@ class BatteryLevelReceiver : BroadcastReceiver() { Intent.ACTION_BATTERY_OKAY -> Preferences.isBatteryLevelLow = false } MainWidget.updateWidget(context) - - Log.d("ciao", "intent: ${intent}") } } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt index 33a1996..05b0f0c 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt @@ -262,7 +262,11 @@ class MainFragment : Fragment(), SharedPreferences.OnSharedPreferenceChangeList } widget_loader?.animate()?.scaleX(0f)?.scaleY(0f)?.alpha(0f)?.setDuration(200L)?.start() - bitmap_container?.setImageBitmap(bitmap) + bitmap_container?.apply { + setImageBitmap(bitmap) + scaleX = 0.9f + scaleY = 0.9f + } widget?.animate()?.alpha(1f)?.start() } }