From 67fc3dbcd88a4c076fd7044872f8d2abaeef215d Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Sun, 3 May 2020 20:40:41 +0200
Subject: [PATCH] Start google tasks integration

---
 .idea/caches/build_file_checksums.ser         | Bin 537 -> 595 bytes
 .idea/gradle.xml                              |   1 +
 .idea/modules.xml                             |   1 +
 app/build.gradle                              |   1 +
 .../anotherwidget/helpers/WeatherHelper.kt    |  12 ++++++----
 app/src/main/res/values/strings.xml           |   1 +
 settings.gradle                               |   1 +
 tasksintegration/.gitignore                   |   1 +
 tasksintegration/build.gradle                 |  21 ++++++++++++++++++
 tasksintegration/src/main/AndroidManifest.xml |  14 ++++++++++++
 10 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 tasksintegration/.gitignore
 create mode 100644 tasksintegration/build.gradle
 create mode 100644 tasksintegration/src/main/AndroidManifest.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 20da4b7ad95ce6ff5c70f6256026f96fb819af05..dab3bebaa21df41a175226a3a9d19fb956ab8446 100644
GIT binary patch
delta 100
zcmV-q0Gt1r1k(hNnFFgt3z3{m0SA%kDG=D~w`{#3Yji1W%HNU8k^++=0ay_obYXLA
zb7^jLWoL3>bZKvHlkou;5E-8G-WLNP-Y1-1PnX|7#FKadkP*#X0}P=}*duh_yI-GP
GJ`#91G%4Ev

delta 61
zcmV-D0K)&%1epYonFEXU#gUv$0S1xjDG&;7J4hwb+p{uH^Jl?Q;s28&0a%l?0ge$N
T0#=iRU&Ta>ujXlkDC}H#Jm4Eh

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a..791dac0 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$/tasksintegration" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e31ade1..3a35afd 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$/tasksintegration/tasksintegration.iml" filepath="$PROJECT_DIR$/tasksintegration/tasksintegration.iml" group="Another Widget/tasksintegration" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fdb4e24..f33fedc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,6 +52,7 @@ android {
 
     viewBinding.enabled = true
 
+    dynamicFeatures = [":tasksintegration"]
 }
 
 dependencies {
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
index 03727b7..09b88d5 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt
@@ -1,5 +1,6 @@
 package com.tommasoberlose.anotherwidget.helpers
 
+import android.Manifest
 import android.content.Context
 import com.google.android.gms.location.LocationServices
 import com.kwabenaberko.openweathermaplib.constants.Units
@@ -10,6 +11,7 @@ import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.network.WeatherNetworkApi
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
+import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
 
 
 /**
@@ -22,12 +24,14 @@ object WeatherHelper {
         val networkApi = WeatherNetworkApi(context)
         if (Preferences.customLocationAdd != "") {
             networkApi.updateWeather()
-        } else {
+        } else if (context.checkGrantedPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
             LocationServices.getFusedLocationProviderClient(context).lastLocation.addOnSuccessListener {
-                Preferences.customLocationLat = it.latitude.toString()
-                Preferences.customLocationLon = it.longitude.toString()
+                if (it != null) {
+                    Preferences.customLocationLat = it.latitude.toString()
+                    Preferences.customLocationLon = it.longitude.toString()
 
-                networkApi.updateWeather()
+                    networkApi.updateWeather()
+                }
             }
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a0a6719..c08588d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,4 +182,5 @@
     <string name="support_dev_subtitle">This is a single developer project,\nso thank you for the support!</string>
     <string name="settings_feedback_subtitle">This is an open-source project, feel free to help.</string>
     <string name="settings_feedback_title">Feedback and feature requests</string>
+    <string name="title_tasksintegration">Tasks Integration</string>
 </resources>
diff --git a/settings.gradle b/settings.gradle
index 9ab0d5f..bc7a0af 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,3 @@
 rootProject.name='Another Widget'
 include ':app'
+include ':tasksintegration'
diff --git a/tasksintegration/.gitignore b/tasksintegration/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/tasksintegration/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/tasksintegration/build.gradle b/tasksintegration/build.gradle
new file mode 100644
index 0000000..fc97adb
--- /dev/null
+++ b/tasksintegration/build.gradle
@@ -0,0 +1,21 @@
+apply plugin: 'com.android.dynamic-feature'
+
+android {
+    compileSdkVersion 29
+    
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+    }
+
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':app')
+}
diff --git a/tasksintegration/src/main/AndroidManifest.xml b/tasksintegration/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2c2fa4d
--- /dev/null
+++ b/tasksintegration/src/main/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution"
+    package="com.tommasoberlose.tasksintegration">
+
+    <dist:module
+        dist:instant="false"
+        dist:title="@string/title_tasksintegration">
+        <dist:delivery>
+            <dist:on-demand />
+        </dist:delivery>
+        <dist:fusing dist:include="true" />
+    </dist:module>
+</manifest>
+