Replaced google weather url with yandex

.idea/gradle.xml

@@ -7,13 +7,13 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -61,7 +61,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -4,6 +4,9 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/Another_Widget.iml" filepath="$PROJECT_DIR$/.idea/modules/Another_Widget.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Another_Widget.app.unitTest.iml" />
     </modules>
   </component>
 </project>

app/build.gradle

@@ -1,16 +1,8 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-
-// Apply the Crashlytics Gradle plugin
-apply plugin: 'com.google.firebase.crashlytics'
 
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
-def apikeyPropertiesFile = rootProject.file("apikey.properties")
-def apikeyProperties = new Properties()
-apikeyProperties.load(new FileInputStream(apikeyPropertiesFile))
-
 android {
 
     compileSdkVersion 30
@@ -23,7 +15,6 @@ android {
         versionName "2.3.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField("String", "GOOGLE_API_KEY", apikeyProperties['GOOGLE_API_KEY'])
 
         renderscriptSupportModeEnabled true
     }
@@ -103,17 +94,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
 
-    // Fitness
-    implementation 'com.google.android.gms:play-services-fitness:20.0.0'
-    implementation 'com.google.android.gms:play-services-auth:19.0.0'
-
     //Weather
     implementation 'com.github.KwabenBerko:OpenWeatherMap-Android-Library:2.0.2'
-    implementation 'com.google.android.gms:play-services-location:18.0.0'
-
-    // Billing
-    implementation 'com.android.billingclient:billing:3.0.3'
-    implementation 'com.android.billingclient:billing-ktx:3.0.3'
 
     // KTX
     implementation "androidx.core:core-ktx:1.5.0"
@@ -131,9 +113,6 @@ dependencies {
     //Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1'
 
-    // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:18.0.0'
-
     // Preferences
     implementation 'com.chibatching.kotpref:kotpref:2.13.1'
     implementation 'com.chibatching.kotpref:livedata-support:2.13.1'

app/src/main/AndroidManifest.xml

@@ -37,7 +37,6 @@
         <activity android:name=".ui.activities.tabs.CustomFontActivity" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.tabs.CustomLocationActivity" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.tabs.WeatherProviderActivity" android:screenOrientation="portrait" />
-        <activity android:name=".ui.activities.settings.SupportDevActivity" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.tabs.CustomDateActivity" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.settings.IntegrationsActivity" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.tabs.MusicPlayersFilterActivity" android:screenOrientation="portrait" />
@@ -126,16 +125,6 @@
                 <action android:name="android.intent.action.BATTERY_CHANGED"/>
             </intent-filter>
         </receiver>
-
-        <receiver android:name=".receivers.ActivityDetectionReceiver"
-            android:exported="true"
-            android:permission="com.google.android.gms.permission.ACTIVITY_RECOGNITION">
-            <intent-filter>
-                <action android:name="com.mypackage.ACTION_PROCESS_ACTIVITY_TRANSITIONS" />
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
     </application>
 
     <queries>

app/src/main/java/com/tommasoberlose/anotherwidget/AWApplication.kt

@@ -1,20 +1,14 @@
 package com.tommasoberlose.anotherwidget
 
-import android.Manifest
 import android.app.Application
-import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.chibatching.kotpref.Kotpref
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tommasoberlose.anotherwidget.global.Preferences
 
 class AWApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        // Firebase crashlitycs
-        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG)
-
         // Preferences
         Kotpref.init(this)
 

app/src/main/java/com/tommasoberlose/anotherwidget/components/GlanceSettingsDialog.kt

@@ -6,18 +6,9 @@ import android.app.AlarmManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.view.LayoutInflater
 import androidx.core.view.isVisible
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.karumi.dexter.Dexter
-import com.karumi.dexter.MultiplePermissionsReport
-import com.karumi.dexter.PermissionToken
-import com.karumi.dexter.listener.PermissionRequest
-import com.karumi.dexter.listener.multi.MultiplePermissionsListener
 import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.databinding.GlanceProviderSettingsLayoutBinding
 import com.tommasoberlose.anotherwidget.global.Constants
@@ -26,7 +17,6 @@ import com.tommasoberlose.anotherwidget.helpers.ActiveNotificationsHelper
 import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
 import com.tommasoberlose.anotherwidget.helpers.GreetingsHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
-import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.AppNotificationsFilterActivity
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.MediaInfoFormatActivity
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.MusicPlayersFilterActivity
@@ -90,14 +80,6 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
             checkNextAlarm()
         }
 
-        /* GOOGLE STEPS */
-        binding.actionToggleGoogleFit.isVisible = provider == Constants.GlanceProviderId.GOOGLE_FIT_STEPS
-        if (provider == Constants.GlanceProviderId.GOOGLE_FIT_STEPS) {
-            binding.warningContainer.isVisible = false
-            checkFitnessPermission()
-            checkGoogleFitConnection()
-        }
-
         /* BATTERY INFO */
         if (provider == Constants.GlanceProviderId.BATTERY_LEVEL_LOW) {
             binding.warningContainer.isVisible = false
@@ -193,34 +175,14 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
                             Preferences.showGreetings = isChecked
                             GreetingsHelper.toggleGreetings(context)
                         }
-                        Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-                            if (isChecked) {
-                                val account: GoogleSignInAccount? =
-                                    GoogleSignIn.getLastSignedInAccount(context)
-                                if (!GoogleSignIn.hasPermissions(account,
-                                        ActivityDetectionReceiver.FITNESS_OPTIONS
-                                    )
-                                ) {
-                                    val mGoogleSignInClient =
-                                        GoogleSignIn.getClient(context, GoogleSignInOptions.Builder(
-                                            GoogleSignInOptions.DEFAULT_SIGN_IN).addExtension(
-                                            ActivityDetectionReceiver.FITNESS_OPTIONS
-                                        ).build())
-                                    context.startActivityForResult(mGoogleSignInClient.signInIntent,
-                                        2)
-                                } else {
-                                    Preferences.showDailySteps = true
-                                }
-                            } else {
-                                Preferences.showDailySteps = false
-                            }
-
-                            binding.warningContainer.isVisible = false
-                            checkFitnessPermission()
-                            checkGoogleFitConnection()
-                        }
                         Constants.GlanceProviderId.EVENTS -> {
                             Preferences.showEventsAsGlanceProvider = isChecked
+                            if (isChecked) {
+                                com.tommasoberlose.anotherwidget.db.EventRepository(context).run {
+                                    resetNextEventData()
+                                    close()
+                                }
+                            }
                         }
                         Constants.GlanceProviderId.WEATHER -> {
                             Preferences.showWeatherAsGlanceProvider = isChecked
@@ -327,89 +289,4 @@ class GlanceSettingsDialog(val context: Activity, val provider: Constants.Glance
         }
         statusCallback?.invoke()
     }
