REM-895 - Move Google Tasks code to the cloud module

naz013 · Dec 22, 2024 · 3ff7b94 · 3ff7b94
1 parent cd347d8
commit 3ff7b94
Show file tree

Hide file tree

Showing 45 changed files with 819 additions and 719 deletions.
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -195,8 +195,6 @@ dependencies {
   implementation(libs.google.api.services.calendar) {
     exclude(group = "com.google.guava", module = "listenablefuture")
   }
-  implementation(libs.google.api.services.tasks)
-  implementation(libs.google.http.client.gson)
   implementation(libs.google.api.client.android) {
     exclude(group = "org.apache.httpcomponents")
   }

diff --git a/app/src/main/java/com/elementary/tasks/core/appwidgets/googletasks/TasksFactory.kt b/app/src/main/java/com/elementary/tasks/core/appwidgets/googletasks/TasksFactory.kt
@@ -12,7 +12,6 @@ import com.elementary.tasks.core.appwidgets.AppWidgetActionActivity
 import com.elementary.tasks.core.appwidgets.Direction
 import com.elementary.tasks.core.appwidgets.WidgetIntentProtocol
 import com.elementary.tasks.core.appwidgets.WidgetUtils
-import com.elementary.tasks.core.cloud.GTasks
 import com.elementary.tasks.core.data.invokeSuspend
 import com.elementary.tasks.core.utils.Constants
 import com.elementary.tasks.core.utils.ThemeProvider
@@ -96,7 +95,7 @@ class TasksFactory(
       ThemeProvider.themedColor(context, 0)
     }
 
-    val icon = if (task.status == GTasks.TASKS_COMPLETE) {
+    val icon = if (task.status == GoogleTask.TASKS_COMPLETE) {
       ViewUtils.createIcon(context, R.drawable.ic_builder_google_task_list, listColor)
     } else {
       ViewUtils.createIcon(context, R.drawable.ic_fluent_radio_button, listColor)

diff --git a/...c/main/java/com/elementary/tasks/core/appwidgets/googletasks/TasksWidgetConfigActivity.kt b/...c/main/java/com/elementary/tasks/core/appwidgets/googletasks/TasksWidgetConfigActivity.kt
@@ -6,16 +6,16 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import com.elementary.tasks.R
-import com.github.naz013.analytics.Widget
-import com.github.naz013.analytics.WidgetUsedEvent
 import com.elementary.tasks.core.appwidgets.BaseWidgetConfigActivity
 import com.elementary.tasks.core.appwidgets.WidgetUtils
-import com.elementary.tasks.core.cloud.GTasks
-import com.github.naz013.feature.common.android.colorOf
 import com.elementary.tasks.core.utils.ui.ViewUtils
+import com.elementary.tasks.databinding.ActivityWidgetGoogleTasksConfigBinding
+import com.github.naz013.analytics.Widget
+import com.github.naz013.analytics.WidgetUsedEvent
+import com.github.naz013.cloudapi.googletasks.GoogleTasksAuthManager
 import com.github.naz013.feature.common.android.applyBottomInsetsMargin
 import com.github.naz013.feature.common.android.applyTopInsets
-import com.elementary.tasks.databinding.ActivityWidgetGoogleTasksConfigBinding
+import com.github.naz013.feature.common.android.colorOf
 import org.koin.android.ext.android.get
 
 class TasksWidgetConfigActivity :
@@ -65,7 +65,7 @@ class TasksWidgetConfigActivity :
 
     showCurrentTheme()
 
-    if (!get<GTasks>().isLogged) {
+    if (!get<GoogleTasksAuthManager>().isAuthorized()) {
       Toast.makeText(this, getString(R.string.you_not_logged_to_google_tasks), Toast.LENGTH_SHORT)
         .show()
       finish()

diff --git a/app/src/main/java/com/elementary/tasks/core/cloud/CloudKeysStorageImpl.kt b/app/src/main/java/com/elementary/tasks/core/cloud/CloudKeysStorageImpl.kt
@@ -7,19 +7,27 @@ class CloudKeysStorageImpl(
   private val prefs: Prefs
 ) : CloudKeysStorage {
 
-    override fun getGoogleDriveUserName(): String {
-      return prefs.driveUser
-    }
+  override fun getGoogleDriveUserName(): String {
+    return prefs.driveUser
+  }
 
-    override fun saveGoogleDriveUserName(name: String) {
-      prefs.driveUser = name
-    }
+  override fun saveGoogleDriveUserName(name: String) {
+    prefs.driveUser = name
+  }
 
-    override fun getDropboxToken(): String {
-      return prefs.dropboxToken
-    }
+  override fun getDropboxToken(): String {
+    return prefs.dropboxToken
+  }
 
-    override fun saveDropboxToken(token: String) {
-      prefs.dropboxToken = token
-    }
+  override fun saveDropboxToken(token: String) {
+    prefs.dropboxToken = token
+  }
+
+  override fun getGoogleTasksUserName(): String {
+    return prefs.tasksUser
+  }
+
+  override fun saveGoogleTasksUserName(name: String) {
+    prefs.tasksUser = name
+  }
 }
diff --git a/app/src/main/java/com/elementary/tasks/core/cloud/GTasks.kt b/app/src/main/java/com/elementary/tasks/core/cloud/GTasks.kt