From c4825806865bc225c23863a942ec76815f9d55cd Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 5 Jul 2022 03:21:35 +0200 Subject: [PATCH] Rename package to com.machaiv3lli.fdroid --- build.gradle.kts | 4 +- src/debug/java/Previews.kt | 12 +-- .../ui/compose/pages/app_detail/AppDetail.kt | 2 - .../droidify => machiav3lli/fdroid}/Common.kt | 2 +- .../fdroid}/MainApplication.kt | 45 +++++---- .../fdroid}/Resource.kt | 2 +- .../fdroid}/content/Cache.kt | 4 +- .../fdroid}/content/Preferences.kt | 12 +-- .../fdroid}/database/Converters.kt | 10 +- .../fdroid}/database/DatabaseX.kt | 36 ++++---- .../fdroid}/database/QueryBuilder.kt | 2 +- .../fdroid}/database/dao/BaseDao.kt | 2 +- .../fdroid}/database/dao/CategoryDao.kt | 6 +- .../fdroid}/database/dao/InstalledDao.kt | 4 +- .../fdroid}/database/dao/ProductDao.kt | 92 +++++++++---------- .../fdroid}/database/dao/ReleaseDao.kt | 4 +- .../fdroid}/database/dao/RepositoryDao.kt | 4 +- .../fdroid}/database/entity/Category.kt | 4 +- .../fdroid}/database/entity/Extras.kt | 4 +- .../fdroid}/database/entity/Installed.kt | 4 +- .../fdroid}/database/entity/Product.kt | 20 ++-- .../fdroid}/database/entity/Release.kt | 10 +- .../fdroid}/database/entity/Repository.kt | 6 +- .../fdroid}/entity/AntiFeatures.kt | 4 +- .../fdroid}/entity/Enums.kt | 4 +- .../fdroid}/entity/ProductItem.kt | 4 +- .../fdroid}/entity/Section.kt | 4 +- .../fdroid}/entity/SubEntities.kt | 4 +- .../fdroid}/graphics/DrawableWrapper.kt | 2 +- .../fdroid}/graphics/PaddingDrawable.kt | 2 +- .../fdroid}/index/IndexHandler.kt | 12 +-- .../fdroid}/index/IndexMerger.kt | 14 +-- .../fdroid}/index/IndexV1Parser.kt | 18 ++-- .../fdroid}/index/RepositoryUpdater.kt | 24 ++--- .../fdroid}/installer/AppInstaller.kt | 4 +- .../fdroid}/installer/BaseInstaller.kt | 2 +- .../fdroid}/installer/DefaultInstaller.kt | 6 +- .../fdroid}/installer/DefaultInstallerOld.kt | 6 +- .../fdroid}/installer/InstallationEvents.kt | 2 +- .../fdroid}/installer/InstallerService.kt | 16 ++-- .../fdroid}/installer/RootInstaller.kt | 10 +- .../fdroid}/network/CoilDownloader.kt | 8 +- .../fdroid}/network/DownloadResult.kt | 2 +- .../fdroid}/network/Downloader.kt | 6 +- .../fdroid}/network/DownloaderX.kt | 6 +- .../fdroid}/screen/MessageDialog.kt | 16 ++-- .../fdroid}/screen/ScreenshotsFragment.kt | 26 +++--- .../fdroid}/service/Connection.kt | 2 +- .../fdroid}/service/ConnectionService.kt | 4 +- .../fdroid}/service/DownloadService.kt | 42 ++++----- .../fdroid}/service/PackageChangedReceiver.kt | 16 ++-- .../fdroid}/service/SyncService.kt | 44 ++++----- .../fdroid}/ui/activities/MainActivityX.kt | 32 +++---- .../fdroid}/ui/activities/PrefsActivityX.kt | 27 +++--- .../fdroid}/ui/compose/ItemRecyclers.kt | 18 ++-- .../ui/compose/components/ActionButton.kt | 6 +- .../ui/compose/components/Controller.kt | 2 +- .../ui/compose/components/ExpandableBlock.kt | 4 +- .../ui/compose/components/ProductCard.kt | 10 +- .../ui/compose/components/ProductsListItem.kt | 18 ++-- .../ui/compose/components/RespositoryItem.kt | 4 +- .../ui/compose/components/ScreenshotList.kt | 10 +- .../fdroid}/ui/compose/components/TopBar.kt | 6 +- .../ui/compose/pages/app_detail/AppDetail.kt | 2 + .../pages/app_detail/components/ChipGrid.kt | 6 +- .../pages/app_detail/components/Header.kt | 16 ++-- .../pages/app_detail/components/LinkItem.kt | 8 +- .../app_detail/components/PermissionsItem.kt | 8 +- .../app_detail/components/ReleaseItem.kt | 18 ++-- .../pages/app_detail/components/TextBlock.kt | 4 +- .../pages/home/components/CategoryChipList.kt | 4 +- .../settings/components/PreferenceSlider.kt | 2 +- .../settings/components/PreferenceSwitch.kt | 2 +- .../settings/components/PrefernceDataType.kt | 2 +- .../settings/repository/RepositoryPage.kt | 6 +- .../fdroid}/ui/compose/theme/Color.kt | 2 +- .../fdroid}/ui/compose/theme/Shape.kt | 2 +- .../fdroid}/ui/compose/theme/Theme.kt | 4 +- .../fdroid}/ui/compose/theme/Utils.kt | 2 +- .../fdroid}/ui/compose/utils/Animations.kt | 2 +- .../fdroid}/ui/compose/utils/Callbacks.kt | 8 +- .../fdroid}/ui/compose/utils/Card.kt | 2 +- .../fdroid}/ui/compose/utils/Chip.kt | 3 +- .../fdroid}/ui/compose/utils/Colors.kt | 2 +- .../fdroid}/ui/compose/utils/Grid.kt | 2 +- .../fdroid}/ui/compose/utils/Image.kt | 10 +- .../fdroid}/ui/dialog/LaunchDialog.kt | 6 +- .../fdroid}/ui/fragments/AppSheetX.kt | 84 ++++++++--------- .../fdroid}/ui/fragments/BaseNavFragment.kt | 2 +- .../ui/fragments/EditRepositorySheetX.kt | 28 +++--- .../fdroid}/ui/fragments/ExploreFragment.kt | 30 +++--- .../FullscreenBottomSheetDialogFragment.kt | 2 +- .../fdroid}/ui/fragments/InstalledFragment.kt | 30 +++--- .../fdroid}/ui/fragments/LatestFragment.kt | 33 +++---- .../fdroid}/ui/fragments/MainNavFragmentX.kt | 14 +-- .../fdroid}/ui/fragments/PrefsNavFragmentX.kt | 22 ++--- .../ui/fragments/PrefsOtherFragment.kt | 8 +- .../ui/fragments/PrefsRepositoriesFragment.kt | 14 +-- .../ui/fragments/PrefsUpdatesFragment.kt | 6 +- .../fdroid}/ui/fragments/PrefsUserFragment.kt | 12 +-- .../fdroid}/ui/fragments/RepositorySheetX.kt | 22 ++--- .../fdroid}/ui/viewmodels/AppViewModelX.kt | 20 ++-- .../ui/viewmodels/MainActivityViewModelX.kt | 2 +- .../viewmodels/MainNavFragmentViewModelX.kt | 24 ++--- .../ui/viewmodels/RepositoriesViewModelX.kt | 12 +-- .../ui/viewmodels/RepositoryViewModelX.kt | 6 +- .../fdroid}/utility/KParcelable.kt | 2 +- .../fdroid}/utility/NotificationUtils.kt | 38 ++++---- .../fdroid}/utility/PackageItemResolver.kt | 4 +- .../fdroid}/utility/PreferenceType.kt | 2 +- .../fdroid}/utility/ProgressInputStream.kt | 2 +- .../fdroid}/utility/RxUtils.kt | 2 +- .../fdroid}/utility/SampleData.kt | 8 +- .../fdroid}/utility/Utils.kt | 42 ++++----- .../fdroid}/utility/extension/Android.kt | 2 +- .../fdroid}/utility/extension/Json.kt | 2 +- .../fdroid}/utility/extension/LiveData.kt | 2 +- .../utility/extension/OkHttpExtension.kt | 2 +- .../fdroid}/utility/extension/Resources.kt | 2 +- .../fdroid}/utility/extension/Text.kt | 2 +- .../fdroid}/widget/EnumRecyclerAdapter.kt | 2 +- .../fdroid}/widget/FocusSearchView.kt | 4 +- .../fdroid}/widget/StableRecyclerAdapter.kt | 2 +- src/main/res/menu/menu_main.xml | 2 +- .../res/navigation/navigation_graph_main.xml | 10 +- .../res/navigation/navigation_graph_prefs.xml | 9 +- 126 files changed, 689 insertions(+), 684 deletions(-) delete mode 100644 src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/AppDetail.kt rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/Common.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/MainApplication.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/Resource.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/content/Cache.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/content/Preferences.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/Converters.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/DatabaseX.kt (74%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/QueryBuilder.kt (94%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/dao/BaseDao.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/dao/CategoryDao.kt (86%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/dao/InstalledDao.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/dao/ProductDao.kt (80%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/dao/ReleaseDao.kt (84%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/dao/RepositoryDao.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/entity/Category.kt (80%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/entity/Extras.kt (74%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/entity/Installed.kt (79%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/entity/Product.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/entity/Release.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/database/entity/Repository.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/entity/AntiFeatures.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/entity/Enums.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/entity/ProductItem.kt (80%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/entity/Section.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/entity/SubEntities.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/graphics/DrawableWrapper.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/graphics/PaddingDrawable.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/index/IndexHandler.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/index/IndexMerger.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/index/IndexV1Parser.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/index/RepositoryUpdater.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/AppInstaller.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/BaseInstaller.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/DefaultInstaller.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/DefaultInstallerOld.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/InstallationEvents.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/InstallerService.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/installer/RootInstaller.kt (94%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/network/CoilDownloader.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/network/DownloadResult.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/network/Downloader.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/network/DownloaderX.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/screen/MessageDialog.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/screen/ScreenshotsFragment.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/service/Connection.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/service/ConnectionService.kt (80%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/service/DownloadService.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/service/PackageChangedReceiver.kt (83%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/service/SyncService.kt (94%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/activities/MainActivityX.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/activities/PrefsActivityX.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/ItemRecyclers.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/ActionButton.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/Controller.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/ExpandableBlock.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/ProductCard.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/ProductsListItem.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/RespositoryItem.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/ScreenshotList.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/components/TopBar.kt (97%) create mode 100644 src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/AppDetail.kt rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/app_detail/components/ChipGrid.kt (86%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/app_detail/components/Header.kt (94%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/app_detail/components/LinkItem.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/app_detail/components/PermissionsItem.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/app_detail/components/ReleaseItem.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/app_detail/components/TextBlock.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/home/components/CategoryChipList.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/settings/components/PreferenceSlider.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/settings/components/PreferenceSwitch.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/settings/components/PrefernceDataType.kt (94%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/pages/settings/repository/RepositoryPage.kt (88%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/theme/Color.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/theme/Shape.kt (88%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/theme/Theme.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/theme/Utils.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Animations.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Callbacks.kt (61%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Card.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Chip.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Colors.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Grid.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/compose/utils/Image.kt (84%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/dialog/LaunchDialog.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/AppSheetX.kt (91%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/BaseNavFragment.kt (88%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/EditRepositorySheetX.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/ExploreFragment.kt (88%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/FullscreenBottomSheetDialogFragment.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/InstalledFragment.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/LatestFragment.kt (89%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/MainNavFragmentX.kt (91%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/PrefsNavFragmentX.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/PrefsOtherFragment.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/PrefsRepositoriesFragment.kt (84%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/PrefsUpdatesFragment.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/PrefsUserFragment.kt (88%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/fragments/RepositorySheetX.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/viewmodels/AppViewModelX.kt (92%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/viewmodels/MainActivityViewModelX.kt (65%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/viewmodels/MainNavFragmentViewModelX.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/viewmodels/RepositoriesViewModelX.kt (87%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/ui/viewmodels/RepositoryViewModelX.kt (90%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/KParcelable.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/NotificationUtils.kt (91%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/PackageItemResolver.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/PreferenceType.kt (91%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/ProgressInputStream.kt (95%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/RxUtils.kt (98%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/SampleData.kt (84%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/Utils.kt (93%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/extension/Android.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/extension/Json.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/extension/LiveData.kt (86%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/extension/OkHttpExtension.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/extension/Resources.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/utility/extension/Text.kt (97%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/widget/EnumRecyclerAdapter.kt (96%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/widget/FocusSearchView.kt (94%) rename src/main/kotlin/com/{looker/droidify => machiav3lli/fdroid}/widget/StableRecyclerAdapter.kt (95%) diff --git a/build.gradle.kts b/build.gradle.kts index 4fa715a4..118f47bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,11 +14,11 @@ plugins { } android { - namespace = "com.looker.droidify" + namespace = "com.machiav3lli.fdroid" compileSdk = 32 defaultConfig { - applicationId = "com.looker.droidify" + applicationId = "com.machiav3lli.fdroid" minSdk = 23 targetSdk = 32 versionCode = 907 diff --git a/src/debug/java/Previews.kt b/src/debug/java/Previews.kt index f07df0de..83010ed2 100644 --- a/src/debug/java/Previews.kt +++ b/src/debug/java/Previews.kt @@ -1,12 +1,12 @@ import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.Preview -import com.looker.droidify.ui.compose.pages.app_detail.components.AntiFeaturesGrid -import com.looker.droidify.ui.compose.pages.app_detail.components.PermissionGrid -import com.looker.droidify.ui.compose.pages.app_detail.components.ReleaseItem -import com.looker.droidify.ui.compose.theme.AppTheme -import com.looker.droidify.ui.compose.utils.CustomChip -import com.looker.droidify.utility.SampleData +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.AntiFeaturesGrid +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.PermissionGrid +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.ReleaseItem +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.ui.compose.utils.CustomChip +import com.machiav3lli.fdroid.utility.SampleData @Preview @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/AppDetail.kt b/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/AppDetail.kt deleted file mode 100644 index 5c1003ae..00000000 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/AppDetail.kt +++ /dev/null @@ -1,2 +0,0 @@ -package com.looker.droidify.ui.compose.pages.app_detail - diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/machiav3lli/fdroid/Common.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/Common.kt rename to src/main/kotlin/com/machiav3lli/fdroid/Common.kt index 34d7811b..280a7f14 100644 --- a/src/main/kotlin/com/looker/droidify/Common.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/Common.kt @@ -1,4 +1,4 @@ -package com.looker.droidify +package com.machiav3lli.fdroid const val NOTIFICATION_CHANNEL_SYNCING = "syncing" const val NOTIFICATION_CHANNEL_UPDATES = "updates" diff --git a/src/main/kotlin/com/looker/droidify/MainApplication.kt b/src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/MainApplication.kt rename to src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt index 0979e717..99df95e8 100644 --- a/src/main/kotlin/com/looker/droidify/MainApplication.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt @@ -1,4 +1,4 @@ -package com.looker.droidify +package com.machiav3lli.fdroid import android.annotation.SuppressLint import android.app.Application @@ -13,34 +13,45 @@ import android.content.IntentFilter import android.os.BatteryManager import coil.ImageLoader import coil.ImageLoaderFactory -import com.looker.droidify.content.Cache -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.index.RepositoryUpdater -import com.looker.droidify.network.CoilDownloader -import com.looker.droidify.network.Downloader -import com.looker.droidify.service.Connection -import com.looker.droidify.service.PackageChangedReceiver -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.activities.MainActivityX -import com.looker.droidify.utility.Utils.setLanguage -import com.looker.droidify.utility.Utils.toInstalledItem -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.content.Cache +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.index.RepositoryUpdater +import com.machiav3lli.fdroid.network.CoilDownloader +import com.machiav3lli.fdroid.network.Downloader +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.PackageChangedReceiver +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.activities.MainActivityX +import com.machiav3lli.fdroid.utility.Utils.setLanguage +import com.machiav3lli.fdroid.utility.Utils.toInstalledItem +import com.machiav3lli.fdroid.utility.extension.android.Android import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch +import java.lang.ref.WeakReference import java.net.InetSocketAddress import java.net.Proxy -import kotlin.time.Duration.Companion.hours +import kotlin.time.Duration.Companion.minutes @Suppress("unused") class MainApplication : Application(), ImageLoaderFactory { lateinit var db: DatabaseX + //lateinit var wm: WorksManager + + companion object { + private var appRef: WeakReference = WeakReference(null) + private val neo_store: MainApplication get() = appRef.get()!! + + //val wm: WorksManager get() = neo_store.wm + //val db: DatabaseX get() = neo_store.db + } override fun onCreate() { super.onCreate() + appRef = WeakReference(this) db = DatabaseX.getInstance(applicationContext) Preferences.init(this) @@ -52,6 +63,8 @@ class MainApplication : Application(), ImageLoaderFactory { forceSyncAll() }*/ + //wm = WorksManager(applicationContext) + //wm.prune() Cache.cleanup(this) updateSyncJob(false) } @@ -168,7 +181,7 @@ class MainApplication : Application(), ImageLoaderFactory { } private fun autoSync(jobScheduler: JobScheduler, connectionType: Int) { - val period = 12.hours.inWholeMilliseconds + val period = 5.minutes.inWholeMilliseconds jobScheduler.schedule( JobInfo .Builder( diff --git a/src/main/kotlin/com/looker/droidify/Resource.kt b/src/main/kotlin/com/machiav3lli/fdroid/Resource.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/Resource.kt rename to src/main/kotlin/com/machiav3lli/fdroid/Resource.kt index 85d1a133..18fcaee4 100644 --- a/src/main/kotlin/com/looker/droidify/Resource.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/Resource.kt @@ -1,4 +1,4 @@ -package com.looker.droidify +package com.machiav3lli.fdroid sealed class Resource(val data: T? = null, val message: String? = null) { class Loading(data: T? = null) : Resource(data) diff --git a/src/main/kotlin/com/looker/droidify/content/Cache.kt b/src/main/kotlin/com/machiav3lli/fdroid/content/Cache.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/content/Cache.kt rename to src/main/kotlin/com/machiav3lli/fdroid/content/Cache.kt index 58b2e788..5d3cfa02 100644 --- a/src/main/kotlin/com/looker/droidify/content/Cache.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/content/Cache.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.content +package com.machiav3lli.fdroid.content import android.content.ContentProvider import android.content.ContentValues @@ -9,7 +9,7 @@ import android.net.Uri import android.os.ParcelFileDescriptor import android.provider.OpenableColumns import android.system.Os -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.Android import java.io.File import java.util.* import kotlin.concurrent.thread diff --git a/src/main/kotlin/com/looker/droidify/content/Preferences.kt b/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/content/Preferences.kt rename to src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt index f9ad26b2..eb75e205 100644 --- a/src/main/kotlin/com/looker/droidify/content/Preferences.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/content/Preferences.kt @@ -1,13 +1,13 @@ -package com.looker.droidify.content +package com.machiav3lli.fdroid.content import android.content.Context import android.content.SharedPreferences import android.content.res.Configuration -import com.looker.droidify.PREFS_LANGUAGE -import com.looker.droidify.PREFS_LANGUAGE_DEFAULT -import com.looker.droidify.R -import com.looker.droidify.entity.Order -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.PREFS_LANGUAGE +import com.machiav3lli.fdroid.PREFS_LANGUAGE_DEFAULT +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.utility.extension.android.Android import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/src/main/kotlin/com/looker/droidify/database/Converters.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/Converters.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/database/Converters.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/Converters.kt index 5d6c6fca..32c1dc22 100644 --- a/src/main/kotlin/com/looker/droidify/database/Converters.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/Converters.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.database +package com.machiav3lli.fdroid.database import androidx.room.TypeConverter -import com.looker.droidify.database.entity.Release -import com.looker.droidify.entity.Author -import com.looker.droidify.entity.Donate -import com.looker.droidify.entity.Screenshot +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.entity.Author +import com.machiav3lli.fdroid.entity.Donate +import com.machiav3lli.fdroid.entity.Screenshot object Converters { @TypeConverter diff --git a/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt similarity index 74% rename from src/main/kotlin/com/looker/droidify/database/DatabaseX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt index 0bf84563..bbbd2540 100644 --- a/src/main/kotlin/com/looker/droidify/database/DatabaseX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/DatabaseX.kt @@ -1,27 +1,27 @@ -package com.looker.droidify.database +package com.machiav3lli.fdroid.database import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.looker.droidify.database.dao.CategoryDao -import com.looker.droidify.database.dao.CategoryTempDao -import com.looker.droidify.database.dao.ExtrasDao -import com.looker.droidify.database.dao.InstalledDao -import com.looker.droidify.database.dao.ProductDao -import com.looker.droidify.database.dao.ProductTempDao -import com.looker.droidify.database.dao.ReleaseDao -import com.looker.droidify.database.dao.RepositoryDao -import com.looker.droidify.database.entity.Category -import com.looker.droidify.database.entity.CategoryTemp -import com.looker.droidify.database.entity.Extras -import com.looker.droidify.database.entity.Installed -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.ProductTemp -import com.looker.droidify.database.entity.Release -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.database.entity.Repository.Companion.defaultRepositories +import com.machiav3lli.fdroid.database.dao.CategoryDao +import com.machiav3lli.fdroid.database.dao.CategoryTempDao +import com.machiav3lli.fdroid.database.dao.ExtrasDao +import com.machiav3lli.fdroid.database.dao.InstalledDao +import com.machiav3lli.fdroid.database.dao.ProductDao +import com.machiav3lli.fdroid.database.dao.ProductTempDao +import com.machiav3lli.fdroid.database.dao.ReleaseDao +import com.machiav3lli.fdroid.database.dao.RepositoryDao +import com.machiav3lli.fdroid.database.entity.Category +import com.machiav3lli.fdroid.database.entity.CategoryTemp +import com.machiav3lli.fdroid.database.entity.Extras +import com.machiav3lli.fdroid.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.ProductTemp +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.database.entity.Repository.Companion.defaultRepositories import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/src/main/kotlin/com/looker/droidify/database/QueryBuilder.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/QueryBuilder.kt similarity index 94% rename from src/main/kotlin/com/looker/droidify/database/QueryBuilder.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/QueryBuilder.kt index f758039a..2ae7988c 100644 --- a/src/main/kotlin/com/looker/droidify/database/QueryBuilder.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/QueryBuilder.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.database +package com.machiav3lli.fdroid.database class QueryBuilder { companion object { diff --git a/src/main/kotlin/com/looker/droidify/database/dao/BaseDao.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/BaseDao.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/database/dao/BaseDao.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/dao/BaseDao.kt index a403e6ce..83fdad9f 100644 --- a/src/main/kotlin/com/looker/droidify/database/dao/BaseDao.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/BaseDao.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.database.dao +package com.machiav3lli.fdroid.database.dao import androidx.room.* diff --git a/src/main/kotlin/com/looker/droidify/database/dao/CategoryDao.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/CategoryDao.kt similarity index 86% rename from src/main/kotlin/com/looker/droidify/database/dao/CategoryDao.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/dao/CategoryDao.kt index 120bd149..6a7998ec 100644 --- a/src/main/kotlin/com/looker/droidify/database/dao/CategoryDao.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/CategoryDao.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.database.dao +package com.machiav3lli.fdroid.database.dao import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query -import com.looker.droidify.database.entity.Category -import com.looker.droidify.database.entity.CategoryTemp +import com.machiav3lli.fdroid.database.entity.Category +import com.machiav3lli.fdroid.database.entity.CategoryTemp @Dao interface CategoryDao : BaseDao { diff --git a/src/main/kotlin/com/looker/droidify/database/dao/InstalledDao.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/InstalledDao.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/database/dao/InstalledDao.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/dao/InstalledDao.kt index 1f9df9cb..02036cf0 100644 --- a/src/main/kotlin/com/looker/droidify/database/dao/InstalledDao.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/InstalledDao.kt @@ -1,9 +1,9 @@ -package com.looker.droidify.database.dao +package com.machiav3lli.fdroid.database.dao import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Query -import com.looker.droidify.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Installed // TODO make sure that apps that not uninstalled by Droid-ify still get removed @Dao diff --git a/src/main/kotlin/com/looker/droidify/database/dao/ProductDao.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/ProductDao.kt similarity index 80% rename from src/main/kotlin/com/looker/droidify/database/dao/ProductDao.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/dao/ProductDao.kt index acc1c368..5c0e5127 100644 --- a/src/main/kotlin/com/looker/droidify/database/dao/ProductDao.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/ProductDao.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.database.dao +package com.machiav3lli.fdroid.database.dao import androidx.lifecycle.LiveData import androidx.room.Dao @@ -8,51 +8,51 @@ import androidx.room.RawQuery import androidx.room.Transaction import androidx.sqlite.db.SimpleSQLiteQuery import androidx.sqlite.db.SupportSQLiteQuery -import com.looker.droidify.ROW_ADDED -import com.looker.droidify.ROW_ANTIFEATURES -import com.looker.droidify.ROW_CAN_UPDATE -import com.looker.droidify.ROW_CATEGORIES -import com.looker.droidify.ROW_COMPATIBLE -import com.looker.droidify.ROW_DESCRIPTION -import com.looker.droidify.ROW_DONATES -import com.looker.droidify.ROW_ENABLED -import com.looker.droidify.ROW_ICON -import com.looker.droidify.ROW_ID -import com.looker.droidify.ROW_IGNORED_VERSION -import com.looker.droidify.ROW_IGNORE_UPDATES -import com.looker.droidify.ROW_LABEL -import com.looker.droidify.ROW_LICENSES -import com.looker.droidify.ROW_MATCH_RANK -import com.looker.droidify.ROW_METADATA_ICON -import com.looker.droidify.ROW_PACKAGE_NAME -import com.looker.droidify.ROW_RELEASES -import com.looker.droidify.ROW_REPOSITORY_ID -import com.looker.droidify.ROW_SCREENSHOTS -import com.looker.droidify.ROW_SIGNATURE -import com.looker.droidify.ROW_SIGNATURES -import com.looker.droidify.ROW_SUMMARY -import com.looker.droidify.ROW_UPDATED -import com.looker.droidify.ROW_VERSION_CODE -import com.looker.droidify.TABLE_CATEGORY -import com.looker.droidify.TABLE_CATEGORY_NAME -import com.looker.droidify.TABLE_EXTRAS -import com.looker.droidify.TABLE_EXTRAS_NAME -import com.looker.droidify.TABLE_INSTALLED -import com.looker.droidify.TABLE_INSTALLED_NAME -import com.looker.droidify.TABLE_PRODUCT -import com.looker.droidify.TABLE_PRODUCT_NAME -import com.looker.droidify.TABLE_REPOSITORY -import com.looker.droidify.TABLE_REPOSITORY_NAME -import com.looker.droidify.database.QueryBuilder -import com.looker.droidify.database.entity.CategoryTemp -import com.looker.droidify.database.entity.Extras -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.ProductTemp -import com.looker.droidify.database.entity.asProductTemp -import com.looker.droidify.entity.Order -import com.looker.droidify.entity.Section -import com.looker.droidify.entity.UpdateCategory -import com.looker.droidify.ui.fragments.Request +import com.machiav3lli.fdroid.ROW_ADDED +import com.machiav3lli.fdroid.ROW_ANTIFEATURES +import com.machiav3lli.fdroid.ROW_CAN_UPDATE +import com.machiav3lli.fdroid.ROW_CATEGORIES +import com.machiav3lli.fdroid.ROW_COMPATIBLE +import com.machiav3lli.fdroid.ROW_DESCRIPTION +import com.machiav3lli.fdroid.ROW_DONATES +import com.machiav3lli.fdroid.ROW_ENABLED +import com.machiav3lli.fdroid.ROW_ICON +import com.machiav3lli.fdroid.ROW_ID +import com.machiav3lli.fdroid.ROW_IGNORED_VERSION +import com.machiav3lli.fdroid.ROW_IGNORE_UPDATES +import com.machiav3lli.fdroid.ROW_LABEL +import com.machiav3lli.fdroid.ROW_LICENSES +import com.machiav3lli.fdroid.ROW_MATCH_RANK +import com.machiav3lli.fdroid.ROW_METADATA_ICON +import com.machiav3lli.fdroid.ROW_PACKAGE_NAME +import com.machiav3lli.fdroid.ROW_RELEASES +import com.machiav3lli.fdroid.ROW_REPOSITORY_ID +import com.machiav3lli.fdroid.ROW_SCREENSHOTS +import com.machiav3lli.fdroid.ROW_SIGNATURE +import com.machiav3lli.fdroid.ROW_SIGNATURES +import com.machiav3lli.fdroid.ROW_SUMMARY +import com.machiav3lli.fdroid.ROW_UPDATED +import com.machiav3lli.fdroid.ROW_VERSION_CODE +import com.machiav3lli.fdroid.TABLE_CATEGORY +import com.machiav3lli.fdroid.TABLE_CATEGORY_NAME +import com.machiav3lli.fdroid.TABLE_EXTRAS +import com.machiav3lli.fdroid.TABLE_EXTRAS_NAME +import com.machiav3lli.fdroid.TABLE_INSTALLED +import com.machiav3lli.fdroid.TABLE_INSTALLED_NAME +import com.machiav3lli.fdroid.TABLE_PRODUCT +import com.machiav3lli.fdroid.TABLE_PRODUCT_NAME +import com.machiav3lli.fdroid.TABLE_REPOSITORY +import com.machiav3lli.fdroid.TABLE_REPOSITORY_NAME +import com.machiav3lli.fdroid.database.QueryBuilder +import com.machiav3lli.fdroid.database.entity.CategoryTemp +import com.machiav3lli.fdroid.database.entity.Extras +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.ProductTemp +import com.machiav3lli.fdroid.database.entity.asProductTemp +import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.entity.Section +import com.machiav3lli.fdroid.entity.UpdateCategory +import com.machiav3lli.fdroid.ui.fragments.Request @Dao interface ProductDao : BaseDao { diff --git a/src/main/kotlin/com/looker/droidify/database/dao/ReleaseDao.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/ReleaseDao.kt similarity index 84% rename from src/main/kotlin/com/looker/droidify/database/dao/ReleaseDao.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/dao/ReleaseDao.kt index 5ac7ccf5..7a4a9ae1 100644 --- a/src/main/kotlin/com/looker/droidify/database/dao/ReleaseDao.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/ReleaseDao.kt @@ -1,8 +1,8 @@ -package com.looker.droidify.database.dao +package com.machiav3lli.fdroid.database.dao import androidx.room.Dao import androidx.room.Query -import com.looker.droidify.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Release @Dao interface ReleaseDao : BaseDao { diff --git a/src/main/kotlin/com/looker/droidify/database/dao/RepositoryDao.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/RepositoryDao.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/database/dao/RepositoryDao.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/dao/RepositoryDao.kt index a704bf1c..3625738c 100644 --- a/src/main/kotlin/com/looker/droidify/database/dao/RepositoryDao.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/dao/RepositoryDao.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.database.dao +package com.machiav3lli.fdroid.database.dao import androidx.lifecycle.LiveData import androidx.room.Dao import androidx.room.Insert import androidx.room.Query -import com.looker.droidify.database.entity.Repository +import com.machiav3lli.fdroid.database.entity.Repository import kotlinx.coroutines.flow.Flow @Dao diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Category.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Category.kt similarity index 80% rename from src/main/kotlin/com/looker/droidify/database/entity/Category.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/entity/Category.kt index 0a7aa668..8a5f4cb3 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Category.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Category.kt @@ -1,7 +1,7 @@ -package com.looker.droidify.database.entity +package com.machiav3lli.fdroid.database.entity import androidx.room.Entity -import com.looker.droidify.* +import com.machiav3lli.fdroid.* @Entity( tableName = TABLE_CATEGORY_NAME, diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Extras.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Extras.kt similarity index 74% rename from src/main/kotlin/com/looker/droidify/database/entity/Extras.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/entity/Extras.kt index 5a035d97..a12d4b78 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Extras.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Extras.kt @@ -1,8 +1,8 @@ -package com.looker.droidify.database.entity +package com.machiav3lli.fdroid.database.entity import androidx.room.Entity import androidx.room.PrimaryKey -import com.looker.droidify.TABLE_EXTRAS_NAME +import com.machiav3lli.fdroid.TABLE_EXTRAS_NAME @Entity(tableName = TABLE_EXTRAS_NAME) data class Extras( diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Installed.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Installed.kt similarity index 79% rename from src/main/kotlin/com/looker/droidify/database/entity/Installed.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/entity/Installed.kt index 807e8561..b562f54f 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Installed.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Installed.kt @@ -1,8 +1,8 @@ -package com.looker.droidify.database.entity +package com.machiav3lli.fdroid.database.entity import androidx.room.Entity import androidx.room.PrimaryKey -import com.looker.droidify.TABLE_INSTALLED_NAME +import com.machiav3lli.fdroid.TABLE_INSTALLED_NAME @Entity(tableName = TABLE_INSTALLED_NAME) data class Installed( diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Product.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Product.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/database/entity/Product.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/entity/Product.kt index 17b867f6..5a683a3d 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Product.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Product.kt @@ -1,15 +1,15 @@ -package com.looker.droidify.database.entity +package com.machiav3lli.fdroid.database.entity import androidx.room.Entity -import com.looker.droidify.ROW_PACKAGE_NAME -import com.looker.droidify.ROW_REPOSITORY_ID -import com.looker.droidify.TABLE_PRODUCT_NAME -import com.looker.droidify.TABLE_PRODUCT_TEMP_NAME -import com.looker.droidify.entity.Author -import com.looker.droidify.entity.Donate -import com.looker.droidify.entity.ProductItem -import com.looker.droidify.entity.Screenshot -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.ROW_PACKAGE_NAME +import com.machiav3lli.fdroid.ROW_REPOSITORY_ID +import com.machiav3lli.fdroid.TABLE_PRODUCT_NAME +import com.machiav3lli.fdroid.TABLE_PRODUCT_TEMP_NAME +import com.machiav3lli.fdroid.entity.Author +import com.machiav3lli.fdroid.entity.Donate +import com.machiav3lli.fdroid.entity.ProductItem +import com.machiav3lli.fdroid.entity.Screenshot +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Release.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Release.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/database/entity/Release.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/entity/Release.kt index 497667cc..3d88c3ed 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Release.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Release.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.database.entity +package com.machiav3lli.fdroid.database.entity import android.net.Uri import androidx.room.Entity -import com.looker.droidify.ROW_PACKAGE_NAME -import com.looker.droidify.ROW_SIGNATURE -import com.looker.droidify.ROW_VERSION_CODE -import com.looker.droidify.TABLE_RELEASE_NAME +import com.machiav3lli.fdroid.ROW_PACKAGE_NAME +import com.machiav3lli.fdroid.ROW_SIGNATURE +import com.machiav3lli.fdroid.ROW_VERSION_CODE +import com.machiav3lli.fdroid.TABLE_RELEASE_NAME import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/com/looker/droidify/database/entity/Repository.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/database/entity/Repository.kt rename to src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt index d074e6ce..afe8fd7e 100644 --- a/src/main/kotlin/com/looker/droidify/database/entity/Repository.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.database.entity +package com.machiav3lli.fdroid.database.entity import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey -import com.looker.droidify.ROW_ID -import com.looker.droidify.TABLE_REPOSITORY_NAME +import com.machiav3lli.fdroid.ROW_ID +import com.machiav3lli.fdroid.TABLE_REPOSITORY_NAME import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/com/looker/droidify/entity/AntiFeatures.kt b/src/main/kotlin/com/machiav3lli/fdroid/entity/AntiFeatures.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/entity/AntiFeatures.kt rename to src/main/kotlin/com/machiav3lli/fdroid/entity/AntiFeatures.kt index bd37b3b7..f5386c1f 100644 --- a/src/main/kotlin/com/looker/droidify/entity/AntiFeatures.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/entity/AntiFeatures.kt @@ -1,6 +1,6 @@ -package com.looker.droidify.entity +package com.machiav3lli.fdroid.entity -import com.looker.droidify.R +import com.machiav3lli.fdroid.R sealed class AntiFeatures(val name: String, val string: Int) { object Ads : AntiFeatures("Ads", R.string.has_advertising) diff --git a/src/main/kotlin/com/looker/droidify/entity/Enums.kt b/src/main/kotlin/com/machiav3lli/fdroid/entity/Enums.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/entity/Enums.kt rename to src/main/kotlin/com/machiav3lli/fdroid/entity/Enums.kt index 7b6ad4c8..1f55dc2c 100644 --- a/src/main/kotlin/com/looker/droidify/entity/Enums.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/entity/Enums.kt @@ -1,8 +1,8 @@ -package com.looker.droidify.entity +package com.machiav3lli.fdroid.entity import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import com.looker.droidify.R +import com.machiav3lli.fdroid.R enum class Order(@StringRes val titleResId: Int, @DrawableRes val iconResId: Int) { NAME(R.string.name,R.drawable.ic_placeholder), diff --git a/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/entity/ProductItem.kt similarity index 80% rename from src/main/kotlin/com/looker/droidify/entity/ProductItem.kt rename to src/main/kotlin/com/machiav3lli/fdroid/entity/ProductItem.kt index d9f163aa..6638fd18 100644 --- a/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/entity/ProductItem.kt @@ -1,8 +1,8 @@ -package com.looker.droidify.entity +package com.machiav3lli.fdroid.entity data class ProductItem( var repositoryId: Long = 0, - var packageName: String = "com.looker.droidify", + var packageName: String = "com.machaiv3lli.fdroid", var name: String = "Droid-ify", var summary: String = "A great F-Droid client", val icon: String = "", diff --git a/src/main/kotlin/com/looker/droidify/entity/Section.kt b/src/main/kotlin/com/machiav3lli/fdroid/entity/Section.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/entity/Section.kt rename to src/main/kotlin/com/machiav3lli/fdroid/entity/Section.kt index 3292a819..0d7d6f16 100644 --- a/src/main/kotlin/com/looker/droidify/entity/Section.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/entity/Section.kt @@ -1,7 +1,7 @@ -package com.looker.droidify.entity +package com.machiav3lli.fdroid.entity import android.os.Parcel -import com.looker.droidify.utility.KParcelable +import com.machiav3lli.fdroid.utility.KParcelable sealed class Section : KParcelable { object All : Section() { diff --git a/src/main/kotlin/com/looker/droidify/entity/SubEntities.kt b/src/main/kotlin/com/machiav3lli/fdroid/entity/SubEntities.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/entity/SubEntities.kt rename to src/main/kotlin/com/machiav3lli/fdroid/entity/SubEntities.kt index 830ba6b6..d6f32878 100644 --- a/src/main/kotlin/com/looker/droidify/entity/SubEntities.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/entity/SubEntities.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.entity +package com.machiav3lli.fdroid.entity import android.content.Context import android.content.pm.PermissionGroupInfo @@ -18,7 +18,7 @@ import androidx.compose.material.icons.rounded.Launch import androidx.compose.material.icons.rounded.Share import androidx.compose.material.icons.rounded.Tune import androidx.compose.ui.graphics.vector.ImageVector -import com.looker.droidify.R +import com.machiav3lli.fdroid.R import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString import kotlinx.serialization.encodeToString diff --git a/src/main/kotlin/com/looker/droidify/graphics/DrawableWrapper.kt b/src/main/kotlin/com/machiav3lli/fdroid/graphics/DrawableWrapper.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/graphics/DrawableWrapper.kt rename to src/main/kotlin/com/machiav3lli/fdroid/graphics/DrawableWrapper.kt index e5947b9a..918f603f 100644 --- a/src/main/kotlin/com/looker/droidify/graphics/DrawableWrapper.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/graphics/DrawableWrapper.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.graphics +package com.machiav3lli.fdroid.graphics import android.graphics.Canvas import android.graphics.ColorFilter diff --git a/src/main/kotlin/com/looker/droidify/graphics/PaddingDrawable.kt b/src/main/kotlin/com/machiav3lli/fdroid/graphics/PaddingDrawable.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/graphics/PaddingDrawable.kt rename to src/main/kotlin/com/machiav3lli/fdroid/graphics/PaddingDrawable.kt index b60a9dd8..fe537ba7 100644 --- a/src/main/kotlin/com/looker/droidify/graphics/PaddingDrawable.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/graphics/PaddingDrawable.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.graphics +package com.machiav3lli.fdroid.graphics import android.graphics.Rect import android.graphics.drawable.Drawable diff --git a/src/main/kotlin/com/looker/droidify/index/IndexHandler.kt b/src/main/kotlin/com/machiav3lli/fdroid/index/IndexHandler.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/index/IndexHandler.kt rename to src/main/kotlin/com/machiav3lli/fdroid/index/IndexHandler.kt index f92c48f7..9d2c8bae 100644 --- a/src/main/kotlin/com/looker/droidify/index/IndexHandler.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/index/IndexHandler.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.index +package com.machiav3lli.fdroid.index -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Release -import com.looker.droidify.entity.Author -import com.looker.droidify.entity.Donate -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.entity.Author +import com.machiav3lli.fdroid.entity.Donate +import com.machiav3lli.fdroid.utility.extension.android.Android import org.xml.sax.Attributes import org.xml.sax.helpers.DefaultHandler import java.text.SimpleDateFormat diff --git a/src/main/kotlin/com/looker/droidify/index/IndexMerger.kt b/src/main/kotlin/com/machiav3lli/fdroid/index/IndexMerger.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/index/IndexMerger.kt rename to src/main/kotlin/com/machiav3lli/fdroid/index/IndexMerger.kt index 08ed7604..75d08647 100644 --- a/src/main/kotlin/com/looker/droidify/index/IndexMerger.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/index/IndexMerger.kt @@ -1,13 +1,13 @@ -package com.looker.droidify.index +package com.machiav3lli.fdroid.index import android.content.ContentValues import android.database.sqlite.SQLiteDatabase -import com.looker.droidify.database.Converters.toByteArray -import com.looker.droidify.database.Converters.toReleases -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Release -import com.looker.droidify.utility.extension.android.asSequence -import com.looker.droidify.utility.extension.android.execWithResult +import com.machiav3lli.fdroid.database.Converters.toByteArray +import com.machiav3lli.fdroid.database.Converters.toReleases +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.utility.extension.android.asSequence +import com.machiav3lli.fdroid.utility.extension.android.execWithResult import java.io.ByteArrayOutputStream import java.io.Closeable import java.io.File diff --git a/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt b/src/main/kotlin/com/machiav3lli/fdroid/index/IndexV1Parser.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt rename to src/main/kotlin/com/machiav3lli/fdroid/index/IndexV1Parser.kt index feec018a..46079b56 100644 --- a/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/index/IndexV1Parser.kt @@ -1,15 +1,15 @@ -package com.looker.droidify.index +package com.machiav3lli.fdroid.index import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonToken -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Release -import com.looker.droidify.entity.Author -import com.looker.droidify.entity.Donate -import com.looker.droidify.entity.Screenshot -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.json.* -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.entity.Author +import com.machiav3lli.fdroid.entity.Donate +import com.machiav3lli.fdroid.entity.Screenshot +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.json.* +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty import java.io.InputStream object IndexV1Parser { diff --git a/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt b/src/main/kotlin/com/machiav3lli/fdroid/index/RepositoryUpdater.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt rename to src/main/kotlin/com/machiav3lli/fdroid/index/RepositoryUpdater.kt index b05c1888..cd32b50a 100644 --- a/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/index/RepositoryUpdater.kt @@ -1,18 +1,18 @@ -package com.looker.droidify.index +package com.machiav3lli.fdroid.index import android.content.Context import android.net.Uri -import com.looker.droidify.content.Cache -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Release -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.network.Downloader -import com.looker.droidify.utility.ProgressInputStream -import com.looker.droidify.utility.RxUtils -import com.looker.droidify.utility.Utils -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.text.unhex +import com.machiav3lli.fdroid.content.Cache +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.network.Downloader +import com.machiav3lli.fdroid.utility.ProgressInputStream +import com.machiav3lli.fdroid.utility.RxUtils +import com.machiav3lli.fdroid.utility.Utils +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.text.unhex import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers diff --git a/src/main/kotlin/com/looker/droidify/installer/AppInstaller.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/AppInstaller.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/installer/AppInstaller.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/AppInstaller.kt index 435210d3..4f69065a 100644 --- a/src/main/kotlin/com/looker/droidify/installer/AppInstaller.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/AppInstaller.kt @@ -1,7 +1,7 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import android.content.Context -import com.looker.droidify.utility.Utils.rootInstallerEnabled +import com.machiav3lli.fdroid.utility.Utils.rootInstallerEnabled abstract class AppInstaller { abstract val defaultInstaller: BaseInstaller? diff --git a/src/main/kotlin/com/looker/droidify/installer/BaseInstaller.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/BaseInstaller.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/installer/BaseInstaller.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/BaseInstaller.kt index bb000ed3..81cbbaf7 100644 --- a/src/main/kotlin/com/looker/droidify/installer/BaseInstaller.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/BaseInstaller.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import android.content.Context diff --git a/src/main/kotlin/com/looker/droidify/installer/DefaultInstaller.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/DefaultInstaller.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/installer/DefaultInstaller.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/DefaultInstaller.kt index 2c9899fb..97784a3f 100644 --- a/src/main/kotlin/com/looker/droidify/installer/DefaultInstaller.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/DefaultInstaller.kt @@ -1,12 +1,12 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import android.app.PendingIntent import android.content.Context import android.content.Intent import android.content.pm.PackageInstaller.SessionParams import android.util.Log -import com.looker.droidify.content.Cache -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.content.Cache +import com.machiav3lli.fdroid.utility.extension.android.Android import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/src/main/kotlin/com/looker/droidify/installer/DefaultInstallerOld.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/DefaultInstallerOld.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/installer/DefaultInstallerOld.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/DefaultInstallerOld.kt index 2b82b746..0557c447 100644 --- a/src/main/kotlin/com/looker/droidify/installer/DefaultInstallerOld.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/DefaultInstallerOld.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import android.content.Context import android.content.Intent import android.net.Uri import androidx.core.net.toUri -import com.looker.droidify.content.Cache -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.content.Cache +import com.machiav3lli.fdroid.utility.extension.android.Android import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/src/main/kotlin/com/looker/droidify/installer/InstallationEvents.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/InstallationEvents.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/installer/InstallationEvents.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/InstallationEvents.kt index 78196423..6b9c1cc1 100644 --- a/src/main/kotlin/com/looker/droidify/installer/InstallationEvents.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/InstallationEvents.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import java.io.File diff --git a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/InstallerService.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/installer/InstallerService.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/InstallerService.kt index 4ef5c130..fbe7a1d0 100644 --- a/src/main/kotlin/com/looker/droidify/installer/InstallerService.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/InstallerService.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import android.app.NotificationChannel import android.app.NotificationManager @@ -8,13 +8,13 @@ import android.content.pm.PackageInstaller import android.net.Uri import android.os.IBinder import androidx.lifecycle.LifecycleService -import com.looker.droidify.NOTIFICATION_CHANNEL_INSTALLER -import com.looker.droidify.R -import com.looker.droidify.ui.activities.MainActivityX -import com.looker.droidify.utility.Utils -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.android.notificationManager -import com.looker.droidify.utility.notifyStatus +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_INSTALLER +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.ui.activities.MainActivityX +import com.machiav3lli.fdroid.utility.Utils +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.notificationManager +import com.machiav3lli.fdroid.utility.notifyStatus /** * Runs during or after a PackageInstaller session in order to handle completion, failure, or diff --git a/src/main/kotlin/com/looker/droidify/installer/RootInstaller.kt b/src/main/kotlin/com/machiav3lli/fdroid/installer/RootInstaller.kt similarity index 94% rename from src/main/kotlin/com/looker/droidify/installer/RootInstaller.kt rename to src/main/kotlin/com/machiav3lli/fdroid/installer/RootInstaller.kt index 7fcb94b5..4345584d 100644 --- a/src/main/kotlin/com/looker/droidify/installer/RootInstaller.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/installer/RootInstaller.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.installer +package com.machiav3lli.fdroid.installer import android.content.Context -import com.looker.droidify.BuildConfig -import com.looker.droidify.content.Cache -import com.looker.droidify.content.Preferences -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.content.Cache +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.utility.extension.android.Android import com.topjohnwu.superuser.Shell import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt b/src/main/kotlin/com/machiav3lli/fdroid/network/CoilDownloader.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt rename to src/main/kotlin/com/machiav3lli/fdroid/network/CoilDownloader.kt index 6158a062..b38954a3 100644 --- a/src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/network/CoilDownloader.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.network +package com.machiav3lli.fdroid.network import android.content.Context import android.net.Uri import android.view.View -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.Screenshot -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.Screenshot +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty import okhttp3.Cache import okhttp3.Call import okhttp3.HttpUrl.Companion.toHttpUrl diff --git a/src/main/kotlin/com/looker/droidify/network/DownloadResult.kt b/src/main/kotlin/com/machiav3lli/fdroid/network/DownloadResult.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/network/DownloadResult.kt rename to src/main/kotlin/com/machiav3lli/fdroid/network/DownloadResult.kt index 06a02d6f..73d3bb7c 100644 --- a/src/main/kotlin/com/looker/droidify/network/DownloadResult.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/network/DownloadResult.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.network +package com.machiav3lli.fdroid.network sealed class DownloadResult( val progress: Long? = 0, diff --git a/src/main/kotlin/com/looker/droidify/network/Downloader.kt b/src/main/kotlin/com/machiav3lli/fdroid/network/Downloader.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/network/Downloader.kt rename to src/main/kotlin/com/machiav3lli/fdroid/network/Downloader.kt index 73e48b5f..c6a4edb6 100644 --- a/src/main/kotlin/com/looker/droidify/network/Downloader.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/network/Downloader.kt @@ -1,7 +1,7 @@ -package com.looker.droidify.network +package com.machiav3lli.fdroid.network -import com.looker.droidify.utility.ProgressInputStream -import com.looker.droidify.utility.RxUtils +import com.machiav3lli.fdroid.utility.ProgressInputStream +import com.machiav3lli.fdroid.utility.RxUtils import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.schedulers.Schedulers import okhttp3.Cache diff --git a/src/main/kotlin/com/looker/droidify/network/DownloaderX.kt b/src/main/kotlin/com/machiav3lli/fdroid/network/DownloaderX.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/network/DownloaderX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/network/DownloaderX.kt index 74bdb092..3cdc6b2a 100644 --- a/src/main/kotlin/com/looker/droidify/network/DownloaderX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/network/DownloaderX.kt @@ -1,7 +1,7 @@ -package com.looker.droidify.network +package com.machiav3lli.fdroid.network -import com.looker.droidify.utility.ProgressInputStream -import com.looker.droidify.utility.extension.await +import com.machiav3lli.fdroid.utility.ProgressInputStream +import com.machiav3lli.fdroid.utility.extension.await import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.flow.Flow diff --git a/src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt b/src/main/kotlin/com/machiav3lli/fdroid/screen/MessageDialog.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt rename to src/main/kotlin/com/machiav3lli/fdroid/screen/MessageDialog.kt index 4b150cca..08789a5e 100644 --- a/src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/screen/MessageDialog.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.screen +package com.machiav3lli.fdroid.screen import android.content.ActivityNotFoundException import android.content.Intent @@ -9,13 +9,13 @@ import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.looker.droidify.R -import com.looker.droidify.RepoManager -import com.looker.droidify.database.entity.Release -import com.looker.droidify.utility.KParcelable -import com.looker.droidify.utility.PackageItemResolver -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.RepoManager +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.utility.KParcelable +import com.machiav3lli.fdroid.utility.PackageItemResolver +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty class MessageDialog() : DialogFragment() { companion object { diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt index 328d4988..1ce3688d 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/screen/ScreenshotsFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.screen +package com.machiav3lli.fdroid.screen import android.app.Dialog import android.content.Context @@ -18,18 +18,18 @@ import androidx.viewpager2.widget.MarginPageTransformer import androidx.viewpager2.widget.ViewPager2 import coil.load import com.google.android.material.imageview.ShapeableImageView -import com.looker.droidify.R -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.Screenshot -import com.looker.droidify.graphics.PaddingDrawable -import com.looker.droidify.network.CoilDownloader -import com.looker.droidify.utility.RxUtils -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.resources.getColorFromAttr -import com.looker.droidify.utility.extension.resources.getDrawableCompat -import com.looker.droidify.utility.extension.resources.sizeScaled -import com.looker.droidify.widget.StableRecyclerAdapter +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.Screenshot +import com.machiav3lli.fdroid.graphics.PaddingDrawable +import com.machiav3lli.fdroid.network.CoilDownloader +import com.machiav3lli.fdroid.utility.RxUtils +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.utility.extension.resources.getDrawableCompat +import com.machiav3lli.fdroid.utility.extension.resources.sizeScaled +import com.machiav3lli.fdroid.widget.StableRecyclerAdapter import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Observable import io.reactivex.rxjava3.disposables.Disposable diff --git a/src/main/kotlin/com/looker/droidify/service/Connection.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/Connection.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/service/Connection.kt rename to src/main/kotlin/com/machiav3lli/fdroid/service/Connection.kt index cd67c3a4..c7b37648 100644 --- a/src/main/kotlin/com/looker/droidify/service/Connection.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/service/Connection.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.service +package com.machiav3lli.fdroid.service import android.content.ComponentName import android.content.Context diff --git a/src/main/kotlin/com/looker/droidify/service/ConnectionService.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/ConnectionService.kt similarity index 80% rename from src/main/kotlin/com/looker/droidify/service/ConnectionService.kt rename to src/main/kotlin/com/machiav3lli/fdroid/service/ConnectionService.kt index 286c3ef1..ad8a2760 100644 --- a/src/main/kotlin/com/looker/droidify/service/ConnectionService.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/service/ConnectionService.kt @@ -1,9 +1,9 @@ -package com.looker.droidify.service +package com.machiav3lli.fdroid.service import android.app.Service import android.content.Intent import android.os.IBinder -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.Android abstract class ConnectionService : Service() { abstract override fun onBind(intent: Intent): T diff --git a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/service/DownloadService.kt rename to src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt index 0fc87a73..9e331463 100644 --- a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/service/DownloadService.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.service +package com.machiav3lli.fdroid.service import android.app.NotificationChannel import android.app.NotificationManager @@ -6,26 +6,26 @@ import android.app.PendingIntent import android.content.Intent import android.view.ContextThemeWrapper import androidx.core.app.NotificationCompat -import com.looker.droidify.BuildConfig -import com.looker.droidify.NOTIFICATION_CHANNEL_DOWNLOADING -import com.looker.droidify.NOTIFICATION_ID_DOWNLOADING -import com.looker.droidify.NOTIFICATION_ID_SYNCING -import com.looker.droidify.R -import com.looker.droidify.content.Cache -import com.looker.droidify.database.entity.Release -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.installer.AppInstaller -import com.looker.droidify.network.Downloader -import com.looker.droidify.utility.Utils -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.android.notificationManager -import com.looker.droidify.utility.extension.android.singleSignature -import com.looker.droidify.utility.extension.android.versionCodeCompat -import com.looker.droidify.utility.extension.resources.getColorFromAttr -import com.looker.droidify.utility.extension.text.formatSize -import com.looker.droidify.utility.extension.text.hex -import com.looker.droidify.utility.extension.text.nullIfEmpty -import com.looker.droidify.utility.showNotificationError +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_DOWNLOADING +import com.machiav3lli.fdroid.NOTIFICATION_ID_DOWNLOADING +import com.machiav3lli.fdroid.NOTIFICATION_ID_SYNCING +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Cache +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.installer.AppInstaller +import com.machiav3lli.fdroid.network.Downloader +import com.machiav3lli.fdroid.utility.Utils +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.notificationManager +import com.machiav3lli.fdroid.utility.extension.android.singleSignature +import com.machiav3lli.fdroid.utility.extension.android.versionCodeCompat +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.utility.extension.text.formatSize +import com.machiav3lli.fdroid.utility.extension.text.hex +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.utility.showNotificationError import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.disposables.Disposable import kotlinx.coroutines.CoroutineScope diff --git a/src/main/kotlin/com/looker/droidify/service/PackageChangedReceiver.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/PackageChangedReceiver.kt similarity index 83% rename from src/main/kotlin/com/looker/droidify/service/PackageChangedReceiver.kt rename to src/main/kotlin/com/machiav3lli/fdroid/service/PackageChangedReceiver.kt index 40d61e83..4baa9301 100644 --- a/src/main/kotlin/com/looker/droidify/service/PackageChangedReceiver.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/service/PackageChangedReceiver.kt @@ -1,15 +1,15 @@ -package com.looker.droidify.service +package com.machiav3lli.fdroid.service import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.entity.Order -import com.looker.droidify.entity.Section -import com.looker.droidify.utility.Utils.toInstalledItem -import com.looker.droidify.utility.displayUpdatesNotification -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.getLaunchActivities +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.entity.Section +import com.machiav3lli.fdroid.utility.Utils.toInstalledItem +import com.machiav3lli.fdroid.utility.displayUpdatesNotification +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.getLaunchActivities import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt similarity index 94% rename from src/main/kotlin/com/looker/droidify/service/SyncService.kt rename to src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt index cdc907a9..bb6397a3 100644 --- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/service/SyncService.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.service +package com.machiav3lli.fdroid.service import android.app.NotificationChannel import android.app.NotificationManager @@ -9,27 +9,27 @@ import android.content.Intent import android.view.ContextThemeWrapper import androidx.core.app.NotificationCompat import androidx.fragment.app.Fragment -import com.looker.droidify.BuildConfig -import com.looker.droidify.NOTIFICATION_CHANNEL_SYNCING -import com.looker.droidify.NOTIFICATION_CHANNEL_UPDATES -import com.looker.droidify.NOTIFICATION_ID_SYNCING -import com.looker.droidify.NOTIFICATION_ID_UPDATES -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.Order -import com.looker.droidify.entity.ProductItem -import com.looker.droidify.entity.Section -import com.looker.droidify.index.RepositoryUpdater -import com.looker.droidify.utility.RxUtils -import com.looker.droidify.utility.Utils -import com.looker.droidify.utility.displayUpdatesNotification -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.android.notificationManager -import com.looker.droidify.utility.extension.resources.getColorFromAttr -import com.looker.droidify.utility.extension.text.formatSize -import com.looker.droidify.utility.showNotificationError +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_SYNCING +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_UPDATES +import com.machiav3lli.fdroid.NOTIFICATION_ID_SYNCING +import com.machiav3lli.fdroid.NOTIFICATION_ID_UPDATES +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.entity.ProductItem +import com.machiav3lli.fdroid.entity.Section +import com.machiav3lli.fdroid.index.RepositoryUpdater +import com.machiav3lli.fdroid.utility.RxUtils +import com.machiav3lli.fdroid.utility.Utils +import com.machiav3lli.fdroid.utility.displayUpdatesNotification +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.notificationManager +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.utility.extension.text.formatSize +import com.machiav3lli.fdroid.utility.showNotificationError import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.disposables.Disposable import io.reactivex.rxjava3.schedulers.Schedulers diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt index 602a560a..d078cddf 100644 --- a/src/main/kotlin/com/looker/droidify/ui/activities/MainActivityX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.activities +package com.machiav3lli.fdroid.ui.activities import android.content.Context import android.content.Intent @@ -13,21 +13,21 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.setupWithNavController -import com.looker.droidify.BuildConfig -import com.looker.droidify.ContextWrapperX -import com.looker.droidify.MainApplication -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.databinding.ActivityMainXBinding -import com.looker.droidify.installer.AppInstaller -import com.looker.droidify.service.Connection -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.fragments.AppSheetX -import com.looker.droidify.ui.fragments.MainNavFragmentX -import com.looker.droidify.ui.fragments.Source -import com.looker.droidify.ui.viewmodels.MainActivityViewModelX -import com.looker.droidify.utility.extension.text.nullIfEmpty -import com.looker.droidify.utility.showBatteryOptimizationDialog +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.ContextWrapperX +import com.machiav3lli.fdroid.MainApplication +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.databinding.ActivityMainXBinding +import com.machiav3lli.fdroid.installer.AppInstaller +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.fragments.AppSheetX +import com.machiav3lli.fdroid.ui.fragments.MainNavFragmentX +import com.machiav3lli.fdroid.ui.fragments.Source +import com.machiav3lli.fdroid.ui.viewmodels.MainActivityViewModelX +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.utility.showBatteryOptimizationDialog import kotlinx.coroutines.launch import kotlin.properties.Delegates diff --git a/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt index 21998254..ac9e6dbe 100644 --- a/src/main/kotlin/com/looker/droidify/ui/activities/PrefsActivityX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt @@ -1,9 +1,8 @@ -package com.looker.droidify.ui.activities +package com.machiav3lli.fdroid.ui.activities import android.content.Context import android.content.Intent import android.os.Bundle -import android.view.* import android.view.inputmethod.InputMethodManager import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope @@ -13,18 +12,18 @@ import androidx.navigation.ui.AppBarConfiguration import androidx.navigation.ui.setupActionBarWithNavController import androidx.navigation.ui.setupWithNavController import com.google.android.material.appbar.MaterialToolbar -import com.looker.droidify.BuildConfig -import com.looker.droidify.ContextWrapperX -import com.looker.droidify.MainApplication -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.databinding.ActivityPrefsXBinding -import com.looker.droidify.installer.AppInstaller -import com.looker.droidify.service.Connection -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.fragments.MainNavFragmentX -import com.looker.droidify.ui.fragments.Source -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.ContextWrapperX +import com.machiav3lli.fdroid.MainApplication +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.databinding.ActivityPrefsXBinding +import com.machiav3lli.fdroid.installer.AppInstaller +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.fragments.MainNavFragmentX +import com.machiav3lli.fdroid.ui.fragments.Source +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty import kotlinx.coroutines.launch // TODO clean up the bloat diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/ItemRecyclers.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/ItemRecyclers.kt index bd57c169..fd840284 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/ItemRecyclers.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/ItemRecyclers.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose +package com.machiav3lli.fdroid.ui.compose import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -18,14 +18,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.database.entity.Installed -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.ProductItem -import com.looker.droidify.ui.compose.components.ProductCard -import com.looker.droidify.ui.compose.components.ProductsListItem -import com.looker.droidify.ui.compose.components.RepositoryItem +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.ProductItem +import com.machiav3lli.fdroid.ui.compose.components.ProductCard +import com.machiav3lli.fdroid.ui.compose.components.ProductsListItem +import com.machiav3lli.fdroid.ui.compose.components.RepositoryItem @Composable fun ProductsVerticalRecycler( diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/ActionButton.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ActionButton.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/ActionButton.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ActionButton.kt index e192f1ca..8f4cdefb 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/ActionButton.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ActionButton.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.animation.* import androidx.compose.foundation.layout.* @@ -8,8 +8,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.looker.droidify.entity.ActionState -import com.looker.droidify.entity.ComponentState +import com.machiav3lli.fdroid.entity.ActionState +import com.machiav3lli.fdroid.entity.ComponentState @OptIn(ExperimentalAnimationApi::class) @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/Controller.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/Controller.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/Controller.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/Controller.kt index 878fb677..7fbd006d 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/Controller.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/Controller.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/ExpandableBlock.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ExpandableBlock.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/ExpandableBlock.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ExpandableBlock.kt index 39273ecb..3452eb8a 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/ExpandableBlock.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ExpandableBlock.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -11,7 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import com.looker.droidify.R +import com.machiav3lli.fdroid.R @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/ProductCard.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ProductCard.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/ProductCard.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ProductCard.kt index 3ab94c19..7de861d8 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/ProductCard.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ProductCard.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.foundation.layout.* import androidx.compose.material3.ExperimentalMaterial3Api @@ -13,10 +13,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.ProductItem -import com.looker.droidify.network.CoilDownloader -import com.looker.droidify.ui.compose.utils.NetworkImage +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.ProductItem +import com.machiav3lli.fdroid.network.CoilDownloader +import com.machiav3lli.fdroid.ui.compose.utils.NetworkImage @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/ProductsListItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ProductsListItem.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/ProductsListItem.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ProductsListItem.kt index 0536998e..5182f353 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/ProductsListItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ProductsListItem.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.layout.Arrangement @@ -29,14 +29,14 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.database.entity.Installed -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.ActionState -import com.looker.droidify.entity.ProductItem -import com.looker.droidify.network.CoilDownloader -import com.looker.droidify.ui.compose.utils.ExpandableCard -import com.looker.droidify.ui.compose.utils.NetworkImage +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.ActionState +import com.machiav3lli.fdroid.entity.ProductItem +import com.machiav3lli.fdroid.network.CoilDownloader +import com.machiav3lli.fdroid.ui.compose.utils.ExpandableCard +import com.machiav3lli.fdroid.ui.compose.utils.NetworkImage @Composable fun ProductsListItem( diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/RespositoryItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/RespositoryItem.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/RespositoryItem.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/RespositoryItem.kt index be10a355..db3ecbd8 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/RespositoryItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/RespositoryItem.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState @@ -24,7 +24,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.looker.droidify.database.entity.Repository +import com.machiav3lli.fdroid.database.entity.Repository @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/ScreenshotList.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ScreenshotList.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/ScreenshotList.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ScreenshotList.kt index 651cf605..71d4038d 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/ScreenshotList.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/ScreenshotList.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -12,10 +12,10 @@ import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.Screenshot -import com.looker.droidify.network.CoilDownloader -import com.looker.droidify.ui.compose.utils.NetworkImage +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.Screenshot +import com.machiav3lli.fdroid.network.CoilDownloader +import com.machiav3lli.fdroid.ui.compose.utils.NetworkImage data class ScreenshotItem( val screenShot: Screenshot, diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt index 1dc48cb6..6ebcf481 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/components/TopBar.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/components/TopBar.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.components +package com.machiav3lli.fdroid.ui.compose.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -38,8 +38,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.TextFieldValue -import com.looker.droidify.R -import com.looker.droidify.ui.compose.utils.HorizontalExpandingVisibility +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.ui.compose.utils.HorizontalExpandingVisibility @Composable fun TopBar( diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/AppDetail.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/AppDetail.kt new file mode 100644 index 00000000..fbb667d3 --- /dev/null +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/AppDetail.kt @@ -0,0 +1,2 @@ +package com.machiav3lli.fdroid.ui.compose.pages.app_detail + diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/ChipGrid.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ChipGrid.kt similarity index 86% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/ChipGrid.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ChipGrid.kt index e7dd83f5..9d77cd15 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/ChipGrid.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ChipGrid.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.app_detail.components +package com.machiav3lli.fdroid.ui.compose.pages.app_detail.components import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.padding @@ -7,8 +7,8 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.looker.droidify.ui.compose.utils.CustomChip -import com.looker.droidify.ui.compose.utils.StaggeredGrid +import com.machiav3lli.fdroid.ui.compose.utils.CustomChip +import com.machiav3lli.fdroid.ui.compose.utils.StaggeredGrid // TODO: Convert Permissions and AntiFeatures to Custom Interface diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt similarity index 94% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt index 1f877ae9..72d836b5 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/Header.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.app_detail.components +package com.machiav3lli.fdroid.ui.compose.pages.app_detail.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.ExperimentalFoundationApi @@ -29,13 +29,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.entity.ActionState -import com.looker.droidify.entity.DownloadState -import com.looker.droidify.ui.compose.components.MainActionButton -import com.looker.droidify.ui.compose.components.SecondaryActionButton -import com.looker.droidify.ui.compose.utils.NetworkImage -import com.looker.droidify.utility.extension.text.formatSize +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.entity.ActionState +import com.machiav3lli.fdroid.entity.DownloadState +import com.machiav3lli.fdroid.ui.compose.components.MainActionButton +import com.machiav3lli.fdroid.ui.compose.components.SecondaryActionButton +import com.machiav3lli.fdroid.ui.compose.utils.NetworkImage +import com.machiav3lli.fdroid.utility.extension.text.formatSize @Composable fun AppInfoHeader( diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/LinkItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/LinkItem.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/LinkItem.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/LinkItem.kt index 3f8a3fe8..5ac45681 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/LinkItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/LinkItem.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.app_detail.components +package com.machiav3lli.fdroid.ui.compose.pages.app_detail.components import android.net.Uri import androidx.compose.foundation.ExperimentalFoundationApi @@ -20,9 +20,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.entity.LinkType -import com.looker.droidify.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.entity.LinkType +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/PermissionsItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/PermissionsItem.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/PermissionsItem.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/PermissionsItem.kt index 3823dd50..7c6ee243 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/PermissionsItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/PermissionsItem.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.app_detail.components +package com.machiav3lli.fdroid.ui.compose.pages.app_detail.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -18,9 +18,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.rememberAsyncImagePainter -import com.looker.droidify.R -import com.looker.droidify.entity.PermissionsType -import com.looker.droidify.utility.getLabels +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.entity.PermissionsType +import com.machiav3lli.fdroid.utility.getLabels @Composable fun PermissionsItem( diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/ReleaseItem.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/ReleaseItem.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt index b5e9febe..3c5d6765 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/ReleaseItem.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/ReleaseItem.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.app_detail.components +package com.machiav3lli.fdroid.ui.compose.pages.app_detail.components import android.os.Build import androidx.compose.animation.AnimatedVisibility @@ -37,14 +37,14 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.RELEASE_STATE_INSTALLED -import com.looker.droidify.RELEASE_STATE_NONE -import com.looker.droidify.RELEASE_STATE_SUGGESTED -import com.looker.droidify.database.entity.Release -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.text.formatSize +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.RELEASE_STATE_INSTALLED +import com.machiav3lli.fdroid.RELEASE_STATE_NONE +import com.machiav3lli.fdroid.RELEASE_STATE_SUGGESTED +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.text.formatSize import java.time.Instant import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/TextBlock.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/TextBlock.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/TextBlock.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/TextBlock.kt index 18a25488..2cd1255f 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/TextBlock.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/app_detail/components/TextBlock.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.app_detail.components +package com.machiav3lli.fdroid.ui.compose.pages.app_detail.components import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.animateIntAsState @@ -21,7 +21,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.looker.droidify.R +import com.machiav3lli.fdroid.R import de.charlex.compose.HtmlText /* diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/home/components/CategoryChipList.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/home/components/CategoryChipList.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt index 05d5dfdb..50cdbf47 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/home/components/CategoryChipList.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/home/components/CategoryChipList.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.home.components +package com.machiav3lli.fdroid.ui.compose.pages.home.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColor @@ -35,7 +35,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.looker.droidify.ui.compose.utils.compositeOverBackground +import com.machiav3lli.fdroid.ui.compose.utils.compositeOverBackground private enum class SelectionState { Unselected, Selected } diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PreferenceSlider.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PreferenceSlider.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PreferenceSlider.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PreferenceSlider.kt index b9bc14f8..c4b31615 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PreferenceSlider.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PreferenceSlider.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.settings.components +package com.machiav3lli.fdroid.ui.compose.pages.settings.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PreferenceSwitch.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PreferenceSwitch.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PreferenceSwitch.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PreferenceSwitch.kt index 34fce5b0..72240652 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PreferenceSwitch.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PreferenceSwitch.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.settings.components +package com.machiav3lli.fdroid.ui.compose.pages.settings.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PrefernceDataType.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PrefernceDataType.kt similarity index 94% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PrefernceDataType.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PrefernceDataType.kt index aaf5ce95..06679d1d 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/components/PrefernceDataType.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/components/PrefernceDataType.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.settings.components +package com.machiav3lli.fdroid.ui.compose.pages.settings.components import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/repository/RepositoryPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/repository/RepositoryPage.kt similarity index 88% rename from src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/repository/RepositoryPage.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/repository/RepositoryPage.kt index 328e4f72..acb0043d 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/settings/repository/RepositoryPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/pages/settings/repository/RepositoryPage.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.pages.settings.repository +package com.machiav3lli.fdroid.ui.compose.pages.settings.repository import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.icons.Icons @@ -13,8 +13,8 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import com.looker.droidify.ui.compose.RepositoriesRecycler -import com.looker.droidify.ui.viewmodels.RepositoriesViewModelX +import com.machiav3lli.fdroid.ui.compose.RepositoriesRecycler +import com.machiav3lli.fdroid.ui.viewmodels.RepositoriesViewModelX @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Color.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Color.kt index 1a970c46..9d653b22 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Color.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Color.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.theme +package com.machiav3lli.fdroid.ui.compose.theme import androidx.compose.ui.graphics.Color diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Shape.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Shape.kt similarity index 88% rename from src/main/kotlin/com/looker/droidify/ui/compose/theme/Shape.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Shape.kt index 3ddd5d9c..9dfd9eaa 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Shape.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Shape.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.theme +package com.machiav3lli.fdroid.ui.compose.theme import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Shapes diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Theme.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Theme.kt index c4f895a8..2d4c7e78 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Theme.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Theme.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.ui.compose.theme +package com.machiav3lli.fdroid.ui.compose.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable -import com.looker.droidify.utility.isBlackTheme +import com.machiav3lli.fdroid.utility.isBlackTheme @Composable fun AppTheme( diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Utils.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Utils.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/compose/theme/Utils.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Utils.kt index 3c8ad3ca..3f8691ec 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/theme/Utils.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/theme/Utils.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.theme +package com.machiav3lli.fdroid.ui.compose.theme import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Animations.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Animations.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Animations.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Animations.kt index 329580b8..1d7af0b4 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Animations.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Animations.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibilityScope diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Callbacks.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Callbacks.kt similarity index 61% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Callbacks.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Callbacks.kt index ac8bedee..ab99a172 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Callbacks.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Callbacks.kt @@ -1,9 +1,9 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils import android.net.Uri -import com.looker.droidify.database.entity.Release -import com.looker.droidify.entity.ActionState -import com.looker.droidify.entity.Screenshot +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.entity.ActionState +import com.machiav3lli.fdroid.entity.Screenshot interface Callbacks { fun onActionClick(action: ActionState?) diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Card.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Card.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Card.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Card.kt index ac029144..4282bbf4 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Card.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Card.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils import androidx.compose.animation.* import androidx.compose.foundation.ExperimentalFoundationApi diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt index 362538b4..cf1f10a3 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Chip.kt @@ -1,6 +1,5 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils -import androidx.compose.foundation.BorderStroke import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material3.* import androidx.compose.runtime.Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Colors.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Colors.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Colors.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Colors.kt index 8ab43dfe..e237c062 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Colors.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Colors.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Grid.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Grid.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Grid.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Grid.kt index 8f39ace5..51e9c847 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Grid.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Grid.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Image.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Image.kt similarity index 84% rename from src/main/kotlin/com/looker/droidify/ui/compose/utils/Image.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Image.kt index 2e7c1990..47093f36 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Image.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/utils/Image.kt @@ -1,9 +1,13 @@ -package com.looker.droidify.ui.compose.utils +package com.machiav3lli.fdroid.ui.compose.utils import androidx.compose.foundation.gestures.rememberTransformableState import androidx.compose.foundation.gestures.transformable import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset @@ -13,7 +17,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.painterResource import coil.compose.AsyncImage -import com.looker.droidify.R +import com.machiav3lli.fdroid.R @Composable fun NetworkImage( diff --git a/src/main/kotlin/com/looker/droidify/ui/dialog/LaunchDialog.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/dialog/LaunchDialog.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/dialog/LaunchDialog.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/dialog/LaunchDialog.kt index 9be37930..12868cd0 100644 --- a/src/main/kotlin/com/looker/droidify/ui/dialog/LaunchDialog.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/dialog/LaunchDialog.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.ui.dialog +package com.machiav3lli.fdroid.ui.dialog import android.os.Bundle import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.looker.droidify.R -import com.looker.droidify.utility.startLauncherActivity +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.utility.startLauncherActivity class LaunchDialog(val packageName: String) : DialogFragment() { companion object { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt similarity index 91% rename from src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt index 53c42b98..d1414460 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/AppSheetX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.content.ActivityNotFoundException import android.content.ClipData @@ -39,47 +39,47 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import com.looker.droidify.R -import com.looker.droidify.RELEASE_STATE_INSTALLED -import com.looker.droidify.RELEASE_STATE_NONE -import com.looker.droidify.RELEASE_STATE_SUGGESTED -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.entity.Extras -import com.looker.droidify.database.entity.Release -import com.looker.droidify.entity.ActionState -import com.looker.droidify.entity.AntiFeature -import com.looker.droidify.entity.DonateType -import com.looker.droidify.entity.DownloadState -import com.looker.droidify.entity.Screenshot -import com.looker.droidify.installer.AppInstaller -import com.looker.droidify.network.CoilDownloader -import com.looker.droidify.screen.MessageDialog -import com.looker.droidify.screen.ScreenshotsFragment -import com.looker.droidify.service.Connection -import com.looker.droidify.service.DownloadService -import com.looker.droidify.ui.activities.MainActivityX -import com.looker.droidify.ui.compose.components.ExpandableBlock -import com.looker.droidify.ui.compose.components.ScreenshotItem -import com.looker.droidify.ui.compose.components.ScreenshotList -import com.looker.droidify.ui.compose.components.SwitchPreference -import com.looker.droidify.ui.compose.pages.app_detail.components.AppInfoHeader -import com.looker.droidify.ui.compose.pages.app_detail.components.HtmlTextBlock -import com.looker.droidify.ui.compose.pages.app_detail.components.LinkItem -import com.looker.droidify.ui.compose.pages.app_detail.components.PermissionsItem -import com.looker.droidify.ui.compose.pages.app_detail.components.ReleaseItem -import com.looker.droidify.ui.compose.pages.app_detail.components.TopBarHeader -import com.looker.droidify.ui.compose.theme.AppTheme -import com.looker.droidify.ui.compose.utils.Callbacks -import com.looker.droidify.ui.viewmodels.AppViewModelX -import com.looker.droidify.utility.Utils.rootInstallerEnabled -import com.looker.droidify.utility.Utils.startUpdate -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.text.formatSize -import com.looker.droidify.utility.findSuggestedProduct -import com.looker.droidify.utility.generateLinks -import com.looker.droidify.utility.generatePermissionGroups -import com.looker.droidify.utility.isDarkTheme -import com.looker.droidify.utility.onLaunchClick +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.RELEASE_STATE_INSTALLED +import com.machiav3lli.fdroid.RELEASE_STATE_NONE +import com.machiav3lli.fdroid.RELEASE_STATE_SUGGESTED +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.entity.Extras +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.entity.ActionState +import com.machiav3lli.fdroid.entity.AntiFeature +import com.machiav3lli.fdroid.entity.DonateType +import com.machiav3lli.fdroid.entity.DownloadState +import com.machiav3lli.fdroid.entity.Screenshot +import com.machiav3lli.fdroid.installer.AppInstaller +import com.machiav3lli.fdroid.network.CoilDownloader +import com.machiav3lli.fdroid.screen.MessageDialog +import com.machiav3lli.fdroid.screen.ScreenshotsFragment +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.DownloadService +import com.machiav3lli.fdroid.ui.activities.MainActivityX +import com.machiav3lli.fdroid.ui.compose.components.ExpandableBlock +import com.machiav3lli.fdroid.ui.compose.components.ScreenshotItem +import com.machiav3lli.fdroid.ui.compose.components.ScreenshotList +import com.machiav3lli.fdroid.ui.compose.components.SwitchPreference +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.AppInfoHeader +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.HtmlTextBlock +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.LinkItem +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.PermissionsItem +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.ReleaseItem +import com.machiav3lli.fdroid.ui.compose.pages.app_detail.components.TopBarHeader +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.ui.compose.utils.Callbacks +import com.machiav3lli.fdroid.ui.viewmodels.AppViewModelX +import com.machiav3lli.fdroid.utility.Utils.rootInstallerEnabled +import com.machiav3lli.fdroid.utility.Utils.startUpdate +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.text.formatSize +import com.machiav3lli.fdroid.utility.findSuggestedProduct +import com.machiav3lli.fdroid.utility.generateLinks +import com.machiav3lli.fdroid.utility.generatePermissionGroups +import com.machiav3lli.fdroid.utility.isDarkTheme +import com.machiav3lli.fdroid.utility.onLaunchClick import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.filter diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/BaseNavFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/BaseNavFragment.kt similarity index 88% rename from src/main/kotlin/com/looker/droidify/ui/fragments/BaseNavFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/BaseNavFragment.kt index 5c3cffb0..df40f207 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/BaseNavFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/BaseNavFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.os.Bundle import android.view.View diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/EditRepositorySheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/fragments/EditRepositorySheetX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt index ae01909b..9824f266 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/EditRepositorySheetX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.content.ClipboardManager import android.content.Context @@ -17,19 +17,19 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.looker.droidify.EXTRA_REPOSITORY_ID -import com.looker.droidify.R -import com.looker.droidify.RepoManager -import com.looker.droidify.databinding.SheetEditRepositoryBinding -import com.looker.droidify.network.Downloader -import com.looker.droidify.screen.MessageDialog -import com.looker.droidify.service.Connection -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.activities.PrefsActivityX -import com.looker.droidify.ui.viewmodels.RepositoryViewModelX -import com.looker.droidify.utility.RxUtils -import com.looker.droidify.utility.extension.resources.getColorFromAttr -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.EXTRA_REPOSITORY_ID +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.RepoManager +import com.machiav3lli.fdroid.databinding.SheetEditRepositoryBinding +import com.machiav3lli.fdroid.network.Downloader +import com.machiav3lli.fdroid.screen.MessageDialog +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.activities.PrefsActivityX +import com.machiav3lli.fdroid.ui.viewmodels.RepositoryViewModelX +import com.machiav3lli.fdroid.utility.RxUtils +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.core.Single import io.reactivex.rxjava3.disposables.Disposable diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt similarity index 88% rename from src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt index 0da8996d..6d398db2 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/ExploreFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.content.Intent import android.os.Bundle @@ -26,20 +26,20 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.res.stringResource -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.Section -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.activities.PrefsActivityX -import com.looker.droidify.ui.compose.ProductsVerticalRecycler -import com.looker.droidify.ui.compose.components.ExpandableSearchAction -import com.looker.droidify.ui.compose.components.TopBar -import com.looker.droidify.ui.compose.components.TopBarAction -import com.looker.droidify.ui.compose.pages.home.components.CategoryChipList -import com.looker.droidify.ui.compose.theme.AppTheme -import com.looker.droidify.utility.isDarkTheme -import com.looker.droidify.utility.onLaunchClick +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.Section +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.activities.PrefsActivityX +import com.machiav3lli.fdroid.ui.compose.ProductsVerticalRecycler +import com.machiav3lli.fdroid.ui.compose.components.ExpandableSearchAction +import com.machiav3lli.fdroid.ui.compose.components.TopBar +import com.machiav3lli.fdroid.ui.compose.components.TopBarAction +import com.machiav3lli.fdroid.ui.compose.pages.home.components.CategoryChipList +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.utility.isDarkTheme +import com.machiav3lli.fdroid.utility.onLaunchClick class ExploreFragment : MainNavFragmentX() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/FullscreenBottomSheetDialogFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/FullscreenBottomSheetDialogFragment.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/ui/fragments/FullscreenBottomSheetDialogFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/FullscreenBottomSheetDialogFragment.kt index 597e9647..d1304af0 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/FullscreenBottomSheetDialogFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/FullscreenBottomSheetDialogFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.app.Dialog import android.os.Bundle diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt index 40ea522c..12f38417 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/InstalledFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.content.Intent import android.os.Bundle @@ -44,20 +44,20 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.activities.PrefsActivityX -import com.looker.droidify.ui.compose.ProductsHorizontalRecycler -import com.looker.droidify.ui.compose.ProductsVerticalRecycler -import com.looker.droidify.ui.compose.components.ExpandableSearchAction -import com.looker.droidify.ui.compose.components.TopBar -import com.looker.droidify.ui.compose.components.TopBarAction -import com.looker.droidify.ui.compose.theme.AppTheme -import com.looker.droidify.utility.isDarkTheme -import com.looker.droidify.utility.onLaunchClick +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.activities.PrefsActivityX +import com.machiav3lli.fdroid.ui.compose.ProductsHorizontalRecycler +import com.machiav3lli.fdroid.ui.compose.ProductsVerticalRecycler +import com.machiav3lli.fdroid.ui.compose.components.ExpandableSearchAction +import com.machiav3lli.fdroid.ui.compose.components.TopBar +import com.machiav3lli.fdroid.ui.compose.components.TopBarAction +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.utility.isDarkTheme +import com.machiav3lli.fdroid.utility.onLaunchClick class InstalledFragment : MainNavFragmentX() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt similarity index 89% rename from src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt index f1c01f71..65086afd 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/LatestFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.content.Intent import android.os.Bundle @@ -10,18 +10,14 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Settings import androidx.compose.material.icons.rounded.Sync import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold -import androidx.compose.material3.SuggestionChip -import androidx.compose.material3.SuggestionChipDefaults import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.rememberTopAppBarScrollState @@ -32,22 +28,21 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.activities.PrefsActivityX -import com.looker.droidify.ui.compose.ProductsHorizontalRecycler -import com.looker.droidify.ui.compose.components.ExpandableSearchAction -import com.looker.droidify.ui.compose.components.ProductsListItem -import com.looker.droidify.ui.compose.components.TopBar -import com.looker.droidify.ui.compose.components.TopBarAction -import com.looker.droidify.ui.compose.theme.AppTheme -import com.looker.droidify.utility.isDarkTheme -import com.looker.droidify.utility.onLaunchClick +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.activities.PrefsActivityX +import com.machiav3lli.fdroid.ui.compose.ProductsHorizontalRecycler +import com.machiav3lli.fdroid.ui.compose.components.ExpandableSearchAction +import com.machiav3lli.fdroid.ui.compose.components.ProductsListItem +import com.machiav3lli.fdroid.ui.compose.components.TopBar +import com.machiav3lli.fdroid.ui.compose.components.TopBarAction +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.utility.isDarkTheme +import com.machiav3lli.fdroid.utility.onLaunchClick class LatestFragment : MainNavFragmentX() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/MainNavFragmentX.kt similarity index 91% rename from src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/MainNavFragmentX.kt index bb5d51d4..8fa0d35b 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/MainNavFragmentX.kt @@ -1,13 +1,13 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels -import com.looker.droidify.R -import com.looker.droidify.entity.Order -import com.looker.droidify.entity.Section -import com.looker.droidify.entity.UpdateCategory -import com.looker.droidify.ui.activities.MainActivityX -import com.looker.droidify.ui.viewmodels.MainNavFragmentViewModelX +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.entity.Section +import com.machiav3lli.fdroid.entity.UpdateCategory +import com.machiav3lli.fdroid.ui.activities.MainActivityX +import com.machiav3lli.fdroid.ui.viewmodels.MainNavFragmentViewModelX abstract class MainNavFragmentX : BaseNavFragment() { protected val mainActivityX: MainActivityX diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsNavFragmentX.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsNavFragmentX.kt index 8489ede5..ddb8eab9 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsNavFragmentX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsNavFragmentX.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.app.Dialog import android.content.Context @@ -25,16 +25,16 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.switchmaterial.SwitchMaterial import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textview.MaterialTextView -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.databinding.FragmentPrefsBinding -import com.looker.droidify.databinding.PreferenceItemBinding -import com.looker.droidify.utility.Utils -import com.looker.droidify.utility.extension.resources.TypefaceExtra -import com.looker.droidify.utility.extension.resources.getColorFromAttr -import com.looker.droidify.utility.extension.resources.inflate -import com.looker.droidify.utility.extension.resources.setTextSizeScaled -import com.looker.droidify.utility.extension.resources.sizeScaled +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.databinding.FragmentPrefsBinding +import com.machiav3lli.fdroid.databinding.PreferenceItemBinding +import com.machiav3lli.fdroid.utility.Utils +import com.machiav3lli.fdroid.utility.extension.resources.TypefaceExtra +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.utility.extension.resources.inflate +import com.machiav3lli.fdroid.utility.extension.resources.setTextSizeScaled +import com.machiav3lli.fdroid.utility.extension.resources.sizeScaled import com.topjohnwu.superuser.Shell import kotlinx.coroutines.launch diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsOtherFragment.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsOtherFragment.kt index 5ff0fce7..fd18bcd1 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsOtherFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsOtherFragment.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.view.ViewGroup import android.widget.LinearLayout import com.google.android.material.circularreveal.CircularRevealFrameLayout -import com.looker.droidify.BuildConfig -import com.looker.droidify.R -import com.looker.droidify.content.Preferences +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences class PrefsOtherFragment : PrefsNavFragmentX() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsRepositoriesFragment.kt similarity index 84% rename from src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsRepositoriesFragment.kt index ba2a7f83..36bb5faa 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsRepositoriesFragment.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.os.Bundle import android.view.LayoutInflater @@ -9,12 +9,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.ComposeView import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import com.looker.droidify.content.Preferences -import com.looker.droidify.ui.activities.PrefsActivityX -import com.looker.droidify.ui.compose.pages.settings.repository.RepositoryPage -import com.looker.droidify.ui.compose.theme.AppTheme -import com.looker.droidify.ui.viewmodels.RepositoriesViewModelX -import com.looker.droidify.utility.isDarkTheme +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.ui.activities.PrefsActivityX +import com.machiav3lli.fdroid.ui.compose.pages.settings.repository.RepositoryPage +import com.machiav3lli.fdroid.ui.compose.theme.AppTheme +import com.machiav3lli.fdroid.ui.viewmodels.RepositoriesViewModelX +import com.machiav3lli.fdroid.utility.isDarkTheme import kotlinx.coroutines.flow.collectLatest class PrefsRepositoriesFragment : BaseNavFragment() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUpdatesFragment.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUpdatesFragment.kt index 8db14a8c..fc595f4e 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUpdatesFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUpdatesFragment.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.view.ViewGroup import android.widget.LinearLayout import com.google.android.material.circularreveal.CircularRevealFrameLayout -import com.looker.droidify.R -import com.looker.droidify.content.Preferences +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences class PrefsUpdatesFragment : PrefsNavFragmentX() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt similarity index 88% rename from src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt index 8eab75f9..14c7e3f6 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsUserFragment.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/PrefsUserFragment.kt @@ -1,13 +1,13 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.view.ViewGroup import android.widget.LinearLayout import com.google.android.material.circularreveal.CircularRevealFrameLayout -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.utility.Utils.getLocaleOfCode -import com.looker.droidify.utility.Utils.languagesList -import com.looker.droidify.utility.Utils.translateLocale +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.utility.Utils.getLocaleOfCode +import com.machiav3lli.fdroid.utility.Utils.languagesList +import com.machiav3lli.fdroid.utility.Utils.translateLocale class PrefsUserFragment : PrefsNavFragmentX() { diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/RepositorySheetX.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/RepositorySheetX.kt index a40acecb..d883606a 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/RepositorySheetX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/RepositorySheetX.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.fragments +package com.machiav3lli.fdroid.ui.fragments import android.os.Bundle import android.text.SpannableStringBuilder @@ -10,16 +10,16 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope -import com.looker.droidify.EXTRA_REPOSITORY_ID -import com.looker.droidify.R -import com.looker.droidify.RepoManager -import com.looker.droidify.databinding.SheetRepositoryBinding -import com.looker.droidify.screen.MessageDialog -import com.looker.droidify.service.Connection -import com.looker.droidify.service.SyncService -import com.looker.droidify.ui.activities.PrefsActivityX -import com.looker.droidify.ui.viewmodels.RepositoryViewModelX -import com.looker.droidify.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.EXTRA_REPOSITORY_ID +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.RepoManager +import com.machiav3lli.fdroid.databinding.SheetRepositoryBinding +import com.machiav3lli.fdroid.screen.MessageDialog +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.SyncService +import com.machiav3lli.fdroid.ui.activities.PrefsActivityX +import com.machiav3lli.fdroid.ui.viewmodels.RepositoryViewModelX +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr import kotlinx.coroutines.launch import java.util.* diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppViewModelX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/AppViewModelX.kt similarity index 92% rename from src/main/kotlin/com/looker/droidify/ui/viewmodels/AppViewModelX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/AppViewModelX.kt index 3a6fa1d1..80e5e951 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/AppViewModelX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/AppViewModelX.kt @@ -1,18 +1,18 @@ -package com.looker.droidify.ui.viewmodels +package com.machiav3lli.fdroid.ui.viewmodels import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.database.entity.Extras -import com.looker.droidify.database.entity.Installed -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.ActionState -import com.looker.droidify.entity.DownloadState -import com.looker.droidify.utility.findSuggestedProduct +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.database.entity.Extras +import com.machiav3lli.fdroid.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.ActionState +import com.machiav3lli.fdroid.entity.DownloadState +import com.machiav3lli.fdroid.utility.findSuggestedProduct import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -67,7 +67,7 @@ class AppViewModelX(val db: DatabaseX, val packageName: String) : ViewModel() { val actions = mutableSetOf() synchronized(actions) { if (canUpdate) actions += ActionState.Update - if (canInstall && !canUpdate) actions += ActionState.Install + else if (canInstall) actions += ActionState.Install if (canLaunch) actions += ActionState.Launch if (installed != null) actions += ActionState.Details if (canUninstall) actions += ActionState.Uninstall diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/MainActivityViewModelX.kt similarity index 65% rename from src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/MainActivityViewModelX.kt index c81a96e8..8c9fa979 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainActivityViewModelX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/MainActivityViewModelX.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.ui.viewmodels +package com.machiav3lli.fdroid.ui.viewmodels import androidx.lifecycle.ViewModel diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/MainNavFragmentViewModelX.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/MainNavFragmentViewModelX.kt index 899e806b..4e1ef483 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/MainNavFragmentViewModelX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/MainNavFragmentViewModelX.kt @@ -1,21 +1,21 @@ -package com.looker.droidify.ui.viewmodels +package com.machiav3lli.fdroid.ui.viewmodels import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.database.entity.Extras -import com.looker.droidify.database.entity.Installed -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.Order -import com.looker.droidify.entity.Section -import com.looker.droidify.ui.fragments.Request -import com.looker.droidify.ui.fragments.Source -import com.looker.droidify.utility.extension.ManageableLiveData +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.database.entity.Extras +import com.machiav3lli.fdroid.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.Order +import com.machiav3lli.fdroid.entity.Section +import com.machiav3lli.fdroid.ui.fragments.Request +import com.machiav3lli.fdroid.ui.fragments.Source +import com.machiav3lli.fdroid.utility.extension.ManageableLiveData import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt similarity index 87% rename from src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt index 138d3662..de2fd426 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoriesViewModelX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt @@ -1,14 +1,14 @@ -package com.looker.droidify.ui.viewmodels +package com.machiav3lli.fdroid.ui.viewmodels import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import com.looker.droidify.database.dao.RepositoryDao -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.database.entity.Repository.Companion.newRepository -import com.looker.droidify.service.Connection -import com.looker.droidify.service.SyncService +import com.machiav3lli.fdroid.database.dao.RepositoryDao +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.database.entity.Repository.Companion.newRepository +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.SyncService import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoryViewModelX.kt similarity index 90% rename from src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt rename to src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoryViewModelX.kt index 26c85c55..1cc89e8d 100644 --- a/src/main/kotlin/com/looker/droidify/ui/viewmodels/RepositoryViewModelX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoryViewModelX.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.ui.viewmodels +package com.machiav3lli.fdroid.ui.viewmodels import androidx.lifecycle.MediatorLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import com.looker.droidify.database.DatabaseX -import com.looker.droidify.database.entity.Repository +import com.machiav3lli.fdroid.database.DatabaseX +import com.machiav3lli.fdroid.database.entity.Repository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/src/main/kotlin/com/looker/droidify/utility/KParcelable.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/KParcelable.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/utility/KParcelable.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/KParcelable.kt index 1f0297f6..1e2b1262 100644 --- a/src/main/kotlin/com/looker/droidify/utility/KParcelable.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/KParcelable.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility import android.os.Parcel import android.os.Parcelable diff --git a/src/main/kotlin/com/looker/droidify/utility/NotificationUtils.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt similarity index 91% rename from src/main/kotlin/com/looker/droidify/utility/NotificationUtils.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt index a6308a68..4cff5833 100644 --- a/src/main/kotlin/com/looker/droidify/utility/NotificationUtils.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/NotificationUtils.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility import android.app.PendingIntent import android.content.Context @@ -11,24 +11,24 @@ import android.text.SpannableStringBuilder import android.text.style.ForegroundColorSpan import android.view.ContextThemeWrapper import androidx.core.app.NotificationCompat -import com.looker.droidify.NOTIFICATION_CHANNEL_DOWNLOADING -import com.looker.droidify.NOTIFICATION_CHANNEL_INSTALLER -import com.looker.droidify.NOTIFICATION_CHANNEL_SYNCING -import com.looker.droidify.NOTIFICATION_CHANNEL_UPDATES -import com.looker.droidify.NOTIFICATION_ID_DOWNLOADING -import com.looker.droidify.NOTIFICATION_ID_INSTALLER -import com.looker.droidify.NOTIFICATION_ID_SYNCING -import com.looker.droidify.NOTIFICATION_ID_UPDATES -import com.looker.droidify.R -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.ProductItem -import com.looker.droidify.index.RepositoryUpdater -import com.looker.droidify.installer.InstallerService -import com.looker.droidify.service.DownloadService -import com.looker.droidify.ui.activities.MainActivityX -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.android.notificationManager -import com.looker.droidify.utility.extension.resources.getColorFromAttr +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_DOWNLOADING +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_INSTALLER +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_SYNCING +import com.machiav3lli.fdroid.NOTIFICATION_CHANNEL_UPDATES +import com.machiav3lli.fdroid.NOTIFICATION_ID_DOWNLOADING +import com.machiav3lli.fdroid.NOTIFICATION_ID_INSTALLER +import com.machiav3lli.fdroid.NOTIFICATION_ID_SYNCING +import com.machiav3lli.fdroid.NOTIFICATION_ID_UPDATES +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.ProductItem +import com.machiav3lli.fdroid.index.RepositoryUpdater +import com.machiav3lli.fdroid.installer.InstallerService +import com.machiav3lli.fdroid.service.DownloadService +import com.machiav3lli.fdroid.ui.activities.MainActivityX +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.notificationManager +import com.machiav3lli.fdroid.utility.extension.resources.getColorFromAttr /** * Displays summary of available updates. diff --git a/src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/PackageItemResolver.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/PackageItemResolver.kt index f0451949..fbcc3767 100644 --- a/src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/PackageItemResolver.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility import android.content.Context import android.content.pm.PackageItemInfo import android.content.pm.PermissionInfo import android.content.res.Resources -import com.looker.droidify.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.Android import java.util.* object PackageItemResolver { diff --git a/src/main/kotlin/com/looker/droidify/utility/PreferenceType.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/PreferenceType.kt similarity index 91% rename from src/main/kotlin/com/looker/droidify/utility/PreferenceType.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/PreferenceType.kt index 94deb339..e00b3505 100644 --- a/src/main/kotlin/com/looker/droidify/utility/PreferenceType.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/PreferenceType.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility sealed interface PreferenceType { data class Switch(val title: String, val description: String, val key: String) : PreferenceType diff --git a/src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/ProgressInputStream.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/ProgressInputStream.kt index 442a5e1c..183165b5 100644 --- a/src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/ProgressInputStream.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility import java.io.InputStream diff --git a/src/main/kotlin/com/looker/droidify/utility/RxUtils.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/RxUtils.kt similarity index 98% rename from src/main/kotlin/com/looker/droidify/utility/RxUtils.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/RxUtils.kt index 5ccf2c07..d0022e13 100644 --- a/src/main/kotlin/com/looker/droidify/utility/RxUtils.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/RxUtils.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility import android.os.CancellationSignal import android.os.OperationCanceledException diff --git a/src/main/kotlin/com/looker/droidify/utility/SampleData.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/SampleData.kt similarity index 84% rename from src/main/kotlin/com/looker/droidify/utility/SampleData.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/SampleData.kt index 5e405888..a960076d 100644 --- a/src/main/kotlin/com/looker/droidify/utility/SampleData.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/SampleData.kt @@ -1,11 +1,11 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility -import com.looker.droidify.database.entity.Release -import com.looker.droidify.database.entity.Repository +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Repository object SampleData { val demoRelease = Release( - packageName = "com.looker.droidify", + packageName = "com.machiav3lli.fdroid", selected = false, version = "v0.2.3", versionCode = 1234, diff --git a/src/main/kotlin/com/looker/droidify/utility/Utils.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt similarity index 93% rename from src/main/kotlin/com/looker/droidify/utility/Utils.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt index 40fb3b58..450f51a1 100644 --- a/src/main/kotlin/com/looker/droidify/utility/Utils.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/Utils.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility +package com.machiav3lli.fdroid.utility import android.app.ActivityManager import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND @@ -40,26 +40,26 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.core.text.HtmlCompat import androidx.core.text.util.LinkifyCompat import androidx.fragment.app.FragmentManager -import com.looker.droidify.BuildConfig -import com.looker.droidify.PREFS_LANGUAGE_DEFAULT -import com.looker.droidify.R -import com.looker.droidify.content.Preferences -import com.looker.droidify.database.entity.Installed -import com.looker.droidify.database.entity.Product -import com.looker.droidify.database.entity.Release -import com.looker.droidify.database.entity.Repository -import com.looker.droidify.entity.LinkType -import com.looker.droidify.entity.PermissionsType -import com.looker.droidify.service.Connection -import com.looker.droidify.service.DownloadService -import com.looker.droidify.ui.compose.utils.Callbacks -import com.looker.droidify.ui.dialog.LaunchDialog -import com.looker.droidify.utility.extension.android.Android -import com.looker.droidify.utility.extension.android.singleSignature -import com.looker.droidify.utility.extension.android.versionCodeCompat -import com.looker.droidify.utility.extension.resources.getDrawableCompat -import com.looker.droidify.utility.extension.text.hex -import com.looker.droidify.utility.extension.text.nullIfEmpty +import com.machiav3lli.fdroid.BuildConfig +import com.machiav3lli.fdroid.PREFS_LANGUAGE_DEFAULT +import com.machiav3lli.fdroid.R +import com.machiav3lli.fdroid.content.Preferences +import com.machiav3lli.fdroid.database.entity.Installed +import com.machiav3lli.fdroid.database.entity.Product +import com.machiav3lli.fdroid.database.entity.Release +import com.machiav3lli.fdroid.database.entity.Repository +import com.machiav3lli.fdroid.entity.LinkType +import com.machiav3lli.fdroid.entity.PermissionsType +import com.machiav3lli.fdroid.service.Connection +import com.machiav3lli.fdroid.service.DownloadService +import com.machiav3lli.fdroid.ui.compose.utils.Callbacks +import com.machiav3lli.fdroid.ui.dialog.LaunchDialog +import com.machiav3lli.fdroid.utility.extension.android.Android +import com.machiav3lli.fdroid.utility.extension.android.singleSignature +import com.machiav3lli.fdroid.utility.extension.android.versionCodeCompat +import com.machiav3lli.fdroid.utility.extension.resources.getDrawableCompat +import com.machiav3lli.fdroid.utility.extension.text.hex +import com.machiav3lli.fdroid.utility.extension.text.nullIfEmpty import com.topjohnwu.superuser.Shell import kotlinx.coroutines.flow.MutableStateFlow import java.lang.ref.WeakReference diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Android.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Android.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/utility/extension/Android.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Android.kt index 92f46a91..4539b7b4 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Android.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Android.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package com.looker.droidify.utility.extension.android +package com.machiav3lli.fdroid.utility.extension.android import android.app.NotificationManager import android.content.Context diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Json.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Json.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/utility/extension/Json.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Json.kt index 304b4366..ce2120f1 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Json.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Json.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package com.looker.droidify.utility.extension.json +package com.machiav3lli.fdroid.utility.extension.json import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.core.JsonParseException diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/LiveData.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/LiveData.kt similarity index 86% rename from src/main/kotlin/com/looker/droidify/utility/extension/LiveData.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/extension/LiveData.kt index 7d7080de..83655c4f 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/LiveData.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/LiveData.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility.extension +package com.machiav3lli.fdroid.utility.extension import androidx.lifecycle.MediatorLiveData diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/OkHttpExtension.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/OkHttpExtension.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/utility/extension/OkHttpExtension.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/extension/OkHttpExtension.kt index 7d3b2f01..981b6ef5 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/OkHttpExtension.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/OkHttpExtension.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.utility.extension +package com.machiav3lli.fdroid.utility.extension import kotlinx.coroutines.suspendCancellableCoroutine import okhttp3.Call diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Resources.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Resources.kt index b195002c..0e23fa5b 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Resources.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package com.looker.droidify.utility.extension.resources +package com.machiav3lli.fdroid.utility.extension.resources import android.content.Context import android.content.res.ColorStateList diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Text.kt b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Text.kt similarity index 97% rename from src/main/kotlin/com/looker/droidify/utility/extension/Text.kt rename to src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Text.kt index 6f52c902..31a5bd0b 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Text.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/utility/extension/Text.kt @@ -1,6 +1,6 @@ @file:Suppress("PackageDirectoryMismatch") -package com.looker.droidify.utility.extension.text +package com.machiav3lli.fdroid.utility.extension.text import android.util.Log import java.util.* diff --git a/src/main/kotlin/com/looker/droidify/widget/EnumRecyclerAdapter.kt b/src/main/kotlin/com/machiav3lli/fdroid/widget/EnumRecyclerAdapter.kt similarity index 96% rename from src/main/kotlin/com/looker/droidify/widget/EnumRecyclerAdapter.kt rename to src/main/kotlin/com/machiav3lli/fdroid/widget/EnumRecyclerAdapter.kt index abdebcb6..80cbe950 100644 --- a/src/main/kotlin/com/looker/droidify/widget/EnumRecyclerAdapter.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/widget/EnumRecyclerAdapter.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.widget +package com.machiav3lli.fdroid.widget import android.util.SparseArray import android.view.ViewGroup diff --git a/src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt b/src/main/kotlin/com/machiav3lli/fdroid/widget/FocusSearchView.kt similarity index 94% rename from src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt rename to src/main/kotlin/com/machiav3lli/fdroid/widget/FocusSearchView.kt index 59085079..a56d0b8c 100644 --- a/src/main/kotlin/com/looker/droidify/widget/FocusSearchView.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/widget/FocusSearchView.kt @@ -1,10 +1,10 @@ -package com.looker.droidify.widget +package com.machiav3lli.fdroid.widget import android.content.Context import android.util.AttributeSet import android.view.KeyEvent import androidx.appcompat.widget.SearchView -import com.looker.droidify.R +import com.machiav3lli.fdroid.R class FocusSearchView : SearchView { constructor(context: Context) : super(context) diff --git a/src/main/kotlin/com/looker/droidify/widget/StableRecyclerAdapter.kt b/src/main/kotlin/com/machiav3lli/fdroid/widget/StableRecyclerAdapter.kt similarity index 95% rename from src/main/kotlin/com/looker/droidify/widget/StableRecyclerAdapter.kt rename to src/main/kotlin/com/machiav3lli/fdroid/widget/StableRecyclerAdapter.kt index d7e68e01..c9c38b30 100644 --- a/src/main/kotlin/com/looker/droidify/widget/StableRecyclerAdapter.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/widget/StableRecyclerAdapter.kt @@ -1,4 +1,4 @@ -package com.looker.droidify.widget +package com.machiav3lli.fdroid.widget import androidx.recyclerview.widget.RecyclerView diff --git a/src/main/res/menu/menu_main.xml b/src/main/res/menu/menu_main.xml index 28118b74..b27ece75 100644 --- a/src/main/res/menu/menu_main.xml +++ b/src/main/res/menu/menu_main.xml @@ -5,7 +5,7 @@ android:id="@+id/toolbar_search" android:icon="@drawable/ic_search" android:title="@string/search" - app:actionViewClass="com.looker.droidify.widget.FocusSearchView" + app:actionViewClass="com.machiav3lli.fdroid.widget.FocusSearchView" app:showAsAction="always|collapseActionView" /> + android:name="com.machiav3lli.fdroid.ui.fragments.ExploreFragment" /> + android:name="com.machiav3lli.fdroid.ui.fragments.LatestFragment" /> + android:name="com.machiav3lli.fdroid.ui.fragments.InstalledFragment" /> diff --git a/src/main/res/navigation/navigation_graph_prefs.xml b/src/main/res/navigation/navigation_graph_prefs.xml index df31219e..f605f486 100644 --- a/src/main/res/navigation/navigation_graph_prefs.xml +++ b/src/main/res/navigation/navigation_graph_prefs.xml @@ -6,21 +6,20 @@ + android:name="com.machiav3lli.fdroid.ui.fragments.PrefsRepositoriesFragment" />