From f013be5a7a5a3f8aa074742d32582b2f35e192ee Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Fri, 8 May 2020 20:16:48 +0200
Subject: [PATCH] Add integreations activity, removed long time until intervals

---
 .gitignore                                    |   3 +-
 .idea/caches/build_file_checksums.ser         | Bin 595 -> 646 bytes
 .idea/gradle.xml                              |   1 +
 .idea/modules.xml                             |   1 +
 app/build.gradle                              |   7 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../anotherwidget/global/Preferences.kt       |   3 +
 .../helpers/SettingsStringHelper.kt           |   1 -
 .../ui/activities/IntegrationsActivity.kt     |  52 ++++++++++++
 .../ui/fragments/CalendarTabFragment.kt       |   2 +-
 .../ui/fragments/SettingsFragment.kt          |  52 +++++++-----
 .../ui/viewmodels/IntegrationsViewModel.kt    |   7 ++
 .../ui/viewmodels/MainViewModel.kt            |   1 +
 .../anotherwidget/ui/widgets/MainWidget.kt    |  38 ++++-----
 .../res/drawable-hdpi/round_extension.png     | Bin 0 -> 279 bytes
 .../round_extension_black_24.png              | Bin 0 -> 322 bytes
 .../round_extension_black_36.png              | Bin 0 -> 435 bytes
 .../round_extension_black_48.png              | Bin 0 -> 503 bytes
 .../res/drawable-mdpi/round_extension.png     | Bin 0 -> 220 bytes
 .../round_extension_black_24.png              | Bin 0 -> 233 bytes
 .../round_extension_black_36.png              | Bin 0 -> 322 bytes
 .../round_extension_black_48.png              | Bin 0 -> 366 bytes
 .../res/drawable-xhdpi/round_extension.png    | Bin 0 -> 322 bytes
 .../round_extension_black_24.png              | Bin 0 -> 366 bytes
 .../round_extension_black_36.png              | Bin 0 -> 503 bytes
 .../round_extension_black_48.png              | Bin 0 -> 605 bytes
 .../res/drawable-xxhdpi/round_extension.png   | Bin 0 -> 435 bytes
 .../round_extension_black_24.png              | Bin 0 -> 503 bytes
 .../round_extension_black_36.png              | Bin 0 -> 753 bytes
 .../round_extension_black_48.png              | Bin 0 -> 933 bytes
 .../res/drawable-xxxhdpi/round_extension.png  | Bin 0 -> 503 bytes
 .../round_extension_black_24.png              | Bin 0 -> 605 bytes
 .../round_extension_black_36.png              | Bin 0 -> 933 bytes
 .../round_extension_black_48.png              | Bin 0 -> 1159 bytes
 .../main/res/drawable/round_extension_24.xml  |  10 +++
 .../res/layout/activity_custom_location.xml   |   2 +-
 .../main/res/layout/activity_integrations.xml |  79 ++++++++++++++++++
 .../res/layout/fragment_advanced_settings.xml |  37 ++++++++
 app/src/main/res/values-de/strings.xml        |   2 +
 app/src/main/res/values-fr/strings.xml        |   2 +
 app/src/main/res/values-it/strings.xml        |   2 +
 app/src/main/res/values/strings.xml           |   3 +
 googlefit/.gitignore                          |   1 +
 googlefit/build.gradle                        |  26 ++++++
 googlefit/src/main/AndroidManifest.xml        |  20 +++++
 settings.gradle                               |   1 +
 .../tmp/debug/dex-renamer-state.txt           |   2 +-
 .../tmp/debug/zip-cache/androidResources      | Bin 147 -> 147 bytes
 48 files changed, 307 insertions(+), 49 deletions(-)
 create mode 100644 app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/IntegrationsActivity.kt
 create mode 100644 app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/IntegrationsViewModel.kt
 create mode 100644 app/src/main/res/drawable-hdpi/round_extension.png
 create mode 100644 app/src/main/res/drawable-hdpi/round_extension_black_24.png
 create mode 100644 app/src/main/res/drawable-hdpi/round_extension_black_36.png
 create mode 100644 app/src/main/res/drawable-hdpi/round_extension_black_48.png
 create mode 100644 app/src/main/res/drawable-mdpi/round_extension.png
 create mode 100644 app/src/main/res/drawable-mdpi/round_extension_black_24.png
 create mode 100644 app/src/main/res/drawable-mdpi/round_extension_black_36.png
 create mode 100644 app/src/main/res/drawable-mdpi/round_extension_black_48.png
 create mode 100644 app/src/main/res/drawable-xhdpi/round_extension.png
 create mode 100644 app/src/main/res/drawable-xhdpi/round_extension_black_24.png
 create mode 100644 app/src/main/res/drawable-xhdpi/round_extension_black_36.png
 create mode 100644 app/src/main/res/drawable-xhdpi/round_extension_black_48.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/round_extension.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/round_extension_black_24.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/round_extension_black_36.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/round_extension_black_48.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/round_extension.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/round_extension_black_24.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/round_extension_black_36.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/round_extension_black_48.png
 create mode 100644 app/src/main/res/drawable/round_extension_24.xml
 create mode 100644 app/src/main/res/layout/activity_integrations.xml
 create mode 100644 googlefit/.gitignore
 create mode 100644 googlefit/build.gradle
 create mode 100644 googlefit/src/main/AndroidManifest.xml

diff --git a/.gitignore b/.gitignore
index 29220b5..4354eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@
 /build
 /captures
 .externalNativeBuild
