From 18a3ef716759db9f9e94393cae7297a672ca1305 Mon Sep 17 00:00:00 2001 From: Igor Bubelov Date: Wed, 22 May 2024 14:12:54 +0700 Subject: [PATCH] Add common code directory and a sample class --- app/build.gradle.kts | 85 ++++++++++------- .../{main => androidMain}/AndroidManifest.xml | 0 .../material-symbols-outlined-2022-12-06.ttf | Bin .../kotlin/activity/Activity.kt | 0 .../{main => androidMain}/kotlin/api/Api.kt | 0 .../{main => androidMain}/kotlin/app/App.kt | 0 .../kotlin/app/AppModule.kt | 0 .../kotlin/app/ContextExt.kt | 0 .../{main => androidMain}/kotlin/area/Area.kt | 0 .../kotlin/area/AreaAdapter.kt | 0 .../kotlin/area/AreaFragment.kt | 0 .../kotlin/area/AreaJson.kt | 0 .../kotlin/area/AreaModel.kt | 0 .../kotlin/area/AreaQueries.kt | 0 .../kotlin/area/AreaResultModel.kt | 0 .../kotlin/area/AreaTags.kt | 0 .../kotlin/area/AreasAdapter.kt | 0 .../kotlin/area/AreasFragment.kt | 0 .../kotlin/area/AreasModel.kt | 0 .../kotlin/area/AreasRepo.kt | 0 .../{main => androidMain}/kotlin/conf/Conf.kt | 0 .../kotlin/conf/ConfQueries.kt | 0 .../kotlin/conf/ConfRepo.kt | 0 .../kotlin/db/CursorExtensions.kt | 0 .../kotlin/db/Database.kt | 0 .../kotlin/delivery/DeliveryAdapter.kt | 0 .../kotlin/delivery/DeliveryFragment.kt | 0 .../kotlin/delivery/DeliveryModel.kt | 0 .../kotlin/donation/DonationFragment.kt | 0 .../kotlin/element/AreaElement.kt | 0 .../kotlin/element/Element.kt | 0 .../kotlin/element/ElementCategory.kt | 0 .../kotlin/element/ElementFragment.kt | 0 .../kotlin/element/ElementJson.kt | 0 .../kotlin/element/ElementQueries.kt | 0 .../kotlin/element/ElementsCluster.kt | 0 .../kotlin/element/ElementsRepo.kt | 0 .../kotlin/element/OsmTags.kt | 0 .../kotlin/event/Event.kt | 0 .../kotlin/event/EventJson.kt | 0 .../kotlin/event/EventListItem.kt | 0 .../kotlin/event/EventQueries.kt | 0 .../kotlin/event/EventsAdapter.kt | 0 .../kotlin/event/EventsFragment.kt | 0 .../kotlin/event/EventsModel.kt | 0 .../kotlin/event/EventsRepo.kt | 0 .../kotlin/icons/ContextExtensions.kt | 0 .../kotlin/issue/IssuesAdapter.kt | 0 .../kotlin/issue/IssuesFragment.kt | 0 .../kotlin/issue/IssuesModel.kt | 0 .../{main => androidMain}/kotlin/json/Json.kt | 0 .../kotlin/location/UserLocationRepository.kt | 0 .../kotlin/map/BoundingBoxExtensions.kt | 0 .../kotlin/map/ContextExtensions.kt | 0 .../kotlin/map/DisabledMapView.kt | 0 .../kotlin/map/MapFragment.kt | 0 .../kotlin/map/MapMarkersRepo.kt | 0 .../kotlin/map/MapModel.kt | 0 .../kotlin/map/MapViewExtensions.kt | 0 .../kotlin/reports/Report.kt | 0 .../kotlin/reports/ReportJson.kt | 0 .../kotlin/reports/ReportQueries.kt | 0 .../kotlin/reports/ReportsFragment.kt | 0 .../kotlin/reports/ReportsModel.kt | 0 .../kotlin/reports/ReportsRepo.kt | 0 .../kotlin/search/SearchAdapter.kt | 0 .../kotlin/search/SearchModel.kt | 0 .../kotlin/search/SearchResultModel.kt | 0 .../kotlin/settings/SettingsFragment.kt | 0 .../kotlin/sync/BackgroundSyncScheduler.kt | 0 .../{main => androidMain}/kotlin/sync/Sync.kt | 0 .../kotlin/sync/SyncNotificationController.kt | 0 .../kotlin/sync/SyncWorker.kt | 0 .../kotlin/time/ZonedDateTimeExt.kt | 0 .../{main => androidMain}/kotlin/user/User.kt | 0 .../kotlin/user/UserFragment.kt | 0 .../kotlin/user/UserJson.kt | 0 .../kotlin/user/UserListItem.kt | 0 .../kotlin/user/UserQueries.kt | 0 .../kotlin/user/UsersAdapter.kt | 0 .../kotlin/user/UsersFragment.kt | 0 .../kotlin/user/UsersModel.kt | 0 .../kotlin/user/UsersRepo.kt | 0 .../drawable-nodpi/donation_qr_lightning.png | Bin .../drawable-nodpi/donation_qr_onchain.png | Bin .../res/drawable-nodpi/merchant.png | Bin .../res/drawable/add.xml | 0 .../res/drawable/add_location.xml | 0 .../res/drawable/area_placeholder.xml | 0 .../res/drawable/area_placeholder_icon.xml | 0 .../res/drawable/arrow_back.xml | 0 .../res/drawable/call.xml | 0 .../res/drawable/cluster.xml | 0 .../res/drawable/contact_discord.xml | 0 .../res/drawable/contact_email.xml | 0 .../res/drawable/contact_facebook.xml | 0 .../res/drawable/contact_instagram.xml | 0 .../res/drawable/contact_telegram.xml | 0 .../res/drawable/contact_twitter.xml | 0 .../res/drawable/contact_youtube.xml | 0 .../res/drawable/currency_bitcoin.xml | 0 .../res/drawable/directions.xml | 0 .../res/drawable/earth.xml | 0 .../res/drawable/edit.xml | 0 .../res/drawable/fmd_bad.xml | 0 .../res/drawable/launcher.xml | 0 .../res/drawable/launcher_fg.xml | 0 .../res/drawable/launcher_fg_monochrome.xml | 0 .../res/drawable/marker.xml | 0 .../res/drawable/monitoring.xml | 0 .../res/drawable/my_location.xml | 0 .../res/drawable/person_alt.xml | 0 .../res/drawable/place.xml | 0 .../res/drawable/remove.xml | 0 .../res/drawable/schedule.xml | 0 .../res/drawable/settings.xml | 0 .../drawable/user_avatar_placeholder_bg.xml | 0 .../res/drawable/verified.xml | 0 .../res/drawable/warning.xml | 0 .../res/layout/activity.xml | 0 .../res/layout/fragment_area.xml | 0 .../res/layout/fragment_areas.xml | 0 .../res/layout/fragment_delivery.xml | 0 .../res/layout/fragment_donation.xml | 0 .../res/layout/fragment_element.xml | 0 .../res/layout/fragment_events.xml | 0 .../res/layout/fragment_issues.xml | 0 .../res/layout/fragment_map.xml | 0 .../res/layout/fragment_reports.xml | 0 .../res/layout/fragment_settings.xml | 0 .../res/layout/fragment_user.xml | 0 .../res/layout/fragment_users.xml | 0 .../res/layout/item_area.xml | 0 .../res/layout/item_area_description.xml | 0 .../res/layout/item_area_element.xml | 0 .../res/layout/item_contact.xml | 0 .../res/layout/item_delivery.xml | 0 .../res/layout/item_event.xml | 0 .../res/layout/item_issue.xml | 0 .../res/layout/item_issues.xml | 0 .../res/layout/item_map.xml | 0 .../res/layout/item_search_result.xml | 0 .../res/layout/item_user.xml | 0 .../{main => androidMain}/res/menu/area.xml | 0 .../res/menu/element.xml | 0 .../{main => androidMain}/res/menu/map.xml | 0 .../{main => androidMain}/res/menu/user.xml | 0 .../res/navigation/nav_graph.xml | 0 .../res/values-af/strings.xml | 0 .../res/values-ar/strings.xml | 0 .../res/values-bg/strings.xml | 0 .../res/values-bn/strings.xml | 0 .../res/values-ca/strings.xml | 0 .../res/values-cs/strings.xml | 0 .../res/values-da/strings.xml | 0 .../res/values-de/strings.xml | 0 .../res/values-el/strings.xml | 0 .../res/values-es/strings.xml | 0 .../res/values-fa/strings.xml | 0 .../res/values-fi/strings.xml | 0 .../res/values-fr/strings.xml | 0 .../res/values-hi/strings.xml | 0 .../res/values-hu/strings.xml | 0 .../res/values-it/strings.xml | 0 .../res/values-iw/strings.xml | 0 .../res/values-ja/strings.xml | 0 .../res/values-ko/strings.xml | 0 .../res/values-night/styles.xml | 0 .../res/values-nl/strings.xml | 0 .../res/values-no/strings.xml | 0 .../res/values-pl/strings.xml | 0 .../res/values-pt/strings.xml | 0 .../res/values-ro/strings.xml | 0 .../res/values-ru/strings.xml | 0 .../res/values-sr/strings.xml | 0 .../res/values-sv/strings.xml | 0 .../res/values-th/strings.xml | 0 .../res/values-tr/strings.xml | 0 .../res/values-uk/strings.xml | 0 .../res/values-ur/strings.xml | 0 .../res/values-vi/strings.xml | 0 .../res/values-zh/strings.xml | 0 .../res/values/strings.xml | 0 .../res/values/styles.xml | 0 .../res/values/untranslatable-strings.xml | 0 .../res/xml/backup_rules.xml | 0 .../kotlin/area/Meetup.kt | 0 app/src/debug/res/drawable/launcher_fg.xml | 20 ---- app/src/test/kotlin/api/ApiImplTest.kt | 86 ------------------ app/src/test/kotlin/area/AreaQueriesTest.kt | 19 ---- app/src/test/kotlin/element/OsmTagsTest.kt | 62 ------------- build.gradle.kts | 5 +- gradle/libs.versions.toml | 3 +- 193 files changed, 56 insertions(+), 224 deletions(-) rename app/src/{main => androidMain}/AndroidManifest.xml (100%) rename app/src/{main => androidMain}/assets/material-symbols-outlined-2022-12-06.ttf (100%) rename app/src/{main => androidMain}/kotlin/activity/Activity.kt (100%) rename app/src/{main => androidMain}/kotlin/api/Api.kt (100%) rename app/src/{main => androidMain}/kotlin/app/App.kt (100%) rename app/src/{main => androidMain}/kotlin/app/AppModule.kt (100%) rename app/src/{main => androidMain}/kotlin/app/ContextExt.kt (100%) rename app/src/{main => androidMain}/kotlin/area/Area.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaJson.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaModel.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaQueries.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaResultModel.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreaTags.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreasAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreasFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreasModel.kt (100%) rename app/src/{main => androidMain}/kotlin/area/AreasRepo.kt (100%) rename app/src/{main => androidMain}/kotlin/conf/Conf.kt (100%) rename app/src/{main => androidMain}/kotlin/conf/ConfQueries.kt (100%) rename app/src/{main => androidMain}/kotlin/conf/ConfRepo.kt (100%) rename app/src/{main => androidMain}/kotlin/db/CursorExtensions.kt (100%) rename app/src/{main => androidMain}/kotlin/db/Database.kt (100%) rename app/src/{main => androidMain}/kotlin/delivery/DeliveryAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/delivery/DeliveryFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/delivery/DeliveryModel.kt (100%) rename app/src/{main => androidMain}/kotlin/donation/DonationFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/element/AreaElement.kt (100%) rename app/src/{main => androidMain}/kotlin/element/Element.kt (100%) rename app/src/{main => androidMain}/kotlin/element/ElementCategory.kt (100%) rename app/src/{main => androidMain}/kotlin/element/ElementFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/element/ElementJson.kt (100%) rename app/src/{main => androidMain}/kotlin/element/ElementQueries.kt (100%) rename app/src/{main => androidMain}/kotlin/element/ElementsCluster.kt (100%) rename app/src/{main => androidMain}/kotlin/element/ElementsRepo.kt (100%) rename app/src/{main => androidMain}/kotlin/element/OsmTags.kt (100%) rename app/src/{main => androidMain}/kotlin/event/Event.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventJson.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventListItem.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventQueries.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventsAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventsFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventsModel.kt (100%) rename app/src/{main => androidMain}/kotlin/event/EventsRepo.kt (100%) rename app/src/{main => androidMain}/kotlin/icons/ContextExtensions.kt (100%) rename app/src/{main => androidMain}/kotlin/issue/IssuesAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/issue/IssuesFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/issue/IssuesModel.kt (100%) rename app/src/{main => androidMain}/kotlin/json/Json.kt (100%) rename app/src/{main => androidMain}/kotlin/location/UserLocationRepository.kt (100%) rename app/src/{main => androidMain}/kotlin/map/BoundingBoxExtensions.kt (100%) rename app/src/{main => androidMain}/kotlin/map/ContextExtensions.kt (100%) rename app/src/{main => androidMain}/kotlin/map/DisabledMapView.kt (100%) rename app/src/{main => androidMain}/kotlin/map/MapFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/map/MapMarkersRepo.kt (100%) rename app/src/{main => androidMain}/kotlin/map/MapModel.kt (100%) rename app/src/{main => androidMain}/kotlin/map/MapViewExtensions.kt (100%) rename app/src/{main => androidMain}/kotlin/reports/Report.kt (100%) rename app/src/{main => androidMain}/kotlin/reports/ReportJson.kt (100%) rename app/src/{main => androidMain}/kotlin/reports/ReportQueries.kt (100%) rename app/src/{main => androidMain}/kotlin/reports/ReportsFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/reports/ReportsModel.kt (100%) rename app/src/{main => androidMain}/kotlin/reports/ReportsRepo.kt (100%) rename app/src/{main => androidMain}/kotlin/search/SearchAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/search/SearchModel.kt (100%) rename app/src/{main => androidMain}/kotlin/search/SearchResultModel.kt (100%) rename app/src/{main => androidMain}/kotlin/settings/SettingsFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/sync/BackgroundSyncScheduler.kt (100%) rename app/src/{main => androidMain}/kotlin/sync/Sync.kt (100%) rename app/src/{main => androidMain}/kotlin/sync/SyncNotificationController.kt (100%) rename app/src/{main => androidMain}/kotlin/sync/SyncWorker.kt (100%) rename app/src/{main => androidMain}/kotlin/time/ZonedDateTimeExt.kt (100%) rename app/src/{main => androidMain}/kotlin/user/User.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UserFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UserJson.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UserListItem.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UserQueries.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UsersAdapter.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UsersFragment.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UsersModel.kt (100%) rename app/src/{main => androidMain}/kotlin/user/UsersRepo.kt (100%) rename app/src/{main => androidMain}/res/drawable-nodpi/donation_qr_lightning.png (100%) rename app/src/{main => androidMain}/res/drawable-nodpi/donation_qr_onchain.png (100%) rename app/src/{main => androidMain}/res/drawable-nodpi/merchant.png (100%) rename app/src/{main => androidMain}/res/drawable/add.xml (100%) rename app/src/{main => androidMain}/res/drawable/add_location.xml (100%) rename app/src/{main => androidMain}/res/drawable/area_placeholder.xml (100%) rename app/src/{main => androidMain}/res/drawable/area_placeholder_icon.xml (100%) rename app/src/{main => androidMain}/res/drawable/arrow_back.xml (100%) rename app/src/{main => androidMain}/res/drawable/call.xml (100%) rename app/src/{main => androidMain}/res/drawable/cluster.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_discord.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_email.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_facebook.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_instagram.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_telegram.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_twitter.xml (100%) rename app/src/{main => androidMain}/res/drawable/contact_youtube.xml (100%) rename app/src/{main => androidMain}/res/drawable/currency_bitcoin.xml (100%) rename app/src/{main => androidMain}/res/drawable/directions.xml (100%) rename app/src/{main => androidMain}/res/drawable/earth.xml (100%) rename app/src/{main => androidMain}/res/drawable/edit.xml (100%) rename app/src/{main => androidMain}/res/drawable/fmd_bad.xml (100%) rename app/src/{main => androidMain}/res/drawable/launcher.xml (100%) rename app/src/{main => androidMain}/res/drawable/launcher_fg.xml (100%) rename app/src/{main => androidMain}/res/drawable/launcher_fg_monochrome.xml (100%) rename app/src/{main => androidMain}/res/drawable/marker.xml (100%) rename app/src/{main => androidMain}/res/drawable/monitoring.xml (100%) rename app/src/{main => androidMain}/res/drawable/my_location.xml (100%) rename app/src/{main => androidMain}/res/drawable/person_alt.xml (100%) rename app/src/{main => androidMain}/res/drawable/place.xml (100%) rename app/src/{main => androidMain}/res/drawable/remove.xml (100%) rename app/src/{main => androidMain}/res/drawable/schedule.xml (100%) rename app/src/{main => androidMain}/res/drawable/settings.xml (100%) rename app/src/{main => androidMain}/res/drawable/user_avatar_placeholder_bg.xml (100%) rename app/src/{main => androidMain}/res/drawable/verified.xml (100%) rename app/src/{main => androidMain}/res/drawable/warning.xml (100%) rename app/src/{main => androidMain}/res/layout/activity.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_area.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_areas.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_delivery.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_donation.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_element.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_events.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_issues.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_map.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_reports.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_settings.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_user.xml (100%) rename app/src/{main => androidMain}/res/layout/fragment_users.xml (100%) rename app/src/{main => androidMain}/res/layout/item_area.xml (100%) rename app/src/{main => androidMain}/res/layout/item_area_description.xml (100%) rename app/src/{main => androidMain}/res/layout/item_area_element.xml (100%) rename app/src/{main => androidMain}/res/layout/item_contact.xml (100%) rename app/src/{main => androidMain}/res/layout/item_delivery.xml (100%) rename app/src/{main => androidMain}/res/layout/item_event.xml (100%) rename app/src/{main => androidMain}/res/layout/item_issue.xml (100%) rename app/src/{main => androidMain}/res/layout/item_issues.xml (100%) rename app/src/{main => androidMain}/res/layout/item_map.xml (100%) rename app/src/{main => androidMain}/res/layout/item_search_result.xml (100%) rename app/src/{main => androidMain}/res/layout/item_user.xml (100%) rename app/src/{main => androidMain}/res/menu/area.xml (100%) rename app/src/{main => androidMain}/res/menu/element.xml (100%) rename app/src/{main => androidMain}/res/menu/map.xml (100%) rename app/src/{main => androidMain}/res/menu/user.xml (100%) rename app/src/{main => androidMain}/res/navigation/nav_graph.xml (100%) rename app/src/{main => androidMain}/res/values-af/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ar/strings.xml (100%) rename app/src/{main => androidMain}/res/values-bg/strings.xml (100%) rename app/src/{main => androidMain}/res/values-bn/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ca/strings.xml (100%) rename app/src/{main => androidMain}/res/values-cs/strings.xml (100%) rename app/src/{main => androidMain}/res/values-da/strings.xml (100%) rename app/src/{main => androidMain}/res/values-de/strings.xml (100%) rename app/src/{main => androidMain}/res/values-el/strings.xml (100%) rename app/src/{main => androidMain}/res/values-es/strings.xml (100%) rename app/src/{main => androidMain}/res/values-fa/strings.xml (100%) rename app/src/{main => androidMain}/res/values-fi/strings.xml (100%) rename app/src/{main => androidMain}/res/values-fr/strings.xml (100%) rename app/src/{main => androidMain}/res/values-hi/strings.xml (100%) rename app/src/{main => androidMain}/res/values-hu/strings.xml (100%) rename app/src/{main => androidMain}/res/values-it/strings.xml (100%) rename app/src/{main => androidMain}/res/values-iw/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ja/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ko/strings.xml (100%) rename app/src/{main => androidMain}/res/values-night/styles.xml (100%) rename app/src/{main => androidMain}/res/values-nl/strings.xml (100%) rename app/src/{main => androidMain}/res/values-no/strings.xml (100%) rename app/src/{main => androidMain}/res/values-pl/strings.xml (100%) rename app/src/{main => androidMain}/res/values-pt/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ro/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ru/strings.xml (100%) rename app/src/{main => androidMain}/res/values-sr/strings.xml (100%) rename app/src/{main => androidMain}/res/values-sv/strings.xml (100%) rename app/src/{main => androidMain}/res/values-th/strings.xml (100%) rename app/src/{main => androidMain}/res/values-tr/strings.xml (100%) rename app/src/{main => androidMain}/res/values-uk/strings.xml (100%) rename app/src/{main => androidMain}/res/values-ur/strings.xml (100%) rename app/src/{main => androidMain}/res/values-vi/strings.xml (100%) rename app/src/{main => androidMain}/res/values-zh/strings.xml (100%) rename app/src/{main => androidMain}/res/values/strings.xml (100%) rename app/src/{main => androidMain}/res/values/styles.xml (100%) rename app/src/{main => androidMain}/res/values/untranslatable-strings.xml (100%) rename app/src/{main => androidMain}/res/xml/backup_rules.xml (100%) rename app/src/{main => commonMain}/kotlin/area/Meetup.kt (100%) delete mode 100644 app/src/debug/res/drawable/launcher_fg.xml delete mode 100644 app/src/test/kotlin/api/ApiImplTest.kt delete mode 100644 app/src/test/kotlin/area/AreaQueriesTest.kt delete mode 100644 app/src/test/kotlin/element/OsmTagsTest.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f4954f7c..262e4de2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,14 +1,60 @@ import java.net.URI plugins { + alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidApplication) - alias(libs.plugins.kotlinAndroid) +} + +kotlin { + androidTarget { + compilations.all { + kotlinOptions { + jvmTarget = "11" + freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" + freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" + } + } + } + + jvm("desktop") + + sourceSets { + androidMain.dependencies { + implementation(libs.kotlinx.coroutines) + + implementation(libs.androidx.navigation.fragment) + implementation(libs.androidx.navigation.ui) + implementation(libs.androidx.preference) + //implementation(libs.androidx.sqlite) + implementation(libs.androidx.work) + implementation(libs.androidx.constraintlayout) + implementation(libs.androidx.room) + + implementation(libs.material) + implementation(libs.okhttp.coroutines) + implementation(libs.okhttp.brotli) + implementation(libs.okhttp.mockwebserver) + implementation(libs.koin) + implementation(libs.osmdroid) + implementation(libs.jts) + implementation(libs.mpandroidchart) + implementation(libs.coil.core) + implementation(libs.coil.svg) + } + commonMain.dependencies { + implementation(libs.androidx.sqlite) + } + } } android { namespace = "org.btcmap" compileSdk = 34 + sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + sourceSets["main"].res.srcDirs("src/androidMain/res") + sourceSets["main"].resources.srcDirs("src/commonMain/resources") + defaultConfig { applicationId = "org.btcmap" minSdk = 27 @@ -22,12 +68,6 @@ android { targetCompatibility = JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = "11" - freeCompilerArgs += "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi" - freeCompilerArgs += "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" - } - signingConfigs { create("selfSigned") { storeFile = File(rootDir, "release.jks") @@ -85,6 +125,11 @@ android { buildFeatures { viewBinding = true } + + dependencies { + testImplementation(libs.junit) + testImplementation(libs.json) + } } tasks.register("bundleData") { @@ -107,30 +152,4 @@ tasks.register("bundleData") { val usersSrc = URI("https://static.btcmap.org/api/v3/users.json") File(destDir, "users.json").writeText(usersSrc.toURL().readText()) } -} - -dependencies { - implementation(libs.kotlinx.coroutines) - - implementation(libs.androidx.navigation.fragment) - implementation(libs.androidx.navigation.ui) - implementation(libs.androidx.preference) - implementation(libs.androidx.sqlite) - implementation(libs.androidx.work) - implementation(libs.androidx.constraintlayout) - implementation(libs.androidx.room) - - implementation(libs.material) - implementation(libs.okhttp.coroutines) - implementation(libs.okhttp.brotli) - implementation(libs.okhttp.mockwebserver) - implementation(libs.koin) - implementation(libs.osmdroid) - implementation(libs.jts) - implementation(libs.mpandroidchart) - implementation(libs.coil.core) - implementation(libs.coil.svg) - - testImplementation(libs.junit) - testImplementation(libs.json) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/androidMain/AndroidManifest.xml similarity index 100% rename from app/src/main/AndroidManifest.xml rename to app/src/androidMain/AndroidManifest.xml diff --git a/app/src/main/assets/material-symbols-outlined-2022-12-06.ttf b/app/src/androidMain/assets/material-symbols-outlined-2022-12-06.ttf similarity index 100% rename from app/src/main/assets/material-symbols-outlined-2022-12-06.ttf rename to app/src/androidMain/assets/material-symbols-outlined-2022-12-06.ttf diff --git a/app/src/main/kotlin/activity/Activity.kt b/app/src/androidMain/kotlin/activity/Activity.kt similarity index 100% rename from app/src/main/kotlin/activity/Activity.kt rename to app/src/androidMain/kotlin/activity/Activity.kt diff --git a/app/src/main/kotlin/api/Api.kt b/app/src/androidMain/kotlin/api/Api.kt similarity index 100% rename from app/src/main/kotlin/api/Api.kt rename to app/src/androidMain/kotlin/api/Api.kt diff --git a/app/src/main/kotlin/app/App.kt b/app/src/androidMain/kotlin/app/App.kt similarity index 100% rename from app/src/main/kotlin/app/App.kt rename to app/src/androidMain/kotlin/app/App.kt diff --git a/app/src/main/kotlin/app/AppModule.kt b/app/src/androidMain/kotlin/app/AppModule.kt similarity index 100% rename from app/src/main/kotlin/app/AppModule.kt rename to app/src/androidMain/kotlin/app/AppModule.kt diff --git a/app/src/main/kotlin/app/ContextExt.kt b/app/src/androidMain/kotlin/app/ContextExt.kt similarity index 100% rename from app/src/main/kotlin/app/ContextExt.kt rename to app/src/androidMain/kotlin/app/ContextExt.kt diff --git a/app/src/main/kotlin/area/Area.kt b/app/src/androidMain/kotlin/area/Area.kt similarity index 100% rename from app/src/main/kotlin/area/Area.kt rename to app/src/androidMain/kotlin/area/Area.kt diff --git a/app/src/main/kotlin/area/AreaAdapter.kt b/app/src/androidMain/kotlin/area/AreaAdapter.kt similarity index 100% rename from app/src/main/kotlin/area/AreaAdapter.kt rename to app/src/androidMain/kotlin/area/AreaAdapter.kt diff --git a/app/src/main/kotlin/area/AreaFragment.kt b/app/src/androidMain/kotlin/area/AreaFragment.kt similarity index 100% rename from app/src/main/kotlin/area/AreaFragment.kt rename to app/src/androidMain/kotlin/area/AreaFragment.kt diff --git a/app/src/main/kotlin/area/AreaJson.kt b/app/src/androidMain/kotlin/area/AreaJson.kt similarity index 100% rename from app/src/main/kotlin/area/AreaJson.kt rename to app/src/androidMain/kotlin/area/AreaJson.kt diff --git a/app/src/main/kotlin/area/AreaModel.kt b/app/src/androidMain/kotlin/area/AreaModel.kt similarity index 100% rename from app/src/main/kotlin/area/AreaModel.kt rename to app/src/androidMain/kotlin/area/AreaModel.kt diff --git a/app/src/main/kotlin/area/AreaQueries.kt b/app/src/androidMain/kotlin/area/AreaQueries.kt similarity index 100% rename from app/src/main/kotlin/area/AreaQueries.kt rename to app/src/androidMain/kotlin/area/AreaQueries.kt diff --git a/app/src/main/kotlin/area/AreaResultModel.kt b/app/src/androidMain/kotlin/area/AreaResultModel.kt similarity index 100% rename from app/src/main/kotlin/area/AreaResultModel.kt rename to app/src/androidMain/kotlin/area/AreaResultModel.kt diff --git a/app/src/main/kotlin/area/AreaTags.kt b/app/src/androidMain/kotlin/area/AreaTags.kt similarity index 100% rename from app/src/main/kotlin/area/AreaTags.kt rename to app/src/androidMain/kotlin/area/AreaTags.kt diff --git a/app/src/main/kotlin/area/AreasAdapter.kt b/app/src/androidMain/kotlin/area/AreasAdapter.kt similarity index 100% rename from app/src/main/kotlin/area/AreasAdapter.kt rename to app/src/androidMain/kotlin/area/AreasAdapter.kt diff --git a/app/src/main/kotlin/area/AreasFragment.kt b/app/src/androidMain/kotlin/area/AreasFragment.kt similarity index 100% rename from app/src/main/kotlin/area/AreasFragment.kt rename to app/src/androidMain/kotlin/area/AreasFragment.kt diff --git a/app/src/main/kotlin/area/AreasModel.kt b/app/src/androidMain/kotlin/area/AreasModel.kt similarity index 100% rename from app/src/main/kotlin/area/AreasModel.kt rename to app/src/androidMain/kotlin/area/AreasModel.kt diff --git a/app/src/main/kotlin/area/AreasRepo.kt b/app/src/androidMain/kotlin/area/AreasRepo.kt similarity index 100% rename from app/src/main/kotlin/area/AreasRepo.kt rename to app/src/androidMain/kotlin/area/AreasRepo.kt diff --git a/app/src/main/kotlin/conf/Conf.kt b/app/src/androidMain/kotlin/conf/Conf.kt similarity index 100% rename from app/src/main/kotlin/conf/Conf.kt rename to app/src/androidMain/kotlin/conf/Conf.kt diff --git a/app/src/main/kotlin/conf/ConfQueries.kt b/app/src/androidMain/kotlin/conf/ConfQueries.kt similarity index 100% rename from app/src/main/kotlin/conf/ConfQueries.kt rename to app/src/androidMain/kotlin/conf/ConfQueries.kt diff --git a/app/src/main/kotlin/conf/ConfRepo.kt b/app/src/androidMain/kotlin/conf/ConfRepo.kt similarity index 100% rename from app/src/main/kotlin/conf/ConfRepo.kt rename to app/src/androidMain/kotlin/conf/ConfRepo.kt diff --git a/app/src/main/kotlin/db/CursorExtensions.kt b/app/src/androidMain/kotlin/db/CursorExtensions.kt similarity index 100% rename from app/src/main/kotlin/db/CursorExtensions.kt rename to app/src/androidMain/kotlin/db/CursorExtensions.kt diff --git a/app/src/main/kotlin/db/Database.kt b/app/src/androidMain/kotlin/db/Database.kt similarity index 100% rename from app/src/main/kotlin/db/Database.kt rename to app/src/androidMain/kotlin/db/Database.kt diff --git a/app/src/main/kotlin/delivery/DeliveryAdapter.kt b/app/src/androidMain/kotlin/delivery/DeliveryAdapter.kt similarity index 100% rename from app/src/main/kotlin/delivery/DeliveryAdapter.kt rename to app/src/androidMain/kotlin/delivery/DeliveryAdapter.kt diff --git a/app/src/main/kotlin/delivery/DeliveryFragment.kt b/app/src/androidMain/kotlin/delivery/DeliveryFragment.kt similarity index 100% rename from app/src/main/kotlin/delivery/DeliveryFragment.kt rename to app/src/androidMain/kotlin/delivery/DeliveryFragment.kt diff --git a/app/src/main/kotlin/delivery/DeliveryModel.kt b/app/src/androidMain/kotlin/delivery/DeliveryModel.kt similarity index 100% rename from app/src/main/kotlin/delivery/DeliveryModel.kt rename to app/src/androidMain/kotlin/delivery/DeliveryModel.kt diff --git a/app/src/main/kotlin/donation/DonationFragment.kt b/app/src/androidMain/kotlin/donation/DonationFragment.kt similarity index 100% rename from app/src/main/kotlin/donation/DonationFragment.kt rename to app/src/androidMain/kotlin/donation/DonationFragment.kt diff --git a/app/src/main/kotlin/element/AreaElement.kt b/app/src/androidMain/kotlin/element/AreaElement.kt similarity index 100% rename from app/src/main/kotlin/element/AreaElement.kt rename to app/src/androidMain/kotlin/element/AreaElement.kt diff --git a/app/src/main/kotlin/element/Element.kt b/app/src/androidMain/kotlin/element/Element.kt similarity index 100% rename from app/src/main/kotlin/element/Element.kt rename to app/src/androidMain/kotlin/element/Element.kt diff --git a/app/src/main/kotlin/element/ElementCategory.kt b/app/src/androidMain/kotlin/element/ElementCategory.kt similarity index 100% rename from app/src/main/kotlin/element/ElementCategory.kt rename to app/src/androidMain/kotlin/element/ElementCategory.kt diff --git a/app/src/main/kotlin/element/ElementFragment.kt b/app/src/androidMain/kotlin/element/ElementFragment.kt similarity index 100% rename from app/src/main/kotlin/element/ElementFragment.kt rename to app/src/androidMain/kotlin/element/ElementFragment.kt diff --git a/app/src/main/kotlin/element/ElementJson.kt b/app/src/androidMain/kotlin/element/ElementJson.kt similarity index 100% rename from app/src/main/kotlin/element/ElementJson.kt rename to app/src/androidMain/kotlin/element/ElementJson.kt diff --git a/app/src/main/kotlin/element/ElementQueries.kt b/app/src/androidMain/kotlin/element/ElementQueries.kt similarity index 100% rename from app/src/main/kotlin/element/ElementQueries.kt rename to app/src/androidMain/kotlin/element/ElementQueries.kt diff --git a/app/src/main/kotlin/element/ElementsCluster.kt b/app/src/androidMain/kotlin/element/ElementsCluster.kt similarity index 100% rename from app/src/main/kotlin/element/ElementsCluster.kt rename to app/src/androidMain/kotlin/element/ElementsCluster.kt diff --git a/app/src/main/kotlin/element/ElementsRepo.kt b/app/src/androidMain/kotlin/element/ElementsRepo.kt similarity index 100% rename from app/src/main/kotlin/element/ElementsRepo.kt rename to app/src/androidMain/kotlin/element/ElementsRepo.kt diff --git a/app/src/main/kotlin/element/OsmTags.kt b/app/src/androidMain/kotlin/element/OsmTags.kt similarity index 100% rename from app/src/main/kotlin/element/OsmTags.kt rename to app/src/androidMain/kotlin/element/OsmTags.kt diff --git a/app/src/main/kotlin/event/Event.kt b/app/src/androidMain/kotlin/event/Event.kt similarity index 100% rename from app/src/main/kotlin/event/Event.kt rename to app/src/androidMain/kotlin/event/Event.kt diff --git a/app/src/main/kotlin/event/EventJson.kt b/app/src/androidMain/kotlin/event/EventJson.kt similarity index 100% rename from app/src/main/kotlin/event/EventJson.kt rename to app/src/androidMain/kotlin/event/EventJson.kt diff --git a/app/src/main/kotlin/event/EventListItem.kt b/app/src/androidMain/kotlin/event/EventListItem.kt similarity index 100% rename from app/src/main/kotlin/event/EventListItem.kt rename to app/src/androidMain/kotlin/event/EventListItem.kt diff --git a/app/src/main/kotlin/event/EventQueries.kt b/app/src/androidMain/kotlin/event/EventQueries.kt similarity index 100% rename from app/src/main/kotlin/event/EventQueries.kt rename to app/src/androidMain/kotlin/event/EventQueries.kt diff --git a/app/src/main/kotlin/event/EventsAdapter.kt b/app/src/androidMain/kotlin/event/EventsAdapter.kt similarity index 100% rename from app/src/main/kotlin/event/EventsAdapter.kt rename to app/src/androidMain/kotlin/event/EventsAdapter.kt diff --git a/app/src/main/kotlin/event/EventsFragment.kt b/app/src/androidMain/kotlin/event/EventsFragment.kt similarity index 100% rename from app/src/main/kotlin/event/EventsFragment.kt rename to app/src/androidMain/kotlin/event/EventsFragment.kt diff --git a/app/src/main/kotlin/event/EventsModel.kt b/app/src/androidMain/kotlin/event/EventsModel.kt similarity index 100% rename from app/src/main/kotlin/event/EventsModel.kt rename to app/src/androidMain/kotlin/event/EventsModel.kt diff --git a/app/src/main/kotlin/event/EventsRepo.kt b/app/src/androidMain/kotlin/event/EventsRepo.kt similarity index 100% rename from app/src/main/kotlin/event/EventsRepo.kt rename to app/src/androidMain/kotlin/event/EventsRepo.kt diff --git a/app/src/main/kotlin/icons/ContextExtensions.kt b/app/src/androidMain/kotlin/icons/ContextExtensions.kt similarity index 100% rename from app/src/main/kotlin/icons/ContextExtensions.kt rename to app/src/androidMain/kotlin/icons/ContextExtensions.kt diff --git a/app/src/main/kotlin/issue/IssuesAdapter.kt b/app/src/androidMain/kotlin/issue/IssuesAdapter.kt similarity index 100% rename from app/src/main/kotlin/issue/IssuesAdapter.kt rename to app/src/androidMain/kotlin/issue/IssuesAdapter.kt diff --git a/app/src/main/kotlin/issue/IssuesFragment.kt b/app/src/androidMain/kotlin/issue/IssuesFragment.kt similarity index 100% rename from app/src/main/kotlin/issue/IssuesFragment.kt rename to app/src/androidMain/kotlin/issue/IssuesFragment.kt diff --git a/app/src/main/kotlin/issue/IssuesModel.kt b/app/src/androidMain/kotlin/issue/IssuesModel.kt similarity index 100% rename from app/src/main/kotlin/issue/IssuesModel.kt rename to app/src/androidMain/kotlin/issue/IssuesModel.kt diff --git a/app/src/main/kotlin/json/Json.kt b/app/src/androidMain/kotlin/json/Json.kt similarity index 100% rename from app/src/main/kotlin/json/Json.kt rename to app/src/androidMain/kotlin/json/Json.kt diff --git a/app/src/main/kotlin/location/UserLocationRepository.kt b/app/src/androidMain/kotlin/location/UserLocationRepository.kt similarity index 100% rename from app/src/main/kotlin/location/UserLocationRepository.kt rename to app/src/androidMain/kotlin/location/UserLocationRepository.kt diff --git a/app/src/main/kotlin/map/BoundingBoxExtensions.kt b/app/src/androidMain/kotlin/map/BoundingBoxExtensions.kt similarity index 100% rename from app/src/main/kotlin/map/BoundingBoxExtensions.kt rename to app/src/androidMain/kotlin/map/BoundingBoxExtensions.kt diff --git a/app/src/main/kotlin/map/ContextExtensions.kt b/app/src/androidMain/kotlin/map/ContextExtensions.kt similarity index 100% rename from app/src/main/kotlin/map/ContextExtensions.kt rename to app/src/androidMain/kotlin/map/ContextExtensions.kt diff --git a/app/src/main/kotlin/map/DisabledMapView.kt b/app/src/androidMain/kotlin/map/DisabledMapView.kt similarity index 100% rename from app/src/main/kotlin/map/DisabledMapView.kt rename to app/src/androidMain/kotlin/map/DisabledMapView.kt diff --git a/app/src/main/kotlin/map/MapFragment.kt b/app/src/androidMain/kotlin/map/MapFragment.kt similarity index 100% rename from app/src/main/kotlin/map/MapFragment.kt rename to app/src/androidMain/kotlin/map/MapFragment.kt diff --git a/app/src/main/kotlin/map/MapMarkersRepo.kt b/app/src/androidMain/kotlin/map/MapMarkersRepo.kt similarity index 100% rename from app/src/main/kotlin/map/MapMarkersRepo.kt rename to app/src/androidMain/kotlin/map/MapMarkersRepo.kt diff --git a/app/src/main/kotlin/map/MapModel.kt b/app/src/androidMain/kotlin/map/MapModel.kt similarity index 100% rename from app/src/main/kotlin/map/MapModel.kt rename to app/src/androidMain/kotlin/map/MapModel.kt diff --git a/app/src/main/kotlin/map/MapViewExtensions.kt b/app/src/androidMain/kotlin/map/MapViewExtensions.kt similarity index 100% rename from app/src/main/kotlin/map/MapViewExtensions.kt rename to app/src/androidMain/kotlin/map/MapViewExtensions.kt diff --git a/app/src/main/kotlin/reports/Report.kt b/app/src/androidMain/kotlin/reports/Report.kt similarity index 100% rename from app/src/main/kotlin/reports/Report.kt rename to app/src/androidMain/kotlin/reports/Report.kt diff --git a/app/src/main/kotlin/reports/ReportJson.kt b/app/src/androidMain/kotlin/reports/ReportJson.kt similarity index 100% rename from app/src/main/kotlin/reports/ReportJson.kt rename to app/src/androidMain/kotlin/reports/ReportJson.kt diff --git a/app/src/main/kotlin/reports/ReportQueries.kt b/app/src/androidMain/kotlin/reports/ReportQueries.kt similarity index 100% rename from app/src/main/kotlin/reports/ReportQueries.kt rename to app/src/androidMain/kotlin/reports/ReportQueries.kt diff --git a/app/src/main/kotlin/reports/ReportsFragment.kt b/app/src/androidMain/kotlin/reports/ReportsFragment.kt similarity index 100% rename from app/src/main/kotlin/reports/ReportsFragment.kt rename to app/src/androidMain/kotlin/reports/ReportsFragment.kt diff --git a/app/src/main/kotlin/reports/ReportsModel.kt b/app/src/androidMain/kotlin/reports/ReportsModel.kt similarity index 100% rename from app/src/main/kotlin/reports/ReportsModel.kt rename to app/src/androidMain/kotlin/reports/ReportsModel.kt diff --git a/app/src/main/kotlin/reports/ReportsRepo.kt b/app/src/androidMain/kotlin/reports/ReportsRepo.kt similarity index 100% rename from app/src/main/kotlin/reports/ReportsRepo.kt rename to app/src/androidMain/kotlin/reports/ReportsRepo.kt diff --git a/app/src/main/kotlin/search/SearchAdapter.kt b/app/src/androidMain/kotlin/search/SearchAdapter.kt similarity index 100% rename from app/src/main/kotlin/search/SearchAdapter.kt rename to app/src/androidMain/kotlin/search/SearchAdapter.kt diff --git a/app/src/main/kotlin/search/SearchModel.kt b/app/src/androidMain/kotlin/search/SearchModel.kt similarity index 100% rename from app/src/main/kotlin/search/SearchModel.kt rename to app/src/androidMain/kotlin/search/SearchModel.kt diff --git a/app/src/main/kotlin/search/SearchResultModel.kt b/app/src/androidMain/kotlin/search/SearchResultModel.kt similarity index 100% rename from app/src/main/kotlin/search/SearchResultModel.kt rename to app/src/androidMain/kotlin/search/SearchResultModel.kt diff --git a/app/src/main/kotlin/settings/SettingsFragment.kt b/app/src/androidMain/kotlin/settings/SettingsFragment.kt similarity index 100% rename from app/src/main/kotlin/settings/SettingsFragment.kt rename to app/src/androidMain/kotlin/settings/SettingsFragment.kt diff --git a/app/src/main/kotlin/sync/BackgroundSyncScheduler.kt b/app/src/androidMain/kotlin/sync/BackgroundSyncScheduler.kt similarity index 100% rename from app/src/main/kotlin/sync/BackgroundSyncScheduler.kt rename to app/src/androidMain/kotlin/sync/BackgroundSyncScheduler.kt diff --git a/app/src/main/kotlin/sync/Sync.kt b/app/src/androidMain/kotlin/sync/Sync.kt similarity index 100% rename from app/src/main/kotlin/sync/Sync.kt rename to app/src/androidMain/kotlin/sync/Sync.kt diff --git a/app/src/main/kotlin/sync/SyncNotificationController.kt b/app/src/androidMain/kotlin/sync/SyncNotificationController.kt similarity index 100% rename from app/src/main/kotlin/sync/SyncNotificationController.kt rename to app/src/androidMain/kotlin/sync/SyncNotificationController.kt diff --git a/app/src/main/kotlin/sync/SyncWorker.kt b/app/src/androidMain/kotlin/sync/SyncWorker.kt similarity index 100% rename from app/src/main/kotlin/sync/SyncWorker.kt rename to app/src/androidMain/kotlin/sync/SyncWorker.kt diff --git a/app/src/main/kotlin/time/ZonedDateTimeExt.kt b/app/src/androidMain/kotlin/time/ZonedDateTimeExt.kt similarity index 100% rename from app/src/main/kotlin/time/ZonedDateTimeExt.kt rename to app/src/androidMain/kotlin/time/ZonedDateTimeExt.kt diff --git a/app/src/main/kotlin/user/User.kt b/app/src/androidMain/kotlin/user/User.kt similarity index 100% rename from app/src/main/kotlin/user/User.kt rename to app/src/androidMain/kotlin/user/User.kt diff --git a/app/src/main/kotlin/user/UserFragment.kt b/app/src/androidMain/kotlin/user/UserFragment.kt similarity index 100% rename from app/src/main/kotlin/user/UserFragment.kt rename to app/src/androidMain/kotlin/user/UserFragment.kt diff --git a/app/src/main/kotlin/user/UserJson.kt b/app/src/androidMain/kotlin/user/UserJson.kt similarity index 100% rename from app/src/main/kotlin/user/UserJson.kt rename to app/src/androidMain/kotlin/user/UserJson.kt diff --git a/app/src/main/kotlin/user/UserListItem.kt b/app/src/androidMain/kotlin/user/UserListItem.kt similarity index 100% rename from app/src/main/kotlin/user/UserListItem.kt rename to app/src/androidMain/kotlin/user/UserListItem.kt diff --git a/app/src/main/kotlin/user/UserQueries.kt b/app/src/androidMain/kotlin/user/UserQueries.kt similarity index 100% rename from app/src/main/kotlin/user/UserQueries.kt rename to app/src/androidMain/kotlin/user/UserQueries.kt diff --git a/app/src/main/kotlin/user/UsersAdapter.kt b/app/src/androidMain/kotlin/user/UsersAdapter.kt similarity index 100% rename from app/src/main/kotlin/user/UsersAdapter.kt rename to app/src/androidMain/kotlin/user/UsersAdapter.kt diff --git a/app/src/main/kotlin/user/UsersFragment.kt b/app/src/androidMain/kotlin/user/UsersFragment.kt similarity index 100% rename from app/src/main/kotlin/user/UsersFragment.kt rename to app/src/androidMain/kotlin/user/UsersFragment.kt diff --git a/app/src/main/kotlin/user/UsersModel.kt b/app/src/androidMain/kotlin/user/UsersModel.kt similarity index 100% rename from app/src/main/kotlin/user/UsersModel.kt rename to app/src/androidMain/kotlin/user/UsersModel.kt diff --git a/app/src/main/kotlin/user/UsersRepo.kt b/app/src/androidMain/kotlin/user/UsersRepo.kt similarity index 100% rename from app/src/main/kotlin/user/UsersRepo.kt rename to app/src/androidMain/kotlin/user/UsersRepo.kt diff --git a/app/src/main/res/drawable-nodpi/donation_qr_lightning.png b/app/src/androidMain/res/drawable-nodpi/donation_qr_lightning.png similarity index 100% rename from app/src/main/res/drawable-nodpi/donation_qr_lightning.png rename to app/src/androidMain/res/drawable-nodpi/donation_qr_lightning.png diff --git a/app/src/main/res/drawable-nodpi/donation_qr_onchain.png b/app/src/androidMain/res/drawable-nodpi/donation_qr_onchain.png similarity index 100% rename from app/src/main/res/drawable-nodpi/donation_qr_onchain.png rename to app/src/androidMain/res/drawable-nodpi/donation_qr_onchain.png diff --git a/app/src/main/res/drawable-nodpi/merchant.png b/app/src/androidMain/res/drawable-nodpi/merchant.png similarity index 100% rename from app/src/main/res/drawable-nodpi/merchant.png rename to app/src/androidMain/res/drawable-nodpi/merchant.png diff --git a/app/src/main/res/drawable/add.xml b/app/src/androidMain/res/drawable/add.xml similarity index 100% rename from app/src/main/res/drawable/add.xml rename to app/src/androidMain/res/drawable/add.xml diff --git a/app/src/main/res/drawable/add_location.xml b/app/src/androidMain/res/drawable/add_location.xml similarity index 100% rename from app/src/main/res/drawable/add_location.xml rename to app/src/androidMain/res/drawable/add_location.xml diff --git a/app/src/main/res/drawable/area_placeholder.xml b/app/src/androidMain/res/drawable/area_placeholder.xml similarity index 100% rename from app/src/main/res/drawable/area_placeholder.xml rename to app/src/androidMain/res/drawable/area_placeholder.xml diff --git a/app/src/main/res/drawable/area_placeholder_icon.xml b/app/src/androidMain/res/drawable/area_placeholder_icon.xml similarity index 100% rename from app/src/main/res/drawable/area_placeholder_icon.xml rename to app/src/androidMain/res/drawable/area_placeholder_icon.xml diff --git a/app/src/main/res/drawable/arrow_back.xml b/app/src/androidMain/res/drawable/arrow_back.xml similarity index 100% rename from app/src/main/res/drawable/arrow_back.xml rename to app/src/androidMain/res/drawable/arrow_back.xml diff --git a/app/src/main/res/drawable/call.xml b/app/src/androidMain/res/drawable/call.xml similarity index 100% rename from app/src/main/res/drawable/call.xml rename to app/src/androidMain/res/drawable/call.xml diff --git a/app/src/main/res/drawable/cluster.xml b/app/src/androidMain/res/drawable/cluster.xml similarity index 100% rename from app/src/main/res/drawable/cluster.xml rename to app/src/androidMain/res/drawable/cluster.xml diff --git a/app/src/main/res/drawable/contact_discord.xml b/app/src/androidMain/res/drawable/contact_discord.xml similarity index 100% rename from app/src/main/res/drawable/contact_discord.xml rename to app/src/androidMain/res/drawable/contact_discord.xml diff --git a/app/src/main/res/drawable/contact_email.xml b/app/src/androidMain/res/drawable/contact_email.xml similarity index 100% rename from app/src/main/res/drawable/contact_email.xml rename to app/src/androidMain/res/drawable/contact_email.xml diff --git a/app/src/main/res/drawable/contact_facebook.xml b/app/src/androidMain/res/drawable/contact_facebook.xml similarity index 100% rename from app/src/main/res/drawable/contact_facebook.xml rename to app/src/androidMain/res/drawable/contact_facebook.xml diff --git a/app/src/main/res/drawable/contact_instagram.xml b/app/src/androidMain/res/drawable/contact_instagram.xml similarity index 100% rename from app/src/main/res/drawable/contact_instagram.xml rename to app/src/androidMain/res/drawable/contact_instagram.xml diff --git a/app/src/main/res/drawable/contact_telegram.xml b/app/src/androidMain/res/drawable/contact_telegram.xml similarity index 100% rename from app/src/main/res/drawable/contact_telegram.xml rename to app/src/androidMain/res/drawable/contact_telegram.xml diff --git a/app/src/main/res/drawable/contact_twitter.xml b/app/src/androidMain/res/drawable/contact_twitter.xml similarity index 100% rename from app/src/main/res/drawable/contact_twitter.xml rename to app/src/androidMain/res/drawable/contact_twitter.xml diff --git a/app/src/main/res/drawable/contact_youtube.xml b/app/src/androidMain/res/drawable/contact_youtube.xml similarity index 100% rename from app/src/main/res/drawable/contact_youtube.xml rename to app/src/androidMain/res/drawable/contact_youtube.xml diff --git a/app/src/main/res/drawable/currency_bitcoin.xml b/app/src/androidMain/res/drawable/currency_bitcoin.xml similarity index 100% rename from app/src/main/res/drawable/currency_bitcoin.xml rename to app/src/androidMain/res/drawable/currency_bitcoin.xml diff --git a/app/src/main/res/drawable/directions.xml b/app/src/androidMain/res/drawable/directions.xml similarity index 100% rename from app/src/main/res/drawable/directions.xml rename to app/src/androidMain/res/drawable/directions.xml diff --git a/app/src/main/res/drawable/earth.xml b/app/src/androidMain/res/drawable/earth.xml similarity index 100% rename from app/src/main/res/drawable/earth.xml rename to app/src/androidMain/res/drawable/earth.xml diff --git a/app/src/main/res/drawable/edit.xml b/app/src/androidMain/res/drawable/edit.xml similarity index 100% rename from app/src/main/res/drawable/edit.xml rename to app/src/androidMain/res/drawable/edit.xml diff --git a/app/src/main/res/drawable/fmd_bad.xml b/app/src/androidMain/res/drawable/fmd_bad.xml similarity index 100% rename from app/src/main/res/drawable/fmd_bad.xml rename to app/src/androidMain/res/drawable/fmd_bad.xml diff --git a/app/src/main/res/drawable/launcher.xml b/app/src/androidMain/res/drawable/launcher.xml similarity index 100% rename from app/src/main/res/drawable/launcher.xml rename to app/src/androidMain/res/drawable/launcher.xml diff --git a/app/src/main/res/drawable/launcher_fg.xml b/app/src/androidMain/res/drawable/launcher_fg.xml similarity index 100% rename from app/src/main/res/drawable/launcher_fg.xml rename to app/src/androidMain/res/drawable/launcher_fg.xml diff --git a/app/src/main/res/drawable/launcher_fg_monochrome.xml b/app/src/androidMain/res/drawable/launcher_fg_monochrome.xml similarity index 100% rename from app/src/main/res/drawable/launcher_fg_monochrome.xml rename to app/src/androidMain/res/drawable/launcher_fg_monochrome.xml diff --git a/app/src/main/res/drawable/marker.xml b/app/src/androidMain/res/drawable/marker.xml similarity index 100% rename from app/src/main/res/drawable/marker.xml rename to app/src/androidMain/res/drawable/marker.xml diff --git a/app/src/main/res/drawable/monitoring.xml b/app/src/androidMain/res/drawable/monitoring.xml similarity index 100% rename from app/src/main/res/drawable/monitoring.xml rename to app/src/androidMain/res/drawable/monitoring.xml diff --git a/app/src/main/res/drawable/my_location.xml b/app/src/androidMain/res/drawable/my_location.xml similarity index 100% rename from app/src/main/res/drawable/my_location.xml rename to app/src/androidMain/res/drawable/my_location.xml diff --git a/app/src/main/res/drawable/person_alt.xml b/app/src/androidMain/res/drawable/person_alt.xml similarity index 100% rename from app/src/main/res/drawable/person_alt.xml rename to app/src/androidMain/res/drawable/person_alt.xml diff --git a/app/src/main/res/drawable/place.xml b/app/src/androidMain/res/drawable/place.xml similarity index 100% rename from app/src/main/res/drawable/place.xml rename to app/src/androidMain/res/drawable/place.xml diff --git a/app/src/main/res/drawable/remove.xml b/app/src/androidMain/res/drawable/remove.xml similarity index 100% rename from app/src/main/res/drawable/remove.xml rename to app/src/androidMain/res/drawable/remove.xml diff --git a/app/src/main/res/drawable/schedule.xml b/app/src/androidMain/res/drawable/schedule.xml similarity index 100% rename from app/src/main/res/drawable/schedule.xml rename to app/src/androidMain/res/drawable/schedule.xml diff --git a/app/src/main/res/drawable/settings.xml b/app/src/androidMain/res/drawable/settings.xml similarity index 100% rename from app/src/main/res/drawable/settings.xml rename to app/src/androidMain/res/drawable/settings.xml diff --git a/app/src/main/res/drawable/user_avatar_placeholder_bg.xml b/app/src/androidMain/res/drawable/user_avatar_placeholder_bg.xml similarity index 100% rename from app/src/main/res/drawable/user_avatar_placeholder_bg.xml rename to app/src/androidMain/res/drawable/user_avatar_placeholder_bg.xml diff --git a/app/src/main/res/drawable/verified.xml b/app/src/androidMain/res/drawable/verified.xml similarity index 100% rename from app/src/main/res/drawable/verified.xml rename to app/src/androidMain/res/drawable/verified.xml diff --git a/app/src/main/res/drawable/warning.xml b/app/src/androidMain/res/drawable/warning.xml similarity index 100% rename from app/src/main/res/drawable/warning.xml rename to app/src/androidMain/res/drawable/warning.xml diff --git a/app/src/main/res/layout/activity.xml b/app/src/androidMain/res/layout/activity.xml similarity index 100% rename from app/src/main/res/layout/activity.xml rename to app/src/androidMain/res/layout/activity.xml diff --git a/app/src/main/res/layout/fragment_area.xml b/app/src/androidMain/res/layout/fragment_area.xml similarity index 100% rename from app/src/main/res/layout/fragment_area.xml rename to app/src/androidMain/res/layout/fragment_area.xml diff --git a/app/src/main/res/layout/fragment_areas.xml b/app/src/androidMain/res/layout/fragment_areas.xml similarity index 100% rename from app/src/main/res/layout/fragment_areas.xml rename to app/src/androidMain/res/layout/fragment_areas.xml diff --git a/app/src/main/res/layout/fragment_delivery.xml b/app/src/androidMain/res/layout/fragment_delivery.xml similarity index 100% rename from app/src/main/res/layout/fragment_delivery.xml rename to app/src/androidMain/res/layout/fragment_delivery.xml diff --git a/app/src/main/res/layout/fragment_donation.xml b/app/src/androidMain/res/layout/fragment_donation.xml similarity index 100% rename from app/src/main/res/layout/fragment_donation.xml rename to app/src/androidMain/res/layout/fragment_donation.xml diff --git a/app/src/main/res/layout/fragment_element.xml b/app/src/androidMain/res/layout/fragment_element.xml similarity index 100% rename from app/src/main/res/layout/fragment_element.xml rename to app/src/androidMain/res/layout/fragment_element.xml diff --git a/app/src/main/res/layout/fragment_events.xml b/app/src/androidMain/res/layout/fragment_events.xml similarity index 100% rename from app/src/main/res/layout/fragment_events.xml rename to app/src/androidMain/res/layout/fragment_events.xml diff --git a/app/src/main/res/layout/fragment_issues.xml b/app/src/androidMain/res/layout/fragment_issues.xml similarity index 100% rename from app/src/main/res/layout/fragment_issues.xml rename to app/src/androidMain/res/layout/fragment_issues.xml diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/androidMain/res/layout/fragment_map.xml similarity index 100% rename from app/src/main/res/layout/fragment_map.xml rename to app/src/androidMain/res/layout/fragment_map.xml diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/androidMain/res/layout/fragment_reports.xml similarity index 100% rename from app/src/main/res/layout/fragment_reports.xml rename to app/src/androidMain/res/layout/fragment_reports.xml diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/androidMain/res/layout/fragment_settings.xml similarity index 100% rename from app/src/main/res/layout/fragment_settings.xml rename to app/src/androidMain/res/layout/fragment_settings.xml diff --git a/app/src/main/res/layout/fragment_user.xml b/app/src/androidMain/res/layout/fragment_user.xml similarity index 100% rename from app/src/main/res/layout/fragment_user.xml rename to app/src/androidMain/res/layout/fragment_user.xml diff --git a/app/src/main/res/layout/fragment_users.xml b/app/src/androidMain/res/layout/fragment_users.xml similarity index 100% rename from app/src/main/res/layout/fragment_users.xml rename to app/src/androidMain/res/layout/fragment_users.xml diff --git a/app/src/main/res/layout/item_area.xml b/app/src/androidMain/res/layout/item_area.xml similarity index 100% rename from app/src/main/res/layout/item_area.xml rename to app/src/androidMain/res/layout/item_area.xml diff --git a/app/src/main/res/layout/item_area_description.xml b/app/src/androidMain/res/layout/item_area_description.xml similarity index 100% rename from app/src/main/res/layout/item_area_description.xml rename to app/src/androidMain/res/layout/item_area_description.xml diff --git a/app/src/main/res/layout/item_area_element.xml b/app/src/androidMain/res/layout/item_area_element.xml similarity index 100% rename from app/src/main/res/layout/item_area_element.xml rename to app/src/androidMain/res/layout/item_area_element.xml diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/androidMain/res/layout/item_contact.xml similarity index 100% rename from app/src/main/res/layout/item_contact.xml rename to app/src/androidMain/res/layout/item_contact.xml diff --git a/app/src/main/res/layout/item_delivery.xml b/app/src/androidMain/res/layout/item_delivery.xml similarity index 100% rename from app/src/main/res/layout/item_delivery.xml rename to app/src/androidMain/res/layout/item_delivery.xml diff --git a/app/src/main/res/layout/item_event.xml b/app/src/androidMain/res/layout/item_event.xml similarity index 100% rename from app/src/main/res/layout/item_event.xml rename to app/src/androidMain/res/layout/item_event.xml diff --git a/app/src/main/res/layout/item_issue.xml b/app/src/androidMain/res/layout/item_issue.xml similarity index 100% rename from app/src/main/res/layout/item_issue.xml rename to app/src/androidMain/res/layout/item_issue.xml diff --git a/app/src/main/res/layout/item_issues.xml b/app/src/androidMain/res/layout/item_issues.xml similarity index 100% rename from app/src/main/res/layout/item_issues.xml rename to app/src/androidMain/res/layout/item_issues.xml diff --git a/app/src/main/res/layout/item_map.xml b/app/src/androidMain/res/layout/item_map.xml similarity index 100% rename from app/src/main/res/layout/item_map.xml rename to app/src/androidMain/res/layout/item_map.xml diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/androidMain/res/layout/item_search_result.xml similarity index 100% rename from app/src/main/res/layout/item_search_result.xml rename to app/src/androidMain/res/layout/item_search_result.xml diff --git a/app/src/main/res/layout/item_user.xml b/app/src/androidMain/res/layout/item_user.xml similarity index 100% rename from app/src/main/res/layout/item_user.xml rename to app/src/androidMain/res/layout/item_user.xml diff --git a/app/src/main/res/menu/area.xml b/app/src/androidMain/res/menu/area.xml similarity index 100% rename from app/src/main/res/menu/area.xml rename to app/src/androidMain/res/menu/area.xml diff --git a/app/src/main/res/menu/element.xml b/app/src/androidMain/res/menu/element.xml similarity index 100% rename from app/src/main/res/menu/element.xml rename to app/src/androidMain/res/menu/element.xml diff --git a/app/src/main/res/menu/map.xml b/app/src/androidMain/res/menu/map.xml similarity index 100% rename from app/src/main/res/menu/map.xml rename to app/src/androidMain/res/menu/map.xml diff --git a/app/src/main/res/menu/user.xml b/app/src/androidMain/res/menu/user.xml similarity index 100% rename from app/src/main/res/menu/user.xml rename to app/src/androidMain/res/menu/user.xml diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/androidMain/res/navigation/nav_graph.xml similarity index 100% rename from app/src/main/res/navigation/nav_graph.xml rename to app/src/androidMain/res/navigation/nav_graph.xml diff --git a/app/src/main/res/values-af/strings.xml b/app/src/androidMain/res/values-af/strings.xml similarity index 100% rename from app/src/main/res/values-af/strings.xml rename to app/src/androidMain/res/values-af/strings.xml diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/androidMain/res/values-ar/strings.xml similarity index 100% rename from app/src/main/res/values-ar/strings.xml rename to app/src/androidMain/res/values-ar/strings.xml diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/androidMain/res/values-bg/strings.xml similarity index 100% rename from app/src/main/res/values-bg/strings.xml rename to app/src/androidMain/res/values-bg/strings.xml diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/androidMain/res/values-bn/strings.xml similarity index 100% rename from app/src/main/res/values-bn/strings.xml rename to app/src/androidMain/res/values-bn/strings.xml diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/androidMain/res/values-ca/strings.xml similarity index 100% rename from app/src/main/res/values-ca/strings.xml rename to app/src/androidMain/res/values-ca/strings.xml diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/androidMain/res/values-cs/strings.xml similarity index 100% rename from app/src/main/res/values-cs/strings.xml rename to app/src/androidMain/res/values-cs/strings.xml diff --git a/app/src/main/res/values-da/strings.xml b/app/src/androidMain/res/values-da/strings.xml similarity index 100% rename from app/src/main/res/values-da/strings.xml rename to app/src/androidMain/res/values-da/strings.xml diff --git a/app/src/main/res/values-de/strings.xml b/app/src/androidMain/res/values-de/strings.xml similarity index 100% rename from app/src/main/res/values-de/strings.xml rename to app/src/androidMain/res/values-de/strings.xml diff --git a/app/src/main/res/values-el/strings.xml b/app/src/androidMain/res/values-el/strings.xml similarity index 100% rename from app/src/main/res/values-el/strings.xml rename to app/src/androidMain/res/values-el/strings.xml diff --git a/app/src/main/res/values-es/strings.xml b/app/src/androidMain/res/values-es/strings.xml similarity index 100% rename from app/src/main/res/values-es/strings.xml rename to app/src/androidMain/res/values-es/strings.xml diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/androidMain/res/values-fa/strings.xml similarity index 100% rename from app/src/main/res/values-fa/strings.xml rename to app/src/androidMain/res/values-fa/strings.xml diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/androidMain/res/values-fi/strings.xml similarity index 100% rename from app/src/main/res/values-fi/strings.xml rename to app/src/androidMain/res/values-fi/strings.xml diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/androidMain/res/values-fr/strings.xml similarity index 100% rename from app/src/main/res/values-fr/strings.xml rename to app/src/androidMain/res/values-fr/strings.xml diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/androidMain/res/values-hi/strings.xml similarity index 100% rename from app/src/main/res/values-hi/strings.xml rename to app/src/androidMain/res/values-hi/strings.xml diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/androidMain/res/values-hu/strings.xml similarity index 100% rename from app/src/main/res/values-hu/strings.xml rename to app/src/androidMain/res/values-hu/strings.xml diff --git a/app/src/main/res/values-it/strings.xml b/app/src/androidMain/res/values-it/strings.xml similarity index 100% rename from app/src/main/res/values-it/strings.xml rename to app/src/androidMain/res/values-it/strings.xml diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/androidMain/res/values-iw/strings.xml similarity index 100% rename from app/src/main/res/values-iw/strings.xml rename to app/src/androidMain/res/values-iw/strings.xml diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/androidMain/res/values-ja/strings.xml similarity index 100% rename from app/src/main/res/values-ja/strings.xml rename to app/src/androidMain/res/values-ja/strings.xml diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/androidMain/res/values-ko/strings.xml similarity index 100% rename from app/src/main/res/values-ko/strings.xml rename to app/src/androidMain/res/values-ko/strings.xml diff --git a/app/src/main/res/values-night/styles.xml b/app/src/androidMain/res/values-night/styles.xml similarity index 100% rename from app/src/main/res/values-night/styles.xml rename to app/src/androidMain/res/values-night/styles.xml diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/androidMain/res/values-nl/strings.xml similarity index 100% rename from app/src/main/res/values-nl/strings.xml rename to app/src/androidMain/res/values-nl/strings.xml diff --git a/app/src/main/res/values-no/strings.xml b/app/src/androidMain/res/values-no/strings.xml similarity index 100% rename from app/src/main/res/values-no/strings.xml rename to app/src/androidMain/res/values-no/strings.xml diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/androidMain/res/values-pl/strings.xml similarity index 100% rename from app/src/main/res/values-pl/strings.xml rename to app/src/androidMain/res/values-pl/strings.xml diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/androidMain/res/values-pt/strings.xml similarity index 100% rename from app/src/main/res/values-pt/strings.xml rename to app/src/androidMain/res/values-pt/strings.xml diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/androidMain/res/values-ro/strings.xml similarity index 100% rename from app/src/main/res/values-ro/strings.xml rename to app/src/androidMain/res/values-ro/strings.xml diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/androidMain/res/values-ru/strings.xml similarity index 100% rename from app/src/main/res/values-ru/strings.xml rename to app/src/androidMain/res/values-ru/strings.xml diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/androidMain/res/values-sr/strings.xml similarity index 100% rename from app/src/main/res/values-sr/strings.xml rename to app/src/androidMain/res/values-sr/strings.xml diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/androidMain/res/values-sv/strings.xml similarity index 100% rename from app/src/main/res/values-sv/strings.xml rename to app/src/androidMain/res/values-sv/strings.xml diff --git a/app/src/main/res/values-th/strings.xml b/app/src/androidMain/res/values-th/strings.xml similarity index 100% rename from app/src/main/res/values-th/strings.xml rename to app/src/androidMain/res/values-th/strings.xml diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/androidMain/res/values-tr/strings.xml similarity index 100% rename from app/src/main/res/values-tr/strings.xml rename to app/src/androidMain/res/values-tr/strings.xml diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/androidMain/res/values-uk/strings.xml similarity index 100% rename from app/src/main/res/values-uk/strings.xml rename to app/src/androidMain/res/values-uk/strings.xml diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/androidMain/res/values-ur/strings.xml similarity index 100% rename from app/src/main/res/values-ur/strings.xml rename to app/src/androidMain/res/values-ur/strings.xml diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/androidMain/res/values-vi/strings.xml similarity index 100% rename from app/src/main/res/values-vi/strings.xml rename to app/src/androidMain/res/values-vi/strings.xml diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/androidMain/res/values-zh/strings.xml similarity index 100% rename from app/src/main/res/values-zh/strings.xml rename to app/src/androidMain/res/values-zh/strings.xml diff --git a/app/src/main/res/values/strings.xml b/app/src/androidMain/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to app/src/androidMain/res/values/strings.xml diff --git a/app/src/main/res/values/styles.xml b/app/src/androidMain/res/values/styles.xml similarity index 100% rename from app/src/main/res/values/styles.xml rename to app/src/androidMain/res/values/styles.xml diff --git a/app/src/main/res/values/untranslatable-strings.xml b/app/src/androidMain/res/values/untranslatable-strings.xml similarity index 100% rename from app/src/main/res/values/untranslatable-strings.xml rename to app/src/androidMain/res/values/untranslatable-strings.xml diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/androidMain/res/xml/backup_rules.xml similarity index 100% rename from app/src/main/res/xml/backup_rules.xml rename to app/src/androidMain/res/xml/backup_rules.xml diff --git a/app/src/main/kotlin/area/Meetup.kt b/app/src/commonMain/kotlin/area/Meetup.kt similarity index 100% rename from app/src/main/kotlin/area/Meetup.kt rename to app/src/commonMain/kotlin/area/Meetup.kt diff --git a/app/src/debug/res/drawable/launcher_fg.xml b/app/src/debug/res/drawable/launcher_fg.xml deleted file mode 100644 index a99fe0cc..00000000 --- a/app/src/debug/res/drawable/launcher_fg.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/test/kotlin/api/ApiImplTest.kt b/app/src/test/kotlin/api/ApiImplTest.kt deleted file mode 100644 index 250a4a2d..00000000 --- a/app/src/test/kotlin/api/ApiImplTest.kt +++ /dev/null @@ -1,86 +0,0 @@ -package api - -import kotlinx.coroutines.runBlocking -import okhttp3.OkHttpClient -import okhttp3.mockwebserver.MockResponse -import okhttp3.mockwebserver.MockWebServer -import org.junit.Assert.assertEquals -import org.junit.Test - -class ApiImplTest { - - @Test - fun getAreas() = runBlocking { - val server = MockWebServer() - server.enqueue(MockResponse().setBody("[]")) - server.start() - - val api = ApiImpl( - baseUrl = server.url(""), - httpClient = OkHttpClient(), - ) - - assertEquals(0, api.getAreas(null, 100).size) - server.shutdown() - } - - @Test - fun getElements() = runBlocking { - val server = MockWebServer() - server.enqueue(MockResponse().setBody("[]")) - server.start() - - val api = ApiImpl( - baseUrl = server.url(""), - httpClient = OkHttpClient(), - ) - - assertEquals(0, api.getElements(null, 100).size) - server.shutdown() - } - - @Test - fun getEvents() = runBlocking { - val server = MockWebServer() - server.enqueue(MockResponse().setBody("[]")) - server.start() - - val api = ApiImpl( - baseUrl = server.url(""), - httpClient = OkHttpClient(), - ) - - assertEquals(0, api.getEvents(null, 100).size) - server.shutdown() - } - - @Test - fun getReports() = runBlocking { - val server = MockWebServer() - server.enqueue(MockResponse().setBody("[]")) - server.start() - - val api = ApiImpl( - baseUrl = server.url(""), - httpClient = OkHttpClient(), - ) - - assertEquals(0, api.getReports(null, 100).size) - server.shutdown() - } - - @Test - fun getUsers() = runBlocking { - val server = MockWebServer() - server.enqueue(MockResponse().setBody("[]")) - server.start() - - val api = ApiImpl( - baseUrl = server.url(""), - httpClient = OkHttpClient(), - ) - - assertEquals(0, api.getUsers(null, 100).size) - server.shutdown() - } -} \ No newline at end of file diff --git a/app/src/test/kotlin/area/AreaQueriesTest.kt b/app/src/test/kotlin/area/AreaQueriesTest.kt deleted file mode 100644 index 7fc1bec2..00000000 --- a/app/src/test/kotlin/area/AreaQueriesTest.kt +++ /dev/null @@ -1,19 +0,0 @@ -package area - -import db.Database -import org.json.JSONObject -import org.junit.Ignore -import org.junit.Test -import java.time.ZonedDateTime - -class AreaQueriesTest { - - @Ignore - @Test - fun insert() { - val queries = AreaQueries(Database(":memory:")) - val area = Area(id = 1, tags = JSONObject(), updatedAt = ZonedDateTime.now()) - queries.insertOrReplace(listOf(area)) - assert(queries.selectById(area.id) == area) - } -} \ No newline at end of file diff --git a/app/src/test/kotlin/element/OsmTagsTest.kt b/app/src/test/kotlin/element/OsmTagsTest.kt deleted file mode 100644 index b2cb53ee..00000000 --- a/app/src/test/kotlin/element/OsmTagsTest.kt +++ /dev/null @@ -1,62 +0,0 @@ -package element - -import org.junit.Assert.assertEquals -import org.junit.Test -import java.util.Locale - -class OsmTagsTest { - - @Test - fun name() { - val name = "test" - val tags: OsmTags = OsmTags(mapOf("name" to name)) - assertEquals(name, tags.name(atmLocalizedString = "", unnamedPlaceLocalizedString = "")) - } - - @Test - fun nameLocalized() { - val locale = Locale("it") - val name = "Shop" - val nameLocalized = "Negozio" - - val tags: OsmTags = OsmTags( - mapOf( - "name" to name, - "name:${locale.language}" to nameLocalized, - ) - ) - - assertEquals( - nameLocalized, - tags.name(atmLocalizedString = "", unnamedPlaceLocalizedString = "", locale = locale) - ) - } - - @Test - fun nameEmpty() { - val unnamedPlaceLocalizedString = "Unnamed" - val tags: OsmTags = OsmTags() - - assertEquals( - unnamedPlaceLocalizedString, - tags.name( - atmLocalizedString = "", - unnamedPlaceLocalizedString = unnamedPlaceLocalizedString, - ) - ) - } - - @Test - fun nameAtm() { - val atmLocalizedString = "ATM" - val tags: OsmTags = OsmTags(mapOf("amenity" to "atm")) - - assertEquals( - atmLocalizedString, - tags.name( - atmLocalizedString = atmLocalizedString, - unnamedPlaceLocalizedString = "", - ) - ) - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 210dc1ab..442d0c0c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + alias(libs.plugins.kotlinMultiplatform) apply false alias(libs.plugins.androidApplication) apply false - alias(libs.plugins.kotlinAndroid) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e3a0fc02..b9401556 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,5 +78,4 @@ json = { module = "org.json:json", version.ref = "json" } [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } -kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } - +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }