From 3f8880a90a9f2cc8d153872fc689a05f99fa339a Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Tue, 13 Dec 2022 17:37:26 +0100 Subject: [PATCH] Reorganize and group modules --- app/{ => app}/.gitignore | 0 app/{ => app}/build.gradle.kts | 68 +++++++-------- app/{ => app}/proguard-rules.pro | 0 app/{ => app}/src/debug/google-services.json | 0 .../java/de/mm20/launcher2/debug/Debug.kt | 0 app/{ => app}/src/debug/res/values/bools.xml | 0 app/{ => app}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/LauncherApplication.kt | 2 +- .../launcher2/activity/AddItemActivity.kt | 0 .../launcher2/content/GenericFileProvider.kt | 0 .../main/res/animator/card_raise_animator.xml | 0 .../main/res/drawable-hdpi/ic_wikipedia.webp | Bin .../main/res/drawable-mdpi/ic_wikipedia.webp | Bin .../drawable-night/ic_account_owncloud.xml | 0 .../main/res/drawable-xhdpi/ic_wikipedia.webp | Bin .../res/drawable-xxhdpi/ic_wikipedia.webp | Bin .../res/drawable-xxxhdpi/ic_wikipedia.webp | Bin app/{ => app}/src/main/res/values/attrs.xml | 0 app/{ => app}/src/main/res/values/bools.xml | 0 .../src/main/res/values/donottranslate.xml | 0 .../src/main/res/values/integers.xml | 0 app/{ => app}/src/main/res/values/styles.xml | 0 .../src/main/res/xml/provider_paths.xml | 0 .../java/de/mm20/launcher2/debug/Debug.kt | 0 {accounts => app/ui}/.gitignore | 0 {ui => app/ui}/build.gradle.kts | 64 +++++++------- {accounts => app/ui}/consumer-rules.pro | 0 {ui => app/ui}/proguard-rules.pro | 0 {ui => app/ui}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/ui/animation/TextStyle.kt | 0 .../mm20/launcher2/ui/animation/TextUnit.kt | 0 .../ui/assistant/AssistantActivity.kt | 0 .../ui/assistant/AssistantScaffold.kt | 0 .../de/mm20/launcher2/ui/base/BaseActivity.kt | 0 .../mm20/launcher2/ui/base/BaseActivityVM.kt | 0 .../launcher2/ui/base/ProvideCurrentTime.kt | 0 .../mm20/launcher2/ui/base/ProvideSettings.kt | 0 .../mm20/launcher2/ui/common/FavoritesVM.kt | 4 +- .../launcher2/ui/common/RestoreBackupSheet.kt | 0 .../ui/common/RestoreBackupSheetVM.kt | 0 .../ui/common/WeatherLocationSearchDialog.kt | 0 .../common/WeatherLocationSearchDialogVM.kt | 0 .../de/mm20/launcher2/ui/component/Badges.kt | 0 .../de/mm20/launcher2/ui/component/Banner.kt | 0 .../ui/component/BottomSheetDialog.kt | 0 .../de/mm20/launcher2/ui/component/Chip.kt | 0 .../mm20/launcher2/ui/component/InnerCard.kt | 0 .../launcher2/ui/component/LargeMessage.kt | 0 .../launcher2/ui/component/LauncherCard.kt | 0 .../ui/component/MissingPermissionBanner.kt | 0 .../launcher2/ui/component/NavBarEffects.kt | 0 .../ui/component/OutlinedTagsInputField.kt | 0 .../ui/component/SearchActionIcon.kt | 0 .../mm20/launcher2/ui/component/SearchBar.kt | 0 .../ui/component/ShapedLauncherIcon.kt | 0 .../launcher2/ui/component/SmallMessage.kt | 0 .../de/mm20/launcher2/ui/component/Toolbar.kt | 0 .../component/preferences/ColorPreference.kt | 0 .../component/preferences/ListPreference.kt | 0 .../ui/component/preferences/Preference.kt | 0 .../preferences/PreferenceCategory.kt | 0 .../component/preferences/PreferenceScreen.kt | 0 .../preferences/PreferenceWithSwitch.kt | 0 .../component/preferences/SliderPreference.kt | 0 .../component/preferences/SwitchPreference.kt | 0 .../component/preferences/TextPreference.kt | 0 .../component/weather/AnimatedWeatherIcon.kt | 0 .../ui/component/weather/WeatherIcon.kt | 0 .../mm20/launcher2/ui/icons/BatteryIcons.kt | 0 .../java/de/mm20/launcher2/ui/icons/Icons.kt | 0 .../java/de/mm20/launcher2/ui/ktx/Color.kt | 0 .../main/java/de/mm20/launcher2/ui/ktx/Dp.kt | 0 .../java/de/mm20/launcher2/ui/ktx/Float.kt | 0 .../main/java/de/mm20/launcher2/ui/ktx/Int.kt | 0 .../java/de/mm20/launcher2/ui/ktx/Modifier.kt | 0 .../de/mm20/launcher2/ui/ktx/MutableState.kt | 0 .../java/de/mm20/launcher2/ui/ktx/Offset.kt | 0 .../launcher2/ui/launcher/LauncherActivity.kt | 0 .../ui/launcher/LauncherActivityVM.kt | 0 .../ui/launcher/LauncherScaffoldVM.kt | 0 .../launcher2/ui/launcher/PagerScaffold.kt | 0 .../launcher2/ui/launcher/PullDownScaffold.kt | 0 .../ui/launcher/SharedLauncherActivity.kt | 0 .../ui/launcher/helper/DragAndDropGrid.kt | 0 .../ui/launcher/helper/DragAndDropList.kt | 0 .../ui/launcher/helper/WallpaperBlur.kt | 0 .../ui/launcher/search/SearchColumn.kt | 0 .../launcher2/ui/launcher/search/SearchVM.kt | 0 .../ui/launcher/search/apps/AppItem.kt | 0 .../ui/launcher/search/apps/AppItemVM.kt | 0 .../ui/launcher/search/apps/AppResults.kt | 0 .../search/appshortcuts/AppShortcutResults.kt | 0 .../search/calculator/CalculatorItem.kt | 0 .../launcher/search/calendar/CalendarItem.kt | 0 .../search/calendar/CalendarItemVM.kt | 0 .../search/calendar/CalendarResults.kt | 0 .../search/common/SearchableItemVM.kt | 2 +- .../launcher/search/common/grid/GridItem.kt | 0 .../launcher/search/common/grid/GridItemVM.kt | 0 .../search/common/grid/SearchResultGrid.kt | 0 .../launcher/search/common/list/ListItem.kt | 0 .../launcher/search/common/list/ListItemVM.kt | 0 .../search/common/list/SearchResultList.kt | 0 .../launcher/search/contacts/ContactItem.kt | 0 .../launcher/search/contacts/ContactItemVM.kt | 0 .../search/contacts/ContactResults.kt | 0 .../search/favorites/SearchFavoritesVM.kt | 0 .../ui/launcher/search/files/FileItem.kt | 0 .../ui/launcher/search/files/FileItemVM.kt | 0 .../ui/launcher/search/files/FileResults.kt | 0 .../launcher/search/shortcut/ShortcutItem.kt | 0 .../search/shortcut/ShortcutItemVM.kt | 0 .../search/unitconverter/UnitConverterItem.kt | 0 .../ui/launcher/search/website/WebsiteItem.kt | 0 .../launcher/search/website/WebsiteItemVM.kt | 0 .../search/wikipedia/WikipediaItem.kt | 0 .../search/wikipedia/WikipediaItemVM.kt | 0 .../launcher/searchbar/LauncherSearchBar.kt | 0 .../ui/launcher/searchbar/SearchBarActions.kt | 0 .../ui/launcher/searchbar/SearchBarMenu.kt | 0 .../sheets/CustomizeSearchableSheet.kt | 0 .../sheets/CustomizeSearchableSheetVM.kt | 4 +- .../ui/launcher/sheets/EditFavoritesSheet.kt | 0 .../launcher/sheets/EditFavoritesSheetVM.kt | 2 +- .../ui/launcher/sheets/HiddenItemsSheet.kt | 0 .../ui/launcher/sheets/HiddenItemsSheetVM.kt | 0 .../sheets/LauncherBottomSheetManager.kt | 0 .../ui/launcher/transitions/HomeTransition.kt | 0 .../transitions/HomeTransitionHandler.kt | 0 .../transitions/HomeTransitionManager.kt | 0 .../transitions/HomeTransitionParams.kt | 0 .../ui/launcher/widgets/WidgetColumn.kt | 0 .../ui/launcher/widgets/WidgetItem.kt | 0 .../ui/launcher/widgets/WidgetsVM.kt | 0 .../widgets/calendar/CalendarWidget.kt | 0 .../widgets/calendar/CalendarWidgetVM.kt | 0 .../ui/launcher/widgets/clock/ClockWidget.kt | 0 .../launcher/widgets/clock/ClockWidgetVM.kt | 0 .../widgets/clock/clocks/AnalogClock.kt | 0 .../widgets/clock/clocks/BinaryClock.kt | 0 .../widgets/clock/clocks/DigitalClock1.kt | 0 .../widgets/clock/clocks/DigitalClock2.kt | 0 .../widgets/clock/clocks/EmptyClock.kt | 0 .../widgets/clock/clocks/OrbitClock.kt | 0 .../widgets/clock/parts/AlarmPartProvider.kt | 0 .../clock/parts/BatteryPartProvider.kt | 0 .../widgets/clock/parts/DatePartProvider.kt | 0 .../clock/parts/FavoritesPartProvider.kt | 0 .../widgets/clock/parts/MusicPartProvider.kt | 0 .../widgets/clock/parts/PartProvider.kt | 0 .../widgets/external/ExternalWidget.kt | 0 .../widgets/favorites/FavoritesWidget.kt | 0 .../widgets/favorites/FavoritesWidgetVM.kt | 0 .../ui/launcher/widgets/music/MusicWidget.kt | 0 .../launcher/widgets/music/MusicWidgetVM.kt | 0 .../launcher/widgets/picker/AppWidgetList.kt | 0 .../widgets/picker/PickAppWidgetActivity.kt | 0 .../widgets/picker/PickAppWidgetVM.kt | 0 .../launcher/widgets/weather/WeatherWidget.kt | 0 .../widgets/weather/WeatherWidgetWM.kt | 0 .../mm20/launcher2/ui/layout/Arrangement.kt | 0 .../launcher2/ui/locals/CompositionLocals.kt | 0 .../mm20/launcher2/ui/modifier/FadingEdges.kt | 0 .../mm20/launcher2/ui/modifier/Modifiers.kt | 0 .../de/mm20/launcher2/ui/modifier/Scrims.kt | 0 .../launcher2/ui/settings/SettingsActivity.kt | 4 + .../ui/settings/about/AboutSettingsScreen.kt | 0 .../settings/about/AboutSettingsScreenVM.kt | 0 .../accounts/AccountsSettingsScreen.kt | 0 .../accounts/AccountsSettingsScreenVM.kt | 0 .../appearance/AppearanceSettingsScreen.kt | 2 - .../appearance/AppearanceSettingsScreenVM.kt | 0 .../settings/backup/BackupSettingsScreen.kt | 0 .../settings/backup/BackupSettingsScreenVM.kt | 0 .../ui/settings/backup/CreateBackupSheet.kt | 0 .../ui/settings/backup/CreateBackupSheetVM.kt | 0 .../ui/settings/badges/BadgeSettingsScreen.kt | 0 .../settings/badges/BadgeSettingsScreenVM.kt | 0 .../buildinfo/BuildInfoSettingsScreen.kt | 0 .../buildinfo/BuildInfoSettingsScreenVM.kt | 0 .../CalendarWidgetSettingsScreen.kt | 0 .../CalendarWidgetSettingsScreenVM.kt | 0 .../ui/settings/cards/CardsSettingsScreen.kt | 0 .../settings/cards/CardsSettingsScreenVM.kt | 0 .../clockwidget/ClockWidgetSettingsScreen.kt | 0 .../ClockWidgetSettingsScreenVM.kt | 0 .../colorscheme/ColorSchemeSettingsScreen.kt | 0 .../ColorSchemeSettingsScreenVM.kt | 0 .../CustomColorSchemeSettingsScreen.kt | 0 .../CustomColorSchemeSettingsScreenVM.kt | 0 .../crashreporter/CrashReportScreen.kt | 0 .../crashreporter/CrashReportScreenVM.kt | 0 .../crashreporter/CrashReporterScreen.kt | 0 .../crashreporter/CrashReporterScreenVM.kt | 0 .../ui/settings/debug/DebugSettingsScreen.kt | 5 -- .../settings/debug/DebugSettingsScreenVM.kt | 2 +- .../easteregg/EasterEggSettingsScreen.kt | 0 .../easteregg/EasterEggSettingsScreenVM.kt | 0 .../favorites/FavoritesSettingsScreen.kt | 0 .../favorites/FavoritesSettingsScreenVM.kt | 0 .../filesearch/FileSearchSettingsScreen.kt | 0 .../filesearch/FileSearchSettingsScreenVM.kt | 0 .../hiddenitems/HiddenItemsSettingsScreen.kt | 0 .../HiddenItemsSettingsScreenVM.kt | 0 .../ui/settings/license/LicenseScreen.kt | 1 - .../ui/settings/license/LicenseScreenVM.kt | 0 .../launcher2/ui/settings/log/LogScreen.kt | 1 - .../ui/settings/main/MainSettingsScreen.kt | 0 .../musicwidget/MusicWidgetSettingsScreen.kt | 0 .../MusicWidgetSettingsScreenVM.kt | 0 .../settings/search/SearchSettingsScreen.kt | 7 ++ .../settings/search/SearchSettingsScreenVM.kt | 0 .../searchactions/EditSearchActionSheet.kt | 0 .../searchactions/EditSearchActionSheetVM.kt | 0 .../SearchActionsSettingsScreen.kt | 0 .../SearchActionsSettingsScreenVM.kt | 0 .../ui/settings/tags/EditTagSheet.kt | 11 +++ .../ui/settings/tags/TagsSettingsScreen.kt | 42 +++++++++ .../ui/settings/tags/TagsSettingsScreenVM.kt | 20 +++++ .../UnitConverterSettingsScreen.kt | 0 .../UnitConverterSettingsScreenVM.kt | 0 .../WeatherWidgetSettingsScreen.kt | 0 .../WeatherWidgetSettingsScreenVM.kt | 0 .../widgets/WidgetSettingsScreenVM.kt | 0 .../settings/widgets/WidgetsSettingsScreen.kt | 0 .../wikipedia/WikipediaSettingsScreen.kt | 0 .../wikipedia/WikipediaSettingsScreenVM.kt | 0 .../mm20/launcher2/ui/theme/ContentAlpha.kt | 0 .../mm20/launcher2/ui/theme/LauncherTheme.kt | 0 .../launcher2/ui/theme/WallpaperColors.kt | 0 .../ui/theme/colorscheme/BlackAndWhite.kt | 0 .../launcher2/ui/theme/colorscheme/Custom.kt | 0 .../launcher2/ui/theme/colorscheme/Default.kt | 0 .../ui/theme/colorscheme/EasterEgg.kt | 0 .../ui/theme/colorscheme/Wallpaper.kt | 0 .../launcher2/ui/theme/typography/Common.kt | 0 .../launcher2/ui/theme/typography/Default.kt | 0 .../ui/theme/typography/SystemDefault.kt | 0 .../typography/fontfamily/DeviceDefault.kt | 0 .../ui/theme/typography/fontfamily/Outfit.kt | 0 .../ui/utils/NotificationShadeController.kt | 0 .../ui/utils/htmlToAnnotatedString.kt | 0 .../ui}/src/main/res/drawable/drag_handle.xml | 0 .../res/raw-night/lottie_play_to_pause.json | 0 .../main/res/raw-night/lottie_skip_next.json | 0 .../src/main/res/raw/ic_menu_to_clear.json | 0 .../main/res/raw/lottie_menu_to_clear.json | 0 .../main/res/raw/lottie_play_to_pause.json | 0 .../src/main/res/raw/lottie_skip_next.json | 0 .../ui}/src/main/res/raw/play_to_pause.json | 0 .../main/res/values-night/weather_colors.xml | 0 .../main/res/values/AspectRatioImageView.xml | 0 .../ui}/src/main/res/values/BottomSheet.xml | 0 .../src/main/res/values/LauncherCardView.xml | 0 .../src/main/res/values/SearchGridView.xml | 0 {ui => app/ui}/src/main/res/values/dimens.xml | 0 .../src/main/res/values/weather_colors.xml | 0 .../src/main/res/xml-v25/debug_shortcuts.xml | 0 build.gradle.kts | 1 - {applications => core/base}/.gitignore | 0 {base => core/base}/build.gradle.kts | 4 +- .../base}/consumer-rules.pro | 0 {base => core/base}/proguard-rules.pro | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-hdpi/ic_launcher_foreground.png | Bin .../mipmap-mdpi/ic_launcher_foreground.png | Bin .../mipmap-xhdpi/ic_launcher_foreground.png | Bin .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin .../res/values/ic_launcher_background.xml | 0 .../base}/src/main/AndroidManifest.xml | 0 .../android/launcher3/GestureNavContract.kt | 0 .../launcher2/debug/DebugInformationDumper.kt | 0 .../mm20/launcher2/graphics/BadgeDrawable.kt | 1 - .../de/mm20/launcher2/helper/NetworkUtils.kt | 0 .../de/mm20/launcher2/icons/LauncherIcon.kt | 0 .../mm20/launcher2/icons/LauncherIconLayer.kt | 0 .../de/mm20/launcher2/licenses/AppLicense.kt | 0 .../launcher2/licenses/OpenSourceLibrary.kt | 0 .../launcher2/licenses/OpenSourceLicenses.kt | 0 .../lifecycle/BroadcastReceiverLiveData.kt | 0 .../launcher2/search/SavableSearchable.kt | 0 .../de/mm20/launcher2/search/Searchable.kt | 0 .../search/SearchableDeserializer.kt | 0 .../launcher2/search/SearchableSerializer.kt | 0 .../src/main/res/anim/ic_skip_next_arrow1.xml | 0 .../src/main/res/anim/ic_skip_next_arrow2.xml | 0 .../src/main/res/anim/ic_skip_prev_arrow1.xml | 0 .../src/main/res/anim/ic_skip_prev_arrow2.xml | 0 .../src/main/res/color/chip_background.xml | 0 .../base}/src/main/res/color/chip_stroke.xml | 0 .../src/main/res/color/chip_textcolor.xml | 0 .../src/main/res/color/text_color_primary.xml | 0 .../main/res/color/text_color_secondary.xml | 0 .../res/drawable-hdpi/ic_badge_gdrive.webp | Bin .../res/drawable-mdpi/ic_badge_gdrive.webp | Bin .../res/drawable-xhdpi/ic_badge_gdrive.webp | Bin .../res/drawable-xxhdpi/ic_badge_gdrive.webp | Bin .../res/drawable-xxxhdpi/ic_badge_gdrive.webp | Bin .../main/res/drawable/anim_ic_edit_add.xml | 0 .../main/res/drawable/anim_ic_menu_clear.xml | 0 .../main/res/drawable/anim_ic_play_pause.xml | 0 .../res/drawable/anim_weather_sun_moon.xml | 0 .../src/main/res/drawable/ic_about_fdroid.xml | 0 .../src/main/res/drawable/ic_about_github.xml | 0 .../main/res/drawable/ic_about_telegram.xml | 0 .../main/res/drawable/ic_account_google.xml | 0 .../res/drawable/ic_account_microsoft.xml | 0 .../res/drawable/ic_account_nextcloud.xml | 0 .../main/res/drawable/ic_account_owncloud.xml | 0 .../base}/src/main/res/drawable/ic_add.xml | 0 .../src/main/res/drawable/ic_arrow_back.xml | 0 .../main/res/drawable/ic_arrow_drop_down.xml | 0 .../src/main/res/drawable/ic_arrow_left.xml | 0 .../src/main/res/drawable/ic_arrow_right.xml | 0 .../src/main/res/drawable/ic_arrow_up.xml | 0 .../src/main/res/drawable/ic_attendees.xml | 0 .../main/res/drawable/ic_badge_nextcloud.xml | 0 .../main/res/drawable/ic_badge_onedrive.xml | 0 .../main/res/drawable/ic_badge_owncloud.xml | 0 .../main/res/drawable/ic_badge_suspended.xml | 0 .../res/drawable/ic_badge_workprofile.xml | 0 .../base}/src/main/res/drawable/ic_call.xml | 0 .../base}/src/main/res/drawable/ic_cancel.xml | 0 .../base}/src/main/res/drawable/ic_clear.xml | 0 .../base}/src/main/res/drawable/ic_delete.xml | 0 .../src/main/res/drawable/ic_description.xml | 0 .../base}/src/main/res/drawable/ic_done.xml | 0 .../src/main/res/drawable/ic_drag_handle.xml | 0 .../base}/src/main/res/drawable/ic_edit.xml | 0 .../src/main/res/drawable/ic_expand_more.xml | 0 .../res/drawable/ic_experimental_feature.xml | 0 .../src/main/res/drawable/ic_file_android.xml | 0 .../src/main/res/drawable/ic_file_archive.xml | 0 .../src/main/res/drawable/ic_file_code.xml | 0 .../main/res/drawable/ic_file_document.xml | 0 .../src/main/res/drawable/ic_file_folder.xml | 0 .../src/main/res/drawable/ic_file_form.xml | 0 .../src/main/res/drawable/ic_file_generic.xml | 0 .../src/main/res/drawable/ic_file_markup.xml | 0 .../src/main/res/drawable/ic_file_music.xml | 0 .../src/main/res/drawable/ic_file_pdf.xml | 0 .../src/main/res/drawable/ic_file_picture.xml | 0 .../res/drawable/ic_file_presentation.xml | 0 .../main/res/drawable/ic_file_spreadsheet.xml | 0 .../src/main/res/drawable/ic_file_video.xml | 0 .../src/main/res/drawable/ic_info_outline.xml | 0 .../src/main/res/drawable/ic_location.xml | 0 .../base}/src/main/res/drawable/ic_mail.xml | 0 .../src/main/res/drawable/ic_message.xml | 0 .../src/main/res/drawable/ic_more_horiz.xml | 0 .../src/main/res/drawable/ic_more_vert.xml | 0 .../main/res/drawable/ic_open_external.xml | 0 .../main/res/drawable/ic_open_in_browser.xml | 0 .../base}/src/main/res/drawable/ic_pause.xml | 0 .../src/main/res/drawable/ic_permission.xml | 0 .../res/drawable/ic_permission_calendar.xml | 0 .../base}/src/main/res/drawable/ic_play.xml | 0 .../res/drawable/ic_precipitation_none.xml | 0 .../res/drawable/ic_precipitation_rain.xml | 0 .../drawable/ic_precipitation_rain_snow.xml | 0 .../res/drawable/ic_precipitation_snow.xml | 0 .../src/main/res/drawable/ic_pref_about.xml | 0 .../src/main/res/drawable/ic_pref_account.xml | 0 .../main/res/drawable/ic_pref_appearance.xml | 0 .../src/main/res/drawable/ic_pref_badge.xml | 0 .../main/res/drawable/ic_pref_calendar.xml | 0 .../src/main/res/drawable/ic_pref_plugins.xml | 0 .../src/main/res/drawable/ic_pref_search.xml | 0 .../src/main/res/drawable/ic_pref_weather.xml | 0 .../drawable/ic_preference_websearch_new.xml | 0 .../res/drawable/ic_resize_drag_handle.xml | 0 .../base}/src/main/res/drawable/ic_search.xml | 0 .../src/main/res/drawable/ic_settings.xml | 0 .../base}/src/main/res/drawable/ic_share.xml | 0 .../src/main/res/drawable/ic_skip_next.xml | 0 .../main/res/drawable/ic_skip_next_anim.xml | 0 .../src/main/res/drawable/ic_skip_prev.xml | 0 .../main/res/drawable/ic_skip_prev_anim.xml | 0 .../src/main/res/drawable/ic_star_outline.xml | 0 .../src/main/res/drawable/ic_star_solid.xml | 0 .../src/main/res/drawable/ic_telegram.xml | 0 .../base}/src/main/res/drawable/ic_time.xml | 0 .../base}/src/main/res/drawable/ic_today.xml | 0 .../src/main/res/drawable/ic_visibility.xml | 0 .../main/res/drawable/ic_visibility_off.xml | 0 .../src/main/res/drawable/ic_website.xml | 0 .../src/main/res/drawable/ic_whatsapp.xml | 0 .../main/res/drawable/ic_widget_resize.xml | 0 .../base}/src/main/res/font/outfit_100.otf | Bin .../base}/src/main/res/font/outfit_200.otf | Bin .../base}/src/main/res/font/outfit_300.otf | Bin .../base}/src/main/res/font/outfit_400.otf | Bin .../base}/src/main/res/font/outfit_500.otf | Bin .../base}/src/main/res/font/outfit_600.otf | Bin .../base}/src/main/res/font/outfit_700.otf | Bin .../base}/src/main/res/font/outfit_800.otf | Bin .../base}/src/main/res/font/outfit_900.otf | Bin .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-hdpi/ic_launcher_foreground.png | Bin .../mipmap-mdpi/ic_launcher_foreground.png | Bin .../mipmap-xhdpi/ic_launcher_foreground.png | Bin .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin .../src/main/res/raw/license_apache_2.txt | 0 .../src/main/res/raw/license_bsd_2clause.txt | 0 .../src/main/res/raw/license_bsd_3clause.txt | 0 .../base}/src/main/res/raw/license_gpl_3.txt | 0 .../base}/src/main/res/raw/license_mit.txt | 0 .../base}/src/main/res/raw/license_ofl.txt | 0 .../main/res/raw/lottie_scaffold_pager.json | 0 .../raw/lottie_scaffold_pager_reverse.json | 0 .../res/raw/lottie_scaffold_pulldown.json | 0 .../res/values-night-v31/color-schemes.xml | 0 .../base}/src/main/res/values-night/bools.xml | 0 .../main/res/values-night/color-schemes.xml | 0 .../src/main/res/values-night/colors.xml | 0 .../src/main/res/values-night/styles.xml | 0 .../src/main/res/values-night/themes.xml | 0 .../main/res/values-notnight-v23/colors.xml | 0 .../src/main/res/values-v31/color-schemes.xml | 0 .../src/main/res/values-w312dp/integers.xml | 0 .../src/main/res/values-w400dp/integers.xml | 0 .../src/main/res/values-w408dp/integers.xml | 0 .../src/main/res/values-w480dp/integers.xml | 0 .../src/main/res/values-w504dp/integers.xml | 0 .../src/main/res/values-w600dp/integers.xml | 0 .../base}/src/main/res/values/attrs.xml | 0 .../src/main/res/values/color-schemes.xml | 0 .../base}/src/main/res/values/colors.xml | 0 .../res/values/ic_launcher_background.xml | 0 .../base}/src/main/res/values/licenses.xml | 0 .../base}/src/main/res/values/styles.xml | 0 .../base}/src/main/res/values/themes.xml | 0 {appshortcuts => core/compat}/.gitignore | 0 {compat => core/compat}/build.gradle.kts | 0 .../compat}/consumer-rules.pro | 0 {compat => core/compat}/proguard-rules.pro | 0 .../compat}/src/main/AndroidManifest.xml | 0 .../launcher2/compat/PackageManagerCompat.kt | 0 {backup => core/crashreporter}/.gitignore | 0 .../crashreporter}/build.gradle.kts | 2 +- .../crashreporter}/consumer-rules.pro | 0 .../crashreporter}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../crashreporter/CrashReporter.java | 0 .../CrashReporterInitProvider.java | 0 .../crashreporter/utils/AppUtils.java | 0 .../crashreporter/utils/AppUtils.kt | 0 .../crashreporter/utils/Constants.java | 0 .../utils/CrashReporterException.java | 0 .../utils/CrashReporterExceptionHandler.java | 0 .../CrashReporterNotInitializedException.java | 0 .../crashreporter/utils/CrashUtil.java | 0 .../crashreporter/utils/FileUtils.java | 0 .../utils/SimplePageChangeListener.java | 0 .../launcher2/crashreporter/CrashReport.kt | 0 .../launcher2/crashreporter/CrashReporter.kt | 0 .../drawable/ic_menu_delete_white_24dp.xml | 0 .../res/drawable/ic_menu_share_white_24dp.xml | 0 .../res/drawable/ic_search_white_24dp.xml | 0 .../res/drawable/ic_warning_black_24dp.xml | 0 .../src/main/res/menu/crash_detail_menu.xml | 0 .../src/main/res/menu/log_main_menu.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 {badges => core/database}/.gitignore | 0 {database => core/database}/build.gradle.kts | 4 +- {badges => core/database}/consumer-rules.pro | 0 {badges => core/database}/proguard-rules.pro | 0 .../0.json | 0 .../1.json | 0 .../10.json | 0 .../11.json | 0 .../12.json | 0 .../13.json | 0 .../14.json | 0 .../15.json | 0 .../16.json | 0 .../17.json | 0 .../18.json | 0 .../19.json | 0 .../2.json | 0 .../3.json | 0 .../4.json | 0 .../5.json | 0 .../6.json | 0 .../7.json | 0 .../8.json | 0 .../9.json | 0 .../database}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/database/AppDatabase.kt | 0 .../launcher2/database/BackupRestoreDao.kt | 0 .../de/mm20/launcher2/database/Converters.kt | 0 .../de/mm20/launcher2/database/CurrencyDao.kt | 0 .../mm20/launcher2/database/CustomAttrsDao.kt | 6 ++ .../de/mm20/launcher2/database/IconDao.kt | 0 .../java/de/mm20/launcher2/database/Module.kt | 0 .../launcher2/database/SearchActionDao.kt | 0 .../de/mm20/launcher2/database/SearchDao.kt | 0 .../de/mm20/launcher2/database/WeatherDao.kt | 0 .../de/mm20/launcher2/database/WidgetDao.kt | 0 .../database/entities/CurrencyEntity.kt | 0 .../entities/CustomAttributeEntity.kt | 0 .../database/entities/ForecastEntity.kt | 0 .../launcher2/database/entities/IconEntity.kt | 0 .../database/entities/IconPackEntity.kt | 0 .../entities/SavedSearchableEntity.kt | 0 .../database/entities/SearchActionEntity.kt | 0 .../database/entities/WebsearchEntity.kt | 0 .../database/entities/WidgetEntity.kt | 0 .../database/migrations/Migration_10_11.kt | 0 .../database/migrations/Migration_11_12.kt | 0 .../database/migrations/Migration_12_13.kt | 0 .../database/migrations/Migration_13_14.kt | 0 .../database/migrations/Migration_14_15.kt | 0 .../database/migrations/Migration_15_16.kt | 0 .../database/migrations/Migration_16_17.kt | 0 .../database/migrations/Migration_17_18.kt | 0 .../database/migrations/Migration_18_19.kt | 0 .../database/migrations/Migration_6_7.kt | 0 .../database/migrations/Migration_7_8.kt | 0 .../database/migrations/Migration_8_9.kt | 0 .../database/migrations/Migration_9_10.kt | 0 {base => core/i18n}/.gitignore | 0 {i18n => core/i18n}/build.gradle.kts | 0 {base => core/i18n}/consumer-rules.pro | 0 {i18n => core/i18n}/proguard-rules.pro | 0 .../i18n}/src/debug/res/values-de/strings.xml | 0 .../i18n}/src/debug/res/values/strings.xml | 0 .../i18n}/src/main/AndroidManifest.xml | 0 .../i18n}/src/main/res/values-cs/strings.xml | 0 .../i18n}/src/main/res/values-cs/units.xml | 0 .../i18n}/src/main/res/values-de/defaults.xml | 0 .../i18n}/src/main/res/values-de/strings.xml | 0 .../i18n}/src/main/res/values-de/units.xml | 0 .../i18n}/src/main/res/values-el/strings.xml | 0 .../i18n}/src/main/res/values-el/units.xml | 0 .../src/main/res/values-en-rUS/defaults.xml | 0 .../i18n}/src/main/res/values-eo/strings.xml | 0 .../i18n}/src/main/res/values-eo/units.xml | 0 .../i18n}/src/main/res/values-es/strings.xml | 0 .../i18n}/src/main/res/values-es/units.xml | 0 .../i18n}/src/main/res/values-fr/defaults.xml | 0 .../i18n}/src/main/res/values-fr/strings.xml | 0 .../i18n}/src/main/res/values-fr/units.xml | 0 .../i18n}/src/main/res/values-it/strings.xml | 0 .../i18n}/src/main/res/values-it/units.xml | 0 .../i18n}/src/main/res/values-ja/strings.xml | 0 .../i18n}/src/main/res/values-ja/units.xml | 0 .../i18n}/src/main/res/values-nl/strings.xml | 0 .../i18n}/src/main/res/values-nl/units.xml | 0 .../i18n}/src/main/res/values-pl/strings.xml | 0 .../i18n}/src/main/res/values-pl/units.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rBR/units.xml | 0 .../i18n}/src/main/res/values-ro/strings.xml | 0 .../i18n}/src/main/res/values-ro/units.xml | 0 .../i18n}/src/main/res/values-ru/strings.xml | 0 .../i18n}/src/main/res/values-ru/units.xml | 0 .../i18n}/src/main/res/values-sv/strings.xml | 0 .../i18n}/src/main/res/values-sv/units.xml | 0 .../i18n}/src/main/res/values-tr/strings.xml | 0 .../i18n}/src/main/res/values-tr/units.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values-zh-rCN/units.xml | 0 .../i18n}/src/main/res/values/defaults.xml | 0 .../i18n}/src/main/res/values/strings.xml | 2 + .../i18n}/src/main/res/values/units.xml | 0 {calculator => core/ktx}/.gitignore | 0 {ktx => core/ktx}/build.gradle.kts | 0 {calculator => core/ktx}/consumer-rules.pro | 0 {ktx => core/ktx}/proguard-rules.pro | 0 .../ktx}/src/main/AndroidManifest.xml | 0 .../java/de/mm20/launcher2/ktx/Address.kt | 0 .../java/de/mm20/launcher2/ktx/Context.kt | 0 .../main/java/de/mm20/launcher2/ktx/Double.kt | 0 .../java/de/mm20/launcher2/ktx/Drawable.kt | 0 .../java/de/mm20/launcher2/ktx/Extensions.kt | 0 .../main/java/de/mm20/launcher2/ktx/Float.kt | 0 .../java/de/mm20/launcher2/ktx/InputStream.kt | 0 .../main/java/de/mm20/launcher2/ktx/Int.kt | 0 .../de/mm20/launcher2/ktx/LayerDrawable.kt | 0 .../main/java/de/mm20/launcher2/ktx/List.kt | 0 .../de/mm20/launcher2/ktx/Notification.kt | 0 .../main/java/de/mm20/launcher2/ktx/Rect.kt | 0 .../main/java/de/mm20/launcher2/ktx/RectF.kt | 0 .../java/de/mm20/launcher2/ktx/Resources.kt | 0 .../mm20/launcher2/ktx/SharedPreferences.kt | 0 .../main/java/de/mm20/launcher2/ktx/String.kt | 0 .../java/de/mm20/launcher2/ktx/TextView.kt | 0 .../java/de/mm20/launcher2/ktx/UserHandle.kt | 0 .../main/java/de/mm20/launcher2/ktx/View.kt | 0 .../de/mm20/launcher2/ktx/StringKtTest.kt | 0 {calendar => core/permissions}/.gitignore | 0 .../permissions}/build.gradle.kts | 6 +- .../permissions}/consumer-rules.pro | 0 .../permissions}/proguard-rules.pro | 0 .../permissions}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/permissions/Module.kt | 0 .../permissions/PermissionsManager.kt | 0 {compat => core/preferences}/.gitignore | 0 .../preferences}/build.gradle.kts | 10 +-- .../preferences}/consumer-rules.pro | 0 .../preferences}/proguard-rules.pro | 0 .../preferences}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/preferences/DataStore.kt | 0 .../de/mm20/launcher2/preferences/Defaults.kt | 0 .../launcher2/preferences/ImportExport.kt | 0 .../de/mm20/launcher2/preferences/Module.kt | 0 .../preferences/SettingsSerializer.kt | 0 .../migrations/FactorySettingsMigration.kt | 0 .../preferences/migrations/Migration_10_11.kt | 0 .../preferences/migrations/Migration_1_2.kt | 0 .../preferences/migrations/Migration_2_3.kt | 0 .../preferences/migrations/Migration_3_4.kt | 0 .../preferences/migrations/Migration_4_5.kt | 0 .../preferences/migrations/Migration_5_6.kt | 0 .../preferences/migrations/Migration_6_7.kt | 0 .../preferences/migrations/Migration_7_8.kt | 0 .../preferences/migrations/Migration_8_9.kt | 0 .../preferences/migrations/Migration_9_10.kt | 0 .../migrations/VersionedMigration.kt | 0 .../src/main/proto/settings.proto | 0 {contacts => data/applications}/.gitignore | 0 .../applications}/build.gradle.kts | 6 +- .../applications}/consumer-rules.pro | 0 .../applications}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../launcher2/applications/AppRepository.kt | 0 .../de/mm20/launcher2/applications/Module.kt | 0 .../launcher2/search/data/AppSerialization.kt | 1 - .../mm20/launcher2/search/data/LauncherApp.kt | 0 .../appshortcuts}/.gitignore | 0 .../appshortcuts}/build.gradle.kts | 8 +- .../appshortcuts}/consumer-rules.pro | 0 .../appshortcuts}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../appshortcuts/AppShortcutRepository.kt | 0 .../appshortcuts/AppShortcutSerialization.kt | 1 - .../de/mm20/launcher2/appshortcuts/Module.kt | 0 .../mm20/launcher2/search/data/AppShortcut.kt | 0 .../launcher2/search/data/LauncherShortcut.kt | 0 .../launcher2/search/data/LegacyShortcut.kt | 0 {currencies => data/calculator}/.gitignore | 0 .../calculator}/build.gradle.kts | 2 +- .../calculator}/consumer-rules.pro | 0 .../calculator}/proguard-rules.pro | 0 .../calculator}/src/main/AndroidManifest.xml | 0 .../calculator/CalculatorRepository.kt | 0 .../de/mm20/launcher2/calculator/Module.kt | 0 .../mm20/launcher2/search/data/Calculator.kt | 0 {customattrs => data/calendar}/.gitignore | 0 {calendar => data/calendar}/build.gradle.kts | 8 +- .../calendar}/consumer-rules.pro | 0 .../calendar}/proguard-rules.pro | 0 .../calendar}/src/main/AndroidManifest.xml | 0 .../launcher2/calendar/CalendarRepository.kt | 0 .../calendar/CalendarSerialization.kt | 0 .../java/de/mm20/launcher2/calendar/Module.kt | 0 .../launcher2/search/data/CalendarEvent.kt | 0 {database => data/contacts}/.gitignore | 0 {contacts => data/contacts}/build.gradle.kts | 6 +- .../contacts}/consumer-rules.pro | 0 .../contacts}/proguard-rules.pro | 0 .../contacts}/src/main/AndroidManifest.xml | 0 .../launcher2/contacts/ContactRepository.kt | 0 .../contacts/ContactSerialization.kt | 0 .../java/de/mm20/launcher2/contacts/Module.kt | 0 .../de/mm20/launcher2/search/data/Contact.kt | 0 {favorites => data/currencies}/.gitignore | 0 .../currencies}/build.gradle.kts | 8 +- .../currencies}/consumer-rules.pro | 0 .../currencies}/proguard-rules.pro | 0 .../currencies}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/currencies/Currency.kt | 0 .../currencies/CurrencyRepository.kt | 0 .../currencies/ExchangeRateWorker.kt | 0 {files => data/customattrs}/.gitignore | 0 .../customattrs}/build.gradle.kts | 12 +-- .../customattrs}/consumer-rules.pro | 0 .../customattrs}/proguard-rules.pro | 0 .../customattrs}/src/main/AndroidManifest.xml | 0 .../data}/customattrs/CustomAttribute.kt | 2 +- .../data}/customattrs/CustomAttributeType.kt | 2 +- .../customattrs/CustomAttributesRepository.kt | 11 ++- .../launcher2/data}/customattrs/Module.kt | 2 +- .../data}/customattrs/utils/Utils.kt | 4 +- {i18n => data/favorites}/.gitignore | 0 .../favorites}/build.gradle.kts | 26 +++--- {files => data/favorites}/consumer-rules.pro | 0 .../favorites}/proguard-rules.pro | 0 .../favorites}/src/main/AndroidManifest.xml | 0 .../favorites/FavoritesRepository.kt | 0 .../de/mm20/launcher2/favorites/Module.kt | 0 .../launcher2/favorites/SavedSearchable.kt | 1 - .../mm20/launcher2/favorites/Serialization.kt | 0 .../launcher2/favorites/TagSerialization.kt | 0 .../java/de/mm20/launcher2/search/data/Tag.kt | 0 {icons => data/files}/.gitignore | 0 {files => data/files}/build.gradle.kts | 16 ++-- {g-services => data/files}/consumer-rules.pro | 0 {files => data/files}/proguard-rules.pro | 0 .../files}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/files/FileSerialization.kt | 0 .../mm20/launcher2/files/FilesRepository.kt | 0 .../java/de/mm20/launcher2/files/Module.kt | 0 .../launcher2/files/providers/FileProvider.kt | 0 .../files/providers/GDriveFileProvider.kt | 0 .../files/providers/LocalFileProvider.kt | 0 .../files/providers/NextcloudFileProvider.kt | 0 .../files/providers/OneDriveFileProvider.kt | 0 .../files/providers/OwncloudFileProvider.kt | 0 .../launcher2/media/ThumbnailUtilsCompat.kt | 0 .../de/mm20/launcher2/search/data/File.kt | 0 .../mm20/launcher2/search/data/GDriveFile.kt | 0 .../mm20/launcher2/search/data/LocalFile.kt | 0 .../launcher2/search/data/NextcloudFile.kt | 0 .../launcher2/search/data/OneDriveFile.kt | 0 .../launcher2/search/data/OwncloudFile.kt | 0 {ktx => data/notifications}/.gitignore | 0 .../notifications}/build.gradle.kts | 2 +- .../notifications}/consumer-rules.pro | 0 .../notifications}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/notifications/Module.kt | 0 .../notifications/NotificationRepository.kt | 0 .../notifications/NotificationService.kt | 0 .../search-actions}/.gitignore | 0 .../search-actions}/build.gradle.kts | 10 +-- .../search-actions}/consumer-rules.pro | 0 .../search-actions}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../searchactions/KnownWebsearchEngines.kt | 0 .../de/mm20/launcher2/searchactions/Module.kt | 0 .../searchactions/SearchActionRepository.kt | 0 .../searchactions/SearchActionService.kt | 0 .../launcher2/searchactions/TextClassifier.kt | 0 .../searchactions/actions/AppSearchAction.kt | 0 .../searchactions/actions/CallAction.kt | 0 .../actions/CreateContactAction.kt | 0 .../actions/CustomIntentAction.kt | 0 .../searchactions/actions/EmailAction.kt | 0 .../searchactions/actions/MessageAction.kt | 0 .../searchactions/actions/OpenUrlAction.kt | 0 .../actions/ScheduleEventAction.kt | 0 .../searchactions/actions/SearchAction.kt | 1 - .../searchactions/actions/SetAlarmAction.kt | 0 .../searchactions/actions/TimerAction.kt | 0 .../builders/AppSearchActionBuilder.kt | 0 .../builders/CallActionBuilder.kt | 0 .../builders/CreateContactActionBuilder.kt | 0 .../builders/CustomIntentActionBuilder.kt | 0 .../CustomizableSearchActionBuilder.kt | 0 .../builders/EmailActionBuilder.kt | 0 .../builders/MessageActionBuilder.kt | 0 .../builders/OpenUrlActionBuilder.kt | 0 .../builders/ScheduleEventActionBuilder.kt | 0 .../builders/SearchActionBuilder.kt | 0 .../builders/SetAlarmActionBuilder.kt | 0 .../builders/TimerActionBuilder.kt | 0 .../builders/WebsearchActionBuilder.kt | 0 {music => data/unitconverter}/.gitignore | 0 .../unitconverter}/build.gradle.kts | 8 +- .../unitconverter}/consumer-rules.pro | 0 .../unitconverter}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../search/data/CurrencyUnitConverter.kt | 0 .../launcher2/search/data/UnitConverter.kt | 0 .../launcher2/unitconverter/ConverterUtils.kt | 0 .../mm20/launcher2/unitconverter/Dimension.kt | 0 .../unitconverter/MeasureUnitWithFactor.kt | 0 .../de/mm20/launcher2/unitconverter/Module.kt | 0 .../unitconverter/UnitConverterRepository.kt | 0 .../mm20/launcher2/unitconverter/UnitValue.kt | 0 .../unitconverter/converters/AreaConverter.kt | 0 .../unitconverter/converters/Converter.kt | 0 .../converters/CurrencyConverter.kt | 0 .../unitconverter/converters/DataConverter.kt | 0 .../converters/LengthConverter.kt | 0 .../unitconverter/converters/MassConverter.kt | 0 .../converters/SimpleFactorConverter.kt | 0 .../converters/TemperatureConverter.kt | 0 .../unitconverter/converters/TimeConverter.kt | 0 .../converters/VelocityConverter.kt | 0 {weather => data/weather}/.gitignore | 0 {weather => data/weather}/build.gradle.kts | 12 +-- {weather => data/weather}/consumer-rules.pro | 0 {weather => data/weather}/proguard-rules.pro | 0 .../weather}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/weather/DailyForecast.kt | 0 .../de/mm20/launcher2/weather/Forecast.kt | 0 .../weather/LatLonWeatherProvider.kt | 0 .../java/de/mm20/launcher2/weather/Module.kt | 0 .../java/de/mm20/launcher2/weather/Weather.kt | 0 .../mm20/launcher2/weather/WeatherLocation.kt | 0 .../mm20/launcher2/weather/WeatherProvider.kt | 0 .../launcher2/weather/WeatherRepository.kt | 0 .../weather/brightsky/BrightSkyApi.kt | 0 .../weather/brightsky/BrightskyProvider.kt | 0 .../launcher2/weather/here/HereGeocodeApi.kt | 0 .../launcher2/weather/here/HereProvider.kt | 0 .../launcher2/weather/here/HereWeatherApi.kt | 0 .../launcher2/weather/metno/MetNoProvider.kt | 0 .../openweathermap/OpenWeatherMapApi.kt | 0 .../openweathermap/OpenWeatherMapProvider.kt | 0 .../src/main/res/values/config_example.xml | 0 {nextcloud => data/websites}/.gitignore | 0 {websites => data/websites}/build.gradle.kts | 4 +- .../websites}/consumer-rules.pro | 0 .../websites}/proguard-rules.pro | 0 .../websites}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/search/data/Website.kt | 0 .../java/de/mm20/launcher2/websites/Module.kt | 0 .../launcher2/websites/WebsiteRepository.kt | 0 .../websites/WebsiteSerialization.kt | 0 .../src/main/res/drawable/ic_website.xml | 0 {notifications => data/widgets}/.gitignore | 0 {widgets => data/widgets}/build.gradle.kts | 16 ++-- .../widgets}/consumer-rules.pro | 0 {widgets => data/widgets}/proguard-rules.pro | 0 .../widgets}/src/main/AndroidManifest.xml | 0 .../java/de/mm20/launcher2/widgets/Module.kt | 0 .../java/de/mm20/launcher2/widgets/Widget.kt | 0 .../launcher2/widgets/WidgetRepository.kt | 0 {owncloud => data/wikipedia}/.gitignore | 0 .../wikipedia}/build.gradle.kts | 8 +- .../wikipedia}/consumer-rules.pro | 0 .../wikipedia}/proguard-rules.pro | 0 .../wikipedia}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/search/data/Wikipedia.kt | 0 .../de/mm20/launcher2/wikipedia/Module.kt | 0 .../mm20/launcher2/wikipedia/WikipediaApi.kt | 0 .../wikipedia/WikipediaRepository.kt | 0 .../wikipedia/WikipediaSerialization.kt | 0 .../main/res/drawable-hdpi/ic_wikipedia.webp | Bin .../main/res/drawable-mdpi/ic_wikipedia.webp | Bin .../main/res/drawable-xhdpi/ic_wikipedia.webp | Bin .../res/drawable-xxhdpi/ic_wikipedia.webp | Bin .../res/drawable-xxxhdpi/ic_wikipedia.webp | Bin gradle/wrapper/gradle-wrapper.properties | 6 +- {g-services => libs/g-services}/.gitignore | 0 .../g-services}/build.gradle.kts | 4 +- {music => libs/g-services}/consumer-rules.pro | 0 .../g-services}/proguard-rules.pro | 0 .../src/debug/res/raw/g_services_example.json | 0 .../g-services}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/gservices/DriveFile.kt | 0 .../mm20/launcher2/gservices/GoogleAccount.kt | 0 .../launcher2/gservices/GoogleApiHelper.kt | 0 .../gservices/GoogleAuthRedirectActivity.kt | 0 .../src/main/res/drawable/ic_google_g.xml | 0 .../src/main/res/values/styles.xml | 0 .../release/res/raw/g_services_example.json | 0 .../material-color-utilities}/.gitignore | 0 .../build.gradle.kts | 2 +- .../consumer-rules.pro | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/java/hct/Cam16.java | 0 .../src/main/java/hct/Hct.java | 0 .../src/main/java/hct/HctSolver.java | 0 .../src/main/java/hct/ViewingConditions.java | 0 .../src/main/java/palettes/CorePalette.java | 0 .../src/main/java/palettes/TonalPalette.java | 0 .../src/main/java/scheme/Scheme.java | 0 .../src/main/java/utils/ColorUtils.java | 0 .../src/main/java/utils/MathUtils.java | 0 {ms-services => libs/ms-services}/.gitignore | 0 .../ms-services}/build.gradle.kts | 3 +- .../ms-services}/consumer-rules.pro | 0 .../ms-services}/proguard-rules.pro | 0 .../res/raw/msal_auth_config_example.json | 0 .../ms-services}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/msservices/DriveItem.kt | 0 .../msservices/MicrosoftGraphApiHelper.kt | 0 .../de/mm20/launcher2/msservices/MsUser.kt | 0 .../res/raw/msal_auth_config_example.json | 0 {preferences => libs/nextcloud}/.gitignore | 0 .../nextcloud}/build.gradle.kts | 5 +- .../nextcloud}/consumer-rules.pro | 0 .../nextcloud}/proguard-rules.pro | 0 .../nextcloud}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/nextcloud/LoginActivity.kt | 0 .../de/mm20/launcher2/nextcloud/NcUser.kt | 0 .../launcher2/nextcloud/NextcloudApiHelper.kt | 0 .../main/res/drawable/ic_nextcloud_logo.xml | 0 .../res/layout/activity_nextcloud_login.xml | 0 .../src/main/res/values-night/styles.xml | 0 .../nextcloud}/src/main/res/values/styles.xml | 0 {search-actions => libs/owncloud}/.gitignore | 0 {owncloud => libs/owncloud}/build.gradle.kts | 9 +- .../owncloud}/consumer-rules.pro | 0 .../owncloud}/proguard-rules.pro | 0 .../owncloud}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/owncloud/LoginActivity.kt | 0 .../java/de/mm20/launcher2/owncloud/OcUser.kt | 0 .../mm20/launcher2/owncloud/OwncloudClient.kt | 0 .../res/drawable-night/ic_owncloud_logo.xml | 0 .../main/res/drawable/ic_owncloud_logo.xml | 0 .../res/layout/activity_owncloud_login.xml | 0 ...ivity_owncloud_login_username_password.xml | 0 .../layout/owncloud_login_drop_down_item.xml | 0 .../src/main/res/values-night/styles.xml | 0 .../owncloud}/src/main/res/values/styles.xml | 0 {search => libs/webdav}/.gitignore | 0 {webdav => libs/webdav}/build.gradle.kts | 4 +- .../webdav}/consumer-rules.pro | 0 {database => libs/webdav}/proguard-rules.pro | 0 .../webdav}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/webdav/WebDavApi.kt | 0 .../de/mm20/launcher2/webdav/WebDavFile.kt | 0 {ui => services/accounts}/.gitignore | 0 .../accounts}/build.gradle.kts | 8 +- .../accounts}/consumer-rules.pro | 0 .../accounts}/proguard-rules.pro | 0 .../accounts}/src/main/AndroidManifest.xml | 0 .../de/mm20/launcher2/accounts/Account.kt | 0 .../de/mm20/launcher2/accounts/AccountType.kt | 0 .../launcher2/accounts/AccountsRepository.kt | 0 .../java/de/mm20/launcher2/accounts/Module.kt | 0 {unitconverter => services/backup}/.gitignore | 0 {backup => services/backup}/build.gradle.kts | 12 +-- {ui => services/backup}/consumer-rules.pro | 0 .../backup}/proguard-rules.pro | 0 .../backup}/src/main/AndroidManifest.xml | 0 .../mm20/launcher2/backup/BackupComponent.kt | 0 .../de/mm20/launcher2/backup/BackupManager.kt | 2 +- .../mm20/launcher2/backup/BackupMetadata.kt | 0 .../java/de/mm20/launcher2/backup/Module.kt | 0 {webdav => services/badges}/.gitignore | 0 {badges => services/badges}/build.gradle.kts | 14 +-- .../badges}/consumer-rules.pro | 0 .../badges}/proguard-rules.pro | 0 .../badges}/src/main/AndroidManifest.xml | 0 .../java/de/mm20/launcher2/badges/Badge.kt | 0 .../mm20/launcher2/badges/BadgeRepository.kt | 0 .../java/de/mm20/launcher2/badges/Module.kt | 0 .../providers/AppShortcutBadgeProvider.kt | 0 .../badges/providers/BadgeProvider.kt | 0 .../badges/providers/CloudBadgeProvider.kt | 0 .../providers/NotificationBadgeProvider.kt | 0 .../providers/SuspendedAppsBadgeProvider.kt | 0 .../providers/WorkProfileBadgeProvider.kt | 0 {websites => services/icons}/.gitignore | 0 {icons => services/icons}/build.gradle.kts | 14 +-- {webdav => services/icons}/consumer-rules.pro | 0 {icons => services/icons}/proguard-rules.pro | 0 .../icons}/src/main/AndroidManifest.xml | 0 .../launcher2/icons/DynamicCalendarIcon.kt | 1 - .../java/de/mm20/launcher2/icons/IconPack.kt | 0 .../de/mm20/launcher2/icons/IconPackIcon.kt | 0 .../mm20/launcher2/icons/IconPackManager.kt | 0 .../de/mm20/launcher2/icons/IconRepository.kt | 16 ++-- .../java/de/mm20/launcher2/icons/Module.kt | 0 .../icons/TransformableDynamicLauncherIcon.kt | 0 .../icons/providers/CalendarIconProvider.kt | 0 .../providers/CustomIconPackIconProvider.kt | 2 +- .../providers/CustomThemedIconProvider.kt | 2 +- .../providers/GoogleClockIconProvider.kt | 0 .../icons/providers/IconPackIconProvider.kt | 0 .../launcher2/icons/providers/IconProvider.kt | 0 .../providers/PlaceholderIconProvider.kt | 0 .../icons/providers/SystemIconProvider.kt | 0 .../icons/providers/ThemedIconProvider.kt | 0 .../ThemedPlaceholderIconProvider.kt | 0 .../ForceThemedIconTransformation.kt | 0 .../LauncherIconTransformation.kt | 0 .../LegacyToAdaptiveTransformation.kt | 0 {widgets => services/music}/.gitignore | 0 {music => services/music}/build.gradle.kts | 8 +- .../music}/consumer-rules.pro | 0 {music => services/music}/proguard-rules.pro | 0 .../music}/src/main/AndroidManifest.xml | 0 .../java/de/mm20/launcher2/music/Module.kt | 0 .../mm20/launcher2/music/MusicRepository.kt | 0 .../music}/src/main/res/values/dimens.xml | 0 {wikipedia => services/search}/.gitignore | 0 {search => services/search}/build.gradle.kts | 32 +++---- .../search}/consumer-rules.pro | 0 .../search}/proguard-rules.pro | 0 .../search}/src/main/AndroidManifest.xml | 0 .../java/de/mm20/launcher2/search/Module.kt | 0 .../de/mm20/launcher2/search/SearchService.kt | 4 +- .../mm20/launcher2/search/data/Websearch.kt | 0 services/tags/.gitignore | 1 + services/tags/build.gradle.kts | 51 +++++++++++ services/tags/consumer-rules.pro | 0 services/tags/proguard-rules.pro | 21 +++++ services/tags/src/main/AndroidManifest.xml | 4 + .../de/mm20/launcher2/services/tags/Module.kt | 8 ++ .../launcher2/services/tags/TagsService.kt | 8 ++ .../services/tags/impl/TagsServiceImpl.kt | 22 +++++ settings.gradle.kts | 82 ++++++++++-------- 995 files changed, 501 insertions(+), 298 deletions(-) rename app/{ => app}/.gitignore (100%) rename app/{ => app}/build.gradle.kts (66%) rename app/{ => app}/proguard-rules.pro (100%) rename app/{ => app}/src/debug/google-services.json (100%) rename app/{ => app}/src/debug/java/de/mm20/launcher2/debug/Debug.kt (100%) rename app/{ => app}/src/debug/res/values/bools.xml (100%) rename app/{ => app}/src/main/AndroidManifest.xml (100%) rename app/{ => app}/src/main/java/de/mm20/launcher2/LauncherApplication.kt (98%) rename app/{ => app}/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt (100%) rename app/{ => app}/src/main/java/de/mm20/launcher2/content/GenericFileProvider.kt (100%) rename app/{ => app}/src/main/res/animator/card_raise_animator.xml (100%) rename app/{ => app}/src/main/res/drawable-hdpi/ic_wikipedia.webp (100%) rename app/{ => app}/src/main/res/drawable-mdpi/ic_wikipedia.webp (100%) rename app/{ => app}/src/main/res/drawable-night/ic_account_owncloud.xml (100%) rename app/{ => app}/src/main/res/drawable-xhdpi/ic_wikipedia.webp (100%) rename app/{ => app}/src/main/res/drawable-xxhdpi/ic_wikipedia.webp (100%) rename app/{ => app}/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp (100%) rename app/{ => app}/src/main/res/values/attrs.xml (100%) rename app/{ => app}/src/main/res/values/bools.xml (100%) rename app/{ => app}/src/main/res/values/donottranslate.xml (100%) rename app/{ => app}/src/main/res/values/integers.xml (100%) rename app/{ => app}/src/main/res/values/styles.xml (100%) rename app/{ => app}/src/main/res/xml/provider_paths.xml (100%) rename app/{ => app}/src/release/java/de/mm20/launcher2/debug/Debug.kt (100%) rename {accounts => app/ui}/.gitignore (100%) rename {ui => app/ui}/build.gradle.kts (69%) rename {accounts => app/ui}/consumer-rules.pro (100%) rename {ui => app/ui}/proguard-rules.pro (100%) rename {ui => app/ui}/src/main/AndroidManifest.xml (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/animation/TextStyle.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/assistant/AssistantActivity.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/assistant/AssistantScaffold.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/base/BaseActivity.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/base/BaseActivityVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/base/ProvideCurrentTime.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt (96%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialogVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/Badges.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/Banner.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/Chip.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/LargeMessage.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/LauncherCard.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/NavBarEffects.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/Preference.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceCategory.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/Color.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/Dp.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/Float.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/Int.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/Modifier.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/ktx/Offset.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivityVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/LauncherScaffoldVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/helper/WallpaperBlur.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt (97%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/SearchResultList.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavoritesVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItemVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt (95%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt (99%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/sheets/LauncherBottomSheetManager.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransition.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionHandler.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionManager.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionParams.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetItem.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidgetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidgetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/BinaryClock.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/EmptyClock.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/OrbitClock.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/FavoritesPartProvider.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/PartProvider.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/external/ExternalWidget.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidget.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidgetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/AppWidgetList.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidgetWM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/layout/Arrangement.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/modifier/FadingEdges.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/modifier/Modifiers.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/modifier/Scrims.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt (98%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt (99%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt (93%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt (91%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt (98%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt (99%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt (96%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheetVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreenVM.kt (100%) create mode 100644 app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt create mode 100644 app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreen.kt create mode 100644 app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreenVM.kt rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetsSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreen.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreenVM.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/WallpaperColors.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Default.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/EasterEgg.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/typography/Common.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/typography/SystemDefault.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/utils/NotificationShadeController.kt (100%) rename {ui => app/ui}/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt (100%) rename {ui => app/ui}/src/main/res/drawable/drag_handle.xml (100%) rename {ui => app/ui}/src/main/res/raw-night/lottie_play_to_pause.json (100%) rename {ui => app/ui}/src/main/res/raw-night/lottie_skip_next.json (100%) rename {ui => app/ui}/src/main/res/raw/ic_menu_to_clear.json (100%) rename {ui => app/ui}/src/main/res/raw/lottie_menu_to_clear.json (100%) rename {ui => app/ui}/src/main/res/raw/lottie_play_to_pause.json (100%) rename {ui => app/ui}/src/main/res/raw/lottie_skip_next.json (100%) rename {ui => app/ui}/src/main/res/raw/play_to_pause.json (100%) rename {ui => app/ui}/src/main/res/values-night/weather_colors.xml (100%) rename {ui => app/ui}/src/main/res/values/AspectRatioImageView.xml (100%) rename {ui => app/ui}/src/main/res/values/BottomSheet.xml (100%) rename {ui => app/ui}/src/main/res/values/LauncherCardView.xml (100%) rename {ui => app/ui}/src/main/res/values/SearchGridView.xml (100%) rename {ui => app/ui}/src/main/res/values/dimens.xml (100%) rename {ui => app/ui}/src/main/res/values/weather_colors.xml (100%) rename {ui => app/ui}/src/main/res/xml-v25/debug_shortcuts.xml (100%) rename {applications => core/base}/.gitignore (100%) rename {base => core/base}/build.gradle.kts (92%) rename {applications => core/base}/consumer-rules.pro (100%) rename {base => core/base}/proguard-rules.pro (100%) rename {base => core/base}/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {base => core/base}/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/debug/res/values/ic_launcher_background.xml (100%) rename {base => core/base}/src/main/AndroidManifest.xml (100%) rename {base => core/base}/src/main/java/com/android/launcher3/GestureNavContract.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/debug/DebugInformationDumper.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt (98%) rename {base => core/base}/src/main/java/de/mm20/launcher2/helper/NetworkUtils.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/icons/LauncherIcon.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/licenses/AppLicense.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/licenses/OpenSourceLibrary.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/lifecycle/BroadcastReceiverLiveData.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/search/Searchable.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/search/SearchableDeserializer.kt (100%) rename {base => core/base}/src/main/java/de/mm20/launcher2/search/SearchableSerializer.kt (100%) rename {base => core/base}/src/main/res/anim/ic_skip_next_arrow1.xml (100%) rename {base => core/base}/src/main/res/anim/ic_skip_next_arrow2.xml (100%) rename {base => core/base}/src/main/res/anim/ic_skip_prev_arrow1.xml (100%) rename {base => core/base}/src/main/res/anim/ic_skip_prev_arrow2.xml (100%) rename {base => core/base}/src/main/res/color/chip_background.xml (100%) rename {base => core/base}/src/main/res/color/chip_stroke.xml (100%) rename {base => core/base}/src/main/res/color/chip_textcolor.xml (100%) rename {base => core/base}/src/main/res/color/text_color_primary.xml (100%) rename {base => core/base}/src/main/res/color/text_color_secondary.xml (100%) rename {base => core/base}/src/main/res/drawable-hdpi/ic_badge_gdrive.webp (100%) rename {base => core/base}/src/main/res/drawable-mdpi/ic_badge_gdrive.webp (100%) rename {base => core/base}/src/main/res/drawable-xhdpi/ic_badge_gdrive.webp (100%) rename {base => core/base}/src/main/res/drawable-xxhdpi/ic_badge_gdrive.webp (100%) rename {base => core/base}/src/main/res/drawable-xxxhdpi/ic_badge_gdrive.webp (100%) rename {base => core/base}/src/main/res/drawable/anim_ic_edit_add.xml (100%) rename {base => core/base}/src/main/res/drawable/anim_ic_menu_clear.xml (100%) rename {base => core/base}/src/main/res/drawable/anim_ic_play_pause.xml (100%) rename {base => core/base}/src/main/res/drawable/anim_weather_sun_moon.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_about_fdroid.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_about_github.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_about_telegram.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_account_google.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_account_microsoft.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_account_nextcloud.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_account_owncloud.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_add.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_arrow_back.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_arrow_drop_down.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_arrow_left.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_arrow_right.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_arrow_up.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_attendees.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_badge_nextcloud.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_badge_onedrive.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_badge_owncloud.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_badge_suspended.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_badge_workprofile.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_call.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_cancel.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_clear.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_delete.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_description.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_done.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_drag_handle.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_edit.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_expand_more.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_experimental_feature.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_android.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_archive.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_code.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_document.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_folder.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_form.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_generic.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_markup.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_music.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_pdf.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_picture.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_presentation.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_spreadsheet.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_file_video.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_info_outline.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_location.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_mail.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_message.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_more_horiz.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_more_vert.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_open_external.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_open_in_browser.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pause.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_permission.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_permission_calendar.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_play.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_precipitation_none.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_precipitation_rain.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_precipitation_rain_snow.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_precipitation_snow.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_about.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_account.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_appearance.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_badge.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_calendar.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_plugins.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_search.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_pref_weather.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_preference_websearch_new.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_resize_drag_handle.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_search.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_settings.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_share.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_skip_next.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_skip_next_anim.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_skip_prev.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_skip_prev_anim.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_star_outline.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_star_solid.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_telegram.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_time.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_today.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_visibility.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_visibility_off.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_website.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_whatsapp.xml (100%) rename {base => core/base}/src/main/res/drawable/ic_widget_resize.xml (100%) rename {base => core/base}/src/main/res/font/outfit_100.otf (100%) rename {base => core/base}/src/main/res/font/outfit_200.otf (100%) rename {base => core/base}/src/main/res/font/outfit_300.otf (100%) rename {base => core/base}/src/main/res/font/outfit_400.otf (100%) rename {base => core/base}/src/main/res/font/outfit_500.otf (100%) rename {base => core/base}/src/main/res/font/outfit_600.otf (100%) rename {base => core/base}/src/main/res/font/outfit_700.otf (100%) rename {base => core/base}/src/main/res/font/outfit_800.otf (100%) rename {base => core/base}/src/main/res/font/outfit_900.otf (100%) rename {base => core/base}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {base => core/base}/src/main/res/mipmap-hdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/main/res/mipmap-mdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png (100%) rename {base => core/base}/src/main/res/raw/license_apache_2.txt (100%) rename {base => core/base}/src/main/res/raw/license_bsd_2clause.txt (100%) rename {base => core/base}/src/main/res/raw/license_bsd_3clause.txt (100%) rename {base => core/base}/src/main/res/raw/license_gpl_3.txt (100%) rename {base => core/base}/src/main/res/raw/license_mit.txt (100%) rename {base => core/base}/src/main/res/raw/license_ofl.txt (100%) rename {base => core/base}/src/main/res/raw/lottie_scaffold_pager.json (100%) rename {base => core/base}/src/main/res/raw/lottie_scaffold_pager_reverse.json (100%) rename {base => core/base}/src/main/res/raw/lottie_scaffold_pulldown.json (100%) rename {base => core/base}/src/main/res/values-night-v31/color-schemes.xml (100%) rename {base => core/base}/src/main/res/values-night/bools.xml (100%) rename {base => core/base}/src/main/res/values-night/color-schemes.xml (100%) rename {base => core/base}/src/main/res/values-night/colors.xml (100%) rename {base => core/base}/src/main/res/values-night/styles.xml (100%) rename {base => core/base}/src/main/res/values-night/themes.xml (100%) rename {base => core/base}/src/main/res/values-notnight-v23/colors.xml (100%) rename {base => core/base}/src/main/res/values-v31/color-schemes.xml (100%) rename {base => core/base}/src/main/res/values-w312dp/integers.xml (100%) rename {base => core/base}/src/main/res/values-w400dp/integers.xml (100%) rename {base => core/base}/src/main/res/values-w408dp/integers.xml (100%) rename {base => core/base}/src/main/res/values-w480dp/integers.xml (100%) rename {base => core/base}/src/main/res/values-w504dp/integers.xml (100%) rename {base => core/base}/src/main/res/values-w600dp/integers.xml (100%) rename {base => core/base}/src/main/res/values/attrs.xml (100%) rename {base => core/base}/src/main/res/values/color-schemes.xml (100%) rename {base => core/base}/src/main/res/values/colors.xml (100%) rename {base => core/base}/src/main/res/values/ic_launcher_background.xml (100%) rename {base => core/base}/src/main/res/values/licenses.xml (100%) rename {base => core/base}/src/main/res/values/styles.xml (100%) rename {base => core/base}/src/main/res/values/themes.xml (100%) rename {appshortcuts => core/compat}/.gitignore (100%) rename {compat => core/compat}/build.gradle.kts (100%) rename {appshortcuts => core/compat}/consumer-rules.pro (100%) rename {compat => core/compat}/proguard-rules.pro (100%) rename {accounts => core/compat}/src/main/AndroidManifest.xml (100%) rename {compat => core/compat}/src/main/java/de/mm20/launcher2/compat/PackageManagerCompat.kt (100%) rename {backup => core/crashreporter}/.gitignore (100%) rename {crashreporter => core/crashreporter}/build.gradle.kts (96%) rename {backup => core/crashreporter}/consumer-rules.pro (100%) rename {crashreporter => core/crashreporter}/proguard-rules.pro (100%) rename {crashreporter => core/crashreporter}/src/main/AndroidManifest.xml (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/CrashReporter.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/Constants.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterException.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterExceptionHandler.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterNotInitializedException.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/FileUtils.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/com/balsikandar/crashreporter/utils/SimplePageChangeListener.java (100%) rename {crashreporter => core/crashreporter}/src/main/java/de/mm20/launcher2/crashreporter/CrashReport.kt (100%) rename {crashreporter => core/crashreporter}/src/main/java/de/mm20/launcher2/crashreporter/CrashReporter.kt (100%) rename {crashreporter => core/crashreporter}/src/main/res/drawable/ic_menu_delete_white_24dp.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/drawable/ic_menu_share_white_24dp.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/drawable/ic_search_white_24dp.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/drawable/ic_warning_black_24dp.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/menu/crash_detail_menu.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/menu/log_main_menu.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/values/colors.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/values/strings.xml (100%) rename {crashreporter => core/crashreporter}/src/main/res/values/styles.xml (100%) rename {badges => core/database}/.gitignore (100%) rename {database => core/database}/build.gradle.kts (94%) rename {badges => core/database}/consumer-rules.pro (100%) rename {badges => core/database}/proguard-rules.pro (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/0.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/1.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/10.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/11.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/12.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/13.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/14.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/15.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/16.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/17.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/18.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/19.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/2.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/3.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/4.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/5.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/6.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/7.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/8.json (100%) rename {database => core/database}/schemas/de.mm20.launcher2.database.AppDatabase/9.json (100%) rename {applications => core/database}/src/main/AndroidManifest.xml (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/AppDatabase.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/Converters.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt (88%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/IconDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/Module.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/SearchDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/WeatherDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/WidgetDao.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt (100%) rename {database => core/database}/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt (100%) rename {base => core/i18n}/.gitignore (100%) rename {i18n => core/i18n}/build.gradle.kts (100%) rename {base => core/i18n}/consumer-rules.pro (100%) rename {i18n => core/i18n}/proguard-rules.pro (100%) rename {i18n => core/i18n}/src/debug/res/values-de/strings.xml (100%) rename {i18n => core/i18n}/src/debug/res/values/strings.xml (100%) rename {i18n => core/i18n}/src/main/AndroidManifest.xml (100%) rename {i18n => core/i18n}/src/main/res/values-cs/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-cs/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-de/defaults.xml (100%) rename {i18n => core/i18n}/src/main/res/values-de/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-de/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-el/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-el/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-en-rUS/defaults.xml (100%) rename {i18n => core/i18n}/src/main/res/values-eo/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-eo/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-es/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-es/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-fr/defaults.xml (100%) rename {i18n => core/i18n}/src/main/res/values-fr/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-fr/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-it/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-it/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-ja/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-ja/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-nl/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-nl/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-pl/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-pl/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-pt-rBR/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-pt-rBR/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-ro/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-ro/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-ru/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-ru/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-sv/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-sv/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-tr/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-tr/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values-zh-rCN/strings.xml (100%) rename {i18n => core/i18n}/src/main/res/values-zh-rCN/units.xml (100%) rename {i18n => core/i18n}/src/main/res/values/defaults.xml (100%) rename {i18n => core/i18n}/src/main/res/values/strings.xml (99%) rename {i18n => core/i18n}/src/main/res/values/units.xml (100%) rename {calculator => core/ktx}/.gitignore (100%) rename {ktx => core/ktx}/build.gradle.kts (100%) rename {calculator => core/ktx}/consumer-rules.pro (100%) rename {ktx => core/ktx}/proguard-rules.pro (100%) rename {badges => core/ktx}/src/main/AndroidManifest.xml (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Address.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Context.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Double.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Drawable.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Extensions.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Float.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/InputStream.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Int.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/LayerDrawable.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/List.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Notification.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Rect.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/RectF.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/Resources.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/SharedPreferences.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/String.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/TextView.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/UserHandle.kt (100%) rename {ktx => core/ktx}/src/main/java/de/mm20/launcher2/ktx/View.kt (100%) rename {ktx => core/ktx}/src/test/java/de/mm20/launcher2/ktx/StringKtTest.kt (100%) rename {calendar => core/permissions}/.gitignore (100%) rename {permissions => core/permissions}/build.gradle.kts (88%) rename {calendar => core/permissions}/consumer-rules.pro (100%) rename {currencies => core/permissions}/proguard-rules.pro (100%) rename {appshortcuts => core/permissions}/src/main/AndroidManifest.xml (100%) rename {permissions => core/permissions}/src/main/java/de/mm20/launcher2/permissions/Module.kt (100%) rename {permissions => core/permissions}/src/main/java/de/mm20/launcher2/permissions/PermissionsManager.kt (100%) rename {compat => core/preferences}/.gitignore (100%) rename {preferences => core/preferences}/build.gradle.kts (87%) rename {preferences => core/preferences}/consumer-rules.pro (100%) rename {nextcloud => core/preferences}/proguard-rules.pro (100%) rename {preferences => core/preferences}/src/main/AndroidManifest.xml (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/DataStore.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/Defaults.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/ImportExport.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/Module.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/SettingsSerializer.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/FactorySettingsMigration.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_10_11.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_1_2.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_2_3.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_3_4.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_4_5.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_5_6.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_6_7.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_7_8.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_9_10.kt (100%) rename {preferences => core/preferences}/src/main/java/de/mm20/launcher2/preferences/migrations/VersionedMigration.kt (100%) rename {preferences => core/preferences}/src/main/proto/settings.proto (100%) rename {contacts => data/applications}/.gitignore (100%) rename {applications => data/applications}/build.gradle.kts (90%) rename {compat => data/applications}/consumer-rules.pro (100%) rename {applications => data/applications}/proguard-rules.pro (100%) rename {calculator => data/applications}/src/main/AndroidManifest.xml (100%) rename {applications => data/applications}/src/main/java/de/mm20/launcher2/applications/AppRepository.kt (100%) rename {applications => data/applications}/src/main/java/de/mm20/launcher2/applications/Module.kt (100%) rename {applications => data/applications}/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt (98%) rename {applications => data/applications}/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt (100%) rename {crashreporter => data/appshortcuts}/.gitignore (100%) rename {appshortcuts => data/appshortcuts}/build.gradle.kts (85%) rename {contacts => data/appshortcuts}/consumer-rules.pro (100%) rename {accounts => data/appshortcuts}/proguard-rules.pro (100%) rename {backup => data/appshortcuts}/src/main/AndroidManifest.xml (100%) rename {appshortcuts => data/appshortcuts}/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutRepository.kt (100%) rename {appshortcuts => data/appshortcuts}/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt (99%) rename {appshortcuts => data/appshortcuts}/src/main/java/de/mm20/launcher2/appshortcuts/Module.kt (100%) rename {appshortcuts => data/appshortcuts}/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt (100%) rename {appshortcuts => data/appshortcuts}/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt (100%) rename {appshortcuts => data/appshortcuts}/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt (100%) rename {currencies => data/calculator}/.gitignore (100%) rename {calculator => data/calculator}/build.gradle.kts (96%) rename {crashreporter => data/calculator}/consumer-rules.pro (100%) rename {calculator => data/calculator}/proguard-rules.pro (100%) rename {contacts => data/calculator}/src/main/AndroidManifest.xml (100%) rename {calculator => data/calculator}/src/main/java/de/mm20/launcher2/calculator/CalculatorRepository.kt (100%) rename {calculator => data/calculator}/src/main/java/de/mm20/launcher2/calculator/Module.kt (100%) rename {calculator => data/calculator}/src/main/java/de/mm20/launcher2/search/data/Calculator.kt (100%) rename {customattrs => data/calendar}/.gitignore (100%) rename {calendar => data/calendar}/build.gradle.kts (84%) rename {currencies => data/calendar}/consumer-rules.pro (100%) rename {calendar => data/calendar}/proguard-rules.pro (100%) rename {calendar => data/calendar}/src/main/AndroidManifest.xml (100%) rename {calendar => data/calendar}/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt (100%) rename {calendar => data/calendar}/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt (100%) rename {calendar => data/calendar}/src/main/java/de/mm20/launcher2/calendar/Module.kt (100%) rename {calendar => data/calendar}/src/main/java/de/mm20/launcher2/search/data/CalendarEvent.kt (100%) rename {database => data/contacts}/.gitignore (100%) rename {contacts => data/contacts}/build.gradle.kts (88%) rename {customattrs => data/contacts}/consumer-rules.pro (100%) rename {contacts => data/contacts}/proguard-rules.pro (100%) rename {database => data/contacts}/src/main/AndroidManifest.xml (100%) rename {contacts => data/contacts}/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt (100%) rename {contacts => data/contacts}/src/main/java/de/mm20/launcher2/contacts/ContactSerialization.kt (100%) rename {contacts => data/contacts}/src/main/java/de/mm20/launcher2/contacts/Module.kt (100%) rename {contacts => data/contacts}/src/main/java/de/mm20/launcher2/search/data/Contact.kt (100%) rename {favorites => data/currencies}/.gitignore (100%) rename {currencies => data/currencies}/build.gradle.kts (85%) rename {database => data/currencies}/consumer-rules.pro (100%) rename {permissions => data/currencies}/proguard-rules.pro (100%) rename {currencies => data/currencies}/src/main/AndroidManifest.xml (100%) rename {currencies => data/currencies}/src/main/java/de/mm20/launcher2/currencies/Currency.kt (100%) rename {currencies => data/currencies}/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt (100%) rename {currencies => data/currencies}/src/main/java/de/mm20/launcher2/currencies/ExchangeRateWorker.kt (100%) rename {files => data/customattrs}/.gitignore (100%) rename {customattrs => data/customattrs}/build.gradle.kts (76%) rename {favorites => data/customattrs}/consumer-rules.pro (100%) rename {appshortcuts => data/customattrs}/proguard-rules.pro (100%) rename {compat => data/customattrs}/src/main/AndroidManifest.xml (100%) rename {customattrs/src/main/java/de/mm20/launcher2 => data/customattrs/src/main/java/de/mm20/launcher2/data}/customattrs/CustomAttribute.kt (99%) rename {customattrs/src/main/java/de/mm20/launcher2 => data/customattrs/src/main/java/de/mm20/launcher2/data}/customattrs/CustomAttributeType.kt (86%) rename {customattrs/src/main/java/de/mm20/launcher2 => data/customattrs/src/main/java/de/mm20/launcher2/data}/customattrs/CustomAttributesRepository.kt (96%) rename {customattrs/src/main/java/de/mm20/launcher2 => data/customattrs/src/main/java/de/mm20/launcher2/data}/customattrs/Module.kt (77%) rename {customattrs/src/main/java/de/mm20/launcher2 => data/customattrs/src/main/java/de/mm20/launcher2/data}/customattrs/utils/Utils.kt (87%) rename {i18n => data/favorites}/.gitignore (100%) rename {favorites => data/favorites}/build.gradle.kts (64%) rename {files => data/favorites}/consumer-rules.pro (100%) rename {favorites => data/favorites}/proguard-rules.pro (100%) rename {favorites => data/favorites}/src/main/AndroidManifest.xml (100%) rename {favorites => data/favorites}/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt (100%) rename {favorites => data/favorites}/src/main/java/de/mm20/launcher2/favorites/Module.kt (100%) rename {favorites => data/favorites}/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt (94%) rename {favorites => data/favorites}/src/main/java/de/mm20/launcher2/favorites/Serialization.kt (100%) rename {favorites => data/favorites}/src/main/java/de/mm20/launcher2/favorites/TagSerialization.kt (100%) rename {favorites => data/favorites}/src/main/java/de/mm20/launcher2/search/data/Tag.kt (100%) rename {icons => data/files}/.gitignore (100%) rename {files => data/files}/build.gradle.kts (75%) rename {g-services => data/files}/consumer-rules.pro (100%) rename {files => data/files}/proguard-rules.pro (100%) rename {files => data/files}/src/main/AndroidManifest.xml (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/FileSerialization.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/FilesRepository.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/Module.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/providers/FileProvider.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/providers/LocalFileProvider.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/providers/NextcloudFileProvider.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/files/providers/OwncloudFileProvider.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/media/ThumbnailUtilsCompat.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/search/data/File.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/search/data/LocalFile.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/search/data/NextcloudFile.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt (100%) rename {files => data/files}/src/main/java/de/mm20/launcher2/search/data/OwncloudFile.kt (100%) rename {ktx => data/notifications}/.gitignore (100%) rename {notifications => data/notifications}/build.gradle.kts (95%) rename {i18n => data/notifications}/consumer-rules.pro (100%) rename {notifications => data/notifications}/proguard-rules.pro (100%) rename {notifications => data/notifications}/src/main/AndroidManifest.xml (100%) rename {notifications => data/notifications}/src/main/java/de/mm20/launcher2/notifications/Module.kt (100%) rename {notifications => data/notifications}/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt (100%) rename {notifications => data/notifications}/src/main/java/de/mm20/launcher2/notifications/NotificationService.kt (100%) rename {material-color-utilities => data/search-actions}/.gitignore (100%) rename {search-actions => data/search-actions}/build.gradle.kts (82%) rename {icons => data/search-actions}/consumer-rules.pro (100%) rename {backup => data/search-actions}/proguard-rules.pro (100%) rename {customattrs => data/search-actions}/src/main/AndroidManifest.xml (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/KnownWebsearchEngines.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/Module.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/SearchActionRepository.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/SearchActionService.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/TextClassifier.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/AppSearchAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/CallAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/CreateContactAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/CustomIntentAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/EmailAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/MessageAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/OpenUrlAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/ScheduleEventAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt (92%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/SetAlarmAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/actions/TimerAction.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/AppSearchActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/CallActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/CreateContactActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/CustomIntentActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/CustomizableSearchActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/EmailActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/MessageActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/OpenUrlActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/ScheduleEventActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/SearchActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/SetAlarmActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/TimerActionBuilder.kt (100%) rename {search-actions => data/search-actions}/src/main/java/de/mm20/launcher2/searchactions/builders/WebsearchActionBuilder.kt (100%) rename {music => data/unitconverter}/.gitignore (100%) rename {unitconverter => data/unitconverter}/build.gradle.kts (85%) rename {ktx => data/unitconverter}/consumer-rules.pro (100%) rename {preferences => data/unitconverter}/proguard-rules.pro (100%) rename {ktx => data/unitconverter}/src/main/AndroidManifest.xml (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/search/data/CurrencyUnitConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/search/data/UnitConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/ConverterUtils.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/Dimension.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/MeasureUnitWithFactor.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/Module.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/UnitConverterRepository.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/UnitValue.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/AreaConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/Converter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/DataConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/LengthConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/MassConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/SimpleFactorConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/TemperatureConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/TimeConverter.kt (100%) rename {unitconverter => data/unitconverter}/src/main/java/de/mm20/launcher2/unitconverter/converters/VelocityConverter.kt (100%) rename {weather => data/weather}/.gitignore (100%) rename {weather => data/weather}/build.gradle.kts (80%) rename {weather => data/weather}/consumer-rules.pro (100%) rename {weather => data/weather}/proguard-rules.pro (100%) rename {weather => data/weather}/src/main/AndroidManifest.xml (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/DailyForecast.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/Forecast.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/LatLonWeatherProvider.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/Module.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/Weather.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/WeatherLocation.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/WeatherProvider.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/brightsky/BrightSkyApi.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/here/HereGeocodeApi.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/here/HereProvider.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/here/HereWeatherApi.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapApi.kt (100%) rename {weather => data/weather}/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt (100%) rename {weather => data/weather}/src/main/res/values/config_example.xml (100%) rename {nextcloud => data/websites}/.gitignore (100%) rename {websites => data/websites}/build.gradle.kts (93%) rename {material-color-utilities => data/websites}/consumer-rules.pro (100%) rename {websites => data/websites}/proguard-rules.pro (100%) rename {music => data/websites}/src/main/AndroidManifest.xml (100%) rename {websites => data/websites}/src/main/java/de/mm20/launcher2/search/data/Website.kt (100%) rename {websites => data/websites}/src/main/java/de/mm20/launcher2/websites/Module.kt (100%) rename {websites => data/websites}/src/main/java/de/mm20/launcher2/websites/WebsiteRepository.kt (100%) rename {websites => data/websites}/src/main/java/de/mm20/launcher2/websites/WebsiteSerialization.kt (100%) rename {websites => data/websites}/src/main/res/drawable/ic_website.xml (100%) rename {notifications => data/widgets}/.gitignore (100%) rename {widgets => data/widgets}/build.gradle.kts (75%) rename {ms-services => data/widgets}/consumer-rules.pro (100%) rename {widgets => data/widgets}/proguard-rules.pro (100%) rename {unitconverter => data/widgets}/src/main/AndroidManifest.xml (100%) rename {widgets => data/widgets}/src/main/java/de/mm20/launcher2/widgets/Module.kt (100%) rename {widgets => data/widgets}/src/main/java/de/mm20/launcher2/widgets/Widget.kt (100%) rename {widgets => data/widgets}/src/main/java/de/mm20/launcher2/widgets/WidgetRepository.kt (100%) rename {owncloud => data/wikipedia}/.gitignore (100%) rename {wikipedia => data/wikipedia}/build.gradle.kts (86%) rename {wikipedia => data/wikipedia}/consumer-rules.pro (100%) rename {unitconverter => data/wikipedia}/proguard-rules.pro (100%) rename {webdav => data/wikipedia}/src/main/AndroidManifest.xml (100%) rename {wikipedia => data/wikipedia}/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt (100%) rename {wikipedia => data/wikipedia}/src/main/java/de/mm20/launcher2/wikipedia/Module.kt (100%) rename {wikipedia => data/wikipedia}/src/main/java/de/mm20/launcher2/wikipedia/WikipediaApi.kt (100%) rename {wikipedia => data/wikipedia}/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt (100%) rename {wikipedia => data/wikipedia}/src/main/java/de/mm20/launcher2/wikipedia/WikipediaSerialization.kt (100%) rename {wikipedia => data/wikipedia}/src/main/res/drawable-hdpi/ic_wikipedia.webp (100%) rename {wikipedia => data/wikipedia}/src/main/res/drawable-mdpi/ic_wikipedia.webp (100%) rename {wikipedia => data/wikipedia}/src/main/res/drawable-xhdpi/ic_wikipedia.webp (100%) rename {wikipedia => data/wikipedia}/src/main/res/drawable-xxhdpi/ic_wikipedia.webp (100%) rename {wikipedia => data/wikipedia}/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp (100%) rename {g-services => libs/g-services}/.gitignore (100%) rename {g-services => libs/g-services}/build.gradle.kts (93%) rename {music => libs/g-services}/consumer-rules.pro (100%) rename {g-services => libs/g-services}/proguard-rules.pro (100%) rename {g-services => libs/g-services}/src/debug/res/raw/g_services_example.json (100%) rename {g-services => libs/g-services}/src/main/AndroidManifest.xml (100%) rename {g-services => libs/g-services}/src/main/java/de/mm20/launcher2/gservices/DriveFile.kt (100%) rename {g-services => libs/g-services}/src/main/java/de/mm20/launcher2/gservices/GoogleAccount.kt (100%) rename {g-services => libs/g-services}/src/main/java/de/mm20/launcher2/gservices/GoogleApiHelper.kt (100%) rename {g-services => libs/g-services}/src/main/java/de/mm20/launcher2/gservices/GoogleAuthRedirectActivity.kt (100%) rename {g-services => libs/g-services}/src/main/res/drawable/ic_google_g.xml (100%) rename {g-services => libs/g-services}/src/main/res/values/styles.xml (100%) rename {g-services => libs/g-services}/src/release/res/raw/g_services_example.json (100%) rename {permissions => libs/material-color-utilities}/.gitignore (100%) rename {material-color-utilities => libs/material-color-utilities}/build.gradle.kts (93%) rename {nextcloud => libs/material-color-utilities}/consumer-rules.pro (100%) rename {customattrs => libs/material-color-utilities}/proguard-rules.pro (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/AndroidManifest.xml (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/hct/Cam16.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/hct/Hct.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/hct/HctSolver.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/hct/ViewingConditions.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/palettes/CorePalette.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/palettes/TonalPalette.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/scheme/Scheme.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/utils/ColorUtils.java (100%) rename {material-color-utilities => libs/material-color-utilities}/src/main/java/utils/MathUtils.java (100%) rename {ms-services => libs/ms-services}/.gitignore (100%) rename {ms-services => libs/ms-services}/build.gradle.kts (92%) rename {notifications => libs/ms-services}/consumer-rules.pro (100%) rename {ms-services => libs/ms-services}/proguard-rules.pro (100%) rename {ms-services => libs/ms-services}/src/debug/res/raw/msal_auth_config_example.json (100%) rename {ms-services => libs/ms-services}/src/main/AndroidManifest.xml (100%) rename {ms-services => libs/ms-services}/src/main/java/de/mm20/launcher2/msservices/DriveItem.kt (100%) rename {ms-services => libs/ms-services}/src/main/java/de/mm20/launcher2/msservices/MicrosoftGraphApiHelper.kt (100%) rename {ms-services => libs/ms-services}/src/main/java/de/mm20/launcher2/msservices/MsUser.kt (100%) rename {ms-services => libs/ms-services}/src/release/res/raw/msal_auth_config_example.json (100%) rename {preferences => libs/nextcloud}/.gitignore (100%) rename {nextcloud => libs/nextcloud}/build.gradle.kts (92%) rename {owncloud => libs/nextcloud}/consumer-rules.pro (100%) rename {wikipedia => libs/nextcloud}/proguard-rules.pro (100%) rename {nextcloud => libs/nextcloud}/src/main/AndroidManifest.xml (100%) rename {nextcloud => libs/nextcloud}/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt (100%) rename {nextcloud => libs/nextcloud}/src/main/java/de/mm20/launcher2/nextcloud/NcUser.kt (100%) rename {nextcloud => libs/nextcloud}/src/main/java/de/mm20/launcher2/nextcloud/NextcloudApiHelper.kt (100%) rename {nextcloud => libs/nextcloud}/src/main/res/drawable/ic_nextcloud_logo.xml (100%) rename {nextcloud => libs/nextcloud}/src/main/res/layout/activity_nextcloud_login.xml (100%) rename {nextcloud => libs/nextcloud}/src/main/res/values-night/styles.xml (100%) rename {nextcloud => libs/nextcloud}/src/main/res/values/styles.xml (100%) rename {search-actions => libs/owncloud}/.gitignore (100%) rename {owncloud => libs/owncloud}/build.gradle.kts (87%) rename {permissions => libs/owncloud}/consumer-rules.pro (100%) rename {owncloud => libs/owncloud}/proguard-rules.pro (100%) rename {owncloud => libs/owncloud}/src/main/AndroidManifest.xml (100%) rename {owncloud => libs/owncloud}/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt (100%) rename {owncloud => libs/owncloud}/src/main/java/de/mm20/launcher2/owncloud/OcUser.kt (100%) rename {owncloud => libs/owncloud}/src/main/java/de/mm20/launcher2/owncloud/OwncloudClient.kt (100%) rename {owncloud => libs/owncloud}/src/main/res/drawable-night/ic_owncloud_logo.xml (100%) rename {owncloud => libs/owncloud}/src/main/res/drawable/ic_owncloud_logo.xml (100%) rename {owncloud => libs/owncloud}/src/main/res/layout/activity_owncloud_login.xml (100%) rename {owncloud => libs/owncloud}/src/main/res/layout/activity_owncloud_login_username_password.xml (100%) rename {owncloud => libs/owncloud}/src/main/res/layout/owncloud_login_drop_down_item.xml (100%) rename {owncloud => libs/owncloud}/src/main/res/values-night/styles.xml (100%) rename {owncloud => libs/owncloud}/src/main/res/values/styles.xml (100%) rename {search => libs/webdav}/.gitignore (100%) rename {webdav => libs/webdav}/build.gradle.kts (91%) rename {search-actions => libs/webdav}/consumer-rules.pro (100%) rename {database => libs/webdav}/proguard-rules.pro (100%) rename {websites => libs/webdav}/src/main/AndroidManifest.xml (100%) rename {webdav => libs/webdav}/src/main/java/de/mm20/launcher2/webdav/WebDavApi.kt (100%) rename {webdav => libs/webdav}/src/main/java/de/mm20/launcher2/webdav/WebDavFile.kt (100%) rename {ui => services/accounts}/.gitignore (100%) rename {accounts => services/accounts}/build.gradle.kts (83%) rename {search => services/accounts}/consumer-rules.pro (100%) rename {material-color-utilities => services/accounts}/proguard-rules.pro (100%) rename {permissions => services/accounts}/src/main/AndroidManifest.xml (100%) rename {accounts => services/accounts}/src/main/java/de/mm20/launcher2/accounts/Account.kt (100%) rename {accounts => services/accounts}/src/main/java/de/mm20/launcher2/accounts/AccountType.kt (100%) rename {accounts => services/accounts}/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt (100%) rename {accounts => services/accounts}/src/main/java/de/mm20/launcher2/accounts/Module.kt (100%) rename {unitconverter => services/backup}/.gitignore (100%) rename {backup => services/backup}/build.gradle.kts (77%) rename {ui => services/backup}/consumer-rules.pro (100%) rename {search-actions => services/backup}/proguard-rules.pro (100%) rename {search-actions => services/backup}/src/main/AndroidManifest.xml (100%) rename {backup => services/backup}/src/main/java/de/mm20/launcher2/backup/BackupComponent.kt (100%) rename {backup => services/backup}/src/main/java/de/mm20/launcher2/backup/BackupManager.kt (99%) rename {backup => services/backup}/src/main/java/de/mm20/launcher2/backup/BackupMetadata.kt (100%) rename {backup => services/backup}/src/main/java/de/mm20/launcher2/backup/Module.kt (100%) rename {webdav => services/badges}/.gitignore (100%) rename {badges => services/badges}/build.gradle.kts (76%) rename {unitconverter => services/badges}/consumer-rules.pro (100%) rename {search => services/badges}/proguard-rules.pro (100%) rename {widgets => services/badges}/src/main/AndroidManifest.xml (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/Badge.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/Module.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/providers/BadgeProvider.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/providers/CloudBadgeProvider.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/providers/NotificationBadgeProvider.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/providers/SuspendedAppsBadgeProvider.kt (100%) rename {badges => services/badges}/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt (100%) rename {websites => services/icons}/.gitignore (100%) rename {icons => services/icons}/build.gradle.kts (78%) rename {webdav => services/icons}/consumer-rules.pro (100%) rename {icons => services/icons}/proguard-rules.pro (100%) rename {icons => services/icons}/src/main/AndroidManifest.xml (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt (98%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/IconPack.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/IconPackIcon.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/IconRepository.kt (96%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/Module.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/TransformableDynamicLauncherIcon.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/CalendarIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt (91%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt (89%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/GoogleClockIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/IconPackIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/IconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/PlaceholderIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/SystemIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/ThemedIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/transformations/ForceThemedIconTransformation.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/transformations/LauncherIconTransformation.kt (100%) rename {icons => services/icons}/src/main/java/de/mm20/launcher2/icons/transformations/LegacyToAdaptiveTransformation.kt (100%) rename {widgets => services/music}/.gitignore (100%) rename {music => services/music}/build.gradle.kts (83%) rename {websites => services/music}/consumer-rules.pro (100%) rename {music => services/music}/proguard-rules.pro (100%) rename {wikipedia => services/music}/src/main/AndroidManifest.xml (100%) rename {music => services/music}/src/main/java/de/mm20/launcher2/music/Module.kt (100%) rename {music => services/music}/src/main/java/de/mm20/launcher2/music/MusicRepository.kt (100%) rename {music => services/music}/src/main/res/values/dimens.xml (100%) rename {wikipedia => services/search}/.gitignore (100%) rename {search => services/search}/build.gradle.kts (60%) rename {widgets => services/search}/consumer-rules.pro (100%) rename {webdav => services/search}/proguard-rules.pro (100%) rename {search => services/search}/src/main/AndroidManifest.xml (100%) rename {search => services/search}/src/main/java/de/mm20/launcher2/search/Module.kt (100%) rename {search => services/search}/src/main/java/de/mm20/launcher2/search/SearchService.kt (98%) rename {search => services/search}/src/main/java/de/mm20/launcher2/search/data/Websearch.kt (100%) create mode 100644 services/tags/.gitignore create mode 100644 services/tags/build.gradle.kts create mode 100644 services/tags/consumer-rules.pro create mode 100644 services/tags/proguard-rules.pro create mode 100644 services/tags/src/main/AndroidManifest.xml create mode 100644 services/tags/src/main/java/de/mm20/launcher2/services/tags/Module.kt create mode 100644 services/tags/src/main/java/de/mm20/launcher2/services/tags/TagsService.kt create mode 100644 services/tags/src/main/java/de/mm20/launcher2/services/tags/impl/TagsServiceImpl.kt diff --git a/app/.gitignore b/app/app/.gitignore similarity index 100% rename from app/.gitignore rename to app/app/.gitignore diff --git a/app/build.gradle.kts b/app/app/build.gradle.kts similarity index 66% rename from app/build.gradle.kts rename to app/app/build.gradle.kts index 35c92d43..ecda4797 100644 --- a/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -102,40 +102,40 @@ dependencies { implementation(libs.koin.android) - implementation(project(":accounts")) - implementation(project(":applications")) - implementation(project(":appshortcuts")) - implementation(project(":backup")) - implementation(project(":badges")) - implementation(project(":base")) - implementation(project(":calculator")) - implementation(project(":calendar")) - implementation(project(":contacts")) - implementation(project(":crashreporter")) - implementation(project(":currencies")) - implementation(project(":customattrs")) - implementation(project(":favorites")) - implementation(project(":files")) - implementation(project(":g-services")) - implementation(project(":i18n")) - implementation(project(":icons")) - implementation(project(":ktx")) - implementation(project(":ms-services")) - implementation(project(":music")) - implementation(project(":nextcloud")) - implementation(project(":notifications")) - implementation(project(":owncloud")) - implementation(project(":permissions")) - implementation(project(":preferences")) - implementation(project(":search")) - implementation(project(":unitconverter")) - implementation(project(":ui")) - implementation(project(":weather")) - implementation(project(":websites")) - implementation(project(":widgets")) - implementation(project(":wikipedia")) - implementation(project(":database")) - implementation(project(":search-actions")) + implementation(project(":services:accounts")) + implementation(project(":data:applications")) + implementation(project(":data:appshortcuts")) + implementation(project(":services:backup")) + implementation(project(":services:badges")) + implementation(project(":core:base")) + implementation(project(":data:calculator")) + implementation(project(":data:calendar")) + implementation(project(":data:contacts")) + implementation(project(":core:crashreporter")) + implementation(project(":data:currencies")) + implementation(project(":data:customattrs")) + implementation(project(":data:favorites")) + implementation(project(":data:files")) + implementation(project(":libs:g-services")) + implementation(project(":core:i18n")) + implementation(project(":services:icons")) + implementation(project(":core:ktx")) + implementation(project(":libs:ms-services")) + implementation(project(":services:music")) + implementation(project(":libs:nextcloud")) + implementation(project(":data:notifications")) + implementation(project(":libs:owncloud")) + implementation(project(":core:permissions")) + implementation(project(":core:preferences")) + implementation(project(":services:search")) + implementation(project(":data:unitconverter")) + implementation(project(":app:ui")) + implementation(project(":data:weather")) + implementation(project(":data:websites")) + implementation(project(":data:widgets")) + implementation(project(":data:wikipedia")) + implementation(project(":core:database")) + implementation(project(":data:search-actions")) // Uncomment this if you want annoying notifications in your debug builds yelling at you how terrible your code is //debugImplementation(libs.leakcanary) diff --git a/app/proguard-rules.pro b/app/app/proguard-rules.pro similarity index 100% rename from app/proguard-rules.pro rename to app/app/proguard-rules.pro diff --git a/app/src/debug/google-services.json b/app/app/src/debug/google-services.json similarity index 100% rename from app/src/debug/google-services.json rename to app/app/src/debug/google-services.json diff --git a/app/src/debug/java/de/mm20/launcher2/debug/Debug.kt b/app/app/src/debug/java/de/mm20/launcher2/debug/Debug.kt similarity index 100% rename from app/src/debug/java/de/mm20/launcher2/debug/Debug.kt rename to app/app/src/debug/java/de/mm20/launcher2/debug/Debug.kt diff --git a/app/src/debug/res/values/bools.xml b/app/app/src/debug/res/values/bools.xml similarity index 100% rename from app/src/debug/res/values/bools.xml rename to app/app/src/debug/res/values/bools.xml diff --git a/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to app/app/src/main/AndroidManifest.xml diff --git a/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt b/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt similarity index 98% rename from app/src/main/java/de/mm20/launcher2/LauncherApplication.kt rename to app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt index 34daf766..19a66e5b 100644 --- a/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt +++ b/app/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt @@ -12,7 +12,7 @@ import de.mm20.launcher2.badges.badgesModule import de.mm20.launcher2.calculator.calculatorModule import de.mm20.launcher2.calendar.calendarModule import de.mm20.launcher2.contacts.contactsModule -import de.mm20.launcher2.customattrs.customAttrsModule +import de.mm20.launcher2.data.customattrs.customAttrsModule import de.mm20.launcher2.debug.Debug import de.mm20.launcher2.favorites.favoritesModule import de.mm20.launcher2.files.filesModule diff --git a/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt b/app/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt similarity index 100% rename from app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt rename to app/app/src/main/java/de/mm20/launcher2/activity/AddItemActivity.kt diff --git a/app/src/main/java/de/mm20/launcher2/content/GenericFileProvider.kt b/app/app/src/main/java/de/mm20/launcher2/content/GenericFileProvider.kt similarity index 100% rename from app/src/main/java/de/mm20/launcher2/content/GenericFileProvider.kt rename to app/app/src/main/java/de/mm20/launcher2/content/GenericFileProvider.kt diff --git a/app/src/main/res/animator/card_raise_animator.xml b/app/app/src/main/res/animator/card_raise_animator.xml similarity index 100% rename from app/src/main/res/animator/card_raise_animator.xml rename to app/app/src/main/res/animator/card_raise_animator.xml diff --git a/app/src/main/res/drawable-hdpi/ic_wikipedia.webp b/app/app/src/main/res/drawable-hdpi/ic_wikipedia.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_wikipedia.webp rename to app/app/src/main/res/drawable-hdpi/ic_wikipedia.webp diff --git a/app/src/main/res/drawable-mdpi/ic_wikipedia.webp b/app/app/src/main/res/drawable-mdpi/ic_wikipedia.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_wikipedia.webp rename to app/app/src/main/res/drawable-mdpi/ic_wikipedia.webp diff --git a/app/src/main/res/drawable-night/ic_account_owncloud.xml b/app/app/src/main/res/drawable-night/ic_account_owncloud.xml similarity index 100% rename from app/src/main/res/drawable-night/ic_account_owncloud.xml rename to app/app/src/main/res/drawable-night/ic_account_owncloud.xml diff --git a/app/src/main/res/drawable-xhdpi/ic_wikipedia.webp b/app/app/src/main/res/drawable-xhdpi/ic_wikipedia.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_wikipedia.webp rename to app/app/src/main/res/drawable-xhdpi/ic_wikipedia.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_wikipedia.webp b/app/app/src/main/res/drawable-xxhdpi/ic_wikipedia.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_wikipedia.webp rename to app/app/src/main/res/drawable-xxhdpi/ic_wikipedia.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp b/app/app/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp rename to app/app/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp diff --git a/app/src/main/res/values/attrs.xml b/app/app/src/main/res/values/attrs.xml similarity index 100% rename from app/src/main/res/values/attrs.xml rename to app/app/src/main/res/values/attrs.xml diff --git a/app/src/main/res/values/bools.xml b/app/app/src/main/res/values/bools.xml similarity index 100% rename from app/src/main/res/values/bools.xml rename to app/app/src/main/res/values/bools.xml diff --git a/app/src/main/res/values/donottranslate.xml b/app/app/src/main/res/values/donottranslate.xml similarity index 100% rename from app/src/main/res/values/donottranslate.xml rename to app/app/src/main/res/values/donottranslate.xml diff --git a/app/src/main/res/values/integers.xml b/app/app/src/main/res/values/integers.xml similarity index 100% rename from app/src/main/res/values/integers.xml rename to app/app/src/main/res/values/integers.xml diff --git a/app/src/main/res/values/styles.xml b/app/app/src/main/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to app/app/src/main/res/values/styles.xml diff --git a/app/src/main/res/xml/provider_paths.xml b/app/app/src/main/res/xml/provider_paths.xml similarity index 100% rename from app/src/main/res/xml/provider_paths.xml rename to app/app/src/main/res/xml/provider_paths.xml diff --git a/app/src/release/java/de/mm20/launcher2/debug/Debug.kt b/app/app/src/release/java/de/mm20/launcher2/debug/Debug.kt similarity index 100% rename from app/src/release/java/de/mm20/launcher2/debug/Debug.kt rename to app/app/src/release/java/de/mm20/launcher2/debug/Debug.kt diff --git a/accounts/.gitignore b/app/ui/.gitignore similarity index 100% rename from accounts/.gitignore rename to app/ui/.gitignore diff --git a/ui/build.gradle.kts b/app/ui/build.gradle.kts similarity index 69% rename from ui/build.gradle.kts rename to app/ui/build.gradle.kts index 6ffa6cab..b1fd242d 100644 --- a/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -109,37 +109,37 @@ dependencies { implementation(libs.lottie) - implementation(project(":material-color-utilities")) + implementation(project(":libs:material-color-utilities")) - implementation(project(":base")) - implementation(project(":i18n")) - implementation(project(":compat")) - implementation(project(":ktx")) - implementation(project(":icons")) - implementation(project(":music")) - implementation(project(":weather")) - implementation(project(":calendar")) - implementation(project(":search")) - implementation(project(":preferences")) - implementation(project(":applications")) - implementation(project(":appshortcuts")) - implementation(project(":calculator")) - implementation(project(":files")) - implementation(project(":widgets")) - implementation(project(":favorites")) - implementation(project(":wikipedia")) - implementation(project(":badges")) - implementation(project(":crashreporter")) - implementation(project(":notifications")) - implementation(project(":contacts")) - implementation(project(":permissions")) - implementation(project(":websites")) - implementation(project(":unitconverter")) - implementation(project(":nextcloud")) - implementation(project(":g-services")) - implementation(project(":ms-services")) - implementation(project(":owncloud")) - implementation(project(":accounts")) - implementation(project(":backup")) - implementation(project(":search-actions")) + implementation(project(":core:base")) + implementation(project(":core:i18n")) + implementation(project(":core:compat")) + implementation(project(":core:ktx")) + implementation(project(":services:icons")) + implementation(project(":services:music")) + implementation(project(":data:weather")) + implementation(project(":data:calendar")) + implementation(project(":services:search")) + implementation(project(":core:preferences")) + implementation(project(":data:applications")) + implementation(project(":data:appshortcuts")) + implementation(project(":data:calculator")) + implementation(project(":data:files")) + implementation(project(":data:widgets")) + implementation(project(":data:favorites")) + implementation(project(":data:wikipedia")) + implementation(project(":services:badges")) + implementation(project(":core:crashreporter")) + implementation(project(":data:notifications")) + implementation(project(":data:contacts")) + implementation(project(":core:permissions")) + implementation(project(":data:websites")) + implementation(project(":data:unitconverter")) + implementation(project(":libs:nextcloud")) + implementation(project(":libs:g-services")) + implementation(project(":libs:ms-services")) + implementation(project(":libs:owncloud")) + implementation(project(":services:accounts")) + implementation(project(":services:backup")) + implementation(project(":data:search-actions")) } \ No newline at end of file diff --git a/accounts/consumer-rules.pro b/app/ui/consumer-rules.pro similarity index 100% rename from accounts/consumer-rules.pro rename to app/ui/consumer-rules.pro diff --git a/ui/proguard-rules.pro b/app/ui/proguard-rules.pro similarity index 100% rename from ui/proguard-rules.pro rename to app/ui/proguard-rules.pro diff --git a/ui/src/main/AndroidManifest.xml b/app/ui/src/main/AndroidManifest.xml similarity index 100% rename from ui/src/main/AndroidManifest.xml rename to app/ui/src/main/AndroidManifest.xml diff --git a/ui/src/main/java/de/mm20/launcher2/ui/animation/TextStyle.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/animation/TextStyle.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/animation/TextStyle.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/animation/TextStyle.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/animation/TextUnit.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantActivity.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantActivity.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantActivity.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantScaffold.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantScaffold.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/assistant/AssistantScaffold.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivity.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivity.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivity.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivityVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivityVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivityVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/base/BaseActivityVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideCurrentTime.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideCurrentTime.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/base/ProvideCurrentTime.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideCurrentTime.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt similarity index 96% rename from ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt index f9477057..eca8ecba 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesVM.kt @@ -2,8 +2,8 @@ package de.mm20.launcher2.ui.common import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import de.mm20.launcher2.customattrs.CustomAttributesRepository -import de.mm20.launcher2.customattrs.utils.withCustomLabels +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.utils.withCustomLabels import de.mm20.launcher2.favorites.FavoritesRepository import de.mm20.launcher2.preferences.LauncherDataStore import de.mm20.launcher2.search.SavableSearchable diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheet.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/common/RestoreBackupSheetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialog.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialogVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialogVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialogVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/common/WeatherLocationSearchDialogVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Badges.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/Badges.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/Badges.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/Badges.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/Banner.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/Chip.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/InnerCard.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/LargeMessage.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/LargeMessage.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/LargeMessage.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/LargeMessage.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/LauncherCard.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/LauncherCard.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/LauncherCard.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/LauncherCard.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/MissingPermissionBanner.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/NavBarEffects.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/NavBarEffects.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/NavBarEffects.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/NavBarEffects.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/OutlinedTagsInputField.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchBar.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/ShapedLauncherIcon.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/SmallMessage.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ColorPreference.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/ListPreference.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/Preference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/Preference.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/Preference.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/Preference.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceCategory.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceCategory.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceCategory.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceCategory.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/PreferenceWithSwitch.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SliderPreference.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/SwitchPreference.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/preferences/TextPreference.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/AnimatedWeatherIcon.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/component/weather/WeatherIcon.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/icons/BatteryIcons.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/icons/Icons.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/Color.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Color.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/Color.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Color.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/Dp.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Dp.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/Dp.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Dp.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/Float.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Float.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/Float.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Float.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/Int.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Int.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/Int.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Int.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/Modifier.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Modifier.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/Modifier.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Modifier.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/MutableState.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/ktx/Offset.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Offset.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/ktx/Offset.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/ktx/Offset.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivity.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivityVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivityVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivityVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherActivityVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherScaffoldVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherScaffoldVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherScaffoldVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/LauncherScaffoldVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/SharedLauncherActivity.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropGrid.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/DragAndDropList.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/WallpaperBlur.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/WallpaperBlur.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/WallpaperBlur.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/helper/WallpaperBlur.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/appshortcuts/AppShortcutResults.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calculator/CalculatorItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/calendar/CalendarResults.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt similarity index 97% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt index d64bf43a..e9be7c7c 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/SearchableItemVM.kt @@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.compose.ui.geometry.Rect import androidx.core.app.ActivityOptionsCompat import de.mm20.launcher2.badges.BadgeRepository -import de.mm20.launcher2.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository import de.mm20.launcher2.favorites.FavoritesRepository import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.icons.LauncherIcon diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/GridItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/grid/SearchResultGrid.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/ListItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/SearchResultList.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/SearchResultList.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/SearchResultList.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/list/SearchResultList.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/contacts/ContactResults.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavoritesVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavoritesVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavoritesVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/favorites/SearchFavoritesVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/files/FileResults.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/shortcut/ShortcutItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/unitconverter/UnitConverterItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/website/WebsiteItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItemVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItemVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItemVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/wikipedia/WikipediaItemVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt similarity index 95% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt index 9f72732f..16e6e9b6 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheetVM.kt @@ -2,8 +2,8 @@ package de.mm20.launcher2.ui.launcher.sheets import androidx.lifecycle.MutableLiveData import androidx.lifecycle.liveData -import de.mm20.launcher2.customattrs.CustomAttributesRepository -import de.mm20.launcher2.customattrs.CustomIcon +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomIcon import de.mm20.launcher2.icons.CustomIconWithPreview import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.icons.LauncherIcon diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheet.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt similarity index 99% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt index bb1e49e2..15b701b1 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/EditFavoritesSheetVM.kt @@ -12,7 +12,7 @@ import androidx.lifecycle.viewModelScope import de.mm20.launcher2.appshortcuts.AppShortcutRepository import de.mm20.launcher2.badges.Badge import de.mm20.launcher2.badges.BadgeRepository -import de.mm20.launcher2.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository import de.mm20.launcher2.favorites.FavoritesRepository import de.mm20.launcher2.icons.IconRepository import de.mm20.launcher2.icons.LauncherIcon diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheet.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/HiddenItemsSheetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/LauncherBottomSheetManager.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/LauncherBottomSheetManager.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/LauncherBottomSheetManager.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/LauncherBottomSheetManager.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransition.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransition.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransition.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransition.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionHandler.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionHandler.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionHandler.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionHandler.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionManager.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionManager.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionManager.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionManager.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionParams.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionParams.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionParams.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/transitions/HomeTransitionParams.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetColumn.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetItem.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetItem.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetItem.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/WidgetsVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidget.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidgetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidgetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidgetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidgetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidget.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidgetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidgetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidgetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/ClockWidgetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/AnalogClock.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/BinaryClock.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/BinaryClock.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/BinaryClock.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/BinaryClock.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock1.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/DigitalClock2.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/EmptyClock.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/EmptyClock.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/EmptyClock.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/EmptyClock.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/OrbitClock.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/OrbitClock.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/OrbitClock.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/clocks/OrbitClock.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/AlarmPartProvider.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/BatteryPartProvider.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/DatePartProvider.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/FavoritesPartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/FavoritesPartProvider.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/FavoritesPartProvider.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/FavoritesPartProvider.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/MusicPartProvider.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/PartProvider.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/PartProvider.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/PartProvider.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/clock/parts/PartProvider.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/external/ExternalWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/external/ExternalWidget.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/external/ExternalWidget.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/external/ExternalWidget.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidget.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidget.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidget.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidgetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidgetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidgetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/favorites/FavoritesWidgetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidgetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/AppWidgetList.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/AppWidgetList.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/AppWidgetList.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/AppWidgetList.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetActivity.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/picker/PickAppWidgetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidgetWM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidgetWM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidgetWM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidgetWM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/layout/Arrangement.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/layout/Arrangement.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/layout/Arrangement.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/layout/Arrangement.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/modifier/FadingEdges.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/modifier/FadingEdges.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/modifier/FadingEdges.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/modifier/FadingEdges.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/modifier/Modifiers.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/modifier/Modifiers.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/modifier/Modifiers.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/modifier/Modifiers.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/modifier/Scrims.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/modifier/Scrims.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/modifier/Scrims.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/modifier/Scrims.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt similarity index 98% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt index c6b80445..60b1470d 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt @@ -46,6 +46,7 @@ import de.mm20.launcher2.ui.settings.main.MainSettingsScreen import de.mm20.launcher2.ui.settings.musicwidget.MusicWidgetSettingsScreen import de.mm20.launcher2.ui.settings.search.SearchSettingsScreen import de.mm20.launcher2.ui.settings.searchactions.SearchActionsSettingsScreen +import de.mm20.launcher2.ui.settings.tags.TagsSettingsScreen import de.mm20.launcher2.ui.settings.unitconverter.UnitConverterSettingsScreen import de.mm20.launcher2.ui.settings.weatherwidget.WeatherWidgetSettingsScreen import de.mm20.launcher2.ui.settings.widgets.WidgetsSettingsScreen @@ -125,6 +126,9 @@ class SettingsActivity : BaseActivity() { composable("settings/search/hiddenitems") { HiddenItemsSettingsScreen() } + composable("settings/search/tags") { + TagsSettingsScreen() + } composable("settings/widgets") { WidgetsSettingsScreen() } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/about/AboutSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt similarity index 99% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt index f21295ed..5fcc1cd2 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreen.kt @@ -24,13 +24,11 @@ import androidx.core.content.ContextCompat import androidx.lifecycle.viewmodel.compose.viewModel import com.airbnb.lottie.LottieProperty import com.airbnb.lottie.compose.* -import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.HorizontalPagerIndicator import com.google.accompanist.pager.rememberPagerState import de.mm20.launcher2.icons.StaticIconLayer import de.mm20.launcher2.icons.StaticLauncherIcon -import de.mm20.launcher2.ktx.isAtLeastApiLevel import de.mm20.launcher2.preferences.Settings.* import de.mm20.launcher2.preferences.Settings.AppearanceSettings.ColorScheme import de.mm20.launcher2.preferences.Settings.AppearanceSettings.Theme diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/appearance/AppearanceSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/BackupSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheet.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/backup/CreateBackupSheetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/badges/BadgeSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/calendarwidget/CalendarWidgetSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/clockwidget/ClockWidgetSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemeSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/CustomColorSchemeSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReportScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/crashreporter/CrashReporterScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt similarity index 93% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt index 05c8163c..17879368 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreen.kt @@ -1,22 +1,17 @@ package de.mm20.launcher2.ui.settings.debug -import android.content.Intent import android.widget.Toast import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.core.content.FileProvider import androidx.lifecycle.viewmodel.compose.viewModel -import de.mm20.launcher2.debug.DebugInformationDumper -import de.mm20.launcher2.ktx.tryStartActivity import de.mm20.launcher2.ui.R import de.mm20.launcher2.ui.component.preferences.Preference import de.mm20.launcher2.ui.component.preferences.PreferenceCategory import de.mm20.launcher2.ui.component.preferences.PreferenceScreen import de.mm20.launcher2.ui.locals.LocalNavController import kotlinx.coroutines.launch -import java.io.File @Composable fun DebugSettingsScreen() { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt similarity index 91% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt index 1f628fcb..2e1c0663 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/debug/DebugSettingsScreenVM.kt @@ -2,7 +2,7 @@ package de.mm20.launcher2.ui.settings.debug import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import de.mm20.launcher2.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository import de.mm20.launcher2.favorites.FavoritesRepository import kotlinx.coroutines.launch import org.koin.core.component.KoinComponent diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/easteregg/EasterEggSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/favorites/FavoritesSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt similarity index 98% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt index 870d2ffb..037e186b 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreen.kt @@ -3,7 +3,6 @@ package de.mm20.launcher2.ui.settings.license import android.net.Uri import androidx.browser.customtabs.CustomTabColorSchemeParams import androidx.browser.customtabs.CustomTabsIntent -import androidx.compose.animation.rememberSplineBasedDecay import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/license/LicenseScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt similarity index 99% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt index b74120c4..73a90fb8 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/log/LogScreen.kt @@ -38,7 +38,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.awaitCancellation import kotlinx.coroutines.isActive import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import java.io.File import java.io.IOException import java.util.regex.Pattern diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/main/MainSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/musicwidget/MusicWidgetSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt similarity index 96% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt index 615da22f..8c7b3a19 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt @@ -196,6 +196,13 @@ fun SearchSettingsScreen() { navController?.navigate("settings/search/hiddenitems") } ) + Preference( + title = stringResource(R.string.preference_screen_tags), + summary = stringResource(R.string.preference_screen_tags_summary), + onClick = { + navController?.navigate("settings/search/tags") + } + ) } } } diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheetVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheetVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheetVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheetVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/SearchActionsSettingsScreenVM.kt diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt new file mode 100644 index 00000000..c7d689c3 --- /dev/null +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/EditTagSheet.kt @@ -0,0 +1,11 @@ +package de.mm20.launcher2.ui.settings.tags + +import androidx.compose.runtime.Composable + +@Composable +fun EditTagSheet( + tag: String?, + onDismiss: () -> Unit, +) { + +} \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreen.kt new file mode 100644 index 00000000..c55980a3 --- /dev/null +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreen.kt @@ -0,0 +1,42 @@ +package de.mm20.launcher2.ui.settings.tags + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Add +import androidx.compose.material.icons.rounded.Tag +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.lifecycle.viewmodel.compose.viewModel +import de.mm20.launcher2.ui.component.preferences.Preference +import de.mm20.launcher2.ui.component.preferences.PreferenceCategory +import de.mm20.launcher2.ui.component.preferences.PreferenceScreen + +@Composable +fun TagsSettingsScreen() { + val viewModel: TagsSettingsScreenVM = viewModel() + + LaunchedEffect(null) { + viewModel.update() + } + + PreferenceScreen( + title = "Tags", + floatingActionButton = { + FloatingActionButton(onClick = { /*TODO*/ }) { + Icon(Icons.Rounded.Add, null) + } + } + ) { + item { + PreferenceCategory { + for (tag in viewModel.tags.value) { + Preference( + icon = Icons.Rounded.Tag, + title = tag, + ) + } + } + } + } +} \ No newline at end of file diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreenVM.kt new file mode 100644 index 00000000..33549219 --- /dev/null +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/tags/TagsSettingsScreenVM.kt @@ -0,0 +1,20 @@ +package de.mm20.launcher2.ui.settings.tags + +import androidx.compose.runtime.mutableStateOf +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository +import kotlinx.coroutines.launch +import org.koin.core.component.KoinComponent +import org.koin.core.component.inject + +class TagsSettingsScreenVM: ViewModel(), KoinComponent { + private val customAttributesRepository: CustomAttributesRepository by inject() + + val tags = mutableStateOf(emptyList()) + + suspend fun update() { + tags.value = customAttributesRepository.getAllTags() + } + +} \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/weatherwidget/WeatherWidgetSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetsSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetsSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/widgets/WidgetsSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreen.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreen.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreen.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreenVM.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreenVM.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/settings/wikipedia/WikipediaSettingsScreenVM.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/ContentAlpha.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/LauncherTheme.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/WallpaperColors.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/WallpaperColors.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/WallpaperColors.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/WallpaperColors.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/BlackAndWhite.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Default.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Default.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Default.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Default.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/EasterEgg.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/EasterEgg.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/EasterEgg.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/EasterEgg.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Common.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Common.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Common.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Common.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/Default.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/SystemDefault.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/SystemDefault.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/typography/SystemDefault.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/SystemDefault.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/DeviceDefault.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/theme/typography/fontfamily/Outfit.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/utils/NotificationShadeController.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/utils/NotificationShadeController.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/utils/NotificationShadeController.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/utils/NotificationShadeController.kt diff --git a/ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt similarity index 100% rename from ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt rename to app/ui/src/main/java/de/mm20/launcher2/ui/utils/htmlToAnnotatedString.kt diff --git a/ui/src/main/res/drawable/drag_handle.xml b/app/ui/src/main/res/drawable/drag_handle.xml similarity index 100% rename from ui/src/main/res/drawable/drag_handle.xml rename to app/ui/src/main/res/drawable/drag_handle.xml diff --git a/ui/src/main/res/raw-night/lottie_play_to_pause.json b/app/ui/src/main/res/raw-night/lottie_play_to_pause.json similarity index 100% rename from ui/src/main/res/raw-night/lottie_play_to_pause.json rename to app/ui/src/main/res/raw-night/lottie_play_to_pause.json diff --git a/ui/src/main/res/raw-night/lottie_skip_next.json b/app/ui/src/main/res/raw-night/lottie_skip_next.json similarity index 100% rename from ui/src/main/res/raw-night/lottie_skip_next.json rename to app/ui/src/main/res/raw-night/lottie_skip_next.json diff --git a/ui/src/main/res/raw/ic_menu_to_clear.json b/app/ui/src/main/res/raw/ic_menu_to_clear.json similarity index 100% rename from ui/src/main/res/raw/ic_menu_to_clear.json rename to app/ui/src/main/res/raw/ic_menu_to_clear.json diff --git a/ui/src/main/res/raw/lottie_menu_to_clear.json b/app/ui/src/main/res/raw/lottie_menu_to_clear.json similarity index 100% rename from ui/src/main/res/raw/lottie_menu_to_clear.json rename to app/ui/src/main/res/raw/lottie_menu_to_clear.json diff --git a/ui/src/main/res/raw/lottie_play_to_pause.json b/app/ui/src/main/res/raw/lottie_play_to_pause.json similarity index 100% rename from ui/src/main/res/raw/lottie_play_to_pause.json rename to app/ui/src/main/res/raw/lottie_play_to_pause.json diff --git a/ui/src/main/res/raw/lottie_skip_next.json b/app/ui/src/main/res/raw/lottie_skip_next.json similarity index 100% rename from ui/src/main/res/raw/lottie_skip_next.json rename to app/ui/src/main/res/raw/lottie_skip_next.json diff --git a/ui/src/main/res/raw/play_to_pause.json b/app/ui/src/main/res/raw/play_to_pause.json similarity index 100% rename from ui/src/main/res/raw/play_to_pause.json rename to app/ui/src/main/res/raw/play_to_pause.json diff --git a/ui/src/main/res/values-night/weather_colors.xml b/app/ui/src/main/res/values-night/weather_colors.xml similarity index 100% rename from ui/src/main/res/values-night/weather_colors.xml rename to app/ui/src/main/res/values-night/weather_colors.xml diff --git a/ui/src/main/res/values/AspectRatioImageView.xml b/app/ui/src/main/res/values/AspectRatioImageView.xml similarity index 100% rename from ui/src/main/res/values/AspectRatioImageView.xml rename to app/ui/src/main/res/values/AspectRatioImageView.xml diff --git a/ui/src/main/res/values/BottomSheet.xml b/app/ui/src/main/res/values/BottomSheet.xml similarity index 100% rename from ui/src/main/res/values/BottomSheet.xml rename to app/ui/src/main/res/values/BottomSheet.xml diff --git a/ui/src/main/res/values/LauncherCardView.xml b/app/ui/src/main/res/values/LauncherCardView.xml similarity index 100% rename from ui/src/main/res/values/LauncherCardView.xml rename to app/ui/src/main/res/values/LauncherCardView.xml diff --git a/ui/src/main/res/values/SearchGridView.xml b/app/ui/src/main/res/values/SearchGridView.xml similarity index 100% rename from ui/src/main/res/values/SearchGridView.xml rename to app/ui/src/main/res/values/SearchGridView.xml diff --git a/ui/src/main/res/values/dimens.xml b/app/ui/src/main/res/values/dimens.xml similarity index 100% rename from ui/src/main/res/values/dimens.xml rename to app/ui/src/main/res/values/dimens.xml diff --git a/ui/src/main/res/values/weather_colors.xml b/app/ui/src/main/res/values/weather_colors.xml similarity index 100% rename from ui/src/main/res/values/weather_colors.xml rename to app/ui/src/main/res/values/weather_colors.xml diff --git a/ui/src/main/res/xml-v25/debug_shortcuts.xml b/app/ui/src/main/res/xml-v25/debug_shortcuts.xml similarity index 100% rename from ui/src/main/res/xml-v25/debug_shortcuts.xml rename to app/ui/src/main/res/xml-v25/debug_shortcuts.xml diff --git a/build.gradle.kts b/build.gradle.kts index 4286ea44..47d4a8d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,6 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:7.3.1") classpath(libs.kotlin.gradle) - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/applications/.gitignore b/core/base/.gitignore similarity index 100% rename from applications/.gitignore rename to core/base/.gitignore diff --git a/base/build.gradle.kts b/core/base/build.gradle.kts similarity index 92% rename from base/build.gradle.kts rename to core/base/build.gradle.kts index 8f998519..c6fbde38 100644 --- a/base/build.gradle.kts +++ b/core/base/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { implementation(libs.androidx.palette) - implementation(project(":ktx")) - implementation(project(":i18n")) + implementation(project(":core:ktx")) + implementation(project(":core:i18n")) } \ No newline at end of file diff --git a/applications/consumer-rules.pro b/core/base/consumer-rules.pro similarity index 100% rename from applications/consumer-rules.pro rename to core/base/consumer-rules.pro diff --git a/base/proguard-rules.pro b/core/base/proguard-rules.pro similarity index 100% rename from base/proguard-rules.pro rename to core/base/proguard-rules.pro diff --git a/base/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/core/base/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from base/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml rename to core/base/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/base/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/core/base/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png rename to core/base/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/base/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/core/base/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png rename to core/base/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/base/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/base/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png rename to core/base/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/base/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/base/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to core/base/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/base/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/base/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to core/base/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/base/src/debug/res/values/ic_launcher_background.xml b/core/base/src/debug/res/values/ic_launcher_background.xml similarity index 100% rename from base/src/debug/res/values/ic_launcher_background.xml rename to core/base/src/debug/res/values/ic_launcher_background.xml diff --git a/base/src/main/AndroidManifest.xml b/core/base/src/main/AndroidManifest.xml similarity index 100% rename from base/src/main/AndroidManifest.xml rename to core/base/src/main/AndroidManifest.xml diff --git a/base/src/main/java/com/android/launcher3/GestureNavContract.kt b/core/base/src/main/java/com/android/launcher3/GestureNavContract.kt similarity index 100% rename from base/src/main/java/com/android/launcher3/GestureNavContract.kt rename to core/base/src/main/java/com/android/launcher3/GestureNavContract.kt diff --git a/base/src/main/java/de/mm20/launcher2/debug/DebugInformationDumper.kt b/core/base/src/main/java/de/mm20/launcher2/debug/DebugInformationDumper.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/debug/DebugInformationDumper.kt rename to core/base/src/main/java/de/mm20/launcher2/debug/DebugInformationDumper.kt diff --git a/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt b/core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt similarity index 98% rename from base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt rename to core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt index 8bea9ce1..1b2be654 100644 --- a/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt +++ b/core/base/src/main/java/de/mm20/launcher2/graphics/BadgeDrawable.kt @@ -6,7 +6,6 @@ import android.graphics.drawable.AdaptiveIconDrawable import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable -import android.os.Build import androidx.core.graphics.drawable.toBitmap import de.mm20.launcher2.ktx.dp import kotlin.math.roundToInt diff --git a/base/src/main/java/de/mm20/launcher2/helper/NetworkUtils.kt b/core/base/src/main/java/de/mm20/launcher2/helper/NetworkUtils.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/helper/NetworkUtils.kt rename to core/base/src/main/java/de/mm20/launcher2/helper/NetworkUtils.kt diff --git a/base/src/main/java/de/mm20/launcher2/icons/LauncherIcon.kt b/core/base/src/main/java/de/mm20/launcher2/icons/LauncherIcon.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/icons/LauncherIcon.kt rename to core/base/src/main/java/de/mm20/launcher2/icons/LauncherIcon.kt diff --git a/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt b/core/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt rename to core/base/src/main/java/de/mm20/launcher2/icons/LauncherIconLayer.kt diff --git a/base/src/main/java/de/mm20/launcher2/licenses/AppLicense.kt b/core/base/src/main/java/de/mm20/launcher2/licenses/AppLicense.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/licenses/AppLicense.kt rename to core/base/src/main/java/de/mm20/launcher2/licenses/AppLicense.kt diff --git a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLibrary.kt b/core/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLibrary.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLibrary.kt rename to core/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLibrary.kt diff --git a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt b/core/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt rename to core/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt diff --git a/base/src/main/java/de/mm20/launcher2/lifecycle/BroadcastReceiverLiveData.kt b/core/base/src/main/java/de/mm20/launcher2/lifecycle/BroadcastReceiverLiveData.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/lifecycle/BroadcastReceiverLiveData.kt rename to core/base/src/main/java/de/mm20/launcher2/lifecycle/BroadcastReceiverLiveData.kt diff --git a/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt b/core/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt rename to core/base/src/main/java/de/mm20/launcher2/search/SavableSearchable.kt diff --git a/base/src/main/java/de/mm20/launcher2/search/Searchable.kt b/core/base/src/main/java/de/mm20/launcher2/search/Searchable.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/search/Searchable.kt rename to core/base/src/main/java/de/mm20/launcher2/search/Searchable.kt diff --git a/base/src/main/java/de/mm20/launcher2/search/SearchableDeserializer.kt b/core/base/src/main/java/de/mm20/launcher2/search/SearchableDeserializer.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/search/SearchableDeserializer.kt rename to core/base/src/main/java/de/mm20/launcher2/search/SearchableDeserializer.kt diff --git a/base/src/main/java/de/mm20/launcher2/search/SearchableSerializer.kt b/core/base/src/main/java/de/mm20/launcher2/search/SearchableSerializer.kt similarity index 100% rename from base/src/main/java/de/mm20/launcher2/search/SearchableSerializer.kt rename to core/base/src/main/java/de/mm20/launcher2/search/SearchableSerializer.kt diff --git a/base/src/main/res/anim/ic_skip_next_arrow1.xml b/core/base/src/main/res/anim/ic_skip_next_arrow1.xml similarity index 100% rename from base/src/main/res/anim/ic_skip_next_arrow1.xml rename to core/base/src/main/res/anim/ic_skip_next_arrow1.xml diff --git a/base/src/main/res/anim/ic_skip_next_arrow2.xml b/core/base/src/main/res/anim/ic_skip_next_arrow2.xml similarity index 100% rename from base/src/main/res/anim/ic_skip_next_arrow2.xml rename to core/base/src/main/res/anim/ic_skip_next_arrow2.xml diff --git a/base/src/main/res/anim/ic_skip_prev_arrow1.xml b/core/base/src/main/res/anim/ic_skip_prev_arrow1.xml similarity index 100% rename from base/src/main/res/anim/ic_skip_prev_arrow1.xml rename to core/base/src/main/res/anim/ic_skip_prev_arrow1.xml diff --git a/base/src/main/res/anim/ic_skip_prev_arrow2.xml b/core/base/src/main/res/anim/ic_skip_prev_arrow2.xml similarity index 100% rename from base/src/main/res/anim/ic_skip_prev_arrow2.xml rename to core/base/src/main/res/anim/ic_skip_prev_arrow2.xml diff --git a/base/src/main/res/color/chip_background.xml b/core/base/src/main/res/color/chip_background.xml similarity index 100% rename from base/src/main/res/color/chip_background.xml rename to core/base/src/main/res/color/chip_background.xml diff --git a/base/src/main/res/color/chip_stroke.xml b/core/base/src/main/res/color/chip_stroke.xml similarity index 100% rename from base/src/main/res/color/chip_stroke.xml rename to core/base/src/main/res/color/chip_stroke.xml diff --git a/base/src/main/res/color/chip_textcolor.xml b/core/base/src/main/res/color/chip_textcolor.xml similarity index 100% rename from base/src/main/res/color/chip_textcolor.xml rename to core/base/src/main/res/color/chip_textcolor.xml diff --git a/base/src/main/res/color/text_color_primary.xml b/core/base/src/main/res/color/text_color_primary.xml similarity index 100% rename from base/src/main/res/color/text_color_primary.xml rename to core/base/src/main/res/color/text_color_primary.xml diff --git a/base/src/main/res/color/text_color_secondary.xml b/core/base/src/main/res/color/text_color_secondary.xml similarity index 100% rename from base/src/main/res/color/text_color_secondary.xml rename to core/base/src/main/res/color/text_color_secondary.xml diff --git a/base/src/main/res/drawable-hdpi/ic_badge_gdrive.webp b/core/base/src/main/res/drawable-hdpi/ic_badge_gdrive.webp similarity index 100% rename from base/src/main/res/drawable-hdpi/ic_badge_gdrive.webp rename to core/base/src/main/res/drawable-hdpi/ic_badge_gdrive.webp diff --git a/base/src/main/res/drawable-mdpi/ic_badge_gdrive.webp b/core/base/src/main/res/drawable-mdpi/ic_badge_gdrive.webp similarity index 100% rename from base/src/main/res/drawable-mdpi/ic_badge_gdrive.webp rename to core/base/src/main/res/drawable-mdpi/ic_badge_gdrive.webp diff --git a/base/src/main/res/drawable-xhdpi/ic_badge_gdrive.webp b/core/base/src/main/res/drawable-xhdpi/ic_badge_gdrive.webp similarity index 100% rename from base/src/main/res/drawable-xhdpi/ic_badge_gdrive.webp rename to core/base/src/main/res/drawable-xhdpi/ic_badge_gdrive.webp diff --git a/base/src/main/res/drawable-xxhdpi/ic_badge_gdrive.webp b/core/base/src/main/res/drawable-xxhdpi/ic_badge_gdrive.webp similarity index 100% rename from base/src/main/res/drawable-xxhdpi/ic_badge_gdrive.webp rename to core/base/src/main/res/drawable-xxhdpi/ic_badge_gdrive.webp diff --git a/base/src/main/res/drawable-xxxhdpi/ic_badge_gdrive.webp b/core/base/src/main/res/drawable-xxxhdpi/ic_badge_gdrive.webp similarity index 100% rename from base/src/main/res/drawable-xxxhdpi/ic_badge_gdrive.webp rename to core/base/src/main/res/drawable-xxxhdpi/ic_badge_gdrive.webp diff --git a/base/src/main/res/drawable/anim_ic_edit_add.xml b/core/base/src/main/res/drawable/anim_ic_edit_add.xml similarity index 100% rename from base/src/main/res/drawable/anim_ic_edit_add.xml rename to core/base/src/main/res/drawable/anim_ic_edit_add.xml diff --git a/base/src/main/res/drawable/anim_ic_menu_clear.xml b/core/base/src/main/res/drawable/anim_ic_menu_clear.xml similarity index 100% rename from base/src/main/res/drawable/anim_ic_menu_clear.xml rename to core/base/src/main/res/drawable/anim_ic_menu_clear.xml diff --git a/base/src/main/res/drawable/anim_ic_play_pause.xml b/core/base/src/main/res/drawable/anim_ic_play_pause.xml similarity index 100% rename from base/src/main/res/drawable/anim_ic_play_pause.xml rename to core/base/src/main/res/drawable/anim_ic_play_pause.xml diff --git a/base/src/main/res/drawable/anim_weather_sun_moon.xml b/core/base/src/main/res/drawable/anim_weather_sun_moon.xml similarity index 100% rename from base/src/main/res/drawable/anim_weather_sun_moon.xml rename to core/base/src/main/res/drawable/anim_weather_sun_moon.xml diff --git a/base/src/main/res/drawable/ic_about_fdroid.xml b/core/base/src/main/res/drawable/ic_about_fdroid.xml similarity index 100% rename from base/src/main/res/drawable/ic_about_fdroid.xml rename to core/base/src/main/res/drawable/ic_about_fdroid.xml diff --git a/base/src/main/res/drawable/ic_about_github.xml b/core/base/src/main/res/drawable/ic_about_github.xml similarity index 100% rename from base/src/main/res/drawable/ic_about_github.xml rename to core/base/src/main/res/drawable/ic_about_github.xml diff --git a/base/src/main/res/drawable/ic_about_telegram.xml b/core/base/src/main/res/drawable/ic_about_telegram.xml similarity index 100% rename from base/src/main/res/drawable/ic_about_telegram.xml rename to core/base/src/main/res/drawable/ic_about_telegram.xml diff --git a/base/src/main/res/drawable/ic_account_google.xml b/core/base/src/main/res/drawable/ic_account_google.xml similarity index 100% rename from base/src/main/res/drawable/ic_account_google.xml rename to core/base/src/main/res/drawable/ic_account_google.xml diff --git a/base/src/main/res/drawable/ic_account_microsoft.xml b/core/base/src/main/res/drawable/ic_account_microsoft.xml similarity index 100% rename from base/src/main/res/drawable/ic_account_microsoft.xml rename to core/base/src/main/res/drawable/ic_account_microsoft.xml diff --git a/base/src/main/res/drawable/ic_account_nextcloud.xml b/core/base/src/main/res/drawable/ic_account_nextcloud.xml similarity index 100% rename from base/src/main/res/drawable/ic_account_nextcloud.xml rename to core/base/src/main/res/drawable/ic_account_nextcloud.xml diff --git a/base/src/main/res/drawable/ic_account_owncloud.xml b/core/base/src/main/res/drawable/ic_account_owncloud.xml similarity index 100% rename from base/src/main/res/drawable/ic_account_owncloud.xml rename to core/base/src/main/res/drawable/ic_account_owncloud.xml diff --git a/base/src/main/res/drawable/ic_add.xml b/core/base/src/main/res/drawable/ic_add.xml similarity index 100% rename from base/src/main/res/drawable/ic_add.xml rename to core/base/src/main/res/drawable/ic_add.xml diff --git a/base/src/main/res/drawable/ic_arrow_back.xml b/core/base/src/main/res/drawable/ic_arrow_back.xml similarity index 100% rename from base/src/main/res/drawable/ic_arrow_back.xml rename to core/base/src/main/res/drawable/ic_arrow_back.xml diff --git a/base/src/main/res/drawable/ic_arrow_drop_down.xml b/core/base/src/main/res/drawable/ic_arrow_drop_down.xml similarity index 100% rename from base/src/main/res/drawable/ic_arrow_drop_down.xml rename to core/base/src/main/res/drawable/ic_arrow_drop_down.xml diff --git a/base/src/main/res/drawable/ic_arrow_left.xml b/core/base/src/main/res/drawable/ic_arrow_left.xml similarity index 100% rename from base/src/main/res/drawable/ic_arrow_left.xml rename to core/base/src/main/res/drawable/ic_arrow_left.xml diff --git a/base/src/main/res/drawable/ic_arrow_right.xml b/core/base/src/main/res/drawable/ic_arrow_right.xml similarity index 100% rename from base/src/main/res/drawable/ic_arrow_right.xml rename to core/base/src/main/res/drawable/ic_arrow_right.xml diff --git a/base/src/main/res/drawable/ic_arrow_up.xml b/core/base/src/main/res/drawable/ic_arrow_up.xml similarity index 100% rename from base/src/main/res/drawable/ic_arrow_up.xml rename to core/base/src/main/res/drawable/ic_arrow_up.xml diff --git a/base/src/main/res/drawable/ic_attendees.xml b/core/base/src/main/res/drawable/ic_attendees.xml similarity index 100% rename from base/src/main/res/drawable/ic_attendees.xml rename to core/base/src/main/res/drawable/ic_attendees.xml diff --git a/base/src/main/res/drawable/ic_badge_nextcloud.xml b/core/base/src/main/res/drawable/ic_badge_nextcloud.xml similarity index 100% rename from base/src/main/res/drawable/ic_badge_nextcloud.xml rename to core/base/src/main/res/drawable/ic_badge_nextcloud.xml diff --git a/base/src/main/res/drawable/ic_badge_onedrive.xml b/core/base/src/main/res/drawable/ic_badge_onedrive.xml similarity index 100% rename from base/src/main/res/drawable/ic_badge_onedrive.xml rename to core/base/src/main/res/drawable/ic_badge_onedrive.xml diff --git a/base/src/main/res/drawable/ic_badge_owncloud.xml b/core/base/src/main/res/drawable/ic_badge_owncloud.xml similarity index 100% rename from base/src/main/res/drawable/ic_badge_owncloud.xml rename to core/base/src/main/res/drawable/ic_badge_owncloud.xml diff --git a/base/src/main/res/drawable/ic_badge_suspended.xml b/core/base/src/main/res/drawable/ic_badge_suspended.xml similarity index 100% rename from base/src/main/res/drawable/ic_badge_suspended.xml rename to core/base/src/main/res/drawable/ic_badge_suspended.xml diff --git a/base/src/main/res/drawable/ic_badge_workprofile.xml b/core/base/src/main/res/drawable/ic_badge_workprofile.xml similarity index 100% rename from base/src/main/res/drawable/ic_badge_workprofile.xml rename to core/base/src/main/res/drawable/ic_badge_workprofile.xml diff --git a/base/src/main/res/drawable/ic_call.xml b/core/base/src/main/res/drawable/ic_call.xml similarity index 100% rename from base/src/main/res/drawable/ic_call.xml rename to core/base/src/main/res/drawable/ic_call.xml diff --git a/base/src/main/res/drawable/ic_cancel.xml b/core/base/src/main/res/drawable/ic_cancel.xml similarity index 100% rename from base/src/main/res/drawable/ic_cancel.xml rename to core/base/src/main/res/drawable/ic_cancel.xml diff --git a/base/src/main/res/drawable/ic_clear.xml b/core/base/src/main/res/drawable/ic_clear.xml similarity index 100% rename from base/src/main/res/drawable/ic_clear.xml rename to core/base/src/main/res/drawable/ic_clear.xml diff --git a/base/src/main/res/drawable/ic_delete.xml b/core/base/src/main/res/drawable/ic_delete.xml similarity index 100% rename from base/src/main/res/drawable/ic_delete.xml rename to core/base/src/main/res/drawable/ic_delete.xml diff --git a/base/src/main/res/drawable/ic_description.xml b/core/base/src/main/res/drawable/ic_description.xml similarity index 100% rename from base/src/main/res/drawable/ic_description.xml rename to core/base/src/main/res/drawable/ic_description.xml diff --git a/base/src/main/res/drawable/ic_done.xml b/core/base/src/main/res/drawable/ic_done.xml similarity index 100% rename from base/src/main/res/drawable/ic_done.xml rename to core/base/src/main/res/drawable/ic_done.xml diff --git a/base/src/main/res/drawable/ic_drag_handle.xml b/core/base/src/main/res/drawable/ic_drag_handle.xml similarity index 100% rename from base/src/main/res/drawable/ic_drag_handle.xml rename to core/base/src/main/res/drawable/ic_drag_handle.xml diff --git a/base/src/main/res/drawable/ic_edit.xml b/core/base/src/main/res/drawable/ic_edit.xml similarity index 100% rename from base/src/main/res/drawable/ic_edit.xml rename to core/base/src/main/res/drawable/ic_edit.xml diff --git a/base/src/main/res/drawable/ic_expand_more.xml b/core/base/src/main/res/drawable/ic_expand_more.xml similarity index 100% rename from base/src/main/res/drawable/ic_expand_more.xml rename to core/base/src/main/res/drawable/ic_expand_more.xml diff --git a/base/src/main/res/drawable/ic_experimental_feature.xml b/core/base/src/main/res/drawable/ic_experimental_feature.xml similarity index 100% rename from base/src/main/res/drawable/ic_experimental_feature.xml rename to core/base/src/main/res/drawable/ic_experimental_feature.xml diff --git a/base/src/main/res/drawable/ic_file_android.xml b/core/base/src/main/res/drawable/ic_file_android.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_android.xml rename to core/base/src/main/res/drawable/ic_file_android.xml diff --git a/base/src/main/res/drawable/ic_file_archive.xml b/core/base/src/main/res/drawable/ic_file_archive.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_archive.xml rename to core/base/src/main/res/drawable/ic_file_archive.xml diff --git a/base/src/main/res/drawable/ic_file_code.xml b/core/base/src/main/res/drawable/ic_file_code.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_code.xml rename to core/base/src/main/res/drawable/ic_file_code.xml diff --git a/base/src/main/res/drawable/ic_file_document.xml b/core/base/src/main/res/drawable/ic_file_document.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_document.xml rename to core/base/src/main/res/drawable/ic_file_document.xml diff --git a/base/src/main/res/drawable/ic_file_folder.xml b/core/base/src/main/res/drawable/ic_file_folder.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_folder.xml rename to core/base/src/main/res/drawable/ic_file_folder.xml diff --git a/base/src/main/res/drawable/ic_file_form.xml b/core/base/src/main/res/drawable/ic_file_form.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_form.xml rename to core/base/src/main/res/drawable/ic_file_form.xml diff --git a/base/src/main/res/drawable/ic_file_generic.xml b/core/base/src/main/res/drawable/ic_file_generic.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_generic.xml rename to core/base/src/main/res/drawable/ic_file_generic.xml diff --git a/base/src/main/res/drawable/ic_file_markup.xml b/core/base/src/main/res/drawable/ic_file_markup.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_markup.xml rename to core/base/src/main/res/drawable/ic_file_markup.xml diff --git a/base/src/main/res/drawable/ic_file_music.xml b/core/base/src/main/res/drawable/ic_file_music.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_music.xml rename to core/base/src/main/res/drawable/ic_file_music.xml diff --git a/base/src/main/res/drawable/ic_file_pdf.xml b/core/base/src/main/res/drawable/ic_file_pdf.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_pdf.xml rename to core/base/src/main/res/drawable/ic_file_pdf.xml diff --git a/base/src/main/res/drawable/ic_file_picture.xml b/core/base/src/main/res/drawable/ic_file_picture.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_picture.xml rename to core/base/src/main/res/drawable/ic_file_picture.xml diff --git a/base/src/main/res/drawable/ic_file_presentation.xml b/core/base/src/main/res/drawable/ic_file_presentation.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_presentation.xml rename to core/base/src/main/res/drawable/ic_file_presentation.xml diff --git a/base/src/main/res/drawable/ic_file_spreadsheet.xml b/core/base/src/main/res/drawable/ic_file_spreadsheet.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_spreadsheet.xml rename to core/base/src/main/res/drawable/ic_file_spreadsheet.xml diff --git a/base/src/main/res/drawable/ic_file_video.xml b/core/base/src/main/res/drawable/ic_file_video.xml similarity index 100% rename from base/src/main/res/drawable/ic_file_video.xml rename to core/base/src/main/res/drawable/ic_file_video.xml diff --git a/base/src/main/res/drawable/ic_info_outline.xml b/core/base/src/main/res/drawable/ic_info_outline.xml similarity index 100% rename from base/src/main/res/drawable/ic_info_outline.xml rename to core/base/src/main/res/drawable/ic_info_outline.xml diff --git a/base/src/main/res/drawable/ic_location.xml b/core/base/src/main/res/drawable/ic_location.xml similarity index 100% rename from base/src/main/res/drawable/ic_location.xml rename to core/base/src/main/res/drawable/ic_location.xml diff --git a/base/src/main/res/drawable/ic_mail.xml b/core/base/src/main/res/drawable/ic_mail.xml similarity index 100% rename from base/src/main/res/drawable/ic_mail.xml rename to core/base/src/main/res/drawable/ic_mail.xml diff --git a/base/src/main/res/drawable/ic_message.xml b/core/base/src/main/res/drawable/ic_message.xml similarity index 100% rename from base/src/main/res/drawable/ic_message.xml rename to core/base/src/main/res/drawable/ic_message.xml diff --git a/base/src/main/res/drawable/ic_more_horiz.xml b/core/base/src/main/res/drawable/ic_more_horiz.xml similarity index 100% rename from base/src/main/res/drawable/ic_more_horiz.xml rename to core/base/src/main/res/drawable/ic_more_horiz.xml diff --git a/base/src/main/res/drawable/ic_more_vert.xml b/core/base/src/main/res/drawable/ic_more_vert.xml similarity index 100% rename from base/src/main/res/drawable/ic_more_vert.xml rename to core/base/src/main/res/drawable/ic_more_vert.xml diff --git a/base/src/main/res/drawable/ic_open_external.xml b/core/base/src/main/res/drawable/ic_open_external.xml similarity index 100% rename from base/src/main/res/drawable/ic_open_external.xml rename to core/base/src/main/res/drawable/ic_open_external.xml diff --git a/base/src/main/res/drawable/ic_open_in_browser.xml b/core/base/src/main/res/drawable/ic_open_in_browser.xml similarity index 100% rename from base/src/main/res/drawable/ic_open_in_browser.xml rename to core/base/src/main/res/drawable/ic_open_in_browser.xml diff --git a/base/src/main/res/drawable/ic_pause.xml b/core/base/src/main/res/drawable/ic_pause.xml similarity index 100% rename from base/src/main/res/drawable/ic_pause.xml rename to core/base/src/main/res/drawable/ic_pause.xml diff --git a/base/src/main/res/drawable/ic_permission.xml b/core/base/src/main/res/drawable/ic_permission.xml similarity index 100% rename from base/src/main/res/drawable/ic_permission.xml rename to core/base/src/main/res/drawable/ic_permission.xml diff --git a/base/src/main/res/drawable/ic_permission_calendar.xml b/core/base/src/main/res/drawable/ic_permission_calendar.xml similarity index 100% rename from base/src/main/res/drawable/ic_permission_calendar.xml rename to core/base/src/main/res/drawable/ic_permission_calendar.xml diff --git a/base/src/main/res/drawable/ic_play.xml b/core/base/src/main/res/drawable/ic_play.xml similarity index 100% rename from base/src/main/res/drawable/ic_play.xml rename to core/base/src/main/res/drawable/ic_play.xml diff --git a/base/src/main/res/drawable/ic_precipitation_none.xml b/core/base/src/main/res/drawable/ic_precipitation_none.xml similarity index 100% rename from base/src/main/res/drawable/ic_precipitation_none.xml rename to core/base/src/main/res/drawable/ic_precipitation_none.xml diff --git a/base/src/main/res/drawable/ic_precipitation_rain.xml b/core/base/src/main/res/drawable/ic_precipitation_rain.xml similarity index 100% rename from base/src/main/res/drawable/ic_precipitation_rain.xml rename to core/base/src/main/res/drawable/ic_precipitation_rain.xml diff --git a/base/src/main/res/drawable/ic_precipitation_rain_snow.xml b/core/base/src/main/res/drawable/ic_precipitation_rain_snow.xml similarity index 100% rename from base/src/main/res/drawable/ic_precipitation_rain_snow.xml rename to core/base/src/main/res/drawable/ic_precipitation_rain_snow.xml diff --git a/base/src/main/res/drawable/ic_precipitation_snow.xml b/core/base/src/main/res/drawable/ic_precipitation_snow.xml similarity index 100% rename from base/src/main/res/drawable/ic_precipitation_snow.xml rename to core/base/src/main/res/drawable/ic_precipitation_snow.xml diff --git a/base/src/main/res/drawable/ic_pref_about.xml b/core/base/src/main/res/drawable/ic_pref_about.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_about.xml rename to core/base/src/main/res/drawable/ic_pref_about.xml diff --git a/base/src/main/res/drawable/ic_pref_account.xml b/core/base/src/main/res/drawable/ic_pref_account.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_account.xml rename to core/base/src/main/res/drawable/ic_pref_account.xml diff --git a/base/src/main/res/drawable/ic_pref_appearance.xml b/core/base/src/main/res/drawable/ic_pref_appearance.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_appearance.xml rename to core/base/src/main/res/drawable/ic_pref_appearance.xml diff --git a/base/src/main/res/drawable/ic_pref_badge.xml b/core/base/src/main/res/drawable/ic_pref_badge.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_badge.xml rename to core/base/src/main/res/drawable/ic_pref_badge.xml diff --git a/base/src/main/res/drawable/ic_pref_calendar.xml b/core/base/src/main/res/drawable/ic_pref_calendar.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_calendar.xml rename to core/base/src/main/res/drawable/ic_pref_calendar.xml diff --git a/base/src/main/res/drawable/ic_pref_plugins.xml b/core/base/src/main/res/drawable/ic_pref_plugins.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_plugins.xml rename to core/base/src/main/res/drawable/ic_pref_plugins.xml diff --git a/base/src/main/res/drawable/ic_pref_search.xml b/core/base/src/main/res/drawable/ic_pref_search.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_search.xml rename to core/base/src/main/res/drawable/ic_pref_search.xml diff --git a/base/src/main/res/drawable/ic_pref_weather.xml b/core/base/src/main/res/drawable/ic_pref_weather.xml similarity index 100% rename from base/src/main/res/drawable/ic_pref_weather.xml rename to core/base/src/main/res/drawable/ic_pref_weather.xml diff --git a/base/src/main/res/drawable/ic_preference_websearch_new.xml b/core/base/src/main/res/drawable/ic_preference_websearch_new.xml similarity index 100% rename from base/src/main/res/drawable/ic_preference_websearch_new.xml rename to core/base/src/main/res/drawable/ic_preference_websearch_new.xml diff --git a/base/src/main/res/drawable/ic_resize_drag_handle.xml b/core/base/src/main/res/drawable/ic_resize_drag_handle.xml similarity index 100% rename from base/src/main/res/drawable/ic_resize_drag_handle.xml rename to core/base/src/main/res/drawable/ic_resize_drag_handle.xml diff --git a/base/src/main/res/drawable/ic_search.xml b/core/base/src/main/res/drawable/ic_search.xml similarity index 100% rename from base/src/main/res/drawable/ic_search.xml rename to core/base/src/main/res/drawable/ic_search.xml diff --git a/base/src/main/res/drawable/ic_settings.xml b/core/base/src/main/res/drawable/ic_settings.xml similarity index 100% rename from base/src/main/res/drawable/ic_settings.xml rename to core/base/src/main/res/drawable/ic_settings.xml diff --git a/base/src/main/res/drawable/ic_share.xml b/core/base/src/main/res/drawable/ic_share.xml similarity index 100% rename from base/src/main/res/drawable/ic_share.xml rename to core/base/src/main/res/drawable/ic_share.xml diff --git a/base/src/main/res/drawable/ic_skip_next.xml b/core/base/src/main/res/drawable/ic_skip_next.xml similarity index 100% rename from base/src/main/res/drawable/ic_skip_next.xml rename to core/base/src/main/res/drawable/ic_skip_next.xml diff --git a/base/src/main/res/drawable/ic_skip_next_anim.xml b/core/base/src/main/res/drawable/ic_skip_next_anim.xml similarity index 100% rename from base/src/main/res/drawable/ic_skip_next_anim.xml rename to core/base/src/main/res/drawable/ic_skip_next_anim.xml diff --git a/base/src/main/res/drawable/ic_skip_prev.xml b/core/base/src/main/res/drawable/ic_skip_prev.xml similarity index 100% rename from base/src/main/res/drawable/ic_skip_prev.xml rename to core/base/src/main/res/drawable/ic_skip_prev.xml diff --git a/base/src/main/res/drawable/ic_skip_prev_anim.xml b/core/base/src/main/res/drawable/ic_skip_prev_anim.xml similarity index 100% rename from base/src/main/res/drawable/ic_skip_prev_anim.xml rename to core/base/src/main/res/drawable/ic_skip_prev_anim.xml diff --git a/base/src/main/res/drawable/ic_star_outline.xml b/core/base/src/main/res/drawable/ic_star_outline.xml similarity index 100% rename from base/src/main/res/drawable/ic_star_outline.xml rename to core/base/src/main/res/drawable/ic_star_outline.xml diff --git a/base/src/main/res/drawable/ic_star_solid.xml b/core/base/src/main/res/drawable/ic_star_solid.xml similarity index 100% rename from base/src/main/res/drawable/ic_star_solid.xml rename to core/base/src/main/res/drawable/ic_star_solid.xml diff --git a/base/src/main/res/drawable/ic_telegram.xml b/core/base/src/main/res/drawable/ic_telegram.xml similarity index 100% rename from base/src/main/res/drawable/ic_telegram.xml rename to core/base/src/main/res/drawable/ic_telegram.xml diff --git a/base/src/main/res/drawable/ic_time.xml b/core/base/src/main/res/drawable/ic_time.xml similarity index 100% rename from base/src/main/res/drawable/ic_time.xml rename to core/base/src/main/res/drawable/ic_time.xml diff --git a/base/src/main/res/drawable/ic_today.xml b/core/base/src/main/res/drawable/ic_today.xml similarity index 100% rename from base/src/main/res/drawable/ic_today.xml rename to core/base/src/main/res/drawable/ic_today.xml diff --git a/base/src/main/res/drawable/ic_visibility.xml b/core/base/src/main/res/drawable/ic_visibility.xml similarity index 100% rename from base/src/main/res/drawable/ic_visibility.xml rename to core/base/src/main/res/drawable/ic_visibility.xml diff --git a/base/src/main/res/drawable/ic_visibility_off.xml b/core/base/src/main/res/drawable/ic_visibility_off.xml similarity index 100% rename from base/src/main/res/drawable/ic_visibility_off.xml rename to core/base/src/main/res/drawable/ic_visibility_off.xml diff --git a/base/src/main/res/drawable/ic_website.xml b/core/base/src/main/res/drawable/ic_website.xml similarity index 100% rename from base/src/main/res/drawable/ic_website.xml rename to core/base/src/main/res/drawable/ic_website.xml diff --git a/base/src/main/res/drawable/ic_whatsapp.xml b/core/base/src/main/res/drawable/ic_whatsapp.xml similarity index 100% rename from base/src/main/res/drawable/ic_whatsapp.xml rename to core/base/src/main/res/drawable/ic_whatsapp.xml diff --git a/base/src/main/res/drawable/ic_widget_resize.xml b/core/base/src/main/res/drawable/ic_widget_resize.xml similarity index 100% rename from base/src/main/res/drawable/ic_widget_resize.xml rename to core/base/src/main/res/drawable/ic_widget_resize.xml diff --git a/base/src/main/res/font/outfit_100.otf b/core/base/src/main/res/font/outfit_100.otf similarity index 100% rename from base/src/main/res/font/outfit_100.otf rename to core/base/src/main/res/font/outfit_100.otf diff --git a/base/src/main/res/font/outfit_200.otf b/core/base/src/main/res/font/outfit_200.otf similarity index 100% rename from base/src/main/res/font/outfit_200.otf rename to core/base/src/main/res/font/outfit_200.otf diff --git a/base/src/main/res/font/outfit_300.otf b/core/base/src/main/res/font/outfit_300.otf similarity index 100% rename from base/src/main/res/font/outfit_300.otf rename to core/base/src/main/res/font/outfit_300.otf diff --git a/base/src/main/res/font/outfit_400.otf b/core/base/src/main/res/font/outfit_400.otf similarity index 100% rename from base/src/main/res/font/outfit_400.otf rename to core/base/src/main/res/font/outfit_400.otf diff --git a/base/src/main/res/font/outfit_500.otf b/core/base/src/main/res/font/outfit_500.otf similarity index 100% rename from base/src/main/res/font/outfit_500.otf rename to core/base/src/main/res/font/outfit_500.otf diff --git a/base/src/main/res/font/outfit_600.otf b/core/base/src/main/res/font/outfit_600.otf similarity index 100% rename from base/src/main/res/font/outfit_600.otf rename to core/base/src/main/res/font/outfit_600.otf diff --git a/base/src/main/res/font/outfit_700.otf b/core/base/src/main/res/font/outfit_700.otf similarity index 100% rename from base/src/main/res/font/outfit_700.otf rename to core/base/src/main/res/font/outfit_700.otf diff --git a/base/src/main/res/font/outfit_800.otf b/core/base/src/main/res/font/outfit_800.otf similarity index 100% rename from base/src/main/res/font/outfit_800.otf rename to core/base/src/main/res/font/outfit_800.otf diff --git a/base/src/main/res/font/outfit_900.otf b/core/base/src/main/res/font/outfit_900.otf similarity index 100% rename from base/src/main/res/font/outfit_900.otf rename to core/base/src/main/res/font/outfit_900.otf diff --git a/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to core/base/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/base/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/core/base/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to core/base/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/base/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/core/base/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to core/base/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/base/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/base/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to core/base/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/base/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/base/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to core/base/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/base/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/base/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from base/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to core/base/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/base/src/main/res/raw/license_apache_2.txt b/core/base/src/main/res/raw/license_apache_2.txt similarity index 100% rename from base/src/main/res/raw/license_apache_2.txt rename to core/base/src/main/res/raw/license_apache_2.txt diff --git a/base/src/main/res/raw/license_bsd_2clause.txt b/core/base/src/main/res/raw/license_bsd_2clause.txt similarity index 100% rename from base/src/main/res/raw/license_bsd_2clause.txt rename to core/base/src/main/res/raw/license_bsd_2clause.txt diff --git a/base/src/main/res/raw/license_bsd_3clause.txt b/core/base/src/main/res/raw/license_bsd_3clause.txt similarity index 100% rename from base/src/main/res/raw/license_bsd_3clause.txt rename to core/base/src/main/res/raw/license_bsd_3clause.txt diff --git a/base/src/main/res/raw/license_gpl_3.txt b/core/base/src/main/res/raw/license_gpl_3.txt similarity index 100% rename from base/src/main/res/raw/license_gpl_3.txt rename to core/base/src/main/res/raw/license_gpl_3.txt diff --git a/base/src/main/res/raw/license_mit.txt b/core/base/src/main/res/raw/license_mit.txt similarity index 100% rename from base/src/main/res/raw/license_mit.txt rename to core/base/src/main/res/raw/license_mit.txt diff --git a/base/src/main/res/raw/license_ofl.txt b/core/base/src/main/res/raw/license_ofl.txt similarity index 100% rename from base/src/main/res/raw/license_ofl.txt rename to core/base/src/main/res/raw/license_ofl.txt diff --git a/base/src/main/res/raw/lottie_scaffold_pager.json b/core/base/src/main/res/raw/lottie_scaffold_pager.json similarity index 100% rename from base/src/main/res/raw/lottie_scaffold_pager.json rename to core/base/src/main/res/raw/lottie_scaffold_pager.json diff --git a/base/src/main/res/raw/lottie_scaffold_pager_reverse.json b/core/base/src/main/res/raw/lottie_scaffold_pager_reverse.json similarity index 100% rename from base/src/main/res/raw/lottie_scaffold_pager_reverse.json rename to core/base/src/main/res/raw/lottie_scaffold_pager_reverse.json diff --git a/base/src/main/res/raw/lottie_scaffold_pulldown.json b/core/base/src/main/res/raw/lottie_scaffold_pulldown.json similarity index 100% rename from base/src/main/res/raw/lottie_scaffold_pulldown.json rename to core/base/src/main/res/raw/lottie_scaffold_pulldown.json diff --git a/base/src/main/res/values-night-v31/color-schemes.xml b/core/base/src/main/res/values-night-v31/color-schemes.xml similarity index 100% rename from base/src/main/res/values-night-v31/color-schemes.xml rename to core/base/src/main/res/values-night-v31/color-schemes.xml diff --git a/base/src/main/res/values-night/bools.xml b/core/base/src/main/res/values-night/bools.xml similarity index 100% rename from base/src/main/res/values-night/bools.xml rename to core/base/src/main/res/values-night/bools.xml diff --git a/base/src/main/res/values-night/color-schemes.xml b/core/base/src/main/res/values-night/color-schemes.xml similarity index 100% rename from base/src/main/res/values-night/color-schemes.xml rename to core/base/src/main/res/values-night/color-schemes.xml diff --git a/base/src/main/res/values-night/colors.xml b/core/base/src/main/res/values-night/colors.xml similarity index 100% rename from base/src/main/res/values-night/colors.xml rename to core/base/src/main/res/values-night/colors.xml diff --git a/base/src/main/res/values-night/styles.xml b/core/base/src/main/res/values-night/styles.xml similarity index 100% rename from base/src/main/res/values-night/styles.xml rename to core/base/src/main/res/values-night/styles.xml diff --git a/base/src/main/res/values-night/themes.xml b/core/base/src/main/res/values-night/themes.xml similarity index 100% rename from base/src/main/res/values-night/themes.xml rename to core/base/src/main/res/values-night/themes.xml diff --git a/base/src/main/res/values-notnight-v23/colors.xml b/core/base/src/main/res/values-notnight-v23/colors.xml similarity index 100% rename from base/src/main/res/values-notnight-v23/colors.xml rename to core/base/src/main/res/values-notnight-v23/colors.xml diff --git a/base/src/main/res/values-v31/color-schemes.xml b/core/base/src/main/res/values-v31/color-schemes.xml similarity index 100% rename from base/src/main/res/values-v31/color-schemes.xml rename to core/base/src/main/res/values-v31/color-schemes.xml diff --git a/base/src/main/res/values-w312dp/integers.xml b/core/base/src/main/res/values-w312dp/integers.xml similarity index 100% rename from base/src/main/res/values-w312dp/integers.xml rename to core/base/src/main/res/values-w312dp/integers.xml diff --git a/base/src/main/res/values-w400dp/integers.xml b/core/base/src/main/res/values-w400dp/integers.xml similarity index 100% rename from base/src/main/res/values-w400dp/integers.xml rename to core/base/src/main/res/values-w400dp/integers.xml diff --git a/base/src/main/res/values-w408dp/integers.xml b/core/base/src/main/res/values-w408dp/integers.xml similarity index 100% rename from base/src/main/res/values-w408dp/integers.xml rename to core/base/src/main/res/values-w408dp/integers.xml diff --git a/base/src/main/res/values-w480dp/integers.xml b/core/base/src/main/res/values-w480dp/integers.xml similarity index 100% rename from base/src/main/res/values-w480dp/integers.xml rename to core/base/src/main/res/values-w480dp/integers.xml diff --git a/base/src/main/res/values-w504dp/integers.xml b/core/base/src/main/res/values-w504dp/integers.xml similarity index 100% rename from base/src/main/res/values-w504dp/integers.xml rename to core/base/src/main/res/values-w504dp/integers.xml diff --git a/base/src/main/res/values-w600dp/integers.xml b/core/base/src/main/res/values-w600dp/integers.xml similarity index 100% rename from base/src/main/res/values-w600dp/integers.xml rename to core/base/src/main/res/values-w600dp/integers.xml diff --git a/base/src/main/res/values/attrs.xml b/core/base/src/main/res/values/attrs.xml similarity index 100% rename from base/src/main/res/values/attrs.xml rename to core/base/src/main/res/values/attrs.xml diff --git a/base/src/main/res/values/color-schemes.xml b/core/base/src/main/res/values/color-schemes.xml similarity index 100% rename from base/src/main/res/values/color-schemes.xml rename to core/base/src/main/res/values/color-schemes.xml diff --git a/base/src/main/res/values/colors.xml b/core/base/src/main/res/values/colors.xml similarity index 100% rename from base/src/main/res/values/colors.xml rename to core/base/src/main/res/values/colors.xml diff --git a/base/src/main/res/values/ic_launcher_background.xml b/core/base/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from base/src/main/res/values/ic_launcher_background.xml rename to core/base/src/main/res/values/ic_launcher_background.xml diff --git a/base/src/main/res/values/licenses.xml b/core/base/src/main/res/values/licenses.xml similarity index 100% rename from base/src/main/res/values/licenses.xml rename to core/base/src/main/res/values/licenses.xml diff --git a/base/src/main/res/values/styles.xml b/core/base/src/main/res/values/styles.xml similarity index 100% rename from base/src/main/res/values/styles.xml rename to core/base/src/main/res/values/styles.xml diff --git a/base/src/main/res/values/themes.xml b/core/base/src/main/res/values/themes.xml similarity index 100% rename from base/src/main/res/values/themes.xml rename to core/base/src/main/res/values/themes.xml diff --git a/appshortcuts/.gitignore b/core/compat/.gitignore similarity index 100% rename from appshortcuts/.gitignore rename to core/compat/.gitignore diff --git a/compat/build.gradle.kts b/core/compat/build.gradle.kts similarity index 100% rename from compat/build.gradle.kts rename to core/compat/build.gradle.kts diff --git a/appshortcuts/consumer-rules.pro b/core/compat/consumer-rules.pro similarity index 100% rename from appshortcuts/consumer-rules.pro rename to core/compat/consumer-rules.pro diff --git a/compat/proguard-rules.pro b/core/compat/proguard-rules.pro similarity index 100% rename from compat/proguard-rules.pro rename to core/compat/proguard-rules.pro diff --git a/accounts/src/main/AndroidManifest.xml b/core/compat/src/main/AndroidManifest.xml similarity index 100% rename from accounts/src/main/AndroidManifest.xml rename to core/compat/src/main/AndroidManifest.xml diff --git a/compat/src/main/java/de/mm20/launcher2/compat/PackageManagerCompat.kt b/core/compat/src/main/java/de/mm20/launcher2/compat/PackageManagerCompat.kt similarity index 100% rename from compat/src/main/java/de/mm20/launcher2/compat/PackageManagerCompat.kt rename to core/compat/src/main/java/de/mm20/launcher2/compat/PackageManagerCompat.kt diff --git a/backup/.gitignore b/core/crashreporter/.gitignore similarity index 100% rename from backup/.gitignore rename to core/crashreporter/.gitignore diff --git a/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts similarity index 96% rename from crashreporter/build.gradle.kts rename to core/crashreporter/build.gradle.kts index f134c094..89794d94 100644 --- a/crashreporter/build.gradle.kts +++ b/core/crashreporter/build.gradle.kts @@ -41,5 +41,5 @@ dependencies { implementation(libs.androidx.recyclerview) - implementation(project(":base")) + implementation(project(":core:base")) } \ No newline at end of file diff --git a/backup/consumer-rules.pro b/core/crashreporter/consumer-rules.pro similarity index 100% rename from backup/consumer-rules.pro rename to core/crashreporter/consumer-rules.pro diff --git a/crashreporter/proguard-rules.pro b/core/crashreporter/proguard-rules.pro similarity index 100% rename from crashreporter/proguard-rules.pro rename to core/crashreporter/proguard-rules.pro diff --git a/crashreporter/src/main/AndroidManifest.xml b/core/crashreporter/src/main/AndroidManifest.xml similarity index 100% rename from crashreporter/src/main/AndroidManifest.xml rename to core/crashreporter/src/main/AndroidManifest.xml diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporter.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporter.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporter.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporter.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/CrashReporterInitProvider.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/AppUtils.kt diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/Constants.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/Constants.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/Constants.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/Constants.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterException.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterException.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterException.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterException.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterExceptionHandler.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterExceptionHandler.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterExceptionHandler.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterExceptionHandler.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterNotInitializedException.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterNotInitializedException.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterNotInitializedException.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashReporterNotInitializedException.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/CrashUtil.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/FileUtils.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/FileUtils.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/FileUtils.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/FileUtils.java diff --git a/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/SimplePageChangeListener.java b/core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/SimplePageChangeListener.java similarity index 100% rename from crashreporter/src/main/java/com/balsikandar/crashreporter/utils/SimplePageChangeListener.java rename to core/crashreporter/src/main/java/com/balsikandar/crashreporter/utils/SimplePageChangeListener.java diff --git a/crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReport.kt b/core/crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReport.kt similarity index 100% rename from crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReport.kt rename to core/crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReport.kt diff --git a/crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReporter.kt b/core/crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReporter.kt similarity index 100% rename from crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReporter.kt rename to core/crashreporter/src/main/java/de/mm20/launcher2/crashreporter/CrashReporter.kt diff --git a/crashreporter/src/main/res/drawable/ic_menu_delete_white_24dp.xml b/core/crashreporter/src/main/res/drawable/ic_menu_delete_white_24dp.xml similarity index 100% rename from crashreporter/src/main/res/drawable/ic_menu_delete_white_24dp.xml rename to core/crashreporter/src/main/res/drawable/ic_menu_delete_white_24dp.xml diff --git a/crashreporter/src/main/res/drawable/ic_menu_share_white_24dp.xml b/core/crashreporter/src/main/res/drawable/ic_menu_share_white_24dp.xml similarity index 100% rename from crashreporter/src/main/res/drawable/ic_menu_share_white_24dp.xml rename to core/crashreporter/src/main/res/drawable/ic_menu_share_white_24dp.xml diff --git a/crashreporter/src/main/res/drawable/ic_search_white_24dp.xml b/core/crashreporter/src/main/res/drawable/ic_search_white_24dp.xml similarity index 100% rename from crashreporter/src/main/res/drawable/ic_search_white_24dp.xml rename to core/crashreporter/src/main/res/drawable/ic_search_white_24dp.xml diff --git a/crashreporter/src/main/res/drawable/ic_warning_black_24dp.xml b/core/crashreporter/src/main/res/drawable/ic_warning_black_24dp.xml similarity index 100% rename from crashreporter/src/main/res/drawable/ic_warning_black_24dp.xml rename to core/crashreporter/src/main/res/drawable/ic_warning_black_24dp.xml diff --git a/crashreporter/src/main/res/menu/crash_detail_menu.xml b/core/crashreporter/src/main/res/menu/crash_detail_menu.xml similarity index 100% rename from crashreporter/src/main/res/menu/crash_detail_menu.xml rename to core/crashreporter/src/main/res/menu/crash_detail_menu.xml diff --git a/crashreporter/src/main/res/menu/log_main_menu.xml b/core/crashreporter/src/main/res/menu/log_main_menu.xml similarity index 100% rename from crashreporter/src/main/res/menu/log_main_menu.xml rename to core/crashreporter/src/main/res/menu/log_main_menu.xml diff --git a/crashreporter/src/main/res/values/colors.xml b/core/crashreporter/src/main/res/values/colors.xml similarity index 100% rename from crashreporter/src/main/res/values/colors.xml rename to core/crashreporter/src/main/res/values/colors.xml diff --git a/crashreporter/src/main/res/values/strings.xml b/core/crashreporter/src/main/res/values/strings.xml similarity index 100% rename from crashreporter/src/main/res/values/strings.xml rename to core/crashreporter/src/main/res/values/strings.xml diff --git a/crashreporter/src/main/res/values/styles.xml b/core/crashreporter/src/main/res/values/styles.xml similarity index 100% rename from crashreporter/src/main/res/values/styles.xml rename to core/crashreporter/src/main/res/values/styles.xml diff --git a/badges/.gitignore b/core/database/.gitignore similarity index 100% rename from badges/.gitignore rename to core/database/.gitignore diff --git a/database/build.gradle.kts b/core/database/build.gradle.kts similarity index 94% rename from database/build.gradle.kts rename to core/database/build.gradle.kts index 664d40b5..37591fb7 100644 --- a/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -51,7 +51,7 @@ dependencies { implementation(libs.androidx.room) implementation(libs.koin.android) - implementation(project(":i18n")) - implementation(project(":ktx")) + implementation(project(":core:i18n")) + implementation(project(":core:ktx")) } \ No newline at end of file diff --git a/badges/consumer-rules.pro b/core/database/consumer-rules.pro similarity index 100% rename from badges/consumer-rules.pro rename to core/database/consumer-rules.pro diff --git a/badges/proguard-rules.pro b/core/database/proguard-rules.pro similarity index 100% rename from badges/proguard-rules.pro rename to core/database/proguard-rules.pro diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/0.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/0.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/1.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/1.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/10.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/10.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/11.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/11.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/12.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/12.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/13.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/13.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/14.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/14.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/15.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/15.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/16.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/16.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/17.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/17.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/18.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/18.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/19.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/19.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/2.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/2.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/3.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/3.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/4.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/4.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/5.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/5.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/6.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/6.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/7.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/7.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/8.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/8.json diff --git a/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json b/core/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json similarity index 100% rename from database/schemas/de.mm20.launcher2.database.AppDatabase/9.json rename to core/database/schemas/de.mm20.launcher2.database.AppDatabase/9.json diff --git a/applications/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xml similarity index 100% rename from applications/src/main/AndroidManifest.xml rename to core/database/src/main/AndroidManifest.xml diff --git a/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt b/core/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt rename to core/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/Converters.kt b/core/database/src/main/java/de/mm20/launcher2/database/Converters.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/Converters.kt rename to core/database/src/main/java/de/mm20/launcher2/database/Converters.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/CurrencyDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt similarity index 88% rename from database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt index c39799dd..ec601900 100644 --- a/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt +++ b/core/database/src/main/java/de/mm20/launcher2/database/CustomAttrsDao.kt @@ -54,4 +54,10 @@ interface CustomAttrsDao { @Query("INSERT INTO CustomAttributes (key, value, type) VALUES (:key, :tag, 'tag')") suspend fun insertTag(key: String, tag: String) + @Query("UPDATE CustomAttributes SET value = :newName WHERE value = :oldName AND type = 'tag'") + suspend fun renameTag(oldName: String, newName: String) + + @Query("DELETE FROM CustomAttributes WHERE type = 'tag' AND value = :tag") + suspend fun deleteTag(tag: String) + } \ No newline at end of file diff --git a/database/src/main/java/de/mm20/launcher2/database/IconDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/IconDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/Module.kt b/core/database/src/main/java/de/mm20/launcher2/database/Module.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/Module.kt rename to core/database/src/main/java/de/mm20/launcher2/database/Module.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/SearchActionDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/SearchDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/SearchDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/WeatherDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt rename to core/database/src/main/java/de/mm20/launcher2/database/WidgetDao.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/CurrencyEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/CustomAttributeEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/ForecastEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/IconEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/IconPackEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/SearchActionEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/WebsearchEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt b/core/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt rename to core/database/src/main/java/de/mm20/launcher2/database/entities/WidgetEntity.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_10_11.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_11_12.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_12_13.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_13_14.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_14_15.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_15_16.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_16_17.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_17_18.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_18_19.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_6_7.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_7_8.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_8_9.kt diff --git a/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt b/core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt similarity index 100% rename from database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt rename to core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_9_10.kt diff --git a/base/.gitignore b/core/i18n/.gitignore similarity index 100% rename from base/.gitignore rename to core/i18n/.gitignore diff --git a/i18n/build.gradle.kts b/core/i18n/build.gradle.kts similarity index 100% rename from i18n/build.gradle.kts rename to core/i18n/build.gradle.kts diff --git a/base/consumer-rules.pro b/core/i18n/consumer-rules.pro similarity index 100% rename from base/consumer-rules.pro rename to core/i18n/consumer-rules.pro diff --git a/i18n/proguard-rules.pro b/core/i18n/proguard-rules.pro similarity index 100% rename from i18n/proguard-rules.pro rename to core/i18n/proguard-rules.pro diff --git a/i18n/src/debug/res/values-de/strings.xml b/core/i18n/src/debug/res/values-de/strings.xml similarity index 100% rename from i18n/src/debug/res/values-de/strings.xml rename to core/i18n/src/debug/res/values-de/strings.xml diff --git a/i18n/src/debug/res/values/strings.xml b/core/i18n/src/debug/res/values/strings.xml similarity index 100% rename from i18n/src/debug/res/values/strings.xml rename to core/i18n/src/debug/res/values/strings.xml diff --git a/i18n/src/main/AndroidManifest.xml b/core/i18n/src/main/AndroidManifest.xml similarity index 100% rename from i18n/src/main/AndroidManifest.xml rename to core/i18n/src/main/AndroidManifest.xml diff --git a/i18n/src/main/res/values-cs/strings.xml b/core/i18n/src/main/res/values-cs/strings.xml similarity index 100% rename from i18n/src/main/res/values-cs/strings.xml rename to core/i18n/src/main/res/values-cs/strings.xml diff --git a/i18n/src/main/res/values-cs/units.xml b/core/i18n/src/main/res/values-cs/units.xml similarity index 100% rename from i18n/src/main/res/values-cs/units.xml rename to core/i18n/src/main/res/values-cs/units.xml diff --git a/i18n/src/main/res/values-de/defaults.xml b/core/i18n/src/main/res/values-de/defaults.xml similarity index 100% rename from i18n/src/main/res/values-de/defaults.xml rename to core/i18n/src/main/res/values-de/defaults.xml diff --git a/i18n/src/main/res/values-de/strings.xml b/core/i18n/src/main/res/values-de/strings.xml similarity index 100% rename from i18n/src/main/res/values-de/strings.xml rename to core/i18n/src/main/res/values-de/strings.xml diff --git a/i18n/src/main/res/values-de/units.xml b/core/i18n/src/main/res/values-de/units.xml similarity index 100% rename from i18n/src/main/res/values-de/units.xml rename to core/i18n/src/main/res/values-de/units.xml diff --git a/i18n/src/main/res/values-el/strings.xml b/core/i18n/src/main/res/values-el/strings.xml similarity index 100% rename from i18n/src/main/res/values-el/strings.xml rename to core/i18n/src/main/res/values-el/strings.xml diff --git a/i18n/src/main/res/values-el/units.xml b/core/i18n/src/main/res/values-el/units.xml similarity index 100% rename from i18n/src/main/res/values-el/units.xml rename to core/i18n/src/main/res/values-el/units.xml diff --git a/i18n/src/main/res/values-en-rUS/defaults.xml b/core/i18n/src/main/res/values-en-rUS/defaults.xml similarity index 100% rename from i18n/src/main/res/values-en-rUS/defaults.xml rename to core/i18n/src/main/res/values-en-rUS/defaults.xml diff --git a/i18n/src/main/res/values-eo/strings.xml b/core/i18n/src/main/res/values-eo/strings.xml similarity index 100% rename from i18n/src/main/res/values-eo/strings.xml rename to core/i18n/src/main/res/values-eo/strings.xml diff --git a/i18n/src/main/res/values-eo/units.xml b/core/i18n/src/main/res/values-eo/units.xml similarity index 100% rename from i18n/src/main/res/values-eo/units.xml rename to core/i18n/src/main/res/values-eo/units.xml diff --git a/i18n/src/main/res/values-es/strings.xml b/core/i18n/src/main/res/values-es/strings.xml similarity index 100% rename from i18n/src/main/res/values-es/strings.xml rename to core/i18n/src/main/res/values-es/strings.xml diff --git a/i18n/src/main/res/values-es/units.xml b/core/i18n/src/main/res/values-es/units.xml similarity index 100% rename from i18n/src/main/res/values-es/units.xml rename to core/i18n/src/main/res/values-es/units.xml diff --git a/i18n/src/main/res/values-fr/defaults.xml b/core/i18n/src/main/res/values-fr/defaults.xml similarity index 100% rename from i18n/src/main/res/values-fr/defaults.xml rename to core/i18n/src/main/res/values-fr/defaults.xml diff --git a/i18n/src/main/res/values-fr/strings.xml b/core/i18n/src/main/res/values-fr/strings.xml similarity index 100% rename from i18n/src/main/res/values-fr/strings.xml rename to core/i18n/src/main/res/values-fr/strings.xml diff --git a/i18n/src/main/res/values-fr/units.xml b/core/i18n/src/main/res/values-fr/units.xml similarity index 100% rename from i18n/src/main/res/values-fr/units.xml rename to core/i18n/src/main/res/values-fr/units.xml diff --git a/i18n/src/main/res/values-it/strings.xml b/core/i18n/src/main/res/values-it/strings.xml similarity index 100% rename from i18n/src/main/res/values-it/strings.xml rename to core/i18n/src/main/res/values-it/strings.xml diff --git a/i18n/src/main/res/values-it/units.xml b/core/i18n/src/main/res/values-it/units.xml similarity index 100% rename from i18n/src/main/res/values-it/units.xml rename to core/i18n/src/main/res/values-it/units.xml diff --git a/i18n/src/main/res/values-ja/strings.xml b/core/i18n/src/main/res/values-ja/strings.xml similarity index 100% rename from i18n/src/main/res/values-ja/strings.xml rename to core/i18n/src/main/res/values-ja/strings.xml diff --git a/i18n/src/main/res/values-ja/units.xml b/core/i18n/src/main/res/values-ja/units.xml similarity index 100% rename from i18n/src/main/res/values-ja/units.xml rename to core/i18n/src/main/res/values-ja/units.xml diff --git a/i18n/src/main/res/values-nl/strings.xml b/core/i18n/src/main/res/values-nl/strings.xml similarity index 100% rename from i18n/src/main/res/values-nl/strings.xml rename to core/i18n/src/main/res/values-nl/strings.xml diff --git a/i18n/src/main/res/values-nl/units.xml b/core/i18n/src/main/res/values-nl/units.xml similarity index 100% rename from i18n/src/main/res/values-nl/units.xml rename to core/i18n/src/main/res/values-nl/units.xml diff --git a/i18n/src/main/res/values-pl/strings.xml b/core/i18n/src/main/res/values-pl/strings.xml similarity index 100% rename from i18n/src/main/res/values-pl/strings.xml rename to core/i18n/src/main/res/values-pl/strings.xml diff --git a/i18n/src/main/res/values-pl/units.xml b/core/i18n/src/main/res/values-pl/units.xml similarity index 100% rename from i18n/src/main/res/values-pl/units.xml rename to core/i18n/src/main/res/values-pl/units.xml diff --git a/i18n/src/main/res/values-pt-rBR/strings.xml b/core/i18n/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from i18n/src/main/res/values-pt-rBR/strings.xml rename to core/i18n/src/main/res/values-pt-rBR/strings.xml diff --git a/i18n/src/main/res/values-pt-rBR/units.xml b/core/i18n/src/main/res/values-pt-rBR/units.xml similarity index 100% rename from i18n/src/main/res/values-pt-rBR/units.xml rename to core/i18n/src/main/res/values-pt-rBR/units.xml diff --git a/i18n/src/main/res/values-ro/strings.xml b/core/i18n/src/main/res/values-ro/strings.xml similarity index 100% rename from i18n/src/main/res/values-ro/strings.xml rename to core/i18n/src/main/res/values-ro/strings.xml diff --git a/i18n/src/main/res/values-ro/units.xml b/core/i18n/src/main/res/values-ro/units.xml similarity index 100% rename from i18n/src/main/res/values-ro/units.xml rename to core/i18n/src/main/res/values-ro/units.xml diff --git a/i18n/src/main/res/values-ru/strings.xml b/core/i18n/src/main/res/values-ru/strings.xml similarity index 100% rename from i18n/src/main/res/values-ru/strings.xml rename to core/i18n/src/main/res/values-ru/strings.xml diff --git a/i18n/src/main/res/values-ru/units.xml b/core/i18n/src/main/res/values-ru/units.xml similarity index 100% rename from i18n/src/main/res/values-ru/units.xml rename to core/i18n/src/main/res/values-ru/units.xml diff --git a/i18n/src/main/res/values-sv/strings.xml b/core/i18n/src/main/res/values-sv/strings.xml similarity index 100% rename from i18n/src/main/res/values-sv/strings.xml rename to core/i18n/src/main/res/values-sv/strings.xml diff --git a/i18n/src/main/res/values-sv/units.xml b/core/i18n/src/main/res/values-sv/units.xml similarity index 100% rename from i18n/src/main/res/values-sv/units.xml rename to core/i18n/src/main/res/values-sv/units.xml diff --git a/i18n/src/main/res/values-tr/strings.xml b/core/i18n/src/main/res/values-tr/strings.xml similarity index 100% rename from i18n/src/main/res/values-tr/strings.xml rename to core/i18n/src/main/res/values-tr/strings.xml diff --git a/i18n/src/main/res/values-tr/units.xml b/core/i18n/src/main/res/values-tr/units.xml similarity index 100% rename from i18n/src/main/res/values-tr/units.xml rename to core/i18n/src/main/res/values-tr/units.xml diff --git a/i18n/src/main/res/values-zh-rCN/strings.xml b/core/i18n/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from i18n/src/main/res/values-zh-rCN/strings.xml rename to core/i18n/src/main/res/values-zh-rCN/strings.xml diff --git a/i18n/src/main/res/values-zh-rCN/units.xml b/core/i18n/src/main/res/values-zh-rCN/units.xml similarity index 100% rename from i18n/src/main/res/values-zh-rCN/units.xml rename to core/i18n/src/main/res/values-zh-rCN/units.xml diff --git a/i18n/src/main/res/values/defaults.xml b/core/i18n/src/main/res/values/defaults.xml similarity index 100% rename from i18n/src/main/res/values/defaults.xml rename to core/i18n/src/main/res/values/defaults.xml diff --git a/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml similarity index 99% rename from i18n/src/main/res/values/strings.xml rename to core/i18n/src/main/res/values/strings.xml index 7f7ffcaf..01dac93d 100644 --- a/i18n/src/main/res/values/strings.xml +++ b/core/i18n/src/main/res/values/strings.xml @@ -628,6 +628,8 @@ Automatically show the keyboard when opening the search Hidden search results Manage hidden apps and search results + Tags + Manage tags and tagged items Wikipedia URL Change the order of pinned items Frequently used diff --git a/i18n/src/main/res/values/units.xml b/core/i18n/src/main/res/values/units.xml similarity index 100% rename from i18n/src/main/res/values/units.xml rename to core/i18n/src/main/res/values/units.xml diff --git a/calculator/.gitignore b/core/ktx/.gitignore similarity index 100% rename from calculator/.gitignore rename to core/ktx/.gitignore diff --git a/ktx/build.gradle.kts b/core/ktx/build.gradle.kts similarity index 100% rename from ktx/build.gradle.kts rename to core/ktx/build.gradle.kts diff --git a/calculator/consumer-rules.pro b/core/ktx/consumer-rules.pro similarity index 100% rename from calculator/consumer-rules.pro rename to core/ktx/consumer-rules.pro diff --git a/ktx/proguard-rules.pro b/core/ktx/proguard-rules.pro similarity index 100% rename from ktx/proguard-rules.pro rename to core/ktx/proguard-rules.pro diff --git a/badges/src/main/AndroidManifest.xml b/core/ktx/src/main/AndroidManifest.xml similarity index 100% rename from badges/src/main/AndroidManifest.xml rename to core/ktx/src/main/AndroidManifest.xml diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Address.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Address.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Address.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Address.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Context.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Context.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Context.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Context.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Double.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Double.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Double.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Double.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Drawable.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Drawable.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Drawable.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Drawable.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Extensions.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Extensions.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Extensions.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Extensions.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Float.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Float.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Float.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Float.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/InputStream.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/InputStream.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/InputStream.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/InputStream.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Int.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Int.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Int.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Int.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/LayerDrawable.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/LayerDrawable.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/LayerDrawable.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/LayerDrawable.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/List.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/List.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/List.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/List.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Notification.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Notification.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Notification.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Notification.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Rect.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Rect.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Rect.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Rect.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/RectF.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/RectF.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/RectF.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/RectF.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Resources.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/Resources.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/Resources.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/Resources.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/SharedPreferences.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/SharedPreferences.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/SharedPreferences.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/SharedPreferences.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/String.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/String.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/String.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/String.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/TextView.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/TextView.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/TextView.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/TextView.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/UserHandle.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/UserHandle.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/UserHandle.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/UserHandle.kt diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/View.kt b/core/ktx/src/main/java/de/mm20/launcher2/ktx/View.kt similarity index 100% rename from ktx/src/main/java/de/mm20/launcher2/ktx/View.kt rename to core/ktx/src/main/java/de/mm20/launcher2/ktx/View.kt diff --git a/ktx/src/test/java/de/mm20/launcher2/ktx/StringKtTest.kt b/core/ktx/src/test/java/de/mm20/launcher2/ktx/StringKtTest.kt similarity index 100% rename from ktx/src/test/java/de/mm20/launcher2/ktx/StringKtTest.kt rename to core/ktx/src/test/java/de/mm20/launcher2/ktx/StringKtTest.kt diff --git a/calendar/.gitignore b/core/permissions/.gitignore similarity index 100% rename from calendar/.gitignore rename to core/permissions/.gitignore diff --git a/permissions/build.gradle.kts b/core/permissions/build.gradle.kts similarity index 88% rename from permissions/build.gradle.kts rename to core/permissions/build.gradle.kts index 325f8571..a861d65a 100644 --- a/permissions/build.gradle.kts +++ b/core/permissions/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { implementation(libs.koin.android) - implementation(project(":ktx")) - implementation(project(":base")) - implementation(project(":crashreporter")) + implementation(project(":core:ktx")) + implementation(project(":core:base")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/calendar/consumer-rules.pro b/core/permissions/consumer-rules.pro similarity index 100% rename from calendar/consumer-rules.pro rename to core/permissions/consumer-rules.pro diff --git a/currencies/proguard-rules.pro b/core/permissions/proguard-rules.pro similarity index 100% rename from currencies/proguard-rules.pro rename to core/permissions/proguard-rules.pro diff --git a/appshortcuts/src/main/AndroidManifest.xml b/core/permissions/src/main/AndroidManifest.xml similarity index 100% rename from appshortcuts/src/main/AndroidManifest.xml rename to core/permissions/src/main/AndroidManifest.xml diff --git a/permissions/src/main/java/de/mm20/launcher2/permissions/Module.kt b/core/permissions/src/main/java/de/mm20/launcher2/permissions/Module.kt similarity index 100% rename from permissions/src/main/java/de/mm20/launcher2/permissions/Module.kt rename to core/permissions/src/main/java/de/mm20/launcher2/permissions/Module.kt diff --git a/permissions/src/main/java/de/mm20/launcher2/permissions/PermissionsManager.kt b/core/permissions/src/main/java/de/mm20/launcher2/permissions/PermissionsManager.kt similarity index 100% rename from permissions/src/main/java/de/mm20/launcher2/permissions/PermissionsManager.kt rename to core/permissions/src/main/java/de/mm20/launcher2/permissions/PermissionsManager.kt diff --git a/compat/.gitignore b/core/preferences/.gitignore similarity index 100% rename from compat/.gitignore rename to core/preferences/.gitignore diff --git a/preferences/build.gradle.kts b/core/preferences/build.gradle.kts similarity index 87% rename from preferences/build.gradle.kts rename to core/preferences/build.gradle.kts index c27835f7..a9adb566 100644 --- a/preferences/build.gradle.kts +++ b/core/preferences/build.gradle.kts @@ -64,10 +64,10 @@ dependencies { api(libs.protobuf.javalite) implementation(libs.koin.android) - implementation(project(":ktx")) - implementation(project(":i18n")) - implementation(project(":base")) - implementation(project(":crashreporter")) - implementation(project(":material-color-utilities")) + implementation(project(":core:ktx")) + implementation(project(":core:i18n")) + implementation(project(":core:base")) + implementation(project(":core:crashreporter")) + implementation(project(":libs:material-color-utilities")) } \ No newline at end of file diff --git a/preferences/consumer-rules.pro b/core/preferences/consumer-rules.pro similarity index 100% rename from preferences/consumer-rules.pro rename to core/preferences/consumer-rules.pro diff --git a/nextcloud/proguard-rules.pro b/core/preferences/proguard-rules.pro similarity index 100% rename from nextcloud/proguard-rules.pro rename to core/preferences/proguard-rules.pro diff --git a/preferences/src/main/AndroidManifest.xml b/core/preferences/src/main/AndroidManifest.xml similarity index 100% rename from preferences/src/main/AndroidManifest.xml rename to core/preferences/src/main/AndroidManifest.xml diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/ImportExport.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/ImportExport.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/ImportExport.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/ImportExport.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/Module.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/SettingsSerializer.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/SettingsSerializer.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/SettingsSerializer.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/SettingsSerializer.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/FactorySettingsMigration.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/FactorySettingsMigration.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/FactorySettingsMigration.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/FactorySettingsMigration.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_10_11.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_10_11.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_10_11.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_10_11.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_1_2.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_1_2.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_1_2.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_1_2.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_2_3.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_2_3.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_2_3.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_2_3.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_3_4.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_3_4.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_3_4.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_3_4.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_4_5.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_4_5.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_4_5.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_4_5.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_5_6.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_5_6.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_5_6.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_5_6.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_6_7.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_6_7.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_6_7.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_6_7.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_7_8.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_7_8.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_7_8.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_7_8.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_9_10.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_9_10.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_9_10.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_9_10.kt diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/VersionedMigration.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/VersionedMigration.kt similarity index 100% rename from preferences/src/main/java/de/mm20/launcher2/preferences/migrations/VersionedMigration.kt rename to core/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/VersionedMigration.kt diff --git a/preferences/src/main/proto/settings.proto b/core/preferences/src/main/proto/settings.proto similarity index 100% rename from preferences/src/main/proto/settings.proto rename to core/preferences/src/main/proto/settings.proto diff --git a/contacts/.gitignore b/data/applications/.gitignore similarity index 100% rename from contacts/.gitignore rename to data/applications/.gitignore diff --git a/applications/build.gradle.kts b/data/applications/build.gradle.kts similarity index 90% rename from applications/build.gradle.kts rename to data/applications/build.gradle.kts index 9de0c0df..f0b51586 100644 --- a/applications/build.gradle.kts +++ b/data/applications/build.gradle.kts @@ -45,8 +45,8 @@ dependencies { implementation(libs.commons.text) - implementation(project(":base")) - implementation(project(":ktx")) - implementation(project(":compat")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) + implementation(project(":core:compat")) } \ No newline at end of file diff --git a/compat/consumer-rules.pro b/data/applications/consumer-rules.pro similarity index 100% rename from compat/consumer-rules.pro rename to data/applications/consumer-rules.pro diff --git a/applications/proguard-rules.pro b/data/applications/proguard-rules.pro similarity index 100% rename from applications/proguard-rules.pro rename to data/applications/proguard-rules.pro diff --git a/calculator/src/main/AndroidManifest.xml b/data/applications/src/main/AndroidManifest.xml similarity index 100% rename from calculator/src/main/AndroidManifest.xml rename to data/applications/src/main/AndroidManifest.xml diff --git a/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt b/data/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt similarity index 100% rename from applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt rename to data/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt diff --git a/applications/src/main/java/de/mm20/launcher2/applications/Module.kt b/data/applications/src/main/java/de/mm20/launcher2/applications/Module.kt similarity index 100% rename from applications/src/main/java/de/mm20/launcher2/applications/Module.kt rename to data/applications/src/main/java/de/mm20/launcher2/applications/Module.kt diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt b/data/applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt similarity index 98% rename from applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt rename to data/applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt index a2643ac5..26a27a9f 100644 --- a/applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt +++ b/data/applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt @@ -4,7 +4,6 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.pm.LauncherApps -import android.os.Process import android.os.UserManager import androidx.core.content.getSystemService import de.mm20.launcher2.search.SavableSearchable diff --git a/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt b/data/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt similarity index 100% rename from applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt rename to data/applications/src/main/java/de/mm20/launcher2/search/data/LauncherApp.kt diff --git a/crashreporter/.gitignore b/data/appshortcuts/.gitignore similarity index 100% rename from crashreporter/.gitignore rename to data/appshortcuts/.gitignore diff --git a/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts similarity index 85% rename from appshortcuts/build.gradle.kts rename to data/appshortcuts/build.gradle.kts index b19fa790..4e5d978b 100644 --- a/appshortcuts/build.gradle.kts +++ b/data/appshortcuts/build.gradle.kts @@ -43,9 +43,9 @@ dependencies { implementation(libs.commons.text) - implementation(project(":applications")) - implementation(project(":permissions")) - implementation(project(":base")) - implementation(project(":ktx")) + implementation(project(":data:applications")) + implementation(project(":core:permissions")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) } \ No newline at end of file diff --git a/contacts/consumer-rules.pro b/data/appshortcuts/consumer-rules.pro similarity index 100% rename from contacts/consumer-rules.pro rename to data/appshortcuts/consumer-rules.pro diff --git a/accounts/proguard-rules.pro b/data/appshortcuts/proguard-rules.pro similarity index 100% rename from accounts/proguard-rules.pro rename to data/appshortcuts/proguard-rules.pro diff --git a/backup/src/main/AndroidManifest.xml b/data/appshortcuts/src/main/AndroidManifest.xml similarity index 100% rename from backup/src/main/AndroidManifest.xml rename to data/appshortcuts/src/main/AndroidManifest.xml diff --git a/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutRepository.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutRepository.kt similarity index 100% rename from appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutRepository.kt rename to data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutRepository.kt diff --git a/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt similarity index 99% rename from appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt rename to data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt index 5a516dd1..60d6bea5 100644 --- a/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt +++ b/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt @@ -5,7 +5,6 @@ import android.content.Intent import android.content.Intent.ShortcutIconResource import android.content.pm.LauncherApps import android.content.pm.PackageManager -import android.os.Process import android.os.UserManager import androidx.core.content.getSystemService import de.mm20.launcher2.ktx.jsonObjectOf diff --git a/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/Module.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/Module.kt similarity index 100% rename from appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/Module.kt rename to data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/Module.kt diff --git a/appshortcuts/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt similarity index 100% rename from appshortcuts/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt rename to data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/AppShortcut.kt diff --git a/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt similarity index 100% rename from appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt rename to data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LauncherShortcut.kt diff --git a/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt b/data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt similarity index 100% rename from appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt rename to data/appshortcuts/src/main/java/de/mm20/launcher2/search/data/LegacyShortcut.kt diff --git a/currencies/.gitignore b/data/calculator/.gitignore similarity index 100% rename from currencies/.gitignore rename to data/calculator/.gitignore diff --git a/calculator/build.gradle.kts b/data/calculator/build.gradle.kts similarity index 96% rename from calculator/build.gradle.kts rename to data/calculator/build.gradle.kts index dd521dfe..88335f95 100644 --- a/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -45,6 +45,6 @@ dependencies { implementation(libs.koin.android) - implementation(project(":base")) + implementation(project(":core:base")) } \ No newline at end of file diff --git a/crashreporter/consumer-rules.pro b/data/calculator/consumer-rules.pro similarity index 100% rename from crashreporter/consumer-rules.pro rename to data/calculator/consumer-rules.pro diff --git a/calculator/proguard-rules.pro b/data/calculator/proguard-rules.pro similarity index 100% rename from calculator/proguard-rules.pro rename to data/calculator/proguard-rules.pro diff --git a/contacts/src/main/AndroidManifest.xml b/data/calculator/src/main/AndroidManifest.xml similarity index 100% rename from contacts/src/main/AndroidManifest.xml rename to data/calculator/src/main/AndroidManifest.xml diff --git a/calculator/src/main/java/de/mm20/launcher2/calculator/CalculatorRepository.kt b/data/calculator/src/main/java/de/mm20/launcher2/calculator/CalculatorRepository.kt similarity index 100% rename from calculator/src/main/java/de/mm20/launcher2/calculator/CalculatorRepository.kt rename to data/calculator/src/main/java/de/mm20/launcher2/calculator/CalculatorRepository.kt diff --git a/calculator/src/main/java/de/mm20/launcher2/calculator/Module.kt b/data/calculator/src/main/java/de/mm20/launcher2/calculator/Module.kt similarity index 100% rename from calculator/src/main/java/de/mm20/launcher2/calculator/Module.kt rename to data/calculator/src/main/java/de/mm20/launcher2/calculator/Module.kt diff --git a/calculator/src/main/java/de/mm20/launcher2/search/data/Calculator.kt b/data/calculator/src/main/java/de/mm20/launcher2/search/data/Calculator.kt similarity index 100% rename from calculator/src/main/java/de/mm20/launcher2/search/data/Calculator.kt rename to data/calculator/src/main/java/de/mm20/launcher2/search/data/Calculator.kt diff --git a/customattrs/.gitignore b/data/calendar/.gitignore similarity index 100% rename from customattrs/.gitignore rename to data/calendar/.gitignore diff --git a/calendar/build.gradle.kts b/data/calendar/build.gradle.kts similarity index 84% rename from calendar/build.gradle.kts rename to data/calendar/build.gradle.kts index 7a8e2184..0c8e2380 100644 --- a/calendar/build.gradle.kts +++ b/data/calendar/build.gradle.kts @@ -42,9 +42,9 @@ dependencies { implementation(libs.koin.android) - implementation(project(":ktx")) - implementation(project(":base")) - implementation(project(":permissions")) - implementation(project(":material-color-utilities")) + implementation(project(":core:ktx")) + implementation(project(":core:base")) + implementation(project(":core:permissions")) + implementation(project(":libs:material-color-utilities")) } \ No newline at end of file diff --git a/currencies/consumer-rules.pro b/data/calendar/consumer-rules.pro similarity index 100% rename from currencies/consumer-rules.pro rename to data/calendar/consumer-rules.pro diff --git a/calendar/proguard-rules.pro b/data/calendar/proguard-rules.pro similarity index 100% rename from calendar/proguard-rules.pro rename to data/calendar/proguard-rules.pro diff --git a/calendar/src/main/AndroidManifest.xml b/data/calendar/src/main/AndroidManifest.xml similarity index 100% rename from calendar/src/main/AndroidManifest.xml rename to data/calendar/src/main/AndroidManifest.xml diff --git a/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt b/data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt similarity index 100% rename from calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt rename to data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarRepository.kt diff --git a/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt b/data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt similarity index 100% rename from calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt rename to data/calendar/src/main/java/de/mm20/launcher2/calendar/CalendarSerialization.kt diff --git a/calendar/src/main/java/de/mm20/launcher2/calendar/Module.kt b/data/calendar/src/main/java/de/mm20/launcher2/calendar/Module.kt similarity index 100% rename from calendar/src/main/java/de/mm20/launcher2/calendar/Module.kt rename to data/calendar/src/main/java/de/mm20/launcher2/calendar/Module.kt diff --git a/calendar/src/main/java/de/mm20/launcher2/search/data/CalendarEvent.kt b/data/calendar/src/main/java/de/mm20/launcher2/search/data/CalendarEvent.kt similarity index 100% rename from calendar/src/main/java/de/mm20/launcher2/search/data/CalendarEvent.kt rename to data/calendar/src/main/java/de/mm20/launcher2/search/data/CalendarEvent.kt diff --git a/database/.gitignore b/data/contacts/.gitignore similarity index 100% rename from database/.gitignore rename to data/contacts/.gitignore diff --git a/contacts/build.gradle.kts b/data/contacts/build.gradle.kts similarity index 88% rename from contacts/build.gradle.kts rename to data/contacts/build.gradle.kts index 38e7bbbe..4b98ae19 100644 --- a/contacts/build.gradle.kts +++ b/data/contacts/build.gradle.kts @@ -42,8 +42,8 @@ dependencies { implementation(libs.koin.android) - implementation(project(":ktx")) - implementation(project(":base")) - implementation(project(":permissions")) + implementation(project(":core:ktx")) + implementation(project(":core:base")) + implementation(project(":core:permissions")) } \ No newline at end of file diff --git a/customattrs/consumer-rules.pro b/data/contacts/consumer-rules.pro similarity index 100% rename from customattrs/consumer-rules.pro rename to data/contacts/consumer-rules.pro diff --git a/contacts/proguard-rules.pro b/data/contacts/proguard-rules.pro similarity index 100% rename from contacts/proguard-rules.pro rename to data/contacts/proguard-rules.pro diff --git a/database/src/main/AndroidManifest.xml b/data/contacts/src/main/AndroidManifest.xml similarity index 100% rename from database/src/main/AndroidManifest.xml rename to data/contacts/src/main/AndroidManifest.xml diff --git a/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt similarity index 100% rename from contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt rename to data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactRepository.kt diff --git a/contacts/src/main/java/de/mm20/launcher2/contacts/ContactSerialization.kt b/data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactSerialization.kt similarity index 100% rename from contacts/src/main/java/de/mm20/launcher2/contacts/ContactSerialization.kt rename to data/contacts/src/main/java/de/mm20/launcher2/contacts/ContactSerialization.kt diff --git a/contacts/src/main/java/de/mm20/launcher2/contacts/Module.kt b/data/contacts/src/main/java/de/mm20/launcher2/contacts/Module.kt similarity index 100% rename from contacts/src/main/java/de/mm20/launcher2/contacts/Module.kt rename to data/contacts/src/main/java/de/mm20/launcher2/contacts/Module.kt diff --git a/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt b/data/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt similarity index 100% rename from contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt rename to data/contacts/src/main/java/de/mm20/launcher2/search/data/Contact.kt diff --git a/favorites/.gitignore b/data/currencies/.gitignore similarity index 100% rename from favorites/.gitignore rename to data/currencies/.gitignore diff --git a/currencies/build.gradle.kts b/data/currencies/build.gradle.kts similarity index 85% rename from currencies/build.gradle.kts rename to data/currencies/build.gradle.kts index f620a9f3..371befac 100644 --- a/currencies/build.gradle.kts +++ b/data/currencies/build.gradle.kts @@ -43,8 +43,8 @@ dependencies { implementation(libs.okhttp) - implementation(project(":ktx")) - implementation(project(":i18n")) - implementation(project(":database")) - implementation(project(":crashreporter")) + implementation(project(":core:ktx")) + implementation(project(":core:i18n")) + implementation(project(":core:database")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/database/consumer-rules.pro b/data/currencies/consumer-rules.pro similarity index 100% rename from database/consumer-rules.pro rename to data/currencies/consumer-rules.pro diff --git a/permissions/proguard-rules.pro b/data/currencies/proguard-rules.pro similarity index 100% rename from permissions/proguard-rules.pro rename to data/currencies/proguard-rules.pro diff --git a/currencies/src/main/AndroidManifest.xml b/data/currencies/src/main/AndroidManifest.xml similarity index 100% rename from currencies/src/main/AndroidManifest.xml rename to data/currencies/src/main/AndroidManifest.xml diff --git a/currencies/src/main/java/de/mm20/launcher2/currencies/Currency.kt b/data/currencies/src/main/java/de/mm20/launcher2/currencies/Currency.kt similarity index 100% rename from currencies/src/main/java/de/mm20/launcher2/currencies/Currency.kt rename to data/currencies/src/main/java/de/mm20/launcher2/currencies/Currency.kt diff --git a/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt b/data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt similarity index 100% rename from currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt rename to data/currencies/src/main/java/de/mm20/launcher2/currencies/CurrencyRepository.kt diff --git a/currencies/src/main/java/de/mm20/launcher2/currencies/ExchangeRateWorker.kt b/data/currencies/src/main/java/de/mm20/launcher2/currencies/ExchangeRateWorker.kt similarity index 100% rename from currencies/src/main/java/de/mm20/launcher2/currencies/ExchangeRateWorker.kt rename to data/currencies/src/main/java/de/mm20/launcher2/currencies/ExchangeRateWorker.kt diff --git a/files/.gitignore b/data/customattrs/.gitignore similarity index 100% rename from files/.gitignore rename to data/customattrs/.gitignore diff --git a/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts similarity index 76% rename from customattrs/build.gradle.kts rename to data/customattrs/build.gradle.kts index 01e2bd0d..dfee48f2 100644 --- a/customattrs/build.gradle.kts +++ b/data/customattrs/build.gradle.kts @@ -31,7 +31,7 @@ android { kotlinOptions { jvmTarget = "1.8" } - namespace = "de.mm20.launcher2.customattrs" + namespace = "de.mm20.launcher2.data.customattrs" } dependencies { @@ -40,9 +40,9 @@ dependencies { implementation(libs.koin.android) - implementation(project(":database")) - implementation(project(":base")) - implementation(project(":ktx")) - implementation(project(":crashreporter")) - implementation(project(":favorites")) + implementation(project(":core:database")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) + implementation(project(":core:crashreporter")) + implementation(project(":data:favorites")) } \ No newline at end of file diff --git a/favorites/consumer-rules.pro b/data/customattrs/consumer-rules.pro similarity index 100% rename from favorites/consumer-rules.pro rename to data/customattrs/consumer-rules.pro diff --git a/appshortcuts/proguard-rules.pro b/data/customattrs/proguard-rules.pro similarity index 100% rename from appshortcuts/proguard-rules.pro rename to data/customattrs/proguard-rules.pro diff --git a/compat/src/main/AndroidManifest.xml b/data/customattrs/src/main/AndroidManifest.xml similarity index 100% rename from compat/src/main/AndroidManifest.xml rename to data/customattrs/src/main/AndroidManifest.xml diff --git a/customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttribute.kt b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttribute.kt similarity index 99% rename from customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttribute.kt rename to data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttribute.kt index 9e25ce75..2910ae6c 100644 --- a/customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttribute.kt +++ b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttribute.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.customattrs +package de.mm20.launcher2.data.customattrs import android.util.Log import de.mm20.launcher2.database.entities.CustomAttributeEntity diff --git a/customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttributeType.kt b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttributeType.kt similarity index 86% rename from customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttributeType.kt rename to data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttributeType.kt index b0f384a2..ccb17335 100644 --- a/customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttributeType.kt +++ b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttributeType.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.customattrs +package de.mm20.launcher2.data.customattrs enum class CustomAttributeType(val value: String) { Icon("icon"), diff --git a/customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttributesRepository.kt b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttributesRepository.kt similarity index 96% rename from customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttributesRepository.kt rename to data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttributesRepository.kt index b286e933..c992cdeb 100644 --- a/customattrs/src/main/java/de/mm20/launcher2/customattrs/CustomAttributesRepository.kt +++ b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/CustomAttributesRepository.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.customattrs +package de.mm20.launcher2.data.customattrs import de.mm20.launcher2.crashreporter.CrashReporter import de.mm20.launcher2.database.AppDatabase @@ -37,6 +37,8 @@ interface CustomAttributesRepository { suspend fun getAllTags(startsWith: String? = null): List fun getItemsForTag(tag: String): Flow> fun addTag(item: SavableSearchable, tag: String) + + fun renameTag(oldName: String, newName: String) suspend fun cleanupDatabase(): Int } @@ -135,6 +137,13 @@ internal class CustomAttributesRepositoryImpl( } } + override fun renameTag(oldName: String, newName: String) { + val dao = appDatabase.customAttrsDao() + scope.launch { + dao.renameTag(oldName, newName) + } + } + override fun search(query: String): Flow> { if (query.isBlank()) { return flow { diff --git a/customattrs/src/main/java/de/mm20/launcher2/customattrs/Module.kt b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/Module.kt similarity index 77% rename from customattrs/src/main/java/de/mm20/launcher2/customattrs/Module.kt rename to data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/Module.kt index 68aa632f..9c73014e 100644 --- a/customattrs/src/main/java/de/mm20/launcher2/customattrs/Module.kt +++ b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/Module.kt @@ -1,4 +1,4 @@ -package de.mm20.launcher2.customattrs +package de.mm20.launcher2.data.customattrs import org.koin.dsl.module diff --git a/customattrs/src/main/java/de/mm20/launcher2/customattrs/utils/Utils.kt b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/utils/Utils.kt similarity index 87% rename from customattrs/src/main/java/de/mm20/launcher2/customattrs/utils/Utils.kt rename to data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/utils/Utils.kt index f4f011e5..91824e48 100644 --- a/customattrs/src/main/java/de/mm20/launcher2/customattrs/utils/Utils.kt +++ b/data/customattrs/src/main/java/de/mm20/launcher2/data/customattrs/utils/Utils.kt @@ -1,6 +1,6 @@ -package de.mm20.launcher2.customattrs.utils +package de.mm20.launcher2.data.customattrs.utils -import de.mm20.launcher2.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository import de.mm20.launcher2.search.SavableSearchable import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow diff --git a/i18n/.gitignore b/data/favorites/.gitignore similarity index 100% rename from i18n/.gitignore rename to data/favorites/.gitignore diff --git a/favorites/build.gradle.kts b/data/favorites/build.gradle.kts similarity index 64% rename from favorites/build.gradle.kts rename to data/favorites/build.gradle.kts index 49f46fd8..b76b962b 100644 --- a/favorites/build.gradle.kts +++ b/data/favorites/build.gradle.kts @@ -42,18 +42,18 @@ dependencies { implementation(libs.koin.android) - implementation(project(":base")) - implementation(project(":calendar")) - implementation(project(":database")) - implementation(project(":preferences")) - implementation(project(":applications")) - implementation(project(":appshortcuts")) - implementation(project(":contacts")) - implementation(project(":ktx")) - implementation(project(":files")) - implementation(project(":websites")) - implementation(project(":wikipedia")) - implementation(project(":badges")) - implementation(project(":crashreporter")) + implementation(project(":core:base")) + implementation(project(":data:calendar")) + implementation(project(":core:database")) + implementation(project(":core:preferences")) + implementation(project(":data:applications")) + implementation(project(":data:appshortcuts")) + implementation(project(":data:contacts")) + implementation(project(":core:ktx")) + implementation(project(":data:files")) + implementation(project(":data:websites")) + implementation(project(":data:wikipedia")) + implementation(project(":services:badges")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/files/consumer-rules.pro b/data/favorites/consumer-rules.pro similarity index 100% rename from files/consumer-rules.pro rename to data/favorites/consumer-rules.pro diff --git a/favorites/proguard-rules.pro b/data/favorites/proguard-rules.pro similarity index 100% rename from favorites/proguard-rules.pro rename to data/favorites/proguard-rules.pro diff --git a/favorites/src/main/AndroidManifest.xml b/data/favorites/src/main/AndroidManifest.xml similarity index 100% rename from favorites/src/main/AndroidManifest.xml rename to data/favorites/src/main/AndroidManifest.xml diff --git a/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt b/data/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt similarity index 100% rename from favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt rename to data/favorites/src/main/java/de/mm20/launcher2/favorites/FavoritesRepository.kt diff --git a/favorites/src/main/java/de/mm20/launcher2/favorites/Module.kt b/data/favorites/src/main/java/de/mm20/launcher2/favorites/Module.kt similarity index 100% rename from favorites/src/main/java/de/mm20/launcher2/favorites/Module.kt rename to data/favorites/src/main/java/de/mm20/launcher2/favorites/Module.kt diff --git a/favorites/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt b/data/favorites/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt similarity index 94% rename from favorites/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt rename to data/favorites/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt index 8de5b07d..b1118fdb 100644 --- a/favorites/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt +++ b/data/favorites/src/main/java/de/mm20/launcher2/favorites/SavedSearchable.kt @@ -2,7 +2,6 @@ package de.mm20.launcher2.favorites import de.mm20.launcher2.database.entities.SavedSearchableEntity import de.mm20.launcher2.search.SavableSearchable -import de.mm20.launcher2.search.SearchableSerializer data class SavedSearchable( val key: String, diff --git a/favorites/src/main/java/de/mm20/launcher2/favorites/Serialization.kt b/data/favorites/src/main/java/de/mm20/launcher2/favorites/Serialization.kt similarity index 100% rename from favorites/src/main/java/de/mm20/launcher2/favorites/Serialization.kt rename to data/favorites/src/main/java/de/mm20/launcher2/favorites/Serialization.kt diff --git a/favorites/src/main/java/de/mm20/launcher2/favorites/TagSerialization.kt b/data/favorites/src/main/java/de/mm20/launcher2/favorites/TagSerialization.kt similarity index 100% rename from favorites/src/main/java/de/mm20/launcher2/favorites/TagSerialization.kt rename to data/favorites/src/main/java/de/mm20/launcher2/favorites/TagSerialization.kt diff --git a/favorites/src/main/java/de/mm20/launcher2/search/data/Tag.kt b/data/favorites/src/main/java/de/mm20/launcher2/search/data/Tag.kt similarity index 100% rename from favorites/src/main/java/de/mm20/launcher2/search/data/Tag.kt rename to data/favorites/src/main/java/de/mm20/launcher2/search/data/Tag.kt diff --git a/icons/.gitignore b/data/files/.gitignore similarity index 100% rename from icons/.gitignore rename to data/files/.gitignore diff --git a/files/build.gradle.kts b/data/files/build.gradle.kts similarity index 75% rename from files/build.gradle.kts rename to data/files/build.gradle.kts index 4410f73c..8beae1bb 100644 --- a/files/build.gradle.kts +++ b/data/files/build.gradle.kts @@ -44,12 +44,12 @@ dependencies { implementation(libs.koin.android) - implementation(project(":base")) - implementation(project(":ktx")) - implementation(project(":ms-services")) - implementation(project(":g-services")) - implementation(project(":nextcloud")) - implementation(project(":owncloud")) - implementation(project(":i18n")) - implementation(project(":permissions")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) + implementation(project(":libs:ms-services")) + implementation(project(":libs:g-services")) + implementation(project(":libs:nextcloud")) + implementation(project(":libs:owncloud")) + implementation(project(":core:i18n")) + implementation(project(":core:permissions")) } \ No newline at end of file diff --git a/g-services/consumer-rules.pro b/data/files/consumer-rules.pro similarity index 100% rename from g-services/consumer-rules.pro rename to data/files/consumer-rules.pro diff --git a/files/proguard-rules.pro b/data/files/proguard-rules.pro similarity index 100% rename from files/proguard-rules.pro rename to data/files/proguard-rules.pro diff --git a/files/src/main/AndroidManifest.xml b/data/files/src/main/AndroidManifest.xml similarity index 100% rename from files/src/main/AndroidManifest.xml rename to data/files/src/main/AndroidManifest.xml diff --git a/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt b/data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt rename to data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt b/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt rename to data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/Module.kt b/data/files/src/main/java/de/mm20/launcher2/files/Module.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/Module.kt rename to data/files/src/main/java/de/mm20/launcher2/files/Module.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/providers/FileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/FileProvider.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/providers/FileProvider.kt rename to data/files/src/main/java/de/mm20/launcher2/files/providers/FileProvider.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt rename to data/files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/providers/LocalFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFileProvider.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/providers/LocalFileProvider.kt rename to data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFileProvider.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/providers/NextcloudFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/NextcloudFileProvider.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/providers/NextcloudFileProvider.kt rename to data/files/src/main/java/de/mm20/launcher2/files/providers/NextcloudFileProvider.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt rename to data/files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt diff --git a/files/src/main/java/de/mm20/launcher2/files/providers/OwncloudFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/OwncloudFileProvider.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/files/providers/OwncloudFileProvider.kt rename to data/files/src/main/java/de/mm20/launcher2/files/providers/OwncloudFileProvider.kt diff --git a/files/src/main/java/de/mm20/launcher2/media/ThumbnailUtilsCompat.kt b/data/files/src/main/java/de/mm20/launcher2/media/ThumbnailUtilsCompat.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/media/ThumbnailUtilsCompat.kt rename to data/files/src/main/java/de/mm20/launcher2/media/ThumbnailUtilsCompat.kt diff --git a/files/src/main/java/de/mm20/launcher2/search/data/File.kt b/data/files/src/main/java/de/mm20/launcher2/search/data/File.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/search/data/File.kt rename to data/files/src/main/java/de/mm20/launcher2/search/data/File.kt diff --git a/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt b/data/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt rename to data/files/src/main/java/de/mm20/launcher2/search/data/GDriveFile.kt diff --git a/files/src/main/java/de/mm20/launcher2/search/data/LocalFile.kt b/data/files/src/main/java/de/mm20/launcher2/search/data/LocalFile.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/search/data/LocalFile.kt rename to data/files/src/main/java/de/mm20/launcher2/search/data/LocalFile.kt diff --git a/files/src/main/java/de/mm20/launcher2/search/data/NextcloudFile.kt b/data/files/src/main/java/de/mm20/launcher2/search/data/NextcloudFile.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/search/data/NextcloudFile.kt rename to data/files/src/main/java/de/mm20/launcher2/search/data/NextcloudFile.kt diff --git a/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt b/data/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt rename to data/files/src/main/java/de/mm20/launcher2/search/data/OneDriveFile.kt diff --git a/files/src/main/java/de/mm20/launcher2/search/data/OwncloudFile.kt b/data/files/src/main/java/de/mm20/launcher2/search/data/OwncloudFile.kt similarity index 100% rename from files/src/main/java/de/mm20/launcher2/search/data/OwncloudFile.kt rename to data/files/src/main/java/de/mm20/launcher2/search/data/OwncloudFile.kt diff --git a/ktx/.gitignore b/data/notifications/.gitignore similarity index 100% rename from ktx/.gitignore rename to data/notifications/.gitignore diff --git a/notifications/build.gradle.kts b/data/notifications/build.gradle.kts similarity index 95% rename from notifications/build.gradle.kts rename to data/notifications/build.gradle.kts index 98ba91be..d5b52090 100644 --- a/notifications/build.gradle.kts +++ b/data/notifications/build.gradle.kts @@ -42,6 +42,6 @@ dependencies { implementation(libs.koin.android) - implementation(project(":permissions")) + implementation(project(":core:permissions")) } \ No newline at end of file diff --git a/i18n/consumer-rules.pro b/data/notifications/consumer-rules.pro similarity index 100% rename from i18n/consumer-rules.pro rename to data/notifications/consumer-rules.pro diff --git a/notifications/proguard-rules.pro b/data/notifications/proguard-rules.pro similarity index 100% rename from notifications/proguard-rules.pro rename to data/notifications/proguard-rules.pro diff --git a/notifications/src/main/AndroidManifest.xml b/data/notifications/src/main/AndroidManifest.xml similarity index 100% rename from notifications/src/main/AndroidManifest.xml rename to data/notifications/src/main/AndroidManifest.xml diff --git a/notifications/src/main/java/de/mm20/launcher2/notifications/Module.kt b/data/notifications/src/main/java/de/mm20/launcher2/notifications/Module.kt similarity index 100% rename from notifications/src/main/java/de/mm20/launcher2/notifications/Module.kt rename to data/notifications/src/main/java/de/mm20/launcher2/notifications/Module.kt diff --git a/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt b/data/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt similarity index 100% rename from notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt rename to data/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationRepository.kt diff --git a/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationService.kt b/data/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationService.kt similarity index 100% rename from notifications/src/main/java/de/mm20/launcher2/notifications/NotificationService.kt rename to data/notifications/src/main/java/de/mm20/launcher2/notifications/NotificationService.kt diff --git a/material-color-utilities/.gitignore b/data/search-actions/.gitignore similarity index 100% rename from material-color-utilities/.gitignore rename to data/search-actions/.gitignore diff --git a/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts similarity index 82% rename from search-actions/build.gradle.kts rename to data/search-actions/build.gradle.kts index bc45fd9c..d16c179f 100644 --- a/search-actions/build.gradle.kts +++ b/data/search-actions/build.gradle.kts @@ -43,10 +43,10 @@ dependencies { implementation(libs.okhttp) implementation(libs.coil.core) - implementation(project(":base")) - implementation(project(":database")) - implementation(project(":ktx")) - implementation(project(":preferences")) - implementation(project(":crashreporter")) + implementation(project(":core:base")) + implementation(project(":core:database")) + implementation(project(":core:ktx")) + implementation(project(":core:preferences")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/icons/consumer-rules.pro b/data/search-actions/consumer-rules.pro similarity index 100% rename from icons/consumer-rules.pro rename to data/search-actions/consumer-rules.pro diff --git a/backup/proguard-rules.pro b/data/search-actions/proguard-rules.pro similarity index 100% rename from backup/proguard-rules.pro rename to data/search-actions/proguard-rules.pro diff --git a/customattrs/src/main/AndroidManifest.xml b/data/search-actions/src/main/AndroidManifest.xml similarity index 100% rename from customattrs/src/main/AndroidManifest.xml rename to data/search-actions/src/main/AndroidManifest.xml diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/KnownWebsearchEngines.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/KnownWebsearchEngines.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/KnownWebsearchEngines.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/KnownWebsearchEngines.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/Module.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/Module.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/Module.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/Module.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionRepository.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionRepository.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionRepository.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionRepository.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionService.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionService.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionService.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/SearchActionService.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/TextClassifier.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/TextClassifier.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/TextClassifier.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/TextClassifier.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/AppSearchAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/AppSearchAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/AppSearchAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/AppSearchAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CallAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CallAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CallAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CallAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CreateContactAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CreateContactAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CreateContactAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CreateContactAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CustomIntentAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CustomIntentAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CustomIntentAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/CustomIntentAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/EmailAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/EmailAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/EmailAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/EmailAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/MessageAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/MessageAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/MessageAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/MessageAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/OpenUrlAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/OpenUrlAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/OpenUrlAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/OpenUrlAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/ScheduleEventAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/ScheduleEventAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/ScheduleEventAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/ScheduleEventAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt similarity index 92% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt index fc1748c0..0a633e2d 100644 --- a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt +++ b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SearchAction.kt @@ -2,7 +2,6 @@ package de.mm20.launcher2.searchactions.actions import android.content.Context import de.mm20.launcher2.search.Searchable -import de.mm20.launcher2.searchactions.builders.WebsearchActionBuilder interface SearchAction : Searchable { val label: String diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SetAlarmAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SetAlarmAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SetAlarmAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/SetAlarmAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/TimerAction.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/TimerAction.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/TimerAction.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/actions/TimerAction.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/AppSearchActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/AppSearchActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/AppSearchActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/AppSearchActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CallActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CallActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CallActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CallActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CreateContactActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CreateContactActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CreateContactActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CreateContactActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomIntentActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomIntentActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomIntentActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomIntentActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomizableSearchActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomizableSearchActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomizableSearchActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/CustomizableSearchActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/EmailActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/EmailActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/EmailActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/EmailActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/MessageActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/MessageActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/MessageActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/MessageActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/OpenUrlActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/OpenUrlActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/OpenUrlActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/OpenUrlActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/ScheduleEventActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/ScheduleEventActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/ScheduleEventActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/ScheduleEventActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SearchActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SearchActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SearchActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SearchActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SetAlarmActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SetAlarmActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SetAlarmActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/SetAlarmActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/TimerActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/TimerActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/TimerActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/TimerActionBuilder.kt diff --git a/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/WebsearchActionBuilder.kt b/data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/WebsearchActionBuilder.kt similarity index 100% rename from search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/WebsearchActionBuilder.kt rename to data/search-actions/src/main/java/de/mm20/launcher2/searchactions/builders/WebsearchActionBuilder.kt diff --git a/music/.gitignore b/data/unitconverter/.gitignore similarity index 100% rename from music/.gitignore rename to data/unitconverter/.gitignore diff --git a/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts similarity index 85% rename from unitconverter/build.gradle.kts rename to data/unitconverter/build.gradle.kts index 288e5c5a..1a980722 100644 --- a/unitconverter/build.gradle.kts +++ b/data/unitconverter/build.gradle.kts @@ -43,9 +43,9 @@ dependencies { implementation(libs.koin.android) - implementation(project(":preferences")) - implementation(project(":currencies")) - implementation(project(":base")) - implementation(project(":i18n")) + implementation(project(":core:preferences")) + implementation(project(":data:currencies")) + implementation(project(":core:base")) + implementation(project(":core:i18n")) } \ No newline at end of file diff --git a/ktx/consumer-rules.pro b/data/unitconverter/consumer-rules.pro similarity index 100% rename from ktx/consumer-rules.pro rename to data/unitconverter/consumer-rules.pro diff --git a/preferences/proguard-rules.pro b/data/unitconverter/proguard-rules.pro similarity index 100% rename from preferences/proguard-rules.pro rename to data/unitconverter/proguard-rules.pro diff --git a/ktx/src/main/AndroidManifest.xml b/data/unitconverter/src/main/AndroidManifest.xml similarity index 100% rename from ktx/src/main/AndroidManifest.xml rename to data/unitconverter/src/main/AndroidManifest.xml diff --git a/unitconverter/src/main/java/de/mm20/launcher2/search/data/CurrencyUnitConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/search/data/CurrencyUnitConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/search/data/CurrencyUnitConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/search/data/CurrencyUnitConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/search/data/UnitConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/search/data/UnitConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/search/data/UnitConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/search/data/UnitConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/ConverterUtils.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/ConverterUtils.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/ConverterUtils.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/ConverterUtils.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Dimension.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Dimension.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Dimension.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Dimension.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/MeasureUnitWithFactor.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/MeasureUnitWithFactor.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/MeasureUnitWithFactor.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/MeasureUnitWithFactor.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Module.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Module.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Module.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/Module.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitConverterRepository.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitConverterRepository.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitConverterRepository.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitConverterRepository.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitValue.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitValue.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitValue.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/UnitValue.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/AreaConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/AreaConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/AreaConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/AreaConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/Converter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/Converter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/Converter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/Converter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/CurrencyConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/DataConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/DataConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/DataConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/DataConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/LengthConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/LengthConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/LengthConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/LengthConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/MassConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/MassConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/MassConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/MassConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/SimpleFactorConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/SimpleFactorConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/SimpleFactorConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/SimpleFactorConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TemperatureConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TemperatureConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TemperatureConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TemperatureConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TimeConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TimeConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TimeConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/TimeConverter.kt diff --git a/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/VelocityConverter.kt b/data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/VelocityConverter.kt similarity index 100% rename from unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/VelocityConverter.kt rename to data/unitconverter/src/main/java/de/mm20/launcher2/unitconverter/converters/VelocityConverter.kt diff --git a/weather/.gitignore b/data/weather/.gitignore similarity index 100% rename from weather/.gitignore rename to data/weather/.gitignore diff --git a/weather/build.gradle.kts b/data/weather/build.gradle.kts similarity index 80% rename from weather/build.gradle.kts rename to data/weather/build.gradle.kts index c287843e..24255274 100644 --- a/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -44,11 +44,11 @@ dependencies { implementation(libs.suncalc) implementation(libs.koin.android) - implementation(project(":database")) - implementation(project(":ktx")) - implementation(project(":crashreporter")) - implementation(project(":preferences")) - implementation(project(":permissions")) - implementation(project(":i18n")) + implementation(project(":core:database")) + implementation(project(":core:ktx")) + implementation(project(":core:crashreporter")) + implementation(project(":core:preferences")) + implementation(project(":core:permissions")) + implementation(project(":core:i18n")) } \ No newline at end of file diff --git a/weather/consumer-rules.pro b/data/weather/consumer-rules.pro similarity index 100% rename from weather/consumer-rules.pro rename to data/weather/consumer-rules.pro diff --git a/weather/proguard-rules.pro b/data/weather/proguard-rules.pro similarity index 100% rename from weather/proguard-rules.pro rename to data/weather/proguard-rules.pro diff --git a/weather/src/main/AndroidManifest.xml b/data/weather/src/main/AndroidManifest.xml similarity index 100% rename from weather/src/main/AndroidManifest.xml rename to data/weather/src/main/AndroidManifest.xml diff --git a/weather/src/main/java/de/mm20/launcher2/weather/DailyForecast.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/DailyForecast.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/DailyForecast.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/DailyForecast.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/Forecast.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/Forecast.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/Forecast.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/Forecast.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/LatLonWeatherProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/LatLonWeatherProvider.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/LatLonWeatherProvider.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/LatLonWeatherProvider.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/Module.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/Module.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/Module.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/Module.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/Weather.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/Weather.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/Weather.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/Weather.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/WeatherLocation.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/WeatherLocation.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/WeatherLocation.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/WeatherLocation.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/WeatherProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/WeatherProvider.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/WeatherProvider.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/WeatherProvider.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/WeatherRepository.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightSkyApi.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightSkyApi.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightSkyApi.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightSkyApi.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/brightsky/BrightskyProvider.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/here/HereGeocodeApi.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/here/HereGeocodeApi.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/here/HereGeocodeApi.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/here/HereGeocodeApi.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/here/HereProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/here/HereProvider.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/here/HereProvider.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/here/HereProvider.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/here/HereWeatherApi.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/here/HereWeatherApi.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/here/HereWeatherApi.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/here/HereWeatherApi.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/metno/MetNoProvider.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapApi.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapApi.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapApi.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapApi.kt diff --git a/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt b/data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt similarity index 100% rename from weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt rename to data/weather/src/main/java/de/mm20/launcher2/weather/openweathermap/OpenWeatherMapProvider.kt diff --git a/weather/src/main/res/values/config_example.xml b/data/weather/src/main/res/values/config_example.xml similarity index 100% rename from weather/src/main/res/values/config_example.xml rename to data/weather/src/main/res/values/config_example.xml diff --git a/nextcloud/.gitignore b/data/websites/.gitignore similarity index 100% rename from nextcloud/.gitignore rename to data/websites/.gitignore diff --git a/websites/build.gradle.kts b/data/websites/build.gradle.kts similarity index 93% rename from websites/build.gradle.kts rename to data/websites/build.gradle.kts index c7e2f17b..72bdc2cd 100644 --- a/websites/build.gradle.kts +++ b/data/websites/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { implementation(libs.coil.core) - implementation(project(":base")) - implementation(project(":ktx")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) } \ No newline at end of file diff --git a/material-color-utilities/consumer-rules.pro b/data/websites/consumer-rules.pro similarity index 100% rename from material-color-utilities/consumer-rules.pro rename to data/websites/consumer-rules.pro diff --git a/websites/proguard-rules.pro b/data/websites/proguard-rules.pro similarity index 100% rename from websites/proguard-rules.pro rename to data/websites/proguard-rules.pro diff --git a/music/src/main/AndroidManifest.xml b/data/websites/src/main/AndroidManifest.xml similarity index 100% rename from music/src/main/AndroidManifest.xml rename to data/websites/src/main/AndroidManifest.xml diff --git a/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt b/data/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt similarity index 100% rename from websites/src/main/java/de/mm20/launcher2/search/data/Website.kt rename to data/websites/src/main/java/de/mm20/launcher2/search/data/Website.kt diff --git a/websites/src/main/java/de/mm20/launcher2/websites/Module.kt b/data/websites/src/main/java/de/mm20/launcher2/websites/Module.kt similarity index 100% rename from websites/src/main/java/de/mm20/launcher2/websites/Module.kt rename to data/websites/src/main/java/de/mm20/launcher2/websites/Module.kt diff --git a/websites/src/main/java/de/mm20/launcher2/websites/WebsiteRepository.kt b/data/websites/src/main/java/de/mm20/launcher2/websites/WebsiteRepository.kt similarity index 100% rename from websites/src/main/java/de/mm20/launcher2/websites/WebsiteRepository.kt rename to data/websites/src/main/java/de/mm20/launcher2/websites/WebsiteRepository.kt diff --git a/websites/src/main/java/de/mm20/launcher2/websites/WebsiteSerialization.kt b/data/websites/src/main/java/de/mm20/launcher2/websites/WebsiteSerialization.kt similarity index 100% rename from websites/src/main/java/de/mm20/launcher2/websites/WebsiteSerialization.kt rename to data/websites/src/main/java/de/mm20/launcher2/websites/WebsiteSerialization.kt diff --git a/websites/src/main/res/drawable/ic_website.xml b/data/websites/src/main/res/drawable/ic_website.xml similarity index 100% rename from websites/src/main/res/drawable/ic_website.xml rename to data/websites/src/main/res/drawable/ic_website.xml diff --git a/notifications/.gitignore b/data/widgets/.gitignore similarity index 100% rename from notifications/.gitignore rename to data/widgets/.gitignore diff --git a/widgets/build.gradle.kts b/data/widgets/build.gradle.kts similarity index 75% rename from widgets/build.gradle.kts rename to data/widgets/build.gradle.kts index 7138142b..0bc8ac1e 100644 --- a/widgets/build.gradle.kts +++ b/data/widgets/build.gradle.kts @@ -44,13 +44,13 @@ dependencies { implementation(libs.koin.android) - implementation(project(":weather")) - implementation(project(":calendar")) - implementation(project(":music")) - implementation(project(":ktx")) - implementation(project(":base")) - implementation(project(":preferences")) - implementation(project(":database")) - implementation(project(":crashreporter")) + implementation(project(":data:weather")) + implementation(project(":data:calendar")) + implementation(project(":services:music")) + implementation(project(":core:ktx")) + implementation(project(":core:base")) + implementation(project(":core:preferences")) + implementation(project(":core:database")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/ms-services/consumer-rules.pro b/data/widgets/consumer-rules.pro similarity index 100% rename from ms-services/consumer-rules.pro rename to data/widgets/consumer-rules.pro diff --git a/widgets/proguard-rules.pro b/data/widgets/proguard-rules.pro similarity index 100% rename from widgets/proguard-rules.pro rename to data/widgets/proguard-rules.pro diff --git a/unitconverter/src/main/AndroidManifest.xml b/data/widgets/src/main/AndroidManifest.xml similarity index 100% rename from unitconverter/src/main/AndroidManifest.xml rename to data/widgets/src/main/AndroidManifest.xml diff --git a/widgets/src/main/java/de/mm20/launcher2/widgets/Module.kt b/data/widgets/src/main/java/de/mm20/launcher2/widgets/Module.kt similarity index 100% rename from widgets/src/main/java/de/mm20/launcher2/widgets/Module.kt rename to data/widgets/src/main/java/de/mm20/launcher2/widgets/Module.kt diff --git a/widgets/src/main/java/de/mm20/launcher2/widgets/Widget.kt b/data/widgets/src/main/java/de/mm20/launcher2/widgets/Widget.kt similarity index 100% rename from widgets/src/main/java/de/mm20/launcher2/widgets/Widget.kt rename to data/widgets/src/main/java/de/mm20/launcher2/widgets/Widget.kt diff --git a/widgets/src/main/java/de/mm20/launcher2/widgets/WidgetRepository.kt b/data/widgets/src/main/java/de/mm20/launcher2/widgets/WidgetRepository.kt similarity index 100% rename from widgets/src/main/java/de/mm20/launcher2/widgets/WidgetRepository.kt rename to data/widgets/src/main/java/de/mm20/launcher2/widgets/WidgetRepository.kt diff --git a/owncloud/.gitignore b/data/wikipedia/.gitignore similarity index 100% rename from owncloud/.gitignore rename to data/wikipedia/.gitignore diff --git a/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts similarity index 86% rename from wikipedia/build.gradle.kts rename to data/wikipedia/build.gradle.kts index 9c818d7f..243b16eb 100644 --- a/wikipedia/build.gradle.kts +++ b/data/wikipedia/build.gradle.kts @@ -47,9 +47,9 @@ dependencies { implementation(libs.koin.android) - implementation(project(":preferences")) - implementation(project(":base")) - implementation(project(":ktx")) - implementation(project(":crashreporter")) + implementation(project(":core:preferences")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/wikipedia/consumer-rules.pro b/data/wikipedia/consumer-rules.pro similarity index 100% rename from wikipedia/consumer-rules.pro rename to data/wikipedia/consumer-rules.pro diff --git a/unitconverter/proguard-rules.pro b/data/wikipedia/proguard-rules.pro similarity index 100% rename from unitconverter/proguard-rules.pro rename to data/wikipedia/proguard-rules.pro diff --git a/webdav/src/main/AndroidManifest.xml b/data/wikipedia/src/main/AndroidManifest.xml similarity index 100% rename from webdav/src/main/AndroidManifest.xml rename to data/wikipedia/src/main/AndroidManifest.xml diff --git a/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt b/data/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt similarity index 100% rename from wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt rename to data/wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt diff --git a/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/Module.kt b/data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/Module.kt similarity index 100% rename from wikipedia/src/main/java/de/mm20/launcher2/wikipedia/Module.kt rename to data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/Module.kt diff --git a/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaApi.kt b/data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaApi.kt similarity index 100% rename from wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaApi.kt rename to data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaApi.kt diff --git a/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt b/data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt similarity index 100% rename from wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt rename to data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaRepository.kt diff --git a/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaSerialization.kt b/data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaSerialization.kt similarity index 100% rename from wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaSerialization.kt rename to data/wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaSerialization.kt diff --git a/wikipedia/src/main/res/drawable-hdpi/ic_wikipedia.webp b/data/wikipedia/src/main/res/drawable-hdpi/ic_wikipedia.webp similarity index 100% rename from wikipedia/src/main/res/drawable-hdpi/ic_wikipedia.webp rename to data/wikipedia/src/main/res/drawable-hdpi/ic_wikipedia.webp diff --git a/wikipedia/src/main/res/drawable-mdpi/ic_wikipedia.webp b/data/wikipedia/src/main/res/drawable-mdpi/ic_wikipedia.webp similarity index 100% rename from wikipedia/src/main/res/drawable-mdpi/ic_wikipedia.webp rename to data/wikipedia/src/main/res/drawable-mdpi/ic_wikipedia.webp diff --git a/wikipedia/src/main/res/drawable-xhdpi/ic_wikipedia.webp b/data/wikipedia/src/main/res/drawable-xhdpi/ic_wikipedia.webp similarity index 100% rename from wikipedia/src/main/res/drawable-xhdpi/ic_wikipedia.webp rename to data/wikipedia/src/main/res/drawable-xhdpi/ic_wikipedia.webp diff --git a/wikipedia/src/main/res/drawable-xxhdpi/ic_wikipedia.webp b/data/wikipedia/src/main/res/drawable-xxhdpi/ic_wikipedia.webp similarity index 100% rename from wikipedia/src/main/res/drawable-xxhdpi/ic_wikipedia.webp rename to data/wikipedia/src/main/res/drawable-xxhdpi/ic_wikipedia.webp diff --git a/wikipedia/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp b/data/wikipedia/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp similarity index 100% rename from wikipedia/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp rename to data/wikipedia/src/main/res/drawable-xxxhdpi/ic_wikipedia.webp diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 043d593c..909683f6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 16 10:19:49 CEST 2021 +#Mon Dec 12 19:53:45 CET 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/g-services/.gitignore b/libs/g-services/.gitignore similarity index 100% rename from g-services/.gitignore rename to libs/g-services/.gitignore diff --git a/g-services/build.gradle.kts b/libs/g-services/build.gradle.kts similarity index 93% rename from g-services/build.gradle.kts rename to libs/g-services/build.gradle.kts index d5f8d2ef..212b3f7d 100644 --- a/g-services/build.gradle.kts +++ b/libs/g-services/build.gradle.kts @@ -47,6 +47,6 @@ dependencies { implementation(libs.google.drive) implementation(libs.google.oauth2) - implementation(project(":i18n")) - implementation(project(":crashreporter")) + implementation(project(":core:i18n")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/music/consumer-rules.pro b/libs/g-services/consumer-rules.pro similarity index 100% rename from music/consumer-rules.pro rename to libs/g-services/consumer-rules.pro diff --git a/g-services/proguard-rules.pro b/libs/g-services/proguard-rules.pro similarity index 100% rename from g-services/proguard-rules.pro rename to libs/g-services/proguard-rules.pro diff --git a/g-services/src/debug/res/raw/g_services_example.json b/libs/g-services/src/debug/res/raw/g_services_example.json similarity index 100% rename from g-services/src/debug/res/raw/g_services_example.json rename to libs/g-services/src/debug/res/raw/g_services_example.json diff --git a/g-services/src/main/AndroidManifest.xml b/libs/g-services/src/main/AndroidManifest.xml similarity index 100% rename from g-services/src/main/AndroidManifest.xml rename to libs/g-services/src/main/AndroidManifest.xml diff --git a/g-services/src/main/java/de/mm20/launcher2/gservices/DriveFile.kt b/libs/g-services/src/main/java/de/mm20/launcher2/gservices/DriveFile.kt similarity index 100% rename from g-services/src/main/java/de/mm20/launcher2/gservices/DriveFile.kt rename to libs/g-services/src/main/java/de/mm20/launcher2/gservices/DriveFile.kt diff --git a/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAccount.kt b/libs/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAccount.kt similarity index 100% rename from g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAccount.kt rename to libs/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAccount.kt diff --git a/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleApiHelper.kt b/libs/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleApiHelper.kt similarity index 100% rename from g-services/src/main/java/de/mm20/launcher2/gservices/GoogleApiHelper.kt rename to libs/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleApiHelper.kt diff --git a/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAuthRedirectActivity.kt b/libs/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAuthRedirectActivity.kt similarity index 100% rename from g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAuthRedirectActivity.kt rename to libs/g-services/src/main/java/de/mm20/launcher2/gservices/GoogleAuthRedirectActivity.kt diff --git a/g-services/src/main/res/drawable/ic_google_g.xml b/libs/g-services/src/main/res/drawable/ic_google_g.xml similarity index 100% rename from g-services/src/main/res/drawable/ic_google_g.xml rename to libs/g-services/src/main/res/drawable/ic_google_g.xml diff --git a/g-services/src/main/res/values/styles.xml b/libs/g-services/src/main/res/values/styles.xml similarity index 100% rename from g-services/src/main/res/values/styles.xml rename to libs/g-services/src/main/res/values/styles.xml diff --git a/g-services/src/release/res/raw/g_services_example.json b/libs/g-services/src/release/res/raw/g_services_example.json similarity index 100% rename from g-services/src/release/res/raw/g_services_example.json rename to libs/g-services/src/release/res/raw/g_services_example.json diff --git a/permissions/.gitignore b/libs/material-color-utilities/.gitignore similarity index 100% rename from permissions/.gitignore rename to libs/material-color-utilities/.gitignore diff --git a/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts similarity index 93% rename from material-color-utilities/build.gradle.kts rename to libs/material-color-utilities/build.gradle.kts index 8dee7013..19a3d303 100644 --- a/material-color-utilities/build.gradle.kts +++ b/libs/material-color-utilities/build.gradle.kts @@ -31,7 +31,7 @@ android { kotlinOptions { jvmTarget = "1.8" } - namespace = "de.mm20.launcher2.materialcolorutilities" + namespace = "de.mm20.launcher2.lib.materialcolorutilities" } dependencies { diff --git a/nextcloud/consumer-rules.pro b/libs/material-color-utilities/consumer-rules.pro similarity index 100% rename from nextcloud/consumer-rules.pro rename to libs/material-color-utilities/consumer-rules.pro diff --git a/customattrs/proguard-rules.pro b/libs/material-color-utilities/proguard-rules.pro similarity index 100% rename from customattrs/proguard-rules.pro rename to libs/material-color-utilities/proguard-rules.pro diff --git a/material-color-utilities/src/main/AndroidManifest.xml b/libs/material-color-utilities/src/main/AndroidManifest.xml similarity index 100% rename from material-color-utilities/src/main/AndroidManifest.xml rename to libs/material-color-utilities/src/main/AndroidManifest.xml diff --git a/material-color-utilities/src/main/java/hct/Cam16.java b/libs/material-color-utilities/src/main/java/hct/Cam16.java similarity index 100% rename from material-color-utilities/src/main/java/hct/Cam16.java rename to libs/material-color-utilities/src/main/java/hct/Cam16.java diff --git a/material-color-utilities/src/main/java/hct/Hct.java b/libs/material-color-utilities/src/main/java/hct/Hct.java similarity index 100% rename from material-color-utilities/src/main/java/hct/Hct.java rename to libs/material-color-utilities/src/main/java/hct/Hct.java diff --git a/material-color-utilities/src/main/java/hct/HctSolver.java b/libs/material-color-utilities/src/main/java/hct/HctSolver.java similarity index 100% rename from material-color-utilities/src/main/java/hct/HctSolver.java rename to libs/material-color-utilities/src/main/java/hct/HctSolver.java diff --git a/material-color-utilities/src/main/java/hct/ViewingConditions.java b/libs/material-color-utilities/src/main/java/hct/ViewingConditions.java similarity index 100% rename from material-color-utilities/src/main/java/hct/ViewingConditions.java rename to libs/material-color-utilities/src/main/java/hct/ViewingConditions.java diff --git a/material-color-utilities/src/main/java/palettes/CorePalette.java b/libs/material-color-utilities/src/main/java/palettes/CorePalette.java similarity index 100% rename from material-color-utilities/src/main/java/palettes/CorePalette.java rename to libs/material-color-utilities/src/main/java/palettes/CorePalette.java diff --git a/material-color-utilities/src/main/java/palettes/TonalPalette.java b/libs/material-color-utilities/src/main/java/palettes/TonalPalette.java similarity index 100% rename from material-color-utilities/src/main/java/palettes/TonalPalette.java rename to libs/material-color-utilities/src/main/java/palettes/TonalPalette.java diff --git a/material-color-utilities/src/main/java/scheme/Scheme.java b/libs/material-color-utilities/src/main/java/scheme/Scheme.java similarity index 100% rename from material-color-utilities/src/main/java/scheme/Scheme.java rename to libs/material-color-utilities/src/main/java/scheme/Scheme.java diff --git a/material-color-utilities/src/main/java/utils/ColorUtils.java b/libs/material-color-utilities/src/main/java/utils/ColorUtils.java similarity index 100% rename from material-color-utilities/src/main/java/utils/ColorUtils.java rename to libs/material-color-utilities/src/main/java/utils/ColorUtils.java diff --git a/material-color-utilities/src/main/java/utils/MathUtils.java b/libs/material-color-utilities/src/main/java/utils/MathUtils.java similarity index 100% rename from material-color-utilities/src/main/java/utils/MathUtils.java rename to libs/material-color-utilities/src/main/java/utils/MathUtils.java diff --git a/ms-services/.gitignore b/libs/ms-services/.gitignore similarity index 100% rename from ms-services/.gitignore rename to libs/ms-services/.gitignore diff --git a/ms-services/build.gradle.kts b/libs/ms-services/build.gradle.kts similarity index 92% rename from ms-services/build.gradle.kts rename to libs/ms-services/build.gradle.kts index c6326ad2..814acd1a 100644 --- a/ms-services/build.gradle.kts +++ b/libs/ms-services/build.gradle.kts @@ -44,6 +44,5 @@ dependencies { implementation(libs.microsoft.graph) implementation(libs.guava) - implementation(project(":crashreporter")) - implementation(project(":preferences")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/notifications/consumer-rules.pro b/libs/ms-services/consumer-rules.pro similarity index 100% rename from notifications/consumer-rules.pro rename to libs/ms-services/consumer-rules.pro diff --git a/ms-services/proguard-rules.pro b/libs/ms-services/proguard-rules.pro similarity index 100% rename from ms-services/proguard-rules.pro rename to libs/ms-services/proguard-rules.pro diff --git a/ms-services/src/debug/res/raw/msal_auth_config_example.json b/libs/ms-services/src/debug/res/raw/msal_auth_config_example.json similarity index 100% rename from ms-services/src/debug/res/raw/msal_auth_config_example.json rename to libs/ms-services/src/debug/res/raw/msal_auth_config_example.json diff --git a/ms-services/src/main/AndroidManifest.xml b/libs/ms-services/src/main/AndroidManifest.xml similarity index 100% rename from ms-services/src/main/AndroidManifest.xml rename to libs/ms-services/src/main/AndroidManifest.xml diff --git a/ms-services/src/main/java/de/mm20/launcher2/msservices/DriveItem.kt b/libs/ms-services/src/main/java/de/mm20/launcher2/msservices/DriveItem.kt similarity index 100% rename from ms-services/src/main/java/de/mm20/launcher2/msservices/DriveItem.kt rename to libs/ms-services/src/main/java/de/mm20/launcher2/msservices/DriveItem.kt diff --git a/ms-services/src/main/java/de/mm20/launcher2/msservices/MicrosoftGraphApiHelper.kt b/libs/ms-services/src/main/java/de/mm20/launcher2/msservices/MicrosoftGraphApiHelper.kt similarity index 100% rename from ms-services/src/main/java/de/mm20/launcher2/msservices/MicrosoftGraphApiHelper.kt rename to libs/ms-services/src/main/java/de/mm20/launcher2/msservices/MicrosoftGraphApiHelper.kt diff --git a/ms-services/src/main/java/de/mm20/launcher2/msservices/MsUser.kt b/libs/ms-services/src/main/java/de/mm20/launcher2/msservices/MsUser.kt similarity index 100% rename from ms-services/src/main/java/de/mm20/launcher2/msservices/MsUser.kt rename to libs/ms-services/src/main/java/de/mm20/launcher2/msservices/MsUser.kt diff --git a/ms-services/src/release/res/raw/msal_auth_config_example.json b/libs/ms-services/src/release/res/raw/msal_auth_config_example.json similarity index 100% rename from ms-services/src/release/res/raw/msal_auth_config_example.json rename to libs/ms-services/src/release/res/raw/msal_auth_config_example.json diff --git a/preferences/.gitignore b/libs/nextcloud/.gitignore similarity index 100% rename from preferences/.gitignore rename to libs/nextcloud/.gitignore diff --git a/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts similarity index 92% rename from nextcloud/build.gradle.kts rename to libs/nextcloud/build.gradle.kts index c6ab8092..36c588ac 100644 --- a/nextcloud/build.gradle.kts +++ b/libs/nextcloud/build.gradle.kts @@ -51,8 +51,7 @@ dependencies { implementation(libs.okhttp) - api(project(":webdav")) - implementation(project(":base")) - implementation(project(":i18n")) + api(project(":libs:webdav")) + implementation(project(":core:i18n")) } \ No newline at end of file diff --git a/owncloud/consumer-rules.pro b/libs/nextcloud/consumer-rules.pro similarity index 100% rename from owncloud/consumer-rules.pro rename to libs/nextcloud/consumer-rules.pro diff --git a/wikipedia/proguard-rules.pro b/libs/nextcloud/proguard-rules.pro similarity index 100% rename from wikipedia/proguard-rules.pro rename to libs/nextcloud/proguard-rules.pro diff --git a/nextcloud/src/main/AndroidManifest.xml b/libs/nextcloud/src/main/AndroidManifest.xml similarity index 100% rename from nextcloud/src/main/AndroidManifest.xml rename to libs/nextcloud/src/main/AndroidManifest.xml diff --git a/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt b/libs/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt similarity index 100% rename from nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt rename to libs/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/LoginActivity.kt diff --git a/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NcUser.kt b/libs/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NcUser.kt similarity index 100% rename from nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NcUser.kt rename to libs/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NcUser.kt diff --git a/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NextcloudApiHelper.kt b/libs/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NextcloudApiHelper.kt similarity index 100% rename from nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NextcloudApiHelper.kt rename to libs/nextcloud/src/main/java/de/mm20/launcher2/nextcloud/NextcloudApiHelper.kt diff --git a/nextcloud/src/main/res/drawable/ic_nextcloud_logo.xml b/libs/nextcloud/src/main/res/drawable/ic_nextcloud_logo.xml similarity index 100% rename from nextcloud/src/main/res/drawable/ic_nextcloud_logo.xml rename to libs/nextcloud/src/main/res/drawable/ic_nextcloud_logo.xml diff --git a/nextcloud/src/main/res/layout/activity_nextcloud_login.xml b/libs/nextcloud/src/main/res/layout/activity_nextcloud_login.xml similarity index 100% rename from nextcloud/src/main/res/layout/activity_nextcloud_login.xml rename to libs/nextcloud/src/main/res/layout/activity_nextcloud_login.xml diff --git a/nextcloud/src/main/res/values-night/styles.xml b/libs/nextcloud/src/main/res/values-night/styles.xml similarity index 100% rename from nextcloud/src/main/res/values-night/styles.xml rename to libs/nextcloud/src/main/res/values-night/styles.xml diff --git a/nextcloud/src/main/res/values/styles.xml b/libs/nextcloud/src/main/res/values/styles.xml similarity index 100% rename from nextcloud/src/main/res/values/styles.xml rename to libs/nextcloud/src/main/res/values/styles.xml diff --git a/search-actions/.gitignore b/libs/owncloud/.gitignore similarity index 100% rename from search-actions/.gitignore rename to libs/owncloud/.gitignore diff --git a/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts similarity index 87% rename from owncloud/build.gradle.kts rename to libs/owncloud/build.gradle.kts index 67043216..d298fa18 100644 --- a/owncloud/build.gradle.kts +++ b/libs/owncloud/build.gradle.kts @@ -51,10 +51,9 @@ dependencies { implementation(libs.okhttp) - api(project(":webdav")) - implementation(project(":base")) - implementation(project(":crashreporter")) - implementation(project(":ktx")) - implementation(project(":i18n")) + api(project(":libs:webdav")) + implementation(project(":core:crashreporter")) + implementation(project(":core:ktx")) + implementation(project(":core:i18n")) } \ No newline at end of file diff --git a/permissions/consumer-rules.pro b/libs/owncloud/consumer-rules.pro similarity index 100% rename from permissions/consumer-rules.pro rename to libs/owncloud/consumer-rules.pro diff --git a/owncloud/proguard-rules.pro b/libs/owncloud/proguard-rules.pro similarity index 100% rename from owncloud/proguard-rules.pro rename to libs/owncloud/proguard-rules.pro diff --git a/owncloud/src/main/AndroidManifest.xml b/libs/owncloud/src/main/AndroidManifest.xml similarity index 100% rename from owncloud/src/main/AndroidManifest.xml rename to libs/owncloud/src/main/AndroidManifest.xml diff --git a/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt b/libs/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt similarity index 100% rename from owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt rename to libs/owncloud/src/main/java/de/mm20/launcher2/owncloud/LoginActivity.kt diff --git a/owncloud/src/main/java/de/mm20/launcher2/owncloud/OcUser.kt b/libs/owncloud/src/main/java/de/mm20/launcher2/owncloud/OcUser.kt similarity index 100% rename from owncloud/src/main/java/de/mm20/launcher2/owncloud/OcUser.kt rename to libs/owncloud/src/main/java/de/mm20/launcher2/owncloud/OcUser.kt diff --git a/owncloud/src/main/java/de/mm20/launcher2/owncloud/OwncloudClient.kt b/libs/owncloud/src/main/java/de/mm20/launcher2/owncloud/OwncloudClient.kt similarity index 100% rename from owncloud/src/main/java/de/mm20/launcher2/owncloud/OwncloudClient.kt rename to libs/owncloud/src/main/java/de/mm20/launcher2/owncloud/OwncloudClient.kt diff --git a/owncloud/src/main/res/drawable-night/ic_owncloud_logo.xml b/libs/owncloud/src/main/res/drawable-night/ic_owncloud_logo.xml similarity index 100% rename from owncloud/src/main/res/drawable-night/ic_owncloud_logo.xml rename to libs/owncloud/src/main/res/drawable-night/ic_owncloud_logo.xml diff --git a/owncloud/src/main/res/drawable/ic_owncloud_logo.xml b/libs/owncloud/src/main/res/drawable/ic_owncloud_logo.xml similarity index 100% rename from owncloud/src/main/res/drawable/ic_owncloud_logo.xml rename to libs/owncloud/src/main/res/drawable/ic_owncloud_logo.xml diff --git a/owncloud/src/main/res/layout/activity_owncloud_login.xml b/libs/owncloud/src/main/res/layout/activity_owncloud_login.xml similarity index 100% rename from owncloud/src/main/res/layout/activity_owncloud_login.xml rename to libs/owncloud/src/main/res/layout/activity_owncloud_login.xml diff --git a/owncloud/src/main/res/layout/activity_owncloud_login_username_password.xml b/libs/owncloud/src/main/res/layout/activity_owncloud_login_username_password.xml similarity index 100% rename from owncloud/src/main/res/layout/activity_owncloud_login_username_password.xml rename to libs/owncloud/src/main/res/layout/activity_owncloud_login_username_password.xml diff --git a/owncloud/src/main/res/layout/owncloud_login_drop_down_item.xml b/libs/owncloud/src/main/res/layout/owncloud_login_drop_down_item.xml similarity index 100% rename from owncloud/src/main/res/layout/owncloud_login_drop_down_item.xml rename to libs/owncloud/src/main/res/layout/owncloud_login_drop_down_item.xml diff --git a/owncloud/src/main/res/values-night/styles.xml b/libs/owncloud/src/main/res/values-night/styles.xml similarity index 100% rename from owncloud/src/main/res/values-night/styles.xml rename to libs/owncloud/src/main/res/values-night/styles.xml diff --git a/owncloud/src/main/res/values/styles.xml b/libs/owncloud/src/main/res/values/styles.xml similarity index 100% rename from owncloud/src/main/res/values/styles.xml rename to libs/owncloud/src/main/res/values/styles.xml diff --git a/search/.gitignore b/libs/webdav/.gitignore similarity index 100% rename from search/.gitignore rename to libs/webdav/.gitignore diff --git a/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts similarity index 91% rename from webdav/build.gradle.kts rename to libs/webdav/build.gradle.kts index 569b2cf3..ce8f93d8 100644 --- a/webdav/build.gradle.kts +++ b/libs/webdav/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { implementation(libs.okhttp) - implementation(project(":crashreporter")) - implementation(project(":ktx")) + implementation(project(":core:crashreporter")) + implementation(project(":core:ktx")) } \ No newline at end of file diff --git a/search-actions/consumer-rules.pro b/libs/webdav/consumer-rules.pro similarity index 100% rename from search-actions/consumer-rules.pro rename to libs/webdav/consumer-rules.pro diff --git a/database/proguard-rules.pro b/libs/webdav/proguard-rules.pro similarity index 100% rename from database/proguard-rules.pro rename to libs/webdav/proguard-rules.pro diff --git a/websites/src/main/AndroidManifest.xml b/libs/webdav/src/main/AndroidManifest.xml similarity index 100% rename from websites/src/main/AndroidManifest.xml rename to libs/webdav/src/main/AndroidManifest.xml diff --git a/webdav/src/main/java/de/mm20/launcher2/webdav/WebDavApi.kt b/libs/webdav/src/main/java/de/mm20/launcher2/webdav/WebDavApi.kt similarity index 100% rename from webdav/src/main/java/de/mm20/launcher2/webdav/WebDavApi.kt rename to libs/webdav/src/main/java/de/mm20/launcher2/webdav/WebDavApi.kt diff --git a/webdav/src/main/java/de/mm20/launcher2/webdav/WebDavFile.kt b/libs/webdav/src/main/java/de/mm20/launcher2/webdav/WebDavFile.kt similarity index 100% rename from webdav/src/main/java/de/mm20/launcher2/webdav/WebDavFile.kt rename to libs/webdav/src/main/java/de/mm20/launcher2/webdav/WebDavFile.kt diff --git a/ui/.gitignore b/services/accounts/.gitignore similarity index 100% rename from ui/.gitignore rename to services/accounts/.gitignore diff --git a/accounts/build.gradle.kts b/services/accounts/build.gradle.kts similarity index 83% rename from accounts/build.gradle.kts rename to services/accounts/build.gradle.kts index 7af645de..a639739c 100644 --- a/accounts/build.gradle.kts +++ b/services/accounts/build.gradle.kts @@ -40,9 +40,9 @@ dependencies { implementation(libs.koin.android) - implementation(project(":g-services")) - implementation(project(":ms-services")) - implementation(project(":owncloud")) - implementation(project(":nextcloud")) + implementation(project(":libs:g-services")) + implementation(project(":libs:ms-services")) + implementation(project(":libs:owncloud")) + implementation(project(":libs:nextcloud")) } \ No newline at end of file diff --git a/search/consumer-rules.pro b/services/accounts/consumer-rules.pro similarity index 100% rename from search/consumer-rules.pro rename to services/accounts/consumer-rules.pro diff --git a/material-color-utilities/proguard-rules.pro b/services/accounts/proguard-rules.pro similarity index 100% rename from material-color-utilities/proguard-rules.pro rename to services/accounts/proguard-rules.pro diff --git a/permissions/src/main/AndroidManifest.xml b/services/accounts/src/main/AndroidManifest.xml similarity index 100% rename from permissions/src/main/AndroidManifest.xml rename to services/accounts/src/main/AndroidManifest.xml diff --git a/accounts/src/main/java/de/mm20/launcher2/accounts/Account.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/Account.kt similarity index 100% rename from accounts/src/main/java/de/mm20/launcher2/accounts/Account.kt rename to services/accounts/src/main/java/de/mm20/launcher2/accounts/Account.kt diff --git a/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt similarity index 100% rename from accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt rename to services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt diff --git a/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt similarity index 100% rename from accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt rename to services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt diff --git a/accounts/src/main/java/de/mm20/launcher2/accounts/Module.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/Module.kt similarity index 100% rename from accounts/src/main/java/de/mm20/launcher2/accounts/Module.kt rename to services/accounts/src/main/java/de/mm20/launcher2/accounts/Module.kt diff --git a/unitconverter/.gitignore b/services/backup/.gitignore similarity index 100% rename from unitconverter/.gitignore rename to services/backup/.gitignore diff --git a/backup/build.gradle.kts b/services/backup/build.gradle.kts similarity index 77% rename from backup/build.gradle.kts rename to services/backup/build.gradle.kts index 81e27b78..1dbe3a35 100644 --- a/backup/build.gradle.kts +++ b/services/backup/build.gradle.kts @@ -40,11 +40,11 @@ dependencies { implementation(libs.koin.android) - implementation(project(":favorites")) - implementation(project(":widgets")) - implementation(project(":search-actions")) - implementation(project(":preferences")) - implementation(project(":ktx")) - implementation(project(":customattrs")) + implementation(project(":data:favorites")) + implementation(project(":data:widgets")) + implementation(project(":data:search-actions")) + implementation(project(":core:preferences")) + implementation(project(":core:ktx")) + implementation(project(":data:customattrs")) } \ No newline at end of file diff --git a/ui/consumer-rules.pro b/services/backup/consumer-rules.pro similarity index 100% rename from ui/consumer-rules.pro rename to services/backup/consumer-rules.pro diff --git a/search-actions/proguard-rules.pro b/services/backup/proguard-rules.pro similarity index 100% rename from search-actions/proguard-rules.pro rename to services/backup/proguard-rules.pro diff --git a/search-actions/src/main/AndroidManifest.xml b/services/backup/src/main/AndroidManifest.xml similarity index 100% rename from search-actions/src/main/AndroidManifest.xml rename to services/backup/src/main/AndroidManifest.xml diff --git a/backup/src/main/java/de/mm20/launcher2/backup/BackupComponent.kt b/services/backup/src/main/java/de/mm20/launcher2/backup/BackupComponent.kt similarity index 100% rename from backup/src/main/java/de/mm20/launcher2/backup/BackupComponent.kt rename to services/backup/src/main/java/de/mm20/launcher2/backup/BackupComponent.kt diff --git a/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt b/services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt similarity index 99% rename from backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt rename to services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt index 26e758ad..e776eb60 100644 --- a/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt +++ b/services/backup/src/main/java/de/mm20/launcher2/backup/BackupManager.kt @@ -3,7 +3,7 @@ package de.mm20.launcher2.backup import android.content.Context import android.net.Uri import android.os.Build -import de.mm20.launcher2.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository import de.mm20.launcher2.favorites.FavoritesRepository import de.mm20.launcher2.preferences.LauncherDataStore import de.mm20.launcher2.preferences.export diff --git a/backup/src/main/java/de/mm20/launcher2/backup/BackupMetadata.kt b/services/backup/src/main/java/de/mm20/launcher2/backup/BackupMetadata.kt similarity index 100% rename from backup/src/main/java/de/mm20/launcher2/backup/BackupMetadata.kt rename to services/backup/src/main/java/de/mm20/launcher2/backup/BackupMetadata.kt diff --git a/backup/src/main/java/de/mm20/launcher2/backup/Module.kt b/services/backup/src/main/java/de/mm20/launcher2/backup/Module.kt similarity index 100% rename from backup/src/main/java/de/mm20/launcher2/backup/Module.kt rename to services/backup/src/main/java/de/mm20/launcher2/backup/Module.kt diff --git a/webdav/.gitignore b/services/badges/.gitignore similarity index 100% rename from webdav/.gitignore rename to services/badges/.gitignore diff --git a/badges/build.gradle.kts b/services/badges/build.gradle.kts similarity index 76% rename from badges/build.gradle.kts rename to services/badges/build.gradle.kts index d86b0eb4..6b8a4102 100644 --- a/badges/build.gradle.kts +++ b/services/badges/build.gradle.kts @@ -43,11 +43,11 @@ dependencies { implementation(libs.koin.android) - implementation(project(":ktx")) - implementation(project(":applications")) - implementation(project(":appshortcuts")) - implementation(project(":notifications")) - implementation(project(":preferences")) - implementation(project(":base")) - implementation(project(":files")) + implementation(project(":core:ktx")) + implementation(project(":data:applications")) + implementation(project(":data:appshortcuts")) + implementation(project(":data:notifications")) + implementation(project(":core:preferences")) + implementation(project(":core:base")) + implementation(project(":data:files")) } \ No newline at end of file diff --git a/unitconverter/consumer-rules.pro b/services/badges/consumer-rules.pro similarity index 100% rename from unitconverter/consumer-rules.pro rename to services/badges/consumer-rules.pro diff --git a/search/proguard-rules.pro b/services/badges/proguard-rules.pro similarity index 100% rename from search/proguard-rules.pro rename to services/badges/proguard-rules.pro diff --git a/widgets/src/main/AndroidManifest.xml b/services/badges/src/main/AndroidManifest.xml similarity index 100% rename from widgets/src/main/AndroidManifest.xml rename to services/badges/src/main/AndroidManifest.xml diff --git a/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/Badge.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/BadgeRepository.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/Module.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/Module.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/Module.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/providers/AppShortcutBadgeProvider.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/providers/BadgeProvider.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/providers/BadgeProvider.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/providers/BadgeProvider.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/providers/BadgeProvider.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/providers/CloudBadgeProvider.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/providers/CloudBadgeProvider.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/providers/CloudBadgeProvider.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/providers/CloudBadgeProvider.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/providers/NotificationBadgeProvider.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/providers/NotificationBadgeProvider.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/providers/NotificationBadgeProvider.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/providers/NotificationBadgeProvider.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/providers/SuspendedAppsBadgeProvider.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/providers/SuspendedAppsBadgeProvider.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/providers/SuspendedAppsBadgeProvider.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/providers/SuspendedAppsBadgeProvider.kt diff --git a/badges/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt similarity index 100% rename from badges/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt rename to services/badges/src/main/java/de/mm20/launcher2/badges/providers/WorkProfileBadgeProvider.kt diff --git a/websites/.gitignore b/services/icons/.gitignore similarity index 100% rename from websites/.gitignore rename to services/icons/.gitignore diff --git a/icons/build.gradle.kts b/services/icons/build.gradle.kts similarity index 78% rename from icons/build.gradle.kts rename to services/icons/build.gradle.kts index b62e2e02..df608e4e 100644 --- a/icons/build.gradle.kts +++ b/services/icons/build.gradle.kts @@ -46,12 +46,12 @@ dependencies { implementation(libs.koin.android) - implementation(project(":database")) - implementation(project(":preferences")) - implementation(project(":ktx")) - implementation(project(":base")) - implementation(project(":applications")) - implementation(project(":crashreporter")) - api(project(":customattrs")) + implementation(project(":core:database")) + implementation(project(":core:preferences")) + implementation(project(":core:ktx")) + implementation(project(":core:base")) + implementation(project(":data:applications")) + implementation(project(":core:crashreporter")) + api(project(":data:customattrs")) } \ No newline at end of file diff --git a/webdav/consumer-rules.pro b/services/icons/consumer-rules.pro similarity index 100% rename from webdav/consumer-rules.pro rename to services/icons/consumer-rules.pro diff --git a/icons/proguard-rules.pro b/services/icons/proguard-rules.pro similarity index 100% rename from icons/proguard-rules.pro rename to services/icons/proguard-rules.pro diff --git a/icons/src/main/AndroidManifest.xml b/services/icons/src/main/AndroidManifest.xml similarity index 100% rename from icons/src/main/AndroidManifest.xml rename to services/icons/src/main/AndroidManifest.xml diff --git a/icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt similarity index 98% rename from icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt index 71cfa192..a4fd9dc5 100644 --- a/icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/DynamicCalendarIcon.kt @@ -3,7 +3,6 @@ package de.mm20.launcher2.icons import android.content.res.Resources import android.graphics.drawable.AdaptiveIconDrawable import androidx.core.content.res.ResourcesCompat -import androidx.lifecycle.Transformations import de.mm20.launcher2.icons.transformations.LauncherIconTransformation import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/IconPack.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/IconPackIcon.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPackIcon.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/IconPackIcon.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/IconPackIcon.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt similarity index 96% rename from icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt index adbfa6e6..b751e0ce 100644 --- a/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/IconRepository.kt @@ -6,14 +6,14 @@ import android.content.Intent import android.content.IntentFilter import android.graphics.Color import android.util.LruCache -import de.mm20.launcher2.customattrs.AdaptifiedLegacyIcon -import de.mm20.launcher2.customattrs.CustomAttributesRepository -import de.mm20.launcher2.customattrs.CustomIcon -import de.mm20.launcher2.customattrs.CustomIconPackIcon -import de.mm20.launcher2.customattrs.CustomThemedIcon -import de.mm20.launcher2.customattrs.DefaultPlaceholderIcon -import de.mm20.launcher2.customattrs.ForceThemedIcon -import de.mm20.launcher2.customattrs.UnmodifiedSystemDefaultIcon +import de.mm20.launcher2.data.customattrs.AdaptifiedLegacyIcon +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.CustomIcon +import de.mm20.launcher2.data.customattrs.CustomIconPackIcon +import de.mm20.launcher2.data.customattrs.CustomThemedIcon +import de.mm20.launcher2.data.customattrs.DefaultPlaceholderIcon +import de.mm20.launcher2.data.customattrs.ForceThemedIcon +import de.mm20.launcher2.data.customattrs.UnmodifiedSystemDefaultIcon import de.mm20.launcher2.icons.providers.CalendarIconProvider import de.mm20.launcher2.icons.providers.CustomIconPackIconProvider import de.mm20.launcher2.icons.providers.CustomThemedIconProvider diff --git a/icons/src/main/java/de/mm20/launcher2/icons/Module.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/Module.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/Module.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/Module.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/TransformableDynamicLauncherIcon.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/TransformableDynamicLauncherIcon.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/TransformableDynamicLauncherIcon.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/TransformableDynamicLauncherIcon.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/CalendarIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/CalendarIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/CalendarIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/CalendarIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt similarity index 91% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt index 8194d398..1c82fe14 100644 --- a/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomIconPackIconProvider.kt @@ -1,7 +1,7 @@ package de.mm20.launcher2.icons.providers import android.content.ComponentName -import de.mm20.launcher2.customattrs.CustomIconPackIcon +import de.mm20.launcher2.data.customattrs.CustomIconPackIcon import de.mm20.launcher2.icons.IconPackManager import de.mm20.launcher2.icons.LauncherIcon import de.mm20.launcher2.search.SavableSearchable diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt similarity index 89% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt index c727962e..da1060e5 100644 --- a/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt +++ b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/CustomThemedIconProvider.kt @@ -1,6 +1,6 @@ package de.mm20.launcher2.icons.providers -import de.mm20.launcher2.customattrs.CustomThemedIcon +import de.mm20.launcher2.data.customattrs.CustomThemedIcon import de.mm20.launcher2.icons.IconPackManager import de.mm20.launcher2.icons.LauncherIcon import de.mm20.launcher2.search.SavableSearchable diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/GoogleClockIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/GoogleClockIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/GoogleClockIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/GoogleClockIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/IconPackIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/IconPackIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/IconPackIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/IconPackIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/IconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/IconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/IconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/IconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/PlaceholderIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/PlaceholderIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/PlaceholderIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/PlaceholderIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/SystemIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/SystemIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/SystemIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/SystemIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/providers/ThemedPlaceholderIconProvider.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/transformations/ForceThemedIconTransformation.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/transformations/ForceThemedIconTransformation.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/transformations/ForceThemedIconTransformation.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/transformations/ForceThemedIconTransformation.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/transformations/LauncherIconTransformation.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/transformations/LauncherIconTransformation.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/transformations/LauncherIconTransformation.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/transformations/LauncherIconTransformation.kt diff --git a/icons/src/main/java/de/mm20/launcher2/icons/transformations/LegacyToAdaptiveTransformation.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/transformations/LegacyToAdaptiveTransformation.kt similarity index 100% rename from icons/src/main/java/de/mm20/launcher2/icons/transformations/LegacyToAdaptiveTransformation.kt rename to services/icons/src/main/java/de/mm20/launcher2/icons/transformations/LegacyToAdaptiveTransformation.kt diff --git a/widgets/.gitignore b/services/music/.gitignore similarity index 100% rename from widgets/.gitignore rename to services/music/.gitignore diff --git a/music/build.gradle.kts b/services/music/build.gradle.kts similarity index 83% rename from music/build.gradle.kts rename to services/music/build.gradle.kts index b153cc19..7876064d 100644 --- a/music/build.gradle.kts +++ b/services/music/build.gradle.kts @@ -41,9 +41,9 @@ dependencies { implementation(libs.koin.android) implementation(libs.coil.core) - implementation(project(":ktx")) - implementation(project(":preferences")) - implementation(project(":notifications")) - implementation(project(":crashreporter")) + implementation(project(":core:ktx")) + implementation(project(":core:preferences")) + implementation(project(":data:notifications")) + implementation(project(":core:crashreporter")) } \ No newline at end of file diff --git a/websites/consumer-rules.pro b/services/music/consumer-rules.pro similarity index 100% rename from websites/consumer-rules.pro rename to services/music/consumer-rules.pro diff --git a/music/proguard-rules.pro b/services/music/proguard-rules.pro similarity index 100% rename from music/proguard-rules.pro rename to services/music/proguard-rules.pro diff --git a/wikipedia/src/main/AndroidManifest.xml b/services/music/src/main/AndroidManifest.xml similarity index 100% rename from wikipedia/src/main/AndroidManifest.xml rename to services/music/src/main/AndroidManifest.xml diff --git a/music/src/main/java/de/mm20/launcher2/music/Module.kt b/services/music/src/main/java/de/mm20/launcher2/music/Module.kt similarity index 100% rename from music/src/main/java/de/mm20/launcher2/music/Module.kt rename to services/music/src/main/java/de/mm20/launcher2/music/Module.kt diff --git a/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt b/services/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt similarity index 100% rename from music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt rename to services/music/src/main/java/de/mm20/launcher2/music/MusicRepository.kt diff --git a/music/src/main/res/values/dimens.xml b/services/music/src/main/res/values/dimens.xml similarity index 100% rename from music/src/main/res/values/dimens.xml rename to services/music/src/main/res/values/dimens.xml diff --git a/wikipedia/.gitignore b/services/search/.gitignore similarity index 100% rename from wikipedia/.gitignore rename to services/search/.gitignore diff --git a/search/build.gradle.kts b/services/search/build.gradle.kts similarity index 60% rename from search/build.gradle.kts rename to services/search/build.gradle.kts index 48d09de6..3f8b8d3c 100644 --- a/search/build.gradle.kts +++ b/services/search/build.gradle.kts @@ -47,21 +47,21 @@ dependencies { implementation(libs.okhttp) implementation(libs.coil.core) - implementation(project(":applications")) - implementation(project(":appshortcuts")) - implementation(project(":calculator")) - implementation(project(":calendar")) - implementation(project(":contacts")) - implementation(project(":files")) - implementation(project(":unitconverter")) - implementation(project(":websites")) - implementation(project(":wikipedia")) - implementation(project(":customattrs")) - implementation(project(":search-actions")) + implementation(project(":data:applications")) + implementation(project(":data:appshortcuts")) + implementation(project(":data:calculator")) + implementation(project(":data:calendar")) + implementation(project(":data:contacts")) + implementation(project(":data:files")) + implementation(project(":data:unitconverter")) + implementation(project(":data:websites")) + implementation(project(":data:wikipedia")) + implementation(project(":data:customattrs")) + implementation(project(":data:search-actions")) - implementation(project(":base")) - implementation(project(":database")) - implementation(project(":preferences")) - implementation(project(":crashreporter")) - implementation(project(":ktx")) + implementation(project(":core:base")) + implementation(project(":core:database")) + implementation(project(":core:preferences")) + implementation(project(":core:crashreporter")) + implementation(project(":core:ktx")) } \ No newline at end of file diff --git a/widgets/consumer-rules.pro b/services/search/consumer-rules.pro similarity index 100% rename from widgets/consumer-rules.pro rename to services/search/consumer-rules.pro diff --git a/webdav/proguard-rules.pro b/services/search/proguard-rules.pro similarity index 100% rename from webdav/proguard-rules.pro rename to services/search/proguard-rules.pro diff --git a/search/src/main/AndroidManifest.xml b/services/search/src/main/AndroidManifest.xml similarity index 100% rename from search/src/main/AndroidManifest.xml rename to services/search/src/main/AndroidManifest.xml diff --git a/search/src/main/java/de/mm20/launcher2/search/Module.kt b/services/search/src/main/java/de/mm20/launcher2/search/Module.kt similarity index 100% rename from search/src/main/java/de/mm20/launcher2/search/Module.kt rename to services/search/src/main/java/de/mm20/launcher2/search/Module.kt diff --git a/search/src/main/java/de/mm20/launcher2/search/SearchService.kt b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt similarity index 98% rename from search/src/main/java/de/mm20/launcher2/search/SearchService.kt rename to services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt index 97ba9cde..221575a8 100644 --- a/search/src/main/java/de/mm20/launcher2/search/SearchService.kt +++ b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt @@ -5,8 +5,8 @@ import de.mm20.launcher2.appshortcuts.AppShortcutRepository import de.mm20.launcher2.calculator.CalculatorRepository import de.mm20.launcher2.calendar.CalendarRepository import de.mm20.launcher2.contacts.ContactRepository -import de.mm20.launcher2.customattrs.CustomAttributesRepository -import de.mm20.launcher2.customattrs.utils.withCustomLabels +import de.mm20.launcher2.data.customattrs.CustomAttributesRepository +import de.mm20.launcher2.data.customattrs.utils.withCustomLabels import de.mm20.launcher2.files.FileRepository import de.mm20.launcher2.preferences.Settings.AppShortcutSearchSettings import de.mm20.launcher2.preferences.Settings.CalculatorSearchSettings diff --git a/search/src/main/java/de/mm20/launcher2/search/data/Websearch.kt b/services/search/src/main/java/de/mm20/launcher2/search/data/Websearch.kt similarity index 100% rename from search/src/main/java/de/mm20/launcher2/search/data/Websearch.kt rename to services/search/src/main/java/de/mm20/launcher2/search/data/Websearch.kt diff --git a/services/tags/.gitignore b/services/tags/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/services/tags/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts new file mode 100644 index 00000000..a86be48b --- /dev/null +++ b/services/tags/build.gradle.kts @@ -0,0 +1,51 @@ +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") +} + +android { + compileSdk = sdk.versions.compileSdk.get().toInt() + + defaultConfig { + minSdk = sdk.versions.minSdk.get().toInt() + targetSdk = sdk.versions.targetSdk.get().toInt() + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } + namespace = "de.mm20.launcher2.services.tags" +} + +dependencies { + implementation(libs.bundles.kotlin) + implementation(libs.androidx.core) + implementation(libs.androidx.appcompat) + + implementation(libs.bundles.androidx.lifecycle) + + implementation(libs.koin.android) + + implementation(project(":core:preferences")) + implementation(project(":core:base")) + implementation(project(":core:ktx")) + implementation(project(":core:crashreporter")) + +} \ No newline at end of file diff --git a/services/tags/consumer-rules.pro b/services/tags/consumer-rules.pro new file mode 100644 index 00000000..e69de29b diff --git a/services/tags/proguard-rules.pro b/services/tags/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/services/tags/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/services/tags/src/main/AndroidManifest.xml b/services/tags/src/main/AndroidManifest.xml new file mode 100644 index 00000000..a5918e68 --- /dev/null +++ b/services/tags/src/main/AndroidManifest.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/services/tags/src/main/java/de/mm20/launcher2/services/tags/Module.kt b/services/tags/src/main/java/de/mm20/launcher2/services/tags/Module.kt new file mode 100644 index 00000000..67d8b35c --- /dev/null +++ b/services/tags/src/main/java/de/mm20/launcher2/services/tags/Module.kt @@ -0,0 +1,8 @@ +package de.mm20.launcher2.services.tags + +import de.mm20.launcher2.services.tags.impl.TagsServiceImpl +import org.koin.dsl.module + +val servicesTagsModule = module { + single { TagsServiceImpl() } +} \ No newline at end of file diff --git a/services/tags/src/main/java/de/mm20/launcher2/services/tags/TagsService.kt b/services/tags/src/main/java/de/mm20/launcher2/services/tags/TagsService.kt new file mode 100644 index 00000000..97e9eb90 --- /dev/null +++ b/services/tags/src/main/java/de/mm20/launcher2/services/tags/TagsService.kt @@ -0,0 +1,8 @@ +package de.mm20.launcher2.services.tags + +interface TagsService { + fun getTags(startsWith: String? = null): List + fun renameTag(oldName: String, newName: String) + fun deleteTag(tag: String) + fun cloneTag(tag: String, newTag: String) +} \ No newline at end of file diff --git a/services/tags/src/main/java/de/mm20/launcher2/services/tags/impl/TagsServiceImpl.kt b/services/tags/src/main/java/de/mm20/launcher2/services/tags/impl/TagsServiceImpl.kt new file mode 100644 index 00000000..6f1aab54 --- /dev/null +++ b/services/tags/src/main/java/de/mm20/launcher2/services/tags/impl/TagsServiceImpl.kt @@ -0,0 +1,22 @@ +package de.mm20.launcher2.services.tags.impl + +import de.mm20.launcher2.services.tags.TagsService + +internal class TagsServiceImpl( +): TagsService { + override fun getTags(startsWith: String?): List { + TODO("Not yet implemented") + } + + override fun renameTag(oldName: String, newName: String) { + TODO("Not yet implemented") + } + + override fun deleteTag(tag: String) { + TODO("Not yet implemented") + } + + override fun cloneTag(tag: String, newTag: String) { + TODO("Not yet implemented") + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 1ecaa205..fc2ef193 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,42 +1,5 @@ enableFeaturePreview("VERSION_CATALOGS") -include(":currencies") -include(":nextcloud") -include(":owncloud") -include(":webdav") -include(":unitconverter") -include(":websites") -include(":wikipedia") -include(":contacts") -include(":g-services") -include(":files") -include(":calculator") -include(":badges") -include(":applications") -include(":ms-services") -include(":favorites") -include(":calendar") -include(":icons") -include(":search") -include(":crashreporter") -include(":music") -include(":preferences") -include(":base") -include(":widgets") -include(":weather") -include(":i18n") -include(":database") -include(":ktx") -include(":app") -include(":permissions") -include(":ui") -include(":compat") -include(":notifications") -include(":accounts") -include(":appshortcuts") -include(":material-color-utilities") -include(":backup") -include(":customattrs") dependencyResolutionManagement { versionCatalogs { @@ -287,4 +250,47 @@ dependencyResolutionManagement { } } } -include(":search-actions") + +include(":app:app") +include(":app:ui") + +include(":core:base") +include(":core:crashreporter") +include(":core:compat") +include(":core:preferences") +include(":core:ktx") +include(":core:i18n") +include(":core:database") +include(":core:permissions") + +include(":data:appshortcuts") +include(":data:customattrs") +include(":data:applications") +include(":data:calendar") +include(":data:calculator") +include(":data:contacts") +include(":data:currencies") +include(":data:files") +include(":data:unitconverter") +include(":data:websites") +include(":data:wikipedia") +include(":data:widgets") +include(":data:weather") +include(":data:notifications") +include(":data:search-actions") +include(":data:favorites") + +include(":services:accounts") +include(":services:tags") +include(":services:search") +include(":services:badges") +include(":services:icons") +include(":services:backup") +include(":services:music") + +include(":libs:material-color-utilities") +include(":libs:nextcloud") +include(":libs:owncloud") +include(":libs:webdav") +include(":libs:g-services") +include(":libs:ms-services")