From da7ab679091b5da8c35457778808b2ef1fdf78b6 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Sun, 16 Jun 2024 09:31:37 +0700 Subject: [PATCH] refactor: Fix namespace --- presentation-widget/build.gradle.kts | 6 +++--- .../kanade/tachiyomi/appwidget}/TachiyomiWidgetManager.kt | 3 ++- .../tachiyomi/appwidget}/UpdatesGridGlanceReceiver.kt | 2 +- .../kanade/tachiyomi/appwidget}/UpdatesGridGlanceWidget.kt | 2 +- .../kanade/tachiyomi/appwidget}/components/LockedWidget.kt | 2 +- .../tachiyomi/appwidget}/components/UpdatesMangaCover.kt | 2 +- .../tachiyomi/appwidget}/components/UpdatesWidget.kt | 7 +++---- .../kanade/tachiyomi/appwidget}/util/GlanceUtils.kt | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/TachiyomiWidgetManager.kt (78%) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/UpdatesGridGlanceReceiver.kt (87%) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/UpdatesGridGlanceWidget.kt (99%) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/components/LockedWidget.kt (96%) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/components/UpdatesMangaCover.kt (96%) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/components/UpdatesWidget.kt (93%) rename presentation-widget/src/main/java/{ => eu/kanade/tachiyomi/appwidget}/util/GlanceUtils.kt (96%) diff --git a/presentation-widget/build.gradle.kts b/presentation-widget/build.gradle.kts index 9f0c945ef1..b89a812723 100644 --- a/presentation-widget/build.gradle.kts +++ b/presentation-widget/build.gradle.kts @@ -21,9 +21,9 @@ android { } dependencies { - implementation(project(":core")) - implementation(project(":domain")) - implementation(project(":presentation-core")) + implementation(projects.core) + implementation(projects.domain) + implementation(projects.presentationCore) implementation(androidx.glance.appwidget) diff --git a/presentation-widget/src/main/java/TachiyomiWidgetManager.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/TachiyomiWidgetManager.kt similarity index 78% rename from presentation-widget/src/main/java/TachiyomiWidgetManager.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/TachiyomiWidgetManager.kt index beb63f41bf..a37fa78e07 100644 --- a/presentation-widget/src/main/java/TachiyomiWidgetManager.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/TachiyomiWidgetManager.kt @@ -1,7 +1,8 @@ -package yokai.presentation.widget +package eu.kanade.tachiyomi.appwidget import android.content.Context import androidx.glance.appwidget.GlanceAppWidgetManager +import eu.kanade.tachiyomi.appwidget.UpdatesGridGlanceWidget class TachiyomiWidgetManager { diff --git a/presentation-widget/src/main/java/UpdatesGridGlanceReceiver.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/UpdatesGridGlanceReceiver.kt similarity index 87% rename from presentation-widget/src/main/java/UpdatesGridGlanceReceiver.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/UpdatesGridGlanceReceiver.kt index b262ec5f35..4423aeebf5 100644 --- a/presentation-widget/src/main/java/UpdatesGridGlanceReceiver.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/UpdatesGridGlanceReceiver.kt @@ -1,4 +1,4 @@ -package yokai.presentation.widget +package eu.kanade.tachiyomi.appwidget import androidx.glance.appwidget.GlanceAppWidget import androidx.glance.appwidget.GlanceAppWidgetReceiver diff --git a/presentation-widget/src/main/java/UpdatesGridGlanceWidget.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/UpdatesGridGlanceWidget.kt similarity index 99% rename from presentation-widget/src/main/java/UpdatesGridGlanceWidget.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/UpdatesGridGlanceWidget.kt index d839cb14bf..dda4a6a6d6 100644 --- a/presentation-widget/src/main/java/UpdatesGridGlanceWidget.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/UpdatesGridGlanceWidget.kt @@ -1,4 +1,4 @@ -package yokai.presentation.widget +package eu.kanade.tachiyomi.appwidget import android.app.Application import android.content.Context diff --git a/presentation-widget/src/main/java/components/LockedWidget.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt similarity index 96% rename from presentation-widget/src/main/java/components/LockedWidget.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt index 07471d8521..8911445446 100644 --- a/presentation-widget/src/main/java/components/LockedWidget.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/LockedWidget.kt @@ -1,4 +1,4 @@ -package yokai.presentation.widget.components +package eu.kanade.tachiyomi.appwidget.components import android.content.Intent import androidx.compose.runtime.Composable diff --git a/presentation-widget/src/main/java/components/UpdatesMangaCover.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesMangaCover.kt similarity index 96% rename from presentation-widget/src/main/java/components/UpdatesMangaCover.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesMangaCover.kt index def7f8db65..a9aa232d08 100644 --- a/presentation-widget/src/main/java/components/UpdatesMangaCover.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesMangaCover.kt @@ -1,4 +1,4 @@ -package yokai.presentation.widget.components +package eu.kanade.tachiyomi.appwidget.components import android.graphics.Bitmap import androidx.compose.runtime.Composable diff --git a/presentation-widget/src/main/java/components/UpdatesWidget.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt similarity index 93% rename from presentation-widget/src/main/java/components/UpdatesWidget.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt index 906c8f09cb..e447e47d4e 100644 --- a/presentation-widget/src/main/java/components/UpdatesWidget.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/components/UpdatesWidget.kt @@ -1,4 +1,4 @@ -package yokai.presentation.widget.components +package eu.kanade.tachiyomi.appwidget.components import android.content.Intent import android.graphics.Bitmap @@ -17,17 +17,16 @@ import androidx.glance.layout.Row import androidx.glance.layout.fillMaxWidth import androidx.glance.layout.padding import androidx.glance.text.Text -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.appwidget.ContainerModifier import eu.kanade.tachiyomi.appwidget.util.calculateRowAndColumnCount import eu.kanade.tachiyomi.appwidget.util.stringResource -import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.SearchActivity @Composable fun UpdatesWidget(data: List>?) { val (rowCount, columnCount) = LocalSize.current.calculateRowAndColumnCount() - val mainIntent = Intent(LocalContext.current, MainActivity::class.java).setAction(MainActivity.SHORTCUT_RECENTS) + val clazz = Class.forName("eu.kanade.tachiyomi.ui.main.MainActivity") + val mainIntent = Intent(LocalContext.current, clazz).setAction("eu.kanade.tachiyomi.SHOW_RECENTS") .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) Column( modifier = ContainerModifier.clickable(actionStartActivity(mainIntent)), diff --git a/presentation-widget/src/main/java/util/GlanceUtils.kt b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/util/GlanceUtils.kt similarity index 96% rename from presentation-widget/src/main/java/util/GlanceUtils.kt rename to presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/util/GlanceUtils.kt index 81214717e4..5f56877211 100644 --- a/presentation-widget/src/main/java/util/GlanceUtils.kt +++ b/presentation-widget/src/main/java/eu/kanade/tachiyomi/appwidget/util/GlanceUtils.kt @@ -1,4 +1,4 @@ -package yokai.presentation.widget.util +package eu.kanade.tachiyomi.appwidget.util import androidx.annotation.StringRes import androidx.compose.runtime.Composable