-/tasksintegration/build
\ No newline at end of file
+/tasksintegration/build
+apikey.properties
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f40dd010b2a5ad53f7441d96209c85bfeee6e175..23f947464aa33fc68b3835601d783484b2ce923b 100644
GIT binary patch
delta 112
zcmV-$0FVFE1cn8Wm<07^lZla>OaTay=_wHP@eNrWt59S?<#UjCG9mtxA^})27H4m7
zXKZC=X>>1Qb!lv5E@yIKWNc-1aR7b*1^@s65EwP#Nu%7;=)Lvr3ag5>J(G9=$`O6b
S>mU3%o3;f;<jom%K(%-xZZDPq

delta 69
zcmV-L0J{H%1=9qOm<054NU@QeOaTXx=_wP~?6+*aA!~FgY|7t}%aQ_g01T7A0Tz=x
b0Y8(i0mu>7prZj!j8(`!{T7ZN54kvaB`Y0|

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 791dac0..de6ffd8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,6 +11,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/googlefit" />
             <option value="$PROJECT_DIR$/tasksintegration" />
           </set>
         </option>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3a35afd..f13a860 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Another Widget.iml" filepath="$PROJECT_DIR$/Another Widget.iml" group="Another Widget" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="Another Widget/app" />
+      <module fileurl="file://$PROJECT_DIR$/googlefit/googlefit.iml" filepath="$PROJECT_DIR$/googlefit/googlefit.iml" group="Another Widget/googlefit" />
       <module fileurl="file://$PROJECT_DIR$/tasksintegration/tasksintegration.iml" filepath="$PROJECT_DIR$/tasksintegration/tasksintegration.iml" group="Another Widget/tasksintegration" />
     </modules>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index cb12d3d..dc7a955 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,9 @@ android {
 
     viewBinding.enabled = true
 
-    dynamicFeatures = [":tasksintegration"]
+    dynamicFeatures = [":tasksintegration", ":googlefit"]
+
+
 }
 
 dependencies {
@@ -110,9 +112,6 @@ dependencies {
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation 'androidx.core:core-ktx:1.2.0'
 
-    // Recommended: Add the Firebase SDK for Google Analytics.
-    implementation 'com.google.firebase:firebase-analytics:17.4.0'
-
     // Add the Firebase SDK for Crashlytics.
     implementation 'com.google.firebase:firebase-crashlytics:17.0.0'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95c24f6..9bfda14 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
         <activity android:name=".ui.activities.WeatherProviderActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.SupportDevActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
         <activity android:name=".ui.activities.CustomDateActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
+        <activity android:name=".ui.activities.IntegrationsActivity" android:launchMode="singleInstance" android:screenOrientation="portrait" />
 
 
         <receiver android:name=".ui.widgets.MainWidget">
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
index 48ddf16..c43bf5f 100755
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Preferences.kt
@@ -80,4 +80,7 @@ object Preferences : KotprefModel() {
     var mediaPlayerAlbum by stringPref(default = "")
     var mediaPlayerArtist by stringPref(default = "")
     var mediaPlayerPackage by stringPref(default = "")
+
+    // Integrations
+    var installedIntegrations by intPref(default = 0)
 }
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 ef83b94..2d64cbf 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/SettingsStringHelper.kt
@@ -39,7 +39,6 @@ object SettingsStringHelper {
         return when (info) {
             0 -> R.string.settings_second_row_info_subtitle_0
             1 -> R.string.settings_second_row_info_subtitle_1
-            2 -> R.string.settings_second_row_info_subtitle_2
             else -> R.string.settings_second_row_info_subtitle_0
         }
     }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/IntegrationsActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/IntegrationsActivity.kt
new file mode 100644
index 0000000..06d04a8
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/IntegrationsActivity.kt
@@ -0,0 +1,52 @@
+package com.tommasoberlose.anotherwidget.ui.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.tommasoberlose.anotherwidget.R
+import com.tommasoberlose.anotherwidget.databinding.ActivityIntegrationsBinding
+import com.tommasoberlose.anotherwidget.ui.viewmodels.IntegrationsViewModel
+import kotlinx.android.synthetic.main.activity_integrations.*
+import net.idik.lib.slimadapter.SlimAdapter
+
+class IntegrationsActivity : AppCompatActivity() {
+
+    private lateinit var adapter: SlimAdapter
+    private lateinit var viewModel: IntegrationsViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(IntegrationsViewModel::class.java)
+        val binding = DataBindingUtil.setContentView<ActivityIntegrationsBinding>(this, R.layout.activity_integrations)
+
+        list_view.setHasFixedSize(true)
+        val mLayoutManager = LinearLayoutManager(this)
+        list_view.layoutManager = mLayoutManager
+
+        adapter = SlimAdapter.create()
+        adapter
+            .register<String>(R.layout.application_info_layout) { _, injector ->
+                injector
+                    .text(R.id.text, getString(R.string.default_name))
+
+            }
+            .attachTo(list_view)
+
+        setupListener()
+        subscribeUi(binding, viewModel)
+    }
+
+    private fun subscribeUi(binding: ActivityIntegrationsBinding, viewModel: IntegrationsViewModel) {
+        binding.viewModel = viewModel
+
+    }
+
+    private fun setupListener() {
+        action_back.setOnClickListener {
+            onBackPressed()
+        }
+    }
+}
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt
index c29dabe..d9896bc 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/CalendarTabFragment.kt
@@ -270,7 +270,7 @@ class CalendarTabFragment : Fragment() {
         action_show_until.setOnClickListener {
             if (Preferences.showEvents) {
                 val dialog = BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_show_until_title)).setSelectedValue(Preferences.showUntil)
-                intArrayOf(6,7,0,1,2,3,4,5).forEach {
+                intArrayOf(6,7,0,1,2).forEach {
                     dialog.addItem(getString(SettingsStringHelper.getShowUntilString(it)), it)
                 }
                 dialog.addOnSelectItemListener { value ->
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt
index 2123691..1c4ee8d 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/SettingsFragment.kt
@@ -32,6 +32,7 @@ import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
 import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper
 import com.tommasoberlose.anotherwidget.helpers.WeatherHelper
+import com.tommasoberlose.anotherwidget.ui.activities.IntegrationsActivity
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 import com.tommasoberlose.anotherwidget.utils.openURI
 import kotlinx.android.synthetic.main.fragment_advanced_settings.*
@@ -97,6 +98,10 @@ class SettingsFragment : Fragment() {
             }
         })
 
+        viewModel.installedIntegrations.observe(viewLifecycleOwner, Observer {
+            integrations_count_label?.text = getString(R.string.label_count_installed_integrations).format(it)
+        })
+
         viewModel.showPreview.observe(viewLifecycleOwner, Observer {
             maintainScrollPosition {
                 show_widget_preview_label?.text =
@@ -115,27 +120,6 @@ class SettingsFragment : Fragment() {
     }
 
     private fun setupListener() {
-        action_change_theme.setOnClickListener {
-            maintainScrollPosition {
-                BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_theme_title))
-                    .setSelectedValue(Preferences.darkThemePreference)
-                    .addItem(
-                        getString(R.string.settings_subtitle_dark_theme_light),
-                        AppCompatDelegate.MODE_NIGHT_NO
-                    )
-                    .addItem(
-                        getString(R.string.settings_subtitle_dark_theme_dark),
-                        AppCompatDelegate.MODE_NIGHT_YES
-                    )
-                    .addItem(
-                        getString(R.string.settings_subtitle_dark_theme_default),
-                        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM else AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
-                    )
-                    .addOnSelectItemListener { value ->
-                        Preferences.darkThemePreference = value
-                    }.show()
-            }
-        }
 
         action_show_widget_preview.setOnClickListener {
             maintainScrollPosition {
@@ -177,6 +161,32 @@ class SettingsFragment : Fragment() {
             }
         }
 
+        action_integrations.setOnClickListener {
+            startActivity(Intent(requireContext(), IntegrationsActivity::class.java))
+        }
+
+        action_change_theme.setOnClickListener {
+            maintainScrollPosition {
+                BottomSheetMenu<Int>(requireContext(), header = getString(R.string.settings_theme_title))
+                    .setSelectedValue(Preferences.darkThemePreference)
+                    .addItem(
+                        getString(R.string.settings_subtitle_dark_theme_light),
+                        AppCompatDelegate.MODE_NIGHT_NO
+                    )
+                    .addItem(
+                        getString(R.string.settings_subtitle_dark_theme_dark),
+                        AppCompatDelegate.MODE_NIGHT_YES
+                    )
+                    .addItem(
+                        getString(R.string.settings_subtitle_dark_theme_default),
+                        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM else AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY
+                    )
+                    .addOnSelectItemListener { value ->
+                        Preferences.darkThemePreference = value
+                    }.show()
+            }
+        }
+
         action_translate.setOnClickListener {
             activity?.openURI("https://github.com/tommasoberlose/another-widget/blob/master/app/src/main/res/values/strings.xml")
         }
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/IntegrationsViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/IntegrationsViewModel.kt
new file mode 100644
index 0000000..73cfc0c
--- /dev/null
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/IntegrationsViewModel.kt
@@ -0,0 +1,7 @@
+package com.tommasoberlose.anotherwidget.ui.viewmodels
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+
+class IntegrationsViewModel(application: Application) : AndroidViewModel(application) {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
index 8137797..17fb9ef 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/viewmodels/MainViewModel.kt
@@ -60,4 +60,5 @@ class MainViewModel : ViewModel() {
     val darkThemePreference = Preferences.asLiveData(Preferences::darkThemePreference)
     val showWallpaper = Preferences.asLiveData(Preferences::showWallpaper)
     val showPreview = Preferences.asLiveData(Preferences::showPreview)
+    val installedIntegrations = Preferences.asLiveData(Preferences::installedIntegrations)
 }
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 c1a76f0..ca940b8 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
@@ -261,14 +261,14 @@ class MainWidget : AppWidgetProvider() {
 
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
-                } else if (Preferences.showNextAlarm && nextAlarm != "") {
-                    val alarmIntent = PendingIntent.getActivity(
+                } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
+                    val musicIntent = PendingIntent.getActivity(
                         context,
                         widgetID,
-                        IntentHelper.getClockIntent(context),
+                        IntentHelper.getMusicIntent(context),
                         0
                     )
-                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
+                    views.setOnClickPendingIntent(R.id.second_row_rect, musicIntent)
 
                     views.setImageViewBitmap(
                         R.id.next_event_rect,
@@ -284,14 +284,14 @@ class MainWidget : AppWidgetProvider() {
                     views.setViewVisibility(R.id.empty_layout_rect, View.GONE)
                     views.setViewVisibility(R.id.calendar_layout_rect, View.VISIBLE)
                     views.setOnClickPendingIntent(R.id.next_event_rect, calPIntent)
-                } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
-                    val musicIntent = PendingIntent.getActivity(
+                } else if (Preferences.showNextAlarm && nextAlarm != "") {
+                    val alarmIntent = PendingIntent.getActivity(
                         context,
                         widgetID,
-                        IntentHelper.getMusicIntent(context),
+                        IntentHelper.getClockIntent(context),
                         0
                     )
-                    views.setOnClickPendingIntent(R.id.second_row_rect, musicIntent)
+                    views.setOnClickPendingIntent(R.id.second_row_rect, alarmIntent)
 
                     views.setImageViewBitmap(
                         R.id.next_event_rect,
@@ -497,17 +497,6 @@ class MainWidget : AppWidgetProvider() {
                     }
                 }
 
-                v.empty_layout.visibility = View.GONE
-                v.calendar_layout.visibility = View.VISIBLE
-            } else if (Preferences.showNextAlarm && nextAlarm != "") {
-                v.second_row_icon.setImageDrawable(
-                    ContextCompat.getDrawable(
-                        context,
-                        R.drawable.round_alarm
-                    )
-                )
-                v.next_event.text = DateHelper.getDateText(context, now)
-                v.next_event_date.text = AlarmHelper.getNextAlarm(context)
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
             } else if (MediaPlayerHelper.isSomeonePlaying(context)) {
@@ -521,6 +510,17 @@ class MainWidget : AppWidgetProvider() {
                 v.next_event_date.text = MediaPlayerHelper.getMediaInfo()
                 v.empty_layout.visibility = View.GONE
                 v.calendar_layout.visibility = View.VISIBLE
+            } else if (Preferences.showNextAlarm && nextAlarm != "") {
+                v.second_row_icon.setImageDrawable(
+                    ContextCompat.getDrawable(
+                        context,
+                        R.drawable.round_alarm
+                    )
+                )
+                v.next_event.text = DateHelper.getDateText(context, now)
+                v.next_event_date.text = AlarmHelper.getNextAlarm(context)
+                v.empty_layout.visibility = View.GONE
+                v.calendar_layout.visibility = View.VISIBLE
             }
 
 
diff --git a/app/src/main/res/drawable-hdpi/round_extension.png b/app/src/main/res/drawable-hdpi/round_extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcfabe7057673fde0133b4f5cf1dba45b2446ec3
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|o_dH!3Ln;{GUS?!D<RH@i(V&Gv
zK%qsTP2dm%ha!uF6OiCw5OCsPZed_-a|VhzG%z}GeE7v+d|r2#@0x!3hW*cD-im+T
z;M8L}OJfbI%F|9Uu9s{lBNk0?5!_iZTk#N2;2goUEgu78RVL`aofyqhsPf&3xllzX
z^^N^A<pVbkevlMYTcNz2`$!{;-I}useKHAanG2spJWF+6an<nX;e#iHqjOW3o86b%
zedV_PVt8QXiH!^|ZSL%s>{jg3-V!!#qu`peid@WV85VgwI2grTe8fOgI^(B-q+r#G
ah<ul+iFVx@cG*CmGI+ZBxvX<aXaWFi8)Vu5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_extension_black_24.png b/app/src/main/res/drawable-hdpi/round_extension_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd38cf5850eb53da31cfc6a09212974bc2efe425
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003ANkl<ZcmeI!
zAqc`i6vlCb!C<sw$7n}bPm2bl(O_7-XfztvG1{?XG#D=!4Tc57!t);tBJOm@-foP2
z@QZ_wyBqKI+LQ_Ah%i8~46uj1v6v!AHjpoDsFS)v3Ph+q;*d10kU`}cA%-a+4#$FT
zmKgf}$~TCD%;!pX5M>kmod-nO%KyRYFm)E{3U!5MFEO^r6bc<-koc@FV_1k9kJTlD
zsPb4{?hrK|tIHXpY*A)q&6_mi3`E%;Khwur`E;(>xE^%+a;RW0>PAP7Gwz`a<uD)j
z9>Inxw04Y{tnNZL^ih;;)rB&M!vU_uRgZ`i;*kEazKFvGr7}bUt5E2KDY~>PPkz{R
Ub<ca)nE(I)07*qoM6N<$f)96$KmY&$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_extension_black_36.png b/app/src/main/res/drawable-hdpi/round_extension_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8d1aff8b8869077b28ec5884d4506eb6fa6915c
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ0004cNkl<ZcmeI&
z0b~ME9LMn?96|_T2q8d#AsitLVE_mLLI`0v1Q<dXh7g7T0pJh<gdv0w1_%L$|Goyo
z?CyC-|2O|H9{~Jt-aFo%^^+B2js>34MbK5Tg8U*y9l=$?7V?K9$_T0vB!?M-Y6HpP
zf(XHMf#lRcFo}cMhUL$OMHpa?GzW38Lz-cMAu1@W2KEpIPG}c@(CQgifmdCKLPK~p
zfhe?qR|!O+)P~tG8)n0Duwgc=h5nThmN-LhXovVp4TV&}yTUu<3}tw?f+%xD9bQ#&
z()kVgH-#wFgI7I>La*?u0a0iPuVRQo<Ntbyw|&pEPlz%rpHUIk5M{Qg`dqd45Je6c
zp@ht0Bv+RBu-m;2vteq6o$-PvH1U854q*<<ei;zqEyQ6Pl#o>#(y%Wykf(cGLK(J!
zOY2(<8$%q;;L`LK|5_c0qXaJXA&v&{E>$*cj|kq?kSZCrLlcG8!5B$~7%sJtWSHO)
dB`C|XtZ%8Ph#jfjJAwcJ002ovPDHLkV1h&yua^J-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/round_extension_black_48.png b/app/src/main/res/drawable-hdpi/round_extension_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..469fe7a64793ae3b280e008d69b71c2b05d12b96
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBF{F;uuoF`1TfK3KOG9`$xqV
z#TEud9tK5+0|qUL4a^`G2ZLgZfeeF!44-p@0AITzk7A26N4`A6rE72Fc9p+>%+64M
zyzsr;nx~cb7!-qYCMGo6X~jxspI{Z7wIW9LjY9o|u-qk5LMKF(LY6U1a+aT}(e`A6
zgX$>-OO+KalP(`*|23EY3G+_}y8vFsq#VWaoMzT}g_ENqoV{K!_XoTc4oVWdQq?Z;
zfotkC0p@7|nf!(c+*6Nm$)8~V)L5e+|6<+`2fGOn6E6Jdkqoo==`cMzah=(eeTUcn
z)2ei2)7;77dv>DVgh}3}?z5bEIu-<Rt9LNguGrEfv7y1sxPy^1M9P`xN1Io02cu?4
zmm*t>#vZml0cJLhJ)B1xOu5#lKY4j`VXxEcr1U3O?>Q!3HFRRrT*+g|bfuv5prmul
zjl=sjZarjX`~Y@Nhs0%>c81H$vWAYz#}yC!aj^a(!pEq_cIrZ?1<MS{j3ose2F4fU
zN?V;9W;Qwj$(4<5<pmrb3onU3ncrk>!O{|tnUu1?e8rUm+nzA%F1#gdrYf7!EOupe
rVvFb|A)YA-9adU%o>$I${+Gef?YeOFs@3y=5z64{>gTe~DWM4fW7)mp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_extension.png b/app/src/main/res/drawable-mdpi/round_extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..866757e55bf45c4a67e6c7aa21cf5bb07932a0ae
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rhe#hxyXAr*{UFEO&UIEb`=bZj`9
z&@br3al!YQ1f!M13kKQ6&N>U6SvVA1K74boIGv(?x#my8hj#O4{$i4gvNj~U<tare
zE@wQrH$Z!l&#S$MQdP}77Vz)cI$`#z<!!H)IE%4b$xL7nW_$9%%qefidb?cyor%Y#
z?Vm;{G=`bDJvCUm>sFJTa^DQa+Freq6P13ewG~dWW!t0{Wcc%0b%$wAT&BOWV$OL5
TkN@02=Q4P@`njxgN@xNAtsqcO

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_extension_black_24.png b/app/src/main/res/drawable-mdpi/round_extension_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..478193f642c942143ef8b5e5f389bea3e932e1fa
GIT binary patch
literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj8$4YcLn;{WURLC33J_>7Y_4@<
zzUbl4Vtw#lb^n)(#<s$|`Vu`XO&2{31bB|@k9YZ&@J80}*!I7lVt3qLyO6^&E5#z=
zBG(G_!;4A-{F_}Ty9aQ}h%9jFIhl20!I6|rxBfM#OPxpvQx6GPkaq6)@(F=$7r$jF
zHnY1~JGoizIl9BC(MqJ_!&K+5=j}7<O%FVLW1slDVf*uW!Kc-;AJ`Qg($9F%c2aMi
hV%{?&Q=yy<{9!3#Ik(d?rU2c};OXk;vd$@?2>{CsUI_pI

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_extension_black_36.png b/app/src/main/res/drawable-mdpi/round_extension_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd38cf5850eb53da31cfc6a09212974bc2efe425
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003ANkl<ZcmeI!
zAqc`i6vlCb!C<sw$7n}bPm2bl(O_7-XfztvG1{?XG#D=!4Tc57!t);tBJOm@-foP2
z@QZ_wyBqKI+LQ_Ah%i8~46uj1v6v!AHjpoDsFS)v3Ph+q;*d10kU`}cA%-a+4#$FT
zmKgf}$~TCD%;!pX5M>kmod-nO%KyRYFm)E{3U!5MFEO^r6bc<-koc@FV_1k9kJTlD
zsPb4{?hrK|tIHXpY*A)q&6_mi3`E%;Khwur`E;(>xE^%+a;RW0>PAP7Gwz`a<uD)j
z9>Inxw04Y{tnNZL^ih;;)rB&M!vU_uRgZ`i;*kEazKFvGr7}bUt5E2KDY~>PPkz{R
Ub<ca)nE(I)07*qoM6N<$f)96$KmY&$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/round_extension_black_48.png b/app/src/main/res/drawable-mdpi/round_extension_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab70e280f06d770e511281f7e0178e5cd05abd7
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003sNkl<ZcmeI#
z0Yt=b6vy!p00In$00SK000+PULVy5p0D!{*01g1dAq*jeFhB^y5JDJ+Fbu;myuN@F
z+W+>nxAMMx0Pq{;{V%+K)Cx~1Q6NE#KhX|7<eLt6n00H&4?4t{Z5d=hirLmc29%g>
z638|mFmVwQyg?>X;D9TrTHq66q|}Z`A;u2+-=eJoqZ8Qk0k(XA4^Z#{#}gT9`vLm4
zXdy=QZ)}Q<M?n9^-a_o?-`JPvAjVRRE{7N^F}i1nv3HEFf*8BUsBR#}daQ7E5o(CB
z9nNlp3S#ILYYetO@qiD=H2j$J0WDq>SFG898n=oo)^tFHNO8rQ57;QKSn~n-uU)Z<
zT1cP-q2*H@YZ)Za9-$reA116Ndcy$?7ErZBhIYaM4IXg~&+`KN0z*t*`6MO$PXGV_
M07*qoM6N<$g7Es1fdBvi

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_extension.png b/app/src/main/res/drawable-xhdpi/round_extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd38cf5850eb53da31cfc6a09212974bc2efe425
GIT binary patch
literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003ANkl<ZcmeI!
zAqc`i6vlCb!C<sw$7n}bPm2bl(O_7-XfztvG1{?XG#D=!4Tc57!t);tBJOm@-foP2
z@QZ_wyBqKI+LQ_Ah%i8~46uj1v6v!AHjpoDsFS)v3Ph+q;*d10kU`}cA%-a+4#$FT
zmKgf}$~TCD%;!pX5M>kmod-nO%KyRYFm)E{3U!5MFEO^r6bc<-koc@FV_1k9kJTlD
zsPb4{?hrK|tIHXpY*A)q&6_mi3`E%;Khwur`E;(>xE^%+a;RW0>PAP7Gwz`a<uD)j
z9>Inxw04Y{tnNZL^ih;;)rB&M!vU_uRgZ`i;*kEazKFvGr7}bUt5E2KDY~>PPkz{R
Ub<ca)nE(I)07*qoM6N<$f)96$KmY&$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_extension_black_24.png b/app/src/main/res/drawable-xhdpi/round_extension_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ab70e280f06d770e511281f7e0178e5cd05abd7
GIT binary patch
literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003sNkl<ZcmeI#
z0Yt=b6vy!p00In$00SK000+PULVy5p0D!{*01g1dAq*jeFhB^y5JDJ+Fbu;myuN@F
z+W+>nxAMMx0Pq{;{V%+K)Cx~1Q6NE#KhX|7<eLt6n00H&4?4t{Z5d=hirLmc29%g>
z638|mFmVwQyg?>X;D9TrTHq66q|}Z`A;u2+-=eJoqZ8Qk0k(XA4^Z#{#}gT9`vLm4
zXdy=QZ)}Q<M?n9^-a_o?-`JPvAjVRRE{7N^F}i1nv3HEFf*8BUsBR#}daQ7E5o(CB
z9nNlp3S#ILYYetO@qiD=H2j$J0WDq>SFG898n=oo)^tFHNO8rQ57;QKSn~n-uU)Z<
zT1cP-q2*H@YZ)Za9-$reA116Ndcy$?7ErZBhIYaM4IXg~&+`KN0z*t*`6MO$PXGV_
M07*qoM6N<$g7Es1fdBvi

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_extension_black_36.png b/app/src/main/res/drawable-xhdpi/round_extension_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..469fe7a64793ae3b280e008d69b71c2b05d12b96
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBF{F;uuoF`1TfK3KOG9`$xqV
z#TEud9tK5+0|qUL4a^`G2ZLgZfeeF!44-p@0AITzk7A26N4`A6rE72Fc9p+>%+64M
zyzsr;nx~cb7!-qYCMGo6X~jxspI{Z7wIW9LjY9o|u-qk5LMKF(LY6U1a+aT}(e`A6
zgX$>-OO+KalP(`*|23EY3G+_}y8vFsq#VWaoMzT}g_ENqoV{K!_XoTc4oVWdQq?Z;
zfotkC0p@7|nf!(c+*6Nm$)8~V)L5e+|6<+`2fGOn6E6Jdkqoo==`cMzah=(eeTUcn
z)2ei2)7;77dv>DVgh}3}?z5bEIu-<Rt9LNguGrEfv7y1sxPy^1M9P`xN1Io02cu?4
zmm*t>#vZml0cJLhJ)B1xOu5#lKY4j`VXxEcr1U3O?>Q!3HFRRrT*+g|bfuv5prmul
zjl=sjZarjX`~Y@Nhs0%>c81H$vWAYz#}yC!aj^a(!pEq_cIrZ?1<MS{j3ose2F4fU
zN?V;9W;Qwj$(4<5<pmrb3onU3ncrk>!O{|tnUu1?e8rUm+nzA%F1#gdrYf7!EOupe
rVvFb|A)YA-9adU%o>$I${+Gef?YeOFs@3y=5z64{>gTe~DWM4fW7)mp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/round_extension_black_48.png b/app/src/main/res/drawable-xhdpi/round_extension_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..112e77d877b4baee7cd1c9965eb92715645b575a
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0006cNkl<ZcmeI(
z0YqzI7>DuU;35D72;l-kfG{8oLkJLH2qC}#Ll}kt0|W>GE<y+g05HHo2mlZc-upN%
zK(5v4dspXq_yIuw*v9*f%*@PotO}=Cqek=3GgcVGzNiT{i2tZ@0_&*?3&a*$T%w0;
ziTH@mk6`DBPiS$14`jd4AU>(a2eJ!9PsXq<dqDJL1>3S0L{FY!TNXWPkeCC&9KZq0
z0UW>_;EOuM0yP@M57XcYbL?Yhs<1?h7>GAqBfScL5Ce6G)K-XryGBaC(IN)!4g0zO
z{hFhA8-zMfDBc@FohJK-k`f9zfCI<@96%1>04iU|0USUM-~e&}2T=LO?>NIH)_8S*
z{HE9-hG<vbF;}=jDEA%nB|^FHm~RkJ(g>9o75VR&rwHY~V}3;_?;Z0Rq0TDz8<Cz-
zyfcJ4P3{M=UQoOlB9GsMZV~FNQM?AB&MAsEMyRtvg`(96btWj<6+)c_iZ(@y&}fMY
z#hUrY?=(0^v5xTQ53SJyF7OMzbnuR2OfVnRhiyV32XFv6fCI<@9H5{Ex0qpC?iSSn
zYK+U@qB=l}tDIX@2WT<PyS#9KS>7$G13c#5qB_7)-U*BY)Va5)4lvKXMRkD5H@iiB
z`Dy3n$KUK0wMOyo5MSiro82NUP`t4NbXpuDrF#b$Es@q9HUl2u2^CV?!~FmUxJ8AX
rX^cC({@?)`tZ@W0Gcz+YvtIiP1wDUO9cHVN00000NkvXXu0mjfY7qW}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_extension.png b/app/src/main/res/drawable-xxhdpi/round_extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8d1aff8b8869077b28ec5884d4506eb6fa6915c
GIT binary patch
literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ0004cNkl<ZcmeI&
z0b~ME9LMn?96|_T2q8d#AsitLVE_mLLI`0v1Q<dXh7g7T0pJh<gdv0w1_%L$|Goyo
z?CyC-|2O|H9{~Jt-aFo%^^+B2js>34MbK5Tg8U*y9l=$?7V?K9$_T0vB!?M-Y6HpP
zf(XHMf#lRcFo}cMhUL$OMHpa?GzW38Lz-cMAu1@W2KEpIPG}c@(CQgifmdCKLPK~p
zfhe?qR|!O+)P~tG8)n0Duwgc=h5nThmN-LhXovVp4TV&}yTUu<3}tw?f+%xD9bQ#&
z()kVgH-#wFgI7I>La*?u0a0iPuVRQo<Ntbyw|&pEPlz%rpHUIk5M{Qg`dqd45Je6c
zp@ht0Bv+RBu-m;2vteq6o$-PvH1U854q*<<ei;zqEyQ6Pl#o>#(y%Wykf(cGLK(J!
zOY2(<8$%q;;L`LK|5_c0qXaJXA&v&{E>$*cj|kq?kSZCrLlcG8!5B$~7%sJtWSHO)
dB`C|XtZ%8Ph#jfjJAwcJ002ovPDHLkV1h&yua^J-

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_extension_black_24.png b/app/src/main/res/drawable-xxhdpi/round_extension_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..469fe7a64793ae3b280e008d69b71c2b05d12b96
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBF{F;uuoF`1TfK3KOG9`$xqV
z#TEud9tK5+0|qUL4a^`G2ZLgZfeeF!44-p@0AITzk7A26N4`A6rE72Fc9p+>%+64M
zyzsr;nx~cb7!-qYCMGo6X~jxspI{Z7wIW9LjY9o|u-qk5LMKF(LY6U1a+aT}(e`A6
zgX$>-OO+KalP(`*|23EY3G+_}y8vFsq#VWaoMzT}g_ENqoV{K!_XoTc4oVWdQq?Z;
zfotkC0p@7|nf!(c+*6Nm$)8~V)L5e+|6<+`2fGOn6E6Jdkqoo==`cMzah=(eeTUcn
z)2ei2)7;77dv>DVgh}3}?z5bEIu-<Rt9LNguGrEfv7y1sxPy^1M9P`xN1Io02cu?4
zmm*t>#vZml0cJLhJ)B1xOu5#lKY4j`VXxEcr1U3O?>Q!3HFRRrT*+g|bfuv5prmul
zjl=sjZarjX`~Y@Nhs0%>c81H$vWAYz#}yC!aj^a(!pEq_cIrZ?1<MS{j3ose2F4fU
zN?V;9W;Qwj$(4<5<pmrb3onU3ncrk>!O{|tnUu1?e8rUm+nzA%F1#gdrYf7!EOupe
rVvFb|A)YA-9adU%o>$I${+Gef?YeOFs@3y=5z64{>gTe~DWM4fW7)mp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_extension_black_36.png b/app/src/main/res/drawable-xxhdpi/round_extension_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..a693954e65c15cdcba281145c7557b6530fec9ef
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq003+N003+V1^@s6k7ifR0008GNkl<ZcmeI*
z0Ysx=9LMp)i$e%ufDmASA%uW1Ko~*@Aq<BQhHwZF0)!AkfB<0#Ap{6v7>2_z4FCJ$
z;IM7wefGYOeZPDFz|XnpdH?+|Gc&W5wS|2g|I<bjR-+0WqmP(jfGad$6}F3a#FEB1
zM+MmtCWvpi#|BoEwJ}9}AET`#+rb!7f^#I!9uOrNqXA1)6H&4&SfVZwB^$sJ^@>QK
z2}{rjkw6=kph)BtmeF86n1h*vIhcbvn5|+k+rj~k(JM(L@{C>yx;R7=+0?=lrieB6
zfio1SWd(jC^q)6uqjudn&P>C)jn+lXr8g9)yiNQ;XrVLzb>-y)mDfiopWnR=5n9?I
zDlPOST?flc&%qqb!5mBu=3oxyU~(`Ab1(;!gE^RkIhY*G!5qxNvf^O3Gu+`BADAGN
z&$I9ibnxh4bDxEu*72ZO3w?x;$w9LMHwfi*(5#10UI)$Y5z6PF*(OE^<#W)ii%>oX
z&3<BxP(BCE9udmtpxG%x`FvE-Mkt?yW-Y|hbb?CTM=VXpsI(4ZY1&7nT_BdGt$fbI
zs*g(BLFB{#zitsr(L0Jfew^0?yQr)N28e|;#ZlE`y&x9S7;RKm6Q78M^ne{yQUlj>
zZz*boS6rfrl~rIHdpN<9?-PCb>tGJ%U~;hZ983<Do`cE30KDP?9qglpHcs(~F`{}7
zc8eV>>L<DwIaoCYXyL1E;@-hl>jjNGK6P@iPc%?QHx8E86it*>fxd&KbDhr<1qYj;
zk<XVi4)%mpbsQ|O$Nw9cI9R#%kg|_;`RZhdSb=S%>>05F2kY{wYk}PVB;*uZ>++dU
z_Rq!fgvu-M?qEyVMJ;M!;$U-Kp;jHv9L>S*QJ{9U@D2w9#`uL=SD=GO4A*e5F<x<j
j2I`QRnVFfHnVJ0sATT6X3akM900000NkvXXu0mjfse@B!

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/round_extension_black_48.png b/app/src/main/res/drawable-xxhdpi/round_extension_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd279815da5c06ea3d2218dcaacf7b2233c2e4f
GIT binary patch
literal 933
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=HU{{FxB}^+1ypV`T>`q;x+KUi
zn8Bca{qg&USC^}><Ujs@J>LKJd7IzK{mtPV&)+*wKP?iym`C9IXOm!w$ugT?E4a_T
zyxYNIzqdwpd-nW!`JYS}7??6VT^vIy7~kGvo%Yy3pyeT#x?E_$IRoS37ysCAv!7nz
zF|*`${__38e;)48neoYJS<u?6(!FV`?>cg(NcY_@t=5RDKM>F3t`RbI|7Xjt$y<Mj
zCyS&_uAjPCA^MNCy_4d$@*n(%H|<%t|MfzK+q?fP*W=o7yn*k_TjK@1wd_0@j`Ncp
zgnvm~(ufxLe_nxm6A&#pyf|#{!L3;){oDOE%)0zh(sfRFxYw=QOC`!1Q+6(2@Y!4C
z)@PB@x<-}o-6GHYCOn$;Xq897W6gJeSUwhM-Ei6yt!3f1hf&l-@ckSvsSbD1`Q|5@
zbWoAh{X3d0OHaO&mz(PpFsohBb!|c3l5+RJm(Sha&DYTSd*{SS<D)-qR=()`bj+im
z-o4UN=!?er{s{>lmCh;^3!3DFEKa>vI;bpKa_ZZxt%C38aYc1ZpPH+8EcWEHq&ETc
zoSC#%On>Ve>%2!?YlYIi8C+T&<{CGve@*2w6L{bIiA{3R-e5=hi+s{ge|4nhKmC<>
zwofzP*m=$6^sd`CowiJ8T>3U_yI^+EVx960`^D!P&ot|vpL}nhWr5kt$O){G7qWCR
zp0BfUZ2ow<w&HU*Z&fvK{=ZX>z284PTQB>iOyb_3t<8O#!JIj*=JjtE9LxkN<FDe(
z|M$w#l!b?zW0t}LNBb3>3d`k8TrVuHy1?Sd|H@H*zWd#%=NauAa`t|H&p6%k$B$?C
zo%U!=uRJW&yY=46)fy~6omEzxWbd7r^k`{w8UI8TalTLd9wx%PpNdsZ?~S?e(>lyx
wB`538qr73kE9Ks-u|8pXTegPnm_+g!@vFDRA7&<byMZ#Br>mdKI;Vst0L@Tcq5uE@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_extension.png b/app/src/main/res/drawable-xxxhdpi/round_extension.png
new file mode 100644
index 0000000000000000000000000000000000000000..469fe7a64793ae3b280e008d69b71c2b05d12b96
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBF{F;uuoF`1TfK3KOG9`$xqV
z#TEud9tK5+0|qUL4a^`G2ZLgZfeeF!44-p@0AITzk7A26N4`A6rE72Fc9p+>%+64M
zyzsr;nx~cb7!-qYCMGo6X~jxspI{Z7wIW9LjY9o|u-qk5LMKF(LY6U1a+aT}(e`A6
zgX$>-OO+KalP(`*|23EY3G+_}y8vFsq#VWaoMzT}g_ENqoV{K!_XoTc4oVWdQq?Z;
zfotkC0p@7|nf!(c+*6Nm$)8~V)L5e+|6<+`2fGOn6E6Jdkqoo==`cMzah=(eeTUcn
z)2ei2)7;77dv>DVgh}3}?z5bEIu-<Rt9LNguGrEfv7y1sxPy^1M9P`xN1Io02cu?4
zmm*t>#vZml0cJLhJ)B1xOu5#lKY4j`VXxEcr1U3O?>Q!3HFRRrT*+g|bfuv5prmul
zjl=sjZarjX`~Y@Nhs0%>c81H$vWAYz#}yC!aj^a(!pEq_cIrZ?1<MS{j3ose2F4fU
zN?V;9W;Qwj$(4<5<pmrb3onU3ncrk>!O{|tnUu1?e8rUm+nzA%F1#gdrYf7!EOupe
rVvFb|A)YA-9adU%o>$I${+Gef?YeOFs@3y=5z64{>gTe~DWM4fW7)mp

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_extension_black_24.png b/app/src/main/res/drawable-xxxhdpi/round_extension_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..112e77d877b4baee7cd1c9965eb92715645b575a
GIT binary patch
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0006cNkl<ZcmeI(
z0YqzI7>DuU;35D72;l-kfG{8oLkJLH2qC}#Ll}kt0|W>GE<y+g05HHo2mlZc-upN%
zK(5v4dspXq_yIuw*v9*f%*@PotO}=Cqek=3GgcVGzNiT{i2tZ@0_&*?3&a*$T%w0;
ziTH@mk6`DBPiS$14`jd4AU>(a2eJ!9PsXq<dqDJL1>3S0L{FY!TNXWPkeCC&9KZq0
z0UW>_;EOuM0yP@M57XcYbL?Yhs<1?h7>GAqBfScL5Ce6G)K-XryGBaC(IN)!4g0zO
z{hFhA8-zMfDBc@FohJK-k`f9zfCI<@96%1>04iU|0USUM-~e&}2T=LO?>NIH)_8S*
z{HE9-hG<vbF;}=jDEA%nB|^FHm~RkJ(g>9o75VR&rwHY~V}3;_?;Z0Rq0TDz8<Cz-
zyfcJ4P3{M=UQoOlB9GsMZV~FNQM?AB&MAsEMyRtvg`(96btWj<6+)c_iZ(@y&}fMY
z#hUrY?=(0^v5xTQ53SJyF7OMzbnuR2OfVnRhiyV32XFv6fCI<@9H5{Ex0qpC?iSSn
zYK+U@qB=l}tDIX@2WT<PyS#9KS>7$G13c#5qB_7)-U*BY)Va5)4lvKXMRkD5H@iiB
z`Dy3n$KUK0wMOyo5MSiro82NUP`t4NbXpuDrF#b$Es@q9HUl2u2^CV?!~FmUxJ8AX
rX^cC({@?)`tZ@W0Gcz+YvtIiP1wDUO9cHVN00000NkvXXu0mjfY7qW}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_extension_black_36.png b/app/src/main/res/drawable-xxxhdpi/round_extension_black_36.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fd279815da5c06ea3d2218dcaacf7b2233c2e4f
GIT binary patch
literal 933
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=HU{{FxB}^+1ypV`T>`q;x+KUi
zn8Bca{qg&USC^}><Ujs@J>LKJd7IzK{mtPV&)+*wKP?iym`C9IXOm!w$ugT?E4a_T
zyxYNIzqdwpd-nW!`JYS}7??6VT^vIy7~kGvo%Yy3pyeT#x?E_$IRoS37ysCAv!7nz
zF|*`${__38e;)48neoYJS<u?6(!FV`?>cg(NcY_@t=5RDKM>F3t`RbI|7Xjt$y<Mj
zCyS&_uAjPCA^MNCy_4d$@*n(%H|<%t|MfzK+q?fP*W=o7yn*k_TjK@1wd_0@j`Ncp
zgnvm~(ufxLe_nxm6A&#pyf|#{!L3;){oDOE%)0zh(sfRFxYw=QOC`!1Q+6(2@Y!4C
z)@PB@x<-}o-6GHYCOn$;Xq897W6gJeSUwhM-Ei6yt!3f1hf&l-@ckSvsSbD1`Q|5@
zbWoAh{X3d0OHaO&mz(PpFsohBb!|c3l5+RJm(Sha&DYTSd*{SS<D)-qR=()`bj+im
z-o4UN=!?er{s{>lmCh;^3!3DFEKa>vI;bpKa_ZZxt%C38aYc1ZpPH+8EcWEHq&ETc
zoSC#%On>Ve>%2!?YlYIi8C+T&<{CGve@*2w6L{bIiA{3R-e5=hi+s{ge|4nhKmC<>
zwofzP*m=$6^sd`CowiJ8T>3U_yI^+EVx960`^D!P&ot|vpL}nhWr5kt$O){G7qWCR
zp0BfUZ2ow<w&HU*Z&fvK{=ZX>z284PTQB>iOyb_3t<8O#!JIj*=JjtE9LxkN<FDe(
z|M$w#l!b?zW0t}LNBb3>3d`k8TrVuHy1?Sd|H@H*zWd#%=NauAa`t|H&p6%k$B$?C
zo%U!=uRJW&yY=46)fy~6omEzxWbd7r^k`{w8UI8TalTLd9wx%PpNdsZ?~S?e(>lyx
wB`538qr73kE9Ks-u|8pXTegPnm_+g!@vFDRA7&<byMZ#Br>mdKI;Vst0L@Tcq5uE@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/round_extension_black_48.png b/app/src/main/res/drawable-xxxhdpi/round_extension_black_48.png
new file mode 100644
index 0000000000000000000000000000000000000000..a40ab7381912df20e45f390bdefcbc09fa3094cb
GIT binary patch
literal 1159
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1TLOGST!HkE13}e++klR?DGBlm
zW{^pqzW(_A!>cDpiwIQz|Ghh(qx}7I7VpQ`E#i3=ch?8MZkG7of7@X5X`A-q<r?QN
z&;RVa-NeCtzshX?PPZph7#Nt{JY5_^Dj471W}PJM$kX~TJ?-oawdAyzXJ4QF`|g!!
zQMlZ6<CV}~c^~v8<|p(R9!pW5t}o*Kv}kG6YIA`(X{(*?yA<wjo=~#O_Lryqd<BX5
zLBDzr3N&V1eDA8<l3=sYewNyW^<MRctyRXqRtrv<efhqt^NMRR7bKfmX6e3MV<Qs1
z_T`#7_Nv?yj?z`RCmngVmOW9*a#$^9xzc&Ht>sF`)y$SFomNko6S6>br)ImHgIEHi
zn8E=jorc3qItQ5g!jA^c)LRm>@?6=8fZ|)ryS2|-op39<t1S4}X48cp&ogHwa<(%I
zm277UF7{sZ?pT6nl294*G`-H#%?ocTd;Z~XUcTf2&%H^kngMOwl~-<<{EK_if9WpI
zR;`-5let8HL`~pI{h_3)<Iuy(v4MdbCu+D^K8^q5-^Dcy{?AuVIK^&YE9()$_Wk5%
zUC-ou>gv*yj_>xDb5-dtonP~2@}7(%njIc;uk9*bq<m(kw|{c`FfGRu#P|DD@%<$G
zB?bO`f0cf7PjAm=vpu37%@$wwD;}#YdOp!)h4Kf_aNc{54w#o#aMT31r#_f%b;hIF
z<cs}6p*^;f*<34jEAw)FnEJ(|x#q>|Z!r&Ef8*Md>)9+;vv&g9-n0knTXuc;>Ls;g
z?t%F%b_c`FKm32Ny+dTif$MLTH3MW1Uw&)$=J%TAawntDJX|e1amUw9oc{XnRq}R6
z9=yELYtyB}`?fYO58m#?^dS4o+&^!U_ix?U&Kl9c0SOpRVBGB8{ha;Sy%388Yg@IR
zy(>!`{v5h7`xN_~y++@bePRrpzS(>#e?`sXH@;7qw{4%ZcV&&k`)MGtj(G*gJjxxU
z({oMO_k0Ga)h{r(E*;Q1x%pOu@En^=-W3M|SD7r}c4uA6sBTepNpi!}w?IR_6_nL4
z^o^PS@96RWQIS*hOw?u^ym`3QtkAsYX?R=pW$hoUjNcU+-I*=-Fk2>*<Hh0lK<5K&
z|NJJ_IIQPvYpQV&mwDV+a-f=NTCl&_f;$YCH>yicxYzX7WCHh!H4_>O6(?~<=nJPj
z4(ZX8-%uB!X#M!t+1UR@j4vNPEM`9k%n%aEJ%-P?qeOpBJ-zk%KTvVv>FVdQ&MBb@
E0EL#nCjbBd

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/round_extension_24.xml b/app/src/main/res/drawable/round_extension_24.xml
new file mode 100644
index 0000000..91e53c3
--- /dev/null
+++ b/app/src/main/res/drawable/round_extension_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_custom_location.xml b/app/src/main/res/layout/activity_custom_location.xml
index 8694351..6127dc5 100644
--- a/app/src/main/res/layout/activity_custom_location.xml
+++ b/app/src/main/res/layout/activity_custom_location.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:background="@color/colorPrimaryDark"
-        tools:context="com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity">
+        tools:context="com.tommasoberlose.anotherwidget.ui.activities.CustomLocationActivity">
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_integrations.xml b/app/src/main/res/layout/activity_integrations.xml
new file mode 100644
index 0000000..03c6b53
--- /dev/null
+++ b/app/src/main/res/layout/activity_integrations.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable
+            name="viewModel"
+            type="com.tommasoberlose.anotherwidget.ui.viewmodels.IntegrationsViewModel" />
+    </data>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@color/colorPrimaryDark"
+        tools:context="com.tommasoberlose.anotherwidget.ui.activities.IntegrationsActivity">
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:cardElevation="2dp"
+            app:cardCornerRadius="0dp"
+            android:id="@+id/toolbar"
+            app:cardBackgroundColor="@color/colorPrimary">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="56dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp">
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="10dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:layout_centerVertical="true"
+                    android:id="@+id/action_back"
+                    android:layout_alignParentLeft="true"
+                    android:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_arrow_back" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:text="@string/settings_title_integrations"
+                    android:gravity="center"
+                    style="@style/AnotherWidget.Main.Title"/>
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:padding="10dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:layout_centerVertical="true"
+                    android:id="@+id/action_filter"
+                    android:layout_alignParentRight="true"
+                    android:visibility="gone"
+                    android:tint="@color/colorPrimaryText"
+                    android:src="@drawable/round_filter_list" />
+            </RelativeLayout>
+        </com.google.android.material.card.MaterialCardView>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+            <androidx.core.widget.ContentLoadingProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:indeterminate="true"
+                android:indeterminateTint="@color/colorAccent"
+                android:layout_marginTop="-7dp"
+                android:id="@+id/loader"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/list_view" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_advanced_settings.xml b/app/src/main/res/layout/fragment_advanced_settings.xml
index 9fe5d1f..8073847 100644
--- a/app/src/main/res/layout/fragment_advanced_settings.xml
+++ b/app/src/main/res/layout/fragment_advanced_settings.xml
@@ -172,6 +172,43 @@
                             style="@style/AnotherWidget.Settings.Subtitle"/>
                     </LinearLayout>
                 </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="16dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center_vertical"
+                    android:id="@+id/action_integrations"
+                    android:orientation="horizontal">
+                    <ImageView
+                        android:layout_width="48dp"
+                        android:layout_height="48dp"
+                        android:padding="12dp"
+                        android:src="@drawable/round_extension"
+                        android:tint="@color/colorPrimaryText"/>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/AnotherWidget.Settings.Title"
+                            android:text="@string/settings_title_integrations"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/integrations_count_label"
+                            style="@style/AnotherWidget.Settings.Subtitle"/>
+                    </LinearLayout>
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f933dc0..dc3295c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -215,4 +215,6 @@
     <string name="settings_song_info_format_title">Song info format</string>
     <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
 	<string name="settings_at_a_glance_title">At a Glance</string>
+	<string name="settings_title_integrations">Integrations</string>
+	<string name="label_count_installed_integrations">%d installed integrations</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 26cf78d..5cd9a61 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -195,4 +195,6 @@
     <string name="settings_song_info_format_title">Song info format</string>
     <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
     <string name="settings_at_a_glance_title">At a Glance</string>
+    <string name="settings_title_integrations">Integrations</string>
+    <string name="label_count_installed_integrations">%d installed integrations</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index aeb2b07..e2e713a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -194,4 +194,6 @@
     <string name="settings_song_info_format_title">Formato informazioni brano</string>
     <string name="settings_request_notification_access">Concedi all\'app il permesso di monitorare le notifiche, è necessario per poter mostrare il brano in riproduzione.</string>
     <string name="settings_at_a_glance_title">At a Glance</string>
+    <string name="settings_title_integrations">Integrazioni</string>
+    <string name="label_count_installed_integrations">%d integrazioni installate</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3c8b97..391f3d3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,4 +206,7 @@
     <string name="settings_show_music_disabled_subtitle">Playing song info hidden</string>
     <string name="settings_song_info_format_title">Song info format</string>
     <string name="settings_request_notification_access">We need the notification access permission to check the current playing song.</string>
+    <string name="title_googlefit" translatable="false">Google Fit</string>
+    <string name="settings_title_integrations">Integrations</string>
+    <string name="label_count_installed_integrations">%d installed integrations</string>
 </resources>
diff --git a/googlefit/.gitignore b/googlefit/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/googlefit/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/googlefit/build.gradle b/googlefit/build.gradle
new file mode 100644
index 0000000..16d5aa4
--- /dev/null
+++ b/googlefit/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.dynamic-feature'
+
+def apiKeyPropertiesFile = rootProject.file("apikey.properties")
+def apiKeyProperties = new Properties()
+apiKeyProperties.load(new FileInputStream(apiKeyPropertiesFile))
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        manifestPlaceholders = [ "AWARENESS_API_KEY": apiKeyProperties['AWARENESS_API_KEY']]
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':app')
+
+    // At a Glance
+    implementation 'com.google.android.gms:play-services-awareness:18.0.0'
+}
diff --git a/googlefit/src/main/AndroidManifest.xml b/googlefit/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..726d10f
--- /dev/null
+++ b/googlefit/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution"
+    package="com.tommasoberlose.googlefit">
+    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
+
+    <dist:module
+        dist:instant="false"
+        dist:title="@string/title_googlefit">
+        <dist:delivery>
+            <dist:on-demand />
+        </dist:delivery>
+        <dist:fusing dist:include="true" />
+
+        <meta-data
+            android:name="com.google.android.awareness.API_KEY"
+            android:value="${AWARENESS_API_KEY}"/>
+    </dist:module>
+</manifest>
+
diff --git a/settings.gradle b/settings.gradle
index bc7a0af..25fe3e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
 rootProject.name='Another Widget'
 include ':app'
 include ':tasksintegration'
+include ':googlefit'
diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index 53f484a..3234213 100644
--- a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Fri May 08 18:14:21 CEST 2020
+#Fri May 08 19:58:17 CEST 2020
 base.0=/Users/tommaso/Documents/MyCode/another-widget/tasksintegration/build/intermediates/dex/debug/mergeProjectDexDebug/out/classes.dex
 path.0=classes.dex
 renamed.0=classes.dex
diff --git a/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/tasksintegration/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index 4997f34960186ddd519bcede263a572f389add13..e30d2ec4088c90dddf46a4eaf8cfca18c9e42f4f 100644
GIT binary patch
delta 28
gcmbQtIGIr-z?+eY0Sq`87&sIe(q<^FnJ7{Z06hQ%`~Uy|

delta 28
gcmbQtIGIr-z?+eY0Sq`87&sIec1Dz*nJ7{Z06*jff&c&j