-
-    private fun checkFitnessPermission() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(
-                Manifest.permission.ACTIVITY_RECOGNITION)
-        ) {
-            if (Preferences.showDailySteps) {
-                ActivityDetectionReceiver.registerFence(context)
-            } else {
-                ActivityDetectionReceiver.unregisterFence(context)
-            }
-        } else if (Preferences.showDailySteps) {
-            ActivityDetectionReceiver.unregisterFence(context)
-            binding.warningContainer.isVisible = true
-            binding.warningTitle.text = context.getString(R.string.settings_request_fitness_access)
-            binding.warningContainer.setOnClickListener {
-                requireFitnessPermission()
-            }
-        } else {
-            ActivityDetectionReceiver.unregisterFence(context)
-        }
-        statusCallback?.invoke()
-    }
-
-    private fun checkGoogleFitConnection() {
-        val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
-        if (!GoogleSignIn.hasPermissions(account,
-                ActivityDetectionReceiver.FITNESS_OPTIONS
-            )) {
-            binding.warningContainer.isVisible = true
-            binding.warningTitle.text = context.getString(R.string.settings_request_fitness_access)
-            binding.warningContainer.setOnClickListener {
-                GoogleSignIn.requestPermissions(
-                    context,
-                    1,
-                    account,
-                    ActivityDetectionReceiver.FITNESS_OPTIONS)
-            }
-            binding.actionConnectToGoogleFit.isVisible = true
-            binding.actionDisconnectToGoogleFit.isVisible = false
-            binding.actionConnectToGoogleFit.setOnClickListener {
-                GoogleSignIn.requestPermissions(
-                    context,
-                    1,
-                    account,
-                    ActivityDetectionReceiver.FITNESS_OPTIONS)
-            }
-            binding.actionDisconnectToGoogleFit.setOnClickListener(null)
-            binding.googleFitStatusLabel.text = context.getString(R.string.google_fit_account_not_connected)
-        } else {
-            binding.actionConnectToGoogleFit.isVisible = false
-            binding.actionDisconnectToGoogleFit.isVisible = true
-            binding.actionConnectToGoogleFit.setOnClickListener(null)
-            binding.actionDisconnectToGoogleFit.setOnClickListener {
-                GoogleSignIn.getClient(context, GoogleSignInOptions.Builder(
-                    GoogleSignInOptions.DEFAULT_SIGN_IN).addExtension(
-                    ActivityDetectionReceiver.FITNESS_OPTIONS
-                ).build()).signOut().addOnCompleteListener {
-                    show()
-                }
-            }
-            binding.googleFitStatusLabel.text = context.getString(R.string.google_fit_account_connected)
-        }
-    }
-
-    private fun requireFitnessPermission() {
-        Dexter.withContext(context)
-            .withPermissions(
-                "com.google.android.gms.permission.ACTIVITY_RECOGNITION",
-                "android.gms.permission.ACTIVITY_RECOGNITION",
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACTIVITY_RECOGNITION else "com.google.android.gms.permission.ACTIVITY_RECOGNITION"
-            ).withListener(object: MultiplePermissionsListener {
-                override fun onPermissionsChecked(report: MultiplePermissionsReport?) {
-                    checkFitnessPermission()
-                }
-                override fun onPermissionRationaleShouldBeShown(
-                    permissions: MutableList<PermissionRequest>?,
-                    token: PermissionToken?
-                ) {
-                    // Remember to invoke this method when the custom rationale is closed
-                    // or just by default if you don't want to use any custom rationale.
-                    token?.continuePermissionRequest()
-                }
-            })
-            .check()
-    }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt

@@ -27,7 +27,7 @@ class EventRepository(val context: Context) {
         db.runInTransaction{
             db.dao().run {
                 deleteAll()
-                insertAll(eventList)
+                insert(eventList)
             }
         }
     }
@@ -39,12 +39,6 @@ class EventRepository(val context: Context) {
     fun resetNextEventData() {
         Preferences.bulk {
             remove(Preferences::nextEventId)
-            remove(Preferences::nextEventName)
-            remove(Preferences::nextEventStartDate)
-            remove(Preferences::nextEventAllDay)
-            remove(Preferences::nextEventLocation)
-            remove(Preferences::nextEventEndDate)
-            remove(Preferences::nextEventCalendarId)
         }
     }
 
@@ -75,7 +69,7 @@ class EventRepository(val context: Context) {
             val events = getEvents()
             if (events.isNotEmpty()) {
                 val newNextEvent = events.first()
-                Preferences.nextEventId = newNextEvent.id
+                saveNextEventData(newNextEvent)
                 newNextEvent
             } else {
                 resetNextEventData()
@@ -93,9 +87,9 @@ class EventRepository(val context: Context) {
         if (eventList.isNotEmpty()) {
             val index = eventList.indexOfFirst { it.id == Preferences.nextEventId }
             if (index > -1 && index < eventList.size - 1) {
-                Preferences.nextEventId = eventList[index + 1].id
+                saveNextEventData(eventList[index + 1])
             } else {
-                Preferences.nextEventId = eventList.first().id
+                saveNextEventData(eventList.first())
             }
         } else {
             resetNextEventData()
@@ -111,9 +105,9 @@ class EventRepository(val context: Context) {
         if (eventList.isNotEmpty()) {
             val index = eventList.indexOfFirst { it.id == Preferences.nextEventId }
             if (index > 0) {
-                Preferences.nextEventId = eventList[index - 1].id
+                saveNextEventData(eventList[index - 1])
             } else {
-                Preferences.nextEventId = eventList.last().id
+                saveNextEventData(eventList.last())
             }
         } else {
             resetNextEventData()
@@ -125,7 +119,7 @@ class EventRepository(val context: Context) {
     }
 
     fun getFutureEvents(): List<Event> {
-        return db.dao().findFuture(Calendar.getInstance().timeInMillis).applyFilters().sortEvents()
+        return db.dao().find(Calendar.getInstance().timeInMillis).sortEvents()
     }
 
     private fun getEvents(): List<Event> {
@@ -144,7 +138,7 @@ class EventRepository(val context: Context) {
                 else -> add(Calendar.HOUR, 6)
             }
         }
-        return db.dao().find(now, limit.timeInMillis).applyFilters().sortEvents()
+        return db.dao().find(now, limit.timeInMillis).sortEvents()
     }
 
     fun getEventsCount(): Int = getEvents().size
@@ -156,16 +150,16 @@ class EventRepository(val context: Context) {
     @Dao
     interface EventDao {
         @Query("SELECT * FROM events WHERE id = :id LIMIT 1")
-        fun findById(id: Long) : Event?
+        fun findById(id: Long): Event?
 
         @Query("SELECT * FROM events WHERE end_date > :from")
-        fun findFuture(from: Long) : List<Event>
+        fun find(from: Long): List<Event>
 
-        @Query("SELECT * FROM events WHERE end_date > :from and start_date <= :to")
-        fun find(from: Long, to: Long) : List<Event>
+        @Query("SELECT * FROM events WHERE end_date > :from AND start_date <= :to")
+        fun find(from: Long, to: Long): List<Event>
 
         @Insert
-        fun insertAll(events: List<Event>)
+        fun insert(events: List<Event>)
 
         @Query("DELETE FROM events")
         fun deleteAll()

app/src/main/java/com/tommasoberlose/anotherwidget/global/Actions.kt

@@ -10,7 +10,6 @@ object Actions {
     const val ACTION_OPEN_WEATHER_INTENT = "com.tommasoberlose.anotherwidget.action.OPEN_WEATHER_INTENT"
     const val ACTION_GO_TO_NEXT_EVENT = "com.tommasoberlose.anotherwidget.action.GO_TO_NEXT_EVENT"
     const val ACTION_GO_TO_PREVIOUS_EVENT = "com.tommasoberlose.anotherwidget.action.GO_TO_PREVIOUS_EVENT"
-    const val ACTION_REPORT_CRASH = "com.tommasoberlose.anotherwidget.action.REPORT_CRASH"
     const val ACTION_CLEAR_NOTIFICATION = "com.tommasoberlose.anotherwidget.action.CLEAR_NOTIFICATION"
     const val ACTION_UPDATE_GREETINGS = "com.tommasoberlose.anotherwidget.action.UPDATE_GREETINGS"
 

app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt

@@ -23,12 +23,6 @@ object Preferences : KotprefModel() {
     var calendarFilter by stringPref(key = "PREF_CALENDAR_FILTER", default = "")
 
     var nextEventId by longPref(key = "PREF_NEXT_EVENT_ID", default = -1)
-    var nextEventName by stringPref(key = "PREF_NEXT_EVENT_NAME")
-    var nextEventStartDate by longPref(key = "PREF_NEXT_EVENT_START_DATE")
-    var nextEventAllDay by booleanPref(key = "PREF_NEXT_EVENT_ALL_DAY")
-    var nextEventLocation by stringPref(key = "PREF_NEXT_EVENT_LOCATION")
-    var nextEventEndDate by longPref(key = "PREF_NEXT_EVENT_END_DATE")
-    var nextEventCalendarId by intPref(key = "PREF_NEXT_EVENT_CALENDAR_ID")
     var customLocationLat by stringPref(key = "PREF_CUSTOM_LOCATION_LAT", default = "")
     var customLocationLon by stringPref(key = "PREF_CUSTOM_LOCATION_LON", default = "")
     var customLocationAdd by stringPref(key = "PREF_CUSTOM_LOCATION_ADD", default = "")

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/AlarmHelper.kt

@@ -5,9 +5,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.text.format.DateFormat
-import android.util.Log
 import com.tommasoberlose.anotherwidget.global.Actions
-import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
 import com.tommasoberlose.anotherwidget.utils.setExactIfCanSchedule
 import java.text.SimpleDateFormat

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/BitmapHelper.kt

@@ -4,11 +4,9 @@ import android.content.Context
 import android.graphics.*
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-import android.util.Log
 import android.view.View
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 
 
 object BitmapHelper {
@@ -39,15 +37,6 @@ object BitmapHelper {
             1
         }
 
-        if (draw) {
-            FirebaseCrashlytics.getInstance().setCustomKey("WIDTH SPEC", measuredWidth)
-            FirebaseCrashlytics.getInstance().setCustomKey("HEIGHT SPEC", measuredHeight)
-            FirebaseCrashlytics.getInstance().setCustomKey("VIEW measuredWidth", view.measuredWidth)
-            FirebaseCrashlytics.getInstance().setCustomKey("VIEW measuredHeight", view.measuredHeight)
-            FirebaseCrashlytics.getInstance().setCustomKey("WIDGET final width", widgetWidth)
-            FirebaseCrashlytics.getInstance().setCustomKey("WIDGET final height", widgetHeight)
-        }
-
         return try {
             val btm = Bitmap.createBitmap(
                 widgetWidth,
@@ -64,7 +53,6 @@ object BitmapHelper {
             }
             btm
         } catch (ex: Exception) {
-            FirebaseCrashlytics.getInstance().recordException(ex)
             Bitmap.createBitmap(5, 5, Bitmap.Config.ALPHA_8)
         }
     }

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WidgetHelper.kt

@@ -6,17 +6,10 @@ import android.content.res.Configuration.ORIENTATION_PORTRAIT
 import android.graphics.Typeface
 import android.os.Handler
 import android.os.HandlerThread
-import android.os.Looper
-import android.util.Log
 import androidx.core.provider.FontRequest
 import androidx.core.provider.FontsContractCompat
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Preferences
-import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
-import com.tommasoberlose.anotherwidget.utils.toPixel
-import kotlin.math.min
 
 object WidgetHelper {
     class WidgetSizeProvider(
@@ -36,8 +29,6 @@ object WidgetHelper {
             )
             val widthInPx = context.dip(width)
             val heightInPx = context.dip(height)
-            FirebaseCrashlytics.getInstance().setCustomKey("widthInPx", widthInPx)
-            FirebaseCrashlytics.getInstance().setCustomKey("heightInPx", heightInPx)
             return widthInPx to heightInPx
         }
 

app/src/main/java/com/tommasoberlose/anotherwidget/receivers/ActivityDetectionReceiver.kt

@@ -1,197 +0,0 @@
-package com.tommasoberlose.anotherwidget.receivers
-
-import android.Manifest
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.util.Log
-import com.chibatching.kotpref.Kotpref
-import com.chibatching.kotpref.blockingBulk
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount
-import com.google.android.gms.fitness.Fitness
-import com.google.android.gms.fitness.FitnessOptions
-import com.google.android.gms.fitness.data.DataType
-import com.google.android.gms.fitness.data.Field.FIELD_STEPS
-import com.google.android.gms.fitness.request.DataReadRequest
-import com.google.android.gms.location.*
-import com.tommasoberlose.anotherwidget.global.Preferences
-import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
-import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
-import com.tommasoberlose.anotherwidget.utils.setExactIfCanSchedule
-import java.util.*
-import java.util.concurrent.TimeUnit
-
-
-class ActivityDetectionReceiver : BroadcastReceiver() {
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (ActivityTransitionResult.hasResult(intent)) {
-            val result = ActivityTransitionResult.extractResult(intent)!!
-            val lastEvent = result.transitionEvents.last()
-
-            if ((lastEvent.activityType == DetectedActivity.WALKING || lastEvent.activityType == DetectedActivity.RUNNING) && lastEvent.transitionType == ActivityTransition.ACTIVITY_TRANSITION_EXIT) {
-                requestDailySteps(context)
-            }
-        } else {
-            if ((intent.action == Intent.ACTION_BOOT_COMPLETED || intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) && Preferences.showDailySteps && (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(Manifest.permission.ACTIVITY_RECOGNITION))) {
-                resetDailySteps(context)
-                registerFence(context)
-            } else {
-                resetDailySteps(context)
-            }
-        }
-    }
-
-    companion object {
-        val FITNESS_OPTIONS: FitnessOptions = FitnessOptions.builder()
-            .addDataType(DataType.TYPE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
-            .addDataType(DataType.AGGREGATE_STEP_COUNT_DELTA, FitnessOptions.ACCESS_READ)
-            .build()
-
-        fun registerFence(context: Context) {
-            Kotpref.init(context)
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || context.checkGrantedPermission(
-                    Manifest.permission.ACTIVITY_RECOGNITION)) {
-                val transitions = mutableListOf<ActivityTransition>()
-
-                transitions +=
-                    ActivityTransition.Builder()
-                        .setActivityType(DetectedActivity.WALKING)
-                        .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
-                        .build()
-
-                transitions +=
-                    ActivityTransition.Builder()
-                        .setActivityType(DetectedActivity.RUNNING)
-                        .setActivityTransition(ActivityTransition.ACTIVITY_TRANSITION_EXIT)
-                        .build()
-
-                val request = ActivityTransitionRequest(transitions)
-
-                // myPendingIntent is the instance of PendingIntent where the app receives callbacks.
-                val task = ActivityRecognition.getClient(context)
-                    .requestActivityTransitionUpdates(
-                        request,
-                        PendingIntent.getBroadcast(
-                            context,
-                            2,
-                            Intent(context, ActivityDetectionReceiver::class.java),
-                            PendingIntent.FLAG_IMMUTABLE
-                        )
-                    )
-
-                task.addOnFailureListener { e: Exception ->
-                    e.printStackTrace()
-                    Preferences.showDailySteps = false
-                }
-
-            }
-        }
-
-        fun unregisterFence(context: Context) {
-            val task = ActivityRecognition.getClient(context)
-                .removeActivityTransitionUpdates(
-                    PendingIntent.getBroadcast(
-                        context,
-                        2,
-                        Intent(context, ActivityDetectionReceiver::class.java),
-                        PendingIntent.FLAG_IMMUTABLE
-                    )
-                )
-
-            task.addOnCompleteListener {
-                if (it.isSuccessful) {
-                    PendingIntent.getBroadcast(
-                        context,
-                        2,
-                        Intent(context, ActivityDetectionReceiver::class.java),
-                        PendingIntent.FLAG_IMMUTABLE
-                    ).cancel()
-                }
-            }
-
-            resetDailySteps(context)
-            clearTimeout(context)
-        }
-
-        fun requestDailySteps(context: Context) {
-            Kotpref.init(context)
-
-            val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(context)
-            if (account != null && GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
-
-                val cal: Calendar = Calendar.getInstance()
-                cal.set(Calendar.HOUR_OF_DAY, 0)
-                cal.set(Calendar.MINUTE, 0)
-                cal.set(Calendar.SECOND, 0)
-                cal.set(Calendar.MILLISECOND, 0)
-                val startTime: Long = cal.timeInMillis
-
-                cal.add(Calendar.DAY_OF_YEAR, 1)
-                val endTime: Long = cal.timeInMillis
-                
-                val readRequest = DataReadRequest.Builder()
-                    .aggregate(DataType.TYPE_STEP_COUNT_DELTA)
-                    .aggregate(DataType.AGGREGATE_STEP_COUNT_DELTA)
-                    .setTimeRange(startTime, endTime, TimeUnit.MILLISECONDS)
-                    .bucketByTime(1, TimeUnit.DAYS)
-                    .build()
-
-                Fitness.getHistoryClient(context, account)
-                    .readData(readRequest)
-                    .addOnSuccessListener { response ->
-                        Preferences.googleFitSteps = response.buckets.sumBy {
-                            try {
-                                it.getDataSet(DataType.AGGREGATE_STEP_COUNT_DELTA)?.dataPoints?.get(
-                                    0
-                                )?.getValue(FIELD_STEPS)?.asInt() ?: 0
-                            } catch (ex: Exception) {
-                                0
-                            }
-                        }.toLong()
-                        MainWidget.updateWidget(context)
-                        setTimeout(context)
-                    }
-            }
-        }
-
-        private fun resetDailySteps(context: Context) {
-            Kotpref.init(context)
-            Preferences.blockingBulk {
-                remove(Preferences::googleFitSteps)
-            }
-        }
-
-        private fun setTimeout(context: Context) {
-            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
-                setExactIfCanSchedule(
-                    AlarmManager.RTC,
-                    Calendar.getInstance().timeInMillis + 5 * 60 * 1000,
-                    PendingIntent.getBroadcast(
-                        context,
-                        5,
-                        Intent(context, ActivityDetectionReceiver::class.java),
-                        PendingIntent.FLAG_IMMUTABLE
-                    )
-                )
-            }
-        }
-
-        private fun clearTimeout(context: Context) {
-            with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
-                cancel(
-                    PendingIntent.getBroadcast(
-                        context,
-                        5,
-                        Intent(context, ActivityDetectionReceiver::class.java),
-                        PendingIntent.FLAG_IMMUTABLE
-                    )
-                )
-            }
-        }
-    }
-}

app/src/main/java/com/tommasoberlose/anotherwidget/receivers/WidgetClickListenerReceiver.kt

@@ -24,7 +24,11 @@ class WidgetClickListenerReceiver : BroadcastReceiver() {
                 }
             } catch (e: Exception) {
                 e.printStackTrace()
-                val uri = Uri.parse("https://www.google.com/search?q=weather")
+                val uri = Uri.parse("https://yandex.ru/pogoda")
+                    .buildUpon()
+                    .appendQueryParameter("lat", Preferences.customLocationLat)
+                    .appendQueryParameter("lon", Preferences.customLocationLon)
+                    .build()
                 val i = Intent(Intent.ACTION_VIEW, uri)
                 i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                 try {

app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarWorker.kt

@@ -66,11 +66,11 @@ class UpdateCalendarWorker(context: Context, params: WorkerParameters) : Worker(
                         limit.timeInMillis + limit.timeZone.getOffset(limit.timeInMillis).coerceAtLeast(0)
                     )
                     if (data != null) {
-                        val instances = data.list
-                        for (instance in instances) {
+                        val filteredCalendarIdList = CalendarHelper.getFilteredCalendarIdList()
+                        for (instance in data.list) {
                             try {
                                 val e = provider.getEvent(instance.eventId)
-                                if (e == null || e.deleted || CalendarHelper.getFilteredCalendarIdList().contains(e.calendarId))
+                                if (e == null || e.deleted || filteredCalendarIdList.contains(e.calendarId))
                                     continue
                                 if (e.allDay) {
                                     val start = Calendar.getInstance()
@@ -131,8 +131,12 @@ class UpdateCalendarWorker(context: Context, params: WorkerParameters) : Worker(
                         eventRepository.resetNextEventData()
                         eventRepository.clearEvents()
                     } else {
-                        eventRepository.saveEvents(sortedEvents)
-                        eventRepository.saveNextEventData(filteredEventList.first())
+                        val first = filteredEventList.first()
+                        if (Preferences.nextEventId != first.id && (
+                            //Preferences.showWeatherAsGlanceProvider || !Preferences.showNextEvent ||
+                            eventRepository.getEventById(first.id)?.startDate != first.startDate))
+                            eventRepository.saveNextEventData(first)
+                        eventRepository.saveEvents(filteredEventList)
                     }
                 } catch (ignored: java.lang.Exception) {
                 }

app/src/main/java/com/tommasoberlose/anotherwidget/services/WeatherWorker.kt

@@ -10,16 +10,11 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import com.google.android.gms.common.ConnectionResult
-import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.gms.location.LocationServices
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import java.util.concurrent.TimeUnit
-import kotlin.coroutines.resume
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 
 class WeatherWorker(context: Context, params: WorkerParameters) : CoroutineWorker(context, params) {
@@ -29,27 +24,17 @@ class WeatherWorker(context: Context, params: WorkerParameters) : CoroutineWorke
         if (Preferences.customLocationAdd == "" &&
             context.checkGrantedPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
         ) {
-            if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context)
-                == ConnectionResult.SUCCESS
-            ) {
-                suspendCancellableCoroutine { continuation ->
-                    LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnCompleteListener {
-                        continuation.resume(if (it.isSuccessful) it.result else null)
-                    }
+            val lm = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+            var location: Location? = null
+            for (provider in lm.getProviders(true)) {
+                lm.getLastKnownLocation(provider)?.let {
+                    if (location == null ||
+                        it.time - location!!.time > 2 * 60 * 1000 ||
+                        (it.time - location!!.time > -2 * 60 * 1000 && it.accuracy < location!!.accuracy))
+                        location = it
                 }
-            } else {
-                val lm = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-                var location: Location? = null
-                for (provider in lm.getProviders(true)) {
-                    lm.getLastKnownLocation(provider)?.let {
-                        if (location == null ||
-                            it.time - location!!.time > 2 * 60 * 1000 ||
-                            (it.time - location!!.time > -2 * 60 * 1000 && it.accuracy < location!!.accuracy))
-                            location = it
-                    }
-                }
-                location
-            }?.let { location ->
+            }
+            location?.let { location ->
                 Preferences.customLocationLat = location.latitude.toString()
                 Preferences.customLocationLon = location.longitude.toString()
             }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/settings/SupportDevActivity.kt

@@ -1,96 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.activities.settings
-
-import android.os.Bundle
-import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.isVisible
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.android.billingclient.api.*
-import com.android.billingclient.api.BillingClient.BillingResponseCode.OK
-import com.android.billingclient.api.BillingClient.BillingResponseCode.USER_CANCELED
-import com.tommasoberlose.anotherwidget.R
-import com.tommasoberlose.anotherwidget.databinding.ActivitySupportDevBinding
-import com.tommasoberlose.anotherwidget.ui.viewmodels.settings.SupportDevViewModel
-import com.tommasoberlose.anotherwidget.utils.toast
-import net.idik.lib.slimadapter.SlimAdapter
-
-class SupportDevActivity : AppCompatActivity(), PurchasesUpdatedListener {
-
-    private lateinit var viewModel: SupportDevViewModel
-    private lateinit var adapter: SlimAdapter
-    private lateinit var binding: ActivitySupportDevBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        viewModel = ViewModelProvider(this).get(SupportDevViewModel::class.java)
-        viewModel.billingClient = BillingClient.newBuilder(this).enablePendingPurchases().setListener(this).build()
-        binding = ActivitySupportDevBinding.inflate(layoutInflater)
-
-
-        binding.listView.setHasFixedSize(true)
-        val mLayoutManager = LinearLayoutManager(this)
-        binding.listView.layoutManager = mLayoutManager
-
-        adapter = SlimAdapter.create()
-        adapter
-            .register<SkuDetails>(R.layout.inapp_product_layout) { item, injector ->
-                item.sku
-                injector
-                    .with<TextView>(R.id.product_title) {
-                        it.text = when (item.sku) {
-                            "donation_coffee" -> getString(R.string.donation_coffee)
-                            "donation_donuts" -> getString(R.string.donation_donuts)
-                            "donation_breakfast" -> getString(R.string.donation_breakfast)
-                            "donation_lunch" -> getString(R.string.donation_lunch)
-                            else -> ""
-                        }
-                    }
-                    .text(R.id.product_price, item.price)
-                    .clicked(R.id.item) {
-                        viewModel.purchase(this, item)
-                    }
-            }
-            .attachTo(binding.listView)
-
-        viewModel.openConnection()
-        subscribeUi(viewModel)
-
-        binding.actionBack.setOnClickListener {
-            onBackPressed()
-        }
-
-        setContentView(binding.root)
-    }
-
-    private fun subscribeUi(viewModel: SupportDevViewModel) {
-        viewModel.products.observe(this, Observer {
-            if (it.isNotEmpty()) {
-                binding.loader.isVisible = false
-            }
-            adapter.updateData(it.sortedWith(compareBy(SkuDetails::getPriceAmountMicros)))
-        })
-    }
-
-    override fun onPurchasesUpdated(billingResult: BillingResult, purchases: List<Purchase>?) {
-        if (billingResult.responseCode == OK && purchases != null) {
-            for (purchase in purchases) {
-                if (purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
-                    viewModel.handlePurchase(purchase)
-                    toast(getString(R.string.thanks))
-                }
-            }
-        } else if (billingResult.responseCode == USER_CANCELED) {
-            // DO nothing
-        } else {
-            toast(getString(R.string.error))
-        }
-    }
-
-    public override fun onDestroy() {
-        viewModel.closeConnection()
-        super.onDestroy()
-    }
-}

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt

@@ -8,13 +8,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.Navigation
-import androidx.transition.TransitionInflater
 import com.google.android.material.transition.MaterialSharedAxis
 import com.karumi.dexter.Dexter
 import com.karumi.dexter.MultiplePermissionsReport
@@ -32,13 +29,10 @@ import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
 import com.tommasoberlose.anotherwidget.ui.activities.settings.IntegrationsActivity
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
-import com.tommasoberlose.anotherwidget.ui.activities.settings.SupportDevActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
-import com.tommasoberlose.anotherwidget.utils.ignoreExceptions
 import com.tommasoberlose.anotherwidget.utils.openURI
 import com.tommasoberlose.anotherwidget.utils.setOnSingleClickListener
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
@@ -197,10 +191,6 @@ class SettingsFragment : Fragment() {
             requireActivity().openURI("https://github.com/tommasoberlose/another-widget/blob/master/privacy-policy.md")
         }
 
-        binding.actionHelpDev.setOnClickListener {
-            startActivity(Intent(requireContext(), SupportDevActivity::class.java))
-        }
-
         binding.actionRefreshWidget.setOnClickListener {
             binding.actionRefreshIcon
                 .animate()

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/GesturesFragment.kt

@@ -144,6 +144,12 @@ class GesturesFragment : Fragment() {
 
         binding.showMultipleEventsToggle.setOnCheckedChangeListener { _, isChecked ->
             Preferences.showNextEvent = isChecked
+            if (!isChecked) {
+                com.tommasoberlose.anotherwidget.db.EventRepository(requireContext()).run {
+                    resetNextEventData()
+                    close()
+                }
+            }
         }
 
         binding.actionOpenEventDetails.setOnClickListener {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/tabs/GlanceTabFragment.kt

@@ -8,26 +8,20 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.Canvas
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AnimationUtils
-import android.view.animation.LayoutAnimationController
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.view.ViewCompat
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInAccount
-import com.google.android.gms.common.api.ApiException
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.transition.MaterialSharedAxis
 import com.tommasoberlose.anotherwidget.R
@@ -41,8 +35,6 @@ import com.tommasoberlose.anotherwidget.helpers.AlarmHelper
 import com.tommasoberlose.anotherwidget.helpers.GlanceProviderHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.models.GlanceProvider
-import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver
-import com.tommasoberlose.anotherwidget.receivers.ActivityDetectionReceiver.Companion.FITNESS_OPTIONS
 import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.utils.*
@@ -238,40 +230,6 @@ class GlanceTabFragment : Fragment() {
                         injector.visibility(R.id.info_icon, View.VISIBLE)
                         isVisible = Preferences.customNotes != ""
                     }
-                    Constants.GlanceProviderId.GOOGLE_FIT_STEPS -> {
-                        val account: GoogleSignInAccount? = GoogleSignIn.getLastSignedInAccount(
-                            context
-                        )
-                        if (GoogleSignIn.hasPermissions(
-                                account,
-                                FITNESS_OPTIONS
-                            ) && (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q || requireActivity().checkGrantedPermission(
-                                Manifest.permission.ACTIVITY_RECOGNITION
-                            ))
-                        ) {
-                            injector.text(
-                                R.id.label,
-                                if (Preferences.showDailySteps) getString(R.string.settings_visible) else getString(
-                                    R.string.settings_not_visible
-                                )
-                            )
-                            injector.visibility(R.id.error_icon, View.GONE)
-                            injector.visibility(R.id.info_icon, View.VISIBLE)
-                            isVisible = Preferences.showDailySteps
-                        } else if (Preferences.showDailySteps) {
-                            ActivityDetectionReceiver.unregisterFence(requireContext())
-                            injector.visibility(R.id.error_icon, View.VISIBLE)
-                            injector.visibility(R.id.info_icon, View.GONE)
-                            injector.text(R.id.label, getString(R.string.settings_not_visible))
-                            isVisible = false
-                        } else {
-                            ActivityDetectionReceiver.unregisterFence(requireContext())
-                            injector.text(R.id.label, getString(R.string.settings_not_visible))
-                            injector.visibility(R.id.error_icon, View.GONE)
-                            injector.visibility(R.id.info_icon, View.VISIBLE)
-                            isVisible = false
-                        }
-                    }
                     Constants.GlanceProviderId.EVENTS -> {
                         isVisible =
                             Preferences.showEventsAsGlanceProvider
@@ -491,30 +449,6 @@ class GlanceTabFragment : Fragment() {
                     Preferences.showDailySteps = false
                 }
 
-                if (dialog != null) {
-                    dialog?.show()
-                }
-            }
-            2 -> {
-                try {
-                    val account: GoogleSignInAccount? = GoogleSignIn.getSignedInAccountFromIntent(
-                        data
-                    ).getResult(ApiException::class.java)
-                    if (!GoogleSignIn.hasPermissions(account, FITNESS_OPTIONS)) {
-                        GoogleSignIn.requestPermissions(
-                            requireActivity(),
-                            1,
-                            account,
-                            FITNESS_OPTIONS
-                        )
-                    } else {
-                        adapter.notifyItemRangeChanged(0, adapter.data.size)
-                    }
-                } catch (e: ApiException) {
-                    e.printStackTrace()
-                    Preferences.showDailySteps = false
-                }
-
                 if (dialog != null) {
                     dialog?.show()
                 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/settings/SupportDevViewModel.kt

@@ -1,69 +0,0 @@
-package com.tommasoberlose.anotherwidget.ui.viewmodels.settings
-
-import android.app.Activity
-import android.content.Context
-import android.util.Log
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.android.billingclient.api.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class SupportDevViewModel : ViewModel() {
-
-    lateinit var billingClient: BillingClient
-    val products: MutableLiveData<List<SkuDetails>> = MutableLiveData(emptyList())
-
-    fun openConnection() {
-
-        billingClient.startConnection(object : BillingClientStateListener {
-            override fun onBillingSetupFinished(billingResult: BillingResult) {
-                if (billingResult.responseCode ==  BillingClient.BillingResponseCode.OK) {
-                    val params = SkuDetailsParams.newBuilder()
-                    params.setSkusList(listOf("donation_coffee", "donation_donuts", "donation_breakfast", "donation_lunch", "donation_dinner")).setType(BillingClient.SkuType.INAPP)
-                    viewModelScope.launch(Dispatchers.IO) {
-                        val skuDetailsList = billingClient.querySkuDetails(params.build()).skuDetailsList
-                        withContext(Dispatchers.Main) {
-                            products.value = skuDetailsList
-                        }
-                    }
-                }
-            }
-            override fun onBillingServiceDisconnected() {
-                // Try to restart the connection on the next request to
-                // Google Play by calling the startConnection() method.
-            }
-        })
-    }
-
-    fun purchase(activity: Activity, product: SkuDetails) {
-        val flowParams = BillingFlowParams.newBuilder()
-            .setSkuDetails(product)
-            .build()
-        billingClient.launchBillingFlow(activity, flowParams)
-    }
-
-    fun handlePurchase(purchase: Purchase) {
-        if (!purchase.isAcknowledged) {
-            viewModelScope.launch(Dispatchers.IO) {
-                val token = purchase.purchaseToken
-                val acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder()
-                    .setPurchaseToken(token)
-                billingClient.acknowledgePurchase(acknowledgePurchaseParams.build())
-
-                val consumeParams =
-                    ConsumeParams.newBuilder()
-                        .setPurchaseToken(token)
-                        .build()
-                billingClient.consumePurchase(consumeParams)
-            }
-        }
-    }
-
-    fun closeConnection() {
-        billingClient.endConnection()
-    }
-}

app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/tabs/CustomFontViewModel.kt

@@ -9,10 +9,9 @@ import androidx.lifecycle.viewModelScope
 import com.koolio.library.DownloadableFontList
 import com.koolio.library.Font
 import com.koolio.library.FontList
-import com.tommasoberlose.anotherwidget.BuildConfig
+//import com.tommasoberlose.anotherwidget.BuildConfig
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class CustomFontViewModel(application: Application) : AndroidViewModel(application) {
 
@@ -34,7 +33,7 @@ class CustomFontViewModel(application: Application) : AndroidViewModel(applicati
                     }
                 }
 
-            DownloadableFontList.requestDownloadableFontList(fontListCallback, BuildConfig.GOOGLE_API_KEY)
+//            DownloadableFontList.requestDownloadableFontList(fontListCallback, BuildConfig.GOOGLE_API_KEY)
         }
     }
 }

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt

@@ -6,12 +6,10 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
-import android.text.format.DateUtils
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.*
 import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
@@ -496,8 +494,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                             context,
                             now.timeInMillis,
                             nextEvent.startDate
-                        )
-                            .toLowerCase(Locale.getDefault())
+                        ).toLowerCase(Locale.getDefault())
                     } else {
                         SettingsStringHelper.getAllDayEventDifferenceText(
                             context,
@@ -510,7 +507,18 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                     if (!Preferences.showNextEventOnMultipleLines) {
                         bindingView.nextEventDifferenceTime.isVisible = true
                     } else {
-                        bindingView.nextEvent.text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, diffTime)
+                        val text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, diffTime)
+                        if (text.endsWith(diffTime)) {
+                            bindingView.nextEvent.addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ ->
+                                (v as TextView).layout?.run {
+                                    val diff = diffTime.trimStart();
+                                    val diffStart = text.length - diff.length
+                                    if (getLineStart(lineCount - 1) > diffStart)
+                                        v.text = (text.substring(0, diffStart).trimEnd() + '\n' + diff)
+                                }
+                            }
+                        }
+                        bindingView.nextEvent.text = text
                         bindingView.nextEventDifferenceTime.isVisible = false
                     }
                 } else {
@@ -577,11 +585,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                     } else {
                         val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
 
-                        bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(
-                                Calendar.DAY_OF_YEAR)) {
-                            DateHelper.getDateText(context, start)
-                        } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(
-                                Calendar.YEAR) > start.get(Calendar.YEAR)) {
+                        bindingView.subLineText.text = if (now.after(start)) {
                             DateHelper.getDateText(context, now)
                         } else {
                             DateHelper.getDateText(context, start)
@@ -716,8 +720,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                                             context,
                                             now.timeInMillis,
                                             nextEvent.startDate
-                                        )
-                                            .toLowerCase(Locale.getDefault())
+                                        ).toLowerCase(Locale.getDefault())
                                     } else {
                                         SettingsStringHelper.getAllDayEventDifferenceText(
                                             context,

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt

@@ -11,7 +11,6 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.ColorHelper
 import com.tommasoberlose.anotherwidget.helpers.IntentHelper
 import com.tommasoberlose.anotherwidget.utils.isDarkTheme
-import com.tommasoberlose.anotherwidget.utils.toPixel
 
 class ClockWidget(val context: Context) {
     fun updateClockView(views: RemoteViews, widgetID: Int): RemoteViews {

app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt

@@ -6,12 +6,10 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
-import android.text.format.DateUtils
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.RemoteViews
 import android.widget.TextView
@@ -528,8 +526,7 @@ class StandardWidget(val context: Context) {
                             context,
                             now.timeInMillis,
                             nextEvent.startDate
-                        )
-                            .toLowerCase(Locale.getDefault())
+                        ).toLowerCase(Locale.getDefault())
                     } else {
                         SettingsStringHelper.getAllDayEventDifferenceText(
                             context,
@@ -542,7 +539,18 @@ class StandardWidget(val context: Context) {
                     if (!Preferences.showNextEventOnMultipleLines) {
                         bindingView.nextEventDifferenceTime.isVisible = true
                     } else {
-                        bindingView.nextEvent.text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, diffTime)
+                        val text = context.getString(R.string.events_glance_provider_format).format(nextEvent.title, diffTime)
+                        if (text.endsWith(diffTime)) {
+                            bindingView.nextEvent.addOnLayoutChangeListener { v, _, _, _, _, _, _, _, _ ->
+                                (v as TextView).layout?.run {
+                                    val diff = diffTime.trimStart();
+                                    val diffStart = text.length - diff.length
+                                    if (getLineStart(lineCount - 1) > diffStart)
+                                        v.text = (text.substring(0, diffStart).trimEnd() + '\n' + diff)
+                                }
+                            }
+                        }
+                        bindingView.nextEvent.text = text
                         bindingView.nextEventDifferenceTime.isVisible = false
                     }
                 } else {
@@ -609,11 +617,7 @@ class StandardWidget(val context: Context) {
                     } else {
                         val start = Calendar.getInstance().apply { timeInMillis = nextEvent.startDate }
 
-                        bindingView.subLineText.text = if (now.get(Calendar.DAY_OF_YEAR) == start.get(
-                                Calendar.DAY_OF_YEAR)) {
-                            DateHelper.getDateText(context, start)
-                        } else if (now.get(Calendar.DAY_OF_YEAR) > start.get(Calendar.DAY_OF_YEAR) || now.get(
-                                Calendar.YEAR) > start.get(Calendar.YEAR)) {
+                        bindingView.subLineText.text = if (now.after(start)) {
                             DateHelper.getDateText(context, now)
                         } else {
                             DateHelper.getDateText(context, start)
@@ -748,8 +752,7 @@ class StandardWidget(val context: Context) {
                                             context,
                                             now.timeInMillis,
                                             nextEvent.startDate
-                                        )
-                                            .toLowerCase(Locale.getDefault())
+                                        ).toLowerCase(Locale.getDefault())
                                     } else {
                                         SettingsStringHelper.getAllDayEventDifferenceText(
                                             context,

app/src/main/res/values-es/strings.xml

@@ -118,14 +118,6 @@
     <string name="api_key_hint">Clave de API de OpenWeather</string>
     <string name="default_weather_app">Clima de Google</string>
     <string name="weather_warning">El clima de Google Awareness está obsoleto. ahora se requiere de una clave de API de OpenWeather para mostrar el clima en el widget.</string>
-    <string name="api_key_title_1">Registrarse para obtener una cuenta de OpenWeather</string>
-    <string name="api_key_subtitle_1">Registra una cuenta gratis en OpenWeather. Solo tomará unos minutos.</string>
-    <string name="api_key_title_2">Copia tu clave de API</string>
-    <string name="api_key_subtitle_2">Encuentra el menu de claves API en los ajustes de tu cuenta y copia la clave predeterminada.</string>
-    <string name="api_key_title_3">Ingresa la clave a la app</string>
-    <string name="api_key_subtitle_3">Pega la clave en el campo de debajo y guárdalo. Una vez la clave sea activada el clima será visible.</string>
-    <string name="action_open_provider">Ir a OpenWeatherMap.com</string>
-    <string name="api_key_info_all_set">La activación de tu clave de API puede llegar a tomar unos diez minutos. El clima se actualizará tan pronto esté disponible.</string>
     <string name="settings_weather_icon_pack_title">Paquete de iconos</string>
     <string name="settings_weather_icon_pack_default">Paquete de iconos %d</string>
     <string name="background_location_warning">Cuando el GPS está encendido, recolectamos los datos de la ubicación para actualizar la información del clima cuando la app está cerrada o no está en uso.\nNo usaremos esos datos en caso contrario.</string>

app/src/main/res/values-in/strings.xml

@@ -97,14 +97,6 @@
     <string name="api_key_hint">Kunci API OpenWeather</string>
     <string name="default_weather_app">Google Weather</string>
     <string name="weather_warning">Layanan cuaca Google Awareness telah ditutup. Sekarang membutuhkan Kunci API OpenWeather untuk menampilkan cuaca di widget.</string>
-    <string name="api_key_title_1">Daftar akun OpenWeather</string>
-    <string name="api_key_subtitle_1">Daftar akun gratis pada situs OpenWeather. Hanya akan membutuhkan waktu beberapa menit saja.</string>
-    <string name="api_key_title_2">Salin Kunci API anda</string>
-    <string name="api_key_subtitle_2">Temukan menu kunci API dari pengaturan akun anda dan salin kunci default.</string>
-    <string name="api_key_title_3">Masukkan kunci API ke aplikasi</string>
-    <string name="api_key_subtitle_3">Tempel kunci API ke dalam ruas di atas dan simpan. Setelah kunci diaktifkan, cuaca akan segera ditampilkan.</string>
-    <string name="action_open_provider">Kunjungi OpenWeatherMap.com</string>
-    <string name="api_key_info_all_set">Mungkin membutuhkan lebih kurang 10 menit sebelum kunci API anda diaktifkan. Cuaca akan diperbarui segera setelah data tersedia.</string>
     <string name="settings_weather_icon_pack_title">Paket ikon</string>
     <string name="settings_weather_icon_pack_default">Paket ikon %d</string>
 
@@ -128,7 +120,6 @@
 
     <!-- Glance -->
     <string name="settings_show_next_alarm_title">Waktu alarm berikutnya</string>
-    <string name="next_alarm_warning">Waktu alarm berikutnya sepertinya salah.\nTelah disetel %s.</string>
     <string name="settings_at_a_glance_title">Sekilas</string>
     <string name="settings_show_music_title">Lagu yang diputar</string>
     <string name="settings_request_notification_access">Membutuhkan izin akses notifikasi untuk menampilkan lagu yang saat ini diputar.</string>

app/src/main/res/values-it/strings.xml

@@ -117,14 +117,6 @@
     <string name="api_key_hint">Chiave API OpenWeather</string>
     <string name="default_weather_app">Meteo Google</string>
     <string name="weather_warning">Il meteo di Google Awareness è stato deprecato. È ora necessaria una chiave API OpenWeather per mostrare il meteo.</string>
-    <string name="api_key_title_1">Registra un account su OpenWeather</string>
-    <string name="api_key_subtitle_1">Registra un account gratuito su OpenWeather, ci vorranno solo alcuni minuti.</string>
-    <string name="api_key_title_2">Copia la chiave API</string>
-    <string name="api_key_subtitle_2">Trova la chiave API nelle impostazioni del tuo nuovo account e copia la chiave di default.</string>
-    <string name="api_key_title_3">Inserisci la chiave nell\'app</string>
-    <string name="api_key_subtitle_3">Copia qui la chiave API e salva la nuova configurazione.</string>
-    <string name="action_open_provider">Apri OpenWeatherMap.com</string>
-    <string name="api_key_info_all_set">La chiave API potrebbe aver bisogno di più di 20 minuti per diventare attiva, aggiorneremo il meteo non appena sarà possibile.</string>
     <string name="settings_weather_icon_pack_title">Icon pack</string>
     <string name="settings_weather_icon_pack_default">Icon pack %d</string>
     <string name="background_location_warning">Con la geolocalizzazione attiva raccoglieremo i dati sulla posizione per attivare l\'aggiornamento del meteo anche quando l\'app è chiusa o non in uso.\nNon utilizzeremo i tuoi dati in nessun altro modo.</string>

app/src/main/res/values-ru/strings.xml

@@ -94,14 +94,6 @@
     <string name="api_key_hint">Ключ API OpenWeather</string>
     <string name="default_weather_app">Google Погода</string>
     <string name="weather_warning">Погода Google Awareness устарела. Для отображения погоды в виджете требуется API ключ OpenWeather.</string>
-    <string name="api_key_title_1">Создайте аккаунт OpenWeather</string>
-    <string name="api_key_subtitle_1">Создайте бесплатный аккаунт  OpenWeather. Это займёт не более нескольких минут.</string>
-    <string name="api_key_title_2">Скопируйте ключ API</string>
-    <string name="api_key_subtitle_2">Найдие меню с ключами API в настройках аккаунта и скопируйте ключ.</string>
-    <string name="api_key_title_3">Введите ключ в приложении</string>
-    <string name="api_key_subtitle_3">Вставьте ключ в поле выше и сохраните. Как только ключ будет активирован, погода начнёт отображаться.</string>
-    <string name="action_open_provider">Перейти на OpenWeatherMap.com</string>
-    <string name="api_key_info_all_set">Активация ключа может занять до десяти минут. Погода обновится как только появится возможность.</string>
     <string name="settings_weather_icon_pack_title">Набор иконок</string>
     <string name="settings_weather_icon_pack_default">Набор иконок %d</string>
 
@@ -125,7 +117,6 @@
 
     <!-- Glance -->
     <string name="settings_show_next_alarm_title">Следующий будильник</string>
-    <string name="next_alarm_warning">Проверьте следующий будильник.\nОн был установлен %s</string>
     <string name="settings_at_a_glance_title">Glance</string>
     <string name="settings_show_music_title">Текущая песня</string>
     <string name="settings_request_notification_access">Нам необходим доступ к уведомлениям для отображения информации песни.</string>

app/src/main/res/values-sk/strings.xml

@@ -107,14 +107,6 @@
     <string name="api_key_hint">Kľúč k OpenWeather API</string>
     <string name="default_weather_app">Počasie Google</string>
     <string name="weather_warning">Počasie Google Awareness je zastaralé. Pre zobrazovanie počasia vo widgete je vyžadovaný kľúč k OpenWeather API.</string>
-    <string name="api_key_title_1">Vytvorte si OpenWeather účet</string>
-    <string name="api_key_subtitle_1">Zaregistrujte sa zdarma na OpenWeather. Bude to trvať len pár minút.</string>
-    <string name="api_key_title_2">Skopírujte kľúč k API</string>
-    <string name="api_key_subtitle_2">Nájdite menu s kľúčmi k API vo Vašom účte a skopírujte predvolený kľúč.</string>
-    <string name="api_key_title_3">Vložte kľúč do aplikácie</string>
-    <string name="api_key_subtitle_3">Vložte kľúč do poľa vyššie a uložte ho. Počasie sa zobrazí hneď ako bude kľúč aktivovaný.</string>
-    <string name="action_open_provider">Prejdite na OpenWeatherMap.com</string>
-    <string name="api_key_info_all_set">Aktivácia Vášho API kľúča môže trvať až 10 minút. Počasie sa aktualizuje hneď ako bude dostupné.</string>
     <string name="settings_weather_icon_pack_title">Balíček ikon</string>
     <string name="settings_weather_icon_pack_default">Balíček ikon %d</string>
     <string name="background_location_warning">Zbierame údaje o polohe pre aktualizáciu počasia aj keď je aplikácia zatvorená alebo sa nepoužíva.\nInak tieto údaje nepoužijeme.</string>
@@ -139,7 +131,6 @@
 
     <!-- Glance -->
     <string name="settings_show_next_alarm_title">Nasledujúci budík</string>
-    <string name="next_alarm_warning">Nasledujúci budík vyzerá nesprávne.\nBol nastavený cez %s.</string>
     <string name="settings_at_a_glance_title">Rýchle informácie</string>
     <string name="settings_show_music_title">Práve prehrávaná skladba</string>
     <string name="settings_request_notification_access">Pre získanie informácií o práve prehrávanej skladbe potrebujeme povolenie prístupu k notifikáciám.</string>

build.gradle

@@ -11,10 +11,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.8'
-
-        // Add the Crashlytics Gradle plugin.
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

privacy-policy.md

@@ -8,17 +8,6 @@ If you choose to use my Service, then you agree to the collection and use of inf
 
 The terms used in this Privacy Policy have the same meanings as in our Terms and Conditions, which is accessible at Another Widget unless otherwise defined in this Privacy Policy.
 
-**Information Collection and Use**
-
-For a better experience, while using our Service, I may require you to provide us with certain personally identifiable information, including but not limited to Location data. The information that I request will be retained on your device and is not collected by me in any way.
-
-The app does use third party services that may collect information used to identify you.
-
-Link to privacy policy of third party service providers used by the app
-
-*   [Google Play Services](https://www.google.com/policies/privacy/)
-*   [Firebase Crashlytics](https://firebase.google.com/support/privacy/)
-
 **Log Data**
 
 I want to inform you that whenever you use my Service, in a case of an error in the app I collect data and information (through third party products) on your phone called Log Data. This Log Data may include information such as your device Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing my Service, the time and date of your use of the Service, and other statistics.