diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9f1d3bd76b..619d79db9c 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1 +1,2 @@ 6aa73face8b5eb8e026cfafa40d1983d4a0502c0 +54c9882c122134bacda6cac1a698b63fd833c847 diff --git a/.github/workflows/android-check-metadata.yaml b/.github/workflows/android-check-metadata.yaml index 10ae5651b6..a2f55a8994 100644 --- a/.github/workflows/android-check-metadata.yaml +++ b/.github/workflows/android-check-metadata.yaml @@ -4,8 +4,8 @@ on: pull_request: paths: - .github/workflows/android-check-metadata.yaml # Run check on self change - - android/src/fdroid/** - - android/src/google/** + - android/app/src/main/fdroid/** + - android/app/src/main/google/** - tools/python/check_store_metadata.py jobs: diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml index f2628b7718..fd5e3a175d 100644 --- a/.github/workflows/android-check.yaml +++ b/.github/workflows/android-check.yaml @@ -14,8 +14,8 @@ on: - LICENSE - NOTICE - README.md - - android/src/fdroid/** - - android/src/google/** + - android/app/src/main/fdroid/** + - android/app/src/main/google/** - iphone/** - data/strings/** - docs/** @@ -106,5 +106,5 @@ jobs: uses: actions/upload-artifact@v3 with: name: android-arm64-v8a-${{ matrix.flavor }} - path: android/build/outputs/apk/**/OrganicMaps-*.apk + path: android/app/build/outputs/apk/**/OrganicMaps-*.apk if-no-files-found: error diff --git a/.github/workflows/android-monkey.yaml b/.github/workflows/android-monkey.yaml index be17f66671..f2f6a0b60a 100644 --- a/.github/workflows/android-monkey.yaml +++ b/.github/workflows/android-monkey.yaml @@ -82,7 +82,7 @@ jobs: run: | gcloud auth activate-service-account --key-file android/firebase-test-lab.json gcloud config set project omapsapp - gcloud firebase test android run --app ./android/build/outputs/apk/google/debug/OrganicMaps-*-google-debug.apk \ + gcloud firebase test android run --app ./android/app/build/outputs/apk/google/debug/OrganicMaps-*-google-debug.apk \ --device model=panther,version=33 \ --device model=bluejay,version=32 \ --device model=b2q,version=31 \ diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml index 8a2a9ecb57..36f403af17 100644 --- a/.github/workflows/android-release.yaml +++ b/.github/workflows/android-release.yaml @@ -3,8 +3,8 @@ on: workflow_dispatch: # Manual trigger env: - RELEASE_NOTES: android/src/google/play/release-notes/en-US/default.txt - FDROID_VERSION: android/src/fdroid/play/version.yaml + RELEASE_NOTES: android/app/src/main/google/play/release-notes/en-US/default.txt + FDROID_VERSION: android/app/src/main/fdroid/play/version.yaml JAVA_HOME: /usr/lib/jvm/temurin-17-jdk-amd64 # Java 17 is required for Android Gradle 8 plugin jobs: @@ -151,7 +151,7 @@ jobs: echo "" echo "sha256sum:" echo -e '\n```' - (cd ./android/build/outputs/apk/web/release/ && sha256sum OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk) | tr -d '\n' + (cd ./android/app/build/outputs/apk/web/release/ && sha256sum OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk) | tr -d '\n' echo -e '\n```' } > ${{ runner.temp }}/release-notes.txt @@ -164,5 +164,5 @@ jobs: name: ${{ needs.tag.outputs.tag }} tag_name: ${{ needs.tag.outputs.tag }} discussion_category_name: 'Announcements' - files: ./android/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk + files: ./android/app/build/outputs/apk/web/release/OrganicMaps-${{ needs.tag.outputs.code }}-web-release.apk fail_on_unmatched_files: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e08ec4ca0..ad6b0625b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -353,5 +353,5 @@ endif() omim_add_test_subdirectory(qt_tstfrm) if (PLATFORM_ANDROID) - add_subdirectory(android/jni) + add_subdirectory(android/app/src/main/cpp) endif() diff --git a/android/.gitignore b/android/.gitignore index 15c3212de9..abb09d8886 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,40 +1,23 @@ -bin -gen -/libs/ -.settings -resbuilder -spoon-output -obj -local -.gradle -build -3rd_party/api-android/ -RELEASE -.idea -.externalNativeBuild -nativeOutputs - -# For now, ignore Android Studio projects +# default android studio ignore list *.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties *.class .classpath .cproject .project -local.properties lint.xml .gradletasknamecache - -# ignore flags symlinks -res/drawable-xhdpi/??.png -res/drawable-xhdpi/do_hack.png -res/drawable-xhdpi/uk_england.png -res/drawable-xhdpi/uk_northern_ireland.png -res/drawable-xhdpi/uk_scotland.png -res/drawable-xhdpi/uk_wales.png -res/drawable-mdpi/??.png -res/drawable-mdpi/do_hack.png -res/drawable-mdpi/uk_england.png -res/drawable-mdpi/uk_northern_ireland.png -res/drawable-mdpi/uk_scotland.png -res/drawable-mdpi/uk_wales.png diff --git a/android/app/.gitignore b/android/app/.gitignore new file mode 100644 index 0000000000..de50a29f33 --- /dev/null +++ b/android/app/.gitignore @@ -0,0 +1,20 @@ +/build +/nativeOutputs +google-services.json +secure.properties + +src/main/res/xml/network_security_config.xml + +# ignore flags symlinks +/src/main/res/drawable-xhdpi/??.png +/src/main/res/drawable-xhdpi/do_hack.png +/src/main/res/drawable-xhdpi/uk_england.png +/src/main/res/drawable-xhdpi/uk_northern_ireland.png +/src/main/res/drawable-xhdpi/uk_scotland.png +/src/main/res/drawable-xhdpi/uk_wales.png +/src/main/res/drawable-mdpi/??.png +/src/main/res/drawable-mdpi/do_hack.png +/src/main/res/drawable-mdpi/uk_england.png +/src/main/res/drawable-mdpi/uk_northern_ireland.png +/src/main/res/drawable-mdpi/uk_scotland.png +/src/main/res/drawable-mdpi/uk_wales.png diff --git a/android/app/assets/00_NotoNaskhArabic-Regular.ttf b/android/app/assets/00_NotoNaskhArabic-Regular.ttf new file mode 120000 index 0000000000..12b19f0bba --- /dev/null +++ b/android/app/assets/00_NotoNaskhArabic-Regular.ttf @@ -0,0 +1 @@ +../../../data/00_NotoNaskhArabic-Regular.ttf \ No newline at end of file diff --git a/android/app/assets/00_NotoSansThai-Regular.ttf b/android/app/assets/00_NotoSansThai-Regular.ttf new file mode 120000 index 0000000000..454f684a02 --- /dev/null +++ b/android/app/assets/00_NotoSansThai-Regular.ttf @@ -0,0 +1 @@ +../../../data/00_NotoSansThai-Regular.ttf \ No newline at end of file diff --git a/android/app/assets/00_NotoSerifDevanagari-Regular.ttf b/android/app/assets/00_NotoSerifDevanagari-Regular.ttf new file mode 120000 index 0000000000..e1d0f62414 --- /dev/null +++ b/android/app/assets/00_NotoSerifDevanagari-Regular.ttf @@ -0,0 +1 @@ +../../../data/00_NotoSerifDevanagari-Regular.ttf \ No newline at end of file diff --git a/android/app/assets/01_dejavusans.ttf b/android/app/assets/01_dejavusans.ttf new file mode 120000 index 0000000000..9fa46acb16 --- /dev/null +++ b/android/app/assets/01_dejavusans.ttf @@ -0,0 +1 @@ +../../../data/01_dejavusans.ttf \ No newline at end of file diff --git a/android/app/assets/02_droidsans-fallback.ttf b/android/app/assets/02_droidsans-fallback.ttf new file mode 120000 index 0000000000..585d112154 --- /dev/null +++ b/android/app/assets/02_droidsans-fallback.ttf @@ -0,0 +1 @@ +../../../data/02_droidsans-fallback.ttf \ No newline at end of file diff --git a/android/app/assets/03_jomolhari-id-a3d.ttf b/android/app/assets/03_jomolhari-id-a3d.ttf new file mode 120000 index 0000000000..aaeacdf663 --- /dev/null +++ b/android/app/assets/03_jomolhari-id-a3d.ttf @@ -0,0 +1 @@ +../../../data/03_jomolhari-id-a3d.ttf \ No newline at end of file diff --git a/android/app/assets/04_padauk.ttf b/android/app/assets/04_padauk.ttf new file mode 120000 index 0000000000..7045b5b29b --- /dev/null +++ b/android/app/assets/04_padauk.ttf @@ -0,0 +1 @@ +../../../data/04_padauk.ttf \ No newline at end of file diff --git a/android/app/assets/05_khmeros.ttf b/android/app/assets/05_khmeros.ttf new file mode 120000 index 0000000000..0c2294786a --- /dev/null +++ b/android/app/assets/05_khmeros.ttf @@ -0,0 +1 @@ +../../../data/05_khmeros.ttf \ No newline at end of file diff --git a/android/app/assets/06_code2000.ttf b/android/app/assets/06_code2000.ttf new file mode 120000 index 0000000000..990f3f1b0b --- /dev/null +++ b/android/app/assets/06_code2000.ttf @@ -0,0 +1 @@ +../../../data/06_code2000.ttf \ No newline at end of file diff --git a/android/app/assets/07_roboto_medium.ttf b/android/app/assets/07_roboto_medium.ttf new file mode 120000 index 0000000000..b7e9ac4a1d --- /dev/null +++ b/android/app/assets/07_roboto_medium.ttf @@ -0,0 +1 @@ +../../../data/07_roboto_medium.ttf \ No newline at end of file diff --git a/android/app/assets/categories.txt b/android/app/assets/categories.txt new file mode 120000 index 0000000000..21d052a3a0 --- /dev/null +++ b/android/app/assets/categories.txt @@ -0,0 +1 @@ +../../../data/categories.txt \ No newline at end of file diff --git a/android/app/assets/categories_brands.txt b/android/app/assets/categories_brands.txt new file mode 120000 index 0000000000..3e31f5b8a6 --- /dev/null +++ b/android/app/assets/categories_brands.txt @@ -0,0 +1 @@ +../../../data/categories_brands.txt \ No newline at end of file diff --git a/android/app/assets/categories_cuisines.txt b/android/app/assets/categories_cuisines.txt new file mode 120000 index 0000000000..c4eb898729 --- /dev/null +++ b/android/app/assets/categories_cuisines.txt @@ -0,0 +1 @@ +../../../data/categories_cuisines.txt \ No newline at end of file diff --git a/android/app/assets/classificator.txt b/android/app/assets/classificator.txt new file mode 120000 index 0000000000..663c05cc7d --- /dev/null +++ b/android/app/assets/classificator.txt @@ -0,0 +1 @@ +../../../data/classificator.txt \ No newline at end of file diff --git a/android/app/assets/colors.txt b/android/app/assets/colors.txt new file mode 120000 index 0000000000..43938d3094 --- /dev/null +++ b/android/app/assets/colors.txt @@ -0,0 +1 @@ +../../../data/colors.txt \ No newline at end of file diff --git a/android/app/assets/copyright.html b/android/app/assets/copyright.html new file mode 120000 index 0000000000..10989c9b4d --- /dev/null +++ b/android/app/assets/copyright.html @@ -0,0 +1 @@ +../../../data/copyright.html \ No newline at end of file diff --git a/android/app/assets/countries-strings b/android/app/assets/countries-strings new file mode 120000 index 0000000000..14ad401e3a --- /dev/null +++ b/android/app/assets/countries-strings @@ -0,0 +1 @@ +../../../data/countries-strings/ \ No newline at end of file diff --git a/android/app/assets/countries.txt b/android/app/assets/countries.txt new file mode 120000 index 0000000000..c614689e61 --- /dev/null +++ b/android/app/assets/countries.txt @@ -0,0 +1 @@ +../../../data/countries.txt \ No newline at end of file diff --git a/android/app/assets/drules_proto_clear.bin b/android/app/assets/drules_proto_clear.bin new file mode 120000 index 0000000000..2672380087 --- /dev/null +++ b/android/app/assets/drules_proto_clear.bin @@ -0,0 +1 @@ +../../../data/drules_proto_clear.bin \ No newline at end of file diff --git a/android/app/assets/drules_proto_dark.bin b/android/app/assets/drules_proto_dark.bin new file mode 120000 index 0000000000..1788ac0447 --- /dev/null +++ b/android/app/assets/drules_proto_dark.bin @@ -0,0 +1 @@ +../../../data/drules_proto_dark.bin \ No newline at end of file diff --git a/android/app/assets/drules_proto_vehicle_clear.bin b/android/app/assets/drules_proto_vehicle_clear.bin new file mode 120000 index 0000000000..98578b807f --- /dev/null +++ b/android/app/assets/drules_proto_vehicle_clear.bin @@ -0,0 +1 @@ +../../../data/drules_proto_vehicle_clear.bin \ No newline at end of file diff --git a/android/app/assets/drules_proto_vehicle_dark.bin b/android/app/assets/drules_proto_vehicle_dark.bin new file mode 120000 index 0000000000..a9bbdf1e66 --- /dev/null +++ b/android/app/assets/drules_proto_vehicle_dark.bin @@ -0,0 +1 @@ +../../../data/drules_proto_vehicle_dark.bin \ No newline at end of file diff --git a/android/app/assets/editor.config b/android/app/assets/editor.config new file mode 120000 index 0000000000..8638c0b69c --- /dev/null +++ b/android/app/assets/editor.config @@ -0,0 +1 @@ +../../../data/editor.config \ No newline at end of file diff --git a/android/app/assets/faq.html b/android/app/assets/faq.html new file mode 120000 index 0000000000..2089767de3 --- /dev/null +++ b/android/app/assets/faq.html @@ -0,0 +1 @@ +../../../data/faq.html \ No newline at end of file diff --git a/android/app/assets/fonts_blacklist.txt b/android/app/assets/fonts_blacklist.txt new file mode 120000 index 0000000000..dc945bbf5a --- /dev/null +++ b/android/app/assets/fonts_blacklist.txt @@ -0,0 +1 @@ +../../../data/fonts_blacklist.txt \ No newline at end of file diff --git a/android/app/assets/fonts_whitelist.txt b/android/app/assets/fonts_whitelist.txt new file mode 120000 index 0000000000..a6eed6e04d --- /dev/null +++ b/android/app/assets/fonts_whitelist.txt @@ -0,0 +1 @@ +../../../data/fonts_whitelist.txt \ No newline at end of file diff --git a/android/app/assets/icudt73l.dat b/android/app/assets/icudt73l.dat new file mode 120000 index 0000000000..fb1be2b05e --- /dev/null +++ b/android/app/assets/icudt73l.dat @@ -0,0 +1 @@ +../../../data/icudt73l.dat \ No newline at end of file diff --git a/android/app/assets/languages.txt b/android/app/assets/languages.txt new file mode 120000 index 0000000000..368b752940 --- /dev/null +++ b/android/app/assets/languages.txt @@ -0,0 +1 @@ +../../../data/languages.txt \ No newline at end of file diff --git a/android/app/assets/opening_hours_how_to_edit.html b/android/app/assets/opening_hours_how_to_edit.html new file mode 120000 index 0000000000..4ba5dab39e --- /dev/null +++ b/android/app/assets/opening_hours_how_to_edit.html @@ -0,0 +1 @@ +../../../data/opening_hours_how_to_edit.html \ No newline at end of file diff --git a/android/app/assets/packed_polygons.bin b/android/app/assets/packed_polygons.bin new file mode 120000 index 0000000000..78a637c4c0 --- /dev/null +++ b/android/app/assets/packed_polygons.bin @@ -0,0 +1 @@ +../../../data/packed_polygons.bin \ No newline at end of file diff --git a/android/app/assets/patterns.txt b/android/app/assets/patterns.txt new file mode 120000 index 0000000000..222450b181 --- /dev/null +++ b/android/app/assets/patterns.txt @@ -0,0 +1 @@ +../../../data/patterns.txt \ No newline at end of file diff --git a/android/app/assets/resources-6plus_clear b/android/app/assets/resources-6plus_clear new file mode 120000 index 0000000000..70c4f4b9cc --- /dev/null +++ b/android/app/assets/resources-6plus_clear @@ -0,0 +1 @@ +../../../data/resources-6plus_clear \ No newline at end of file diff --git a/android/app/assets/resources-6plus_dark b/android/app/assets/resources-6plus_dark new file mode 120000 index 0000000000..75476b02f1 --- /dev/null +++ b/android/app/assets/resources-6plus_dark @@ -0,0 +1 @@ +../../../data/resources-6plus_dark \ No newline at end of file diff --git a/android/app/assets/resources-default b/android/app/assets/resources-default new file mode 120000 index 0000000000..781a66a1d4 --- /dev/null +++ b/android/app/assets/resources-default @@ -0,0 +1 @@ +../../../data/resources-default \ No newline at end of file diff --git a/android/app/assets/resources-hdpi_clear b/android/app/assets/resources-hdpi_clear new file mode 120000 index 0000000000..e9dc969a50 --- /dev/null +++ b/android/app/assets/resources-hdpi_clear @@ -0,0 +1 @@ +../../../data/resources-hdpi_clear \ No newline at end of file diff --git a/android/app/assets/resources-hdpi_dark b/android/app/assets/resources-hdpi_dark new file mode 120000 index 0000000000..d09f7ef120 --- /dev/null +++ b/android/app/assets/resources-hdpi_dark @@ -0,0 +1 @@ +../../../data/resources-hdpi_dark \ No newline at end of file diff --git a/android/app/assets/resources-mdpi_clear b/android/app/assets/resources-mdpi_clear new file mode 120000 index 0000000000..aa8190fe71 --- /dev/null +++ b/android/app/assets/resources-mdpi_clear @@ -0,0 +1 @@ +../../../data/resources-mdpi_clear \ No newline at end of file diff --git a/android/app/assets/resources-mdpi_dark b/android/app/assets/resources-mdpi_dark new file mode 120000 index 0000000000..06fe7998c5 --- /dev/null +++ b/android/app/assets/resources-mdpi_dark @@ -0,0 +1 @@ +../../../data/resources-mdpi_dark \ No newline at end of file diff --git a/android/app/assets/resources-xhdpi_clear b/android/app/assets/resources-xhdpi_clear new file mode 120000 index 0000000000..1fefb638f1 --- /dev/null +++ b/android/app/assets/resources-xhdpi_clear @@ -0,0 +1 @@ +../../../data/resources-xhdpi_clear \ No newline at end of file diff --git a/android/app/assets/resources-xhdpi_dark b/android/app/assets/resources-xhdpi_dark new file mode 120000 index 0000000000..2d536f69ff --- /dev/null +++ b/android/app/assets/resources-xhdpi_dark @@ -0,0 +1 @@ +../../../data/resources-xhdpi_dark \ No newline at end of file diff --git a/android/app/assets/resources-xxhdpi_clear b/android/app/assets/resources-xxhdpi_clear new file mode 120000 index 0000000000..489cf74a5c --- /dev/null +++ b/android/app/assets/resources-xxhdpi_clear @@ -0,0 +1 @@ +../../../data/resources-xxhdpi_clear \ No newline at end of file diff --git a/android/app/assets/resources-xxhdpi_dark b/android/app/assets/resources-xxhdpi_dark new file mode 120000 index 0000000000..64fea6973d --- /dev/null +++ b/android/app/assets/resources-xxhdpi_dark @@ -0,0 +1 @@ +../../../data/resources-xxhdpi_dark \ No newline at end of file diff --git a/android/app/assets/resources-xxxhdpi_clear b/android/app/assets/resources-xxxhdpi_clear new file mode 120000 index 0000000000..ab74c41798 --- /dev/null +++ b/android/app/assets/resources-xxxhdpi_clear @@ -0,0 +1 @@ +../../../data/resources-xxxhdpi_clear \ No newline at end of file diff --git a/android/app/assets/resources-xxxhdpi_dark b/android/app/assets/resources-xxxhdpi_dark new file mode 120000 index 0000000000..56d6b3349b --- /dev/null +++ b/android/app/assets/resources-xxxhdpi_dark @@ -0,0 +1 @@ +../../../data/resources-xxxhdpi_dark \ No newline at end of file diff --git a/android/app/assets/sound-strings b/android/app/assets/sound-strings new file mode 120000 index 0000000000..e7471a6df0 --- /dev/null +++ b/android/app/assets/sound-strings @@ -0,0 +1 @@ +../../../data/sound-strings \ No newline at end of file diff --git a/android/app/assets/transit_colors.txt b/android/app/assets/transit_colors.txt new file mode 120000 index 0000000000..4990391b80 --- /dev/null +++ b/android/app/assets/transit_colors.txt @@ -0,0 +1 @@ +../../../data/transit_colors.txt \ No newline at end of file diff --git a/android/app/assets/types.txt b/android/app/assets/types.txt new file mode 120000 index 0000000000..095b163bee --- /dev/null +++ b/android/app/assets/types.txt @@ -0,0 +1 @@ +../../../data/types.txt \ No newline at end of file diff --git a/android/app/assets/unicode_blocks.txt b/android/app/assets/unicode_blocks.txt new file mode 120000 index 0000000000..cc7ace66f1 --- /dev/null +++ b/android/app/assets/unicode_blocks.txt @@ -0,0 +1 @@ +../../../data/unicode_blocks.txt \ No newline at end of file diff --git a/android/app/assets/vulkan_shaders b/android/app/assets/vulkan_shaders new file mode 120000 index 0000000000..c0a5dd1df5 --- /dev/null +++ b/android/app/assets/vulkan_shaders @@ -0,0 +1 @@ +../../../data/vulkan_shaders \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 0000000000..1d10d2783e --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,545 @@ +buildscript { + repositories { + google() + mavenCentral() + } + // + // The magic below is needed to disable Google Mobile Services (a.k.a GMS) and + // Google Firebase Services during the build time. Unfortunately, the only way + // to disable Gradle plugins is to add these hardcore switches to buildscript(). + // + + // Detect flavors from the task name. + def taskName = getGradle().getStartParameter().getTaskRequests().toString().toLowerCase() + def isFdroid = taskName.contains('fdroid') + def isBeta = taskName.contains('beta') + + // Enable Google Mobile Services for all flavors except fdroid. + def googleMobileServicesDefault = !isFdroid + // Add a parameter to force GMS. + ext.googleMobileServicesEnabled = project.hasProperty('gms') ?: googleMobileServicesDefault + + // Enable Firebase for all beta flavors except fdroid only if google-services.json exists. + def googleFirebaseServicesDefault = isBeta && !isFdroid && file('google-services.json').exists() + // Add a parameter to force Firebase. + ext.googleFirebaseServicesEnabled = project.hasProperty('firebase') ?: googleFirebaseServicesDefault + + // See https://developer.android.com/jetpack/androidx/releases/compose-kotlin + // to see which kotlin version is compatible with compose + ext.kotlin_version = '1.9.0' + + dependencies { + classpath 'com.android.tools.build:gradle:8.1.0' + + if (googleMobileServicesEnabled) { + println('Building with Google Mobile Services') + classpath 'com.google.gms:google-services:4.3.15' + } else { + println('Building without Google Services') + } + + if (googleFirebaseServicesEnabled) { + println('Building with Google Firebase Services') + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5' + classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0' + } else { + println('Building without Google Firebase Services') + } + + classpath('com.github.triplet.gradle:play-publisher:3.8.3') + classpath('ru.cian:huawei-publish-gradle-plugin:1.4.0') + + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +repositories { + google() + mavenCentral() + maven { url 'https://www.jitpack.io' } // MPAndroidChart +} + +apply plugin: 'com.android.application' +apply from: 'secure.properties' +if (googleMobileServicesEnabled) { + apply plugin: 'com.google.gms.google-services' +} +if (googleFirebaseServicesEnabled) { + apply plugin: 'com.google.firebase.crashlytics' + apply plugin: 'com.google.firebase.appdistribution' +} +apply plugin: 'com.github.triplet.play' +apply plugin: 'ru.cian.huawei-publish-gradle-plugin' +apply plugin: 'kotlin-android' + +dependencies { + // Google Mobile Services + if (googleMobileServicesEnabled) { + implementation 'com.google.android.gms:play-services-location:21.0.1' + } + + // Google Firebase Services + if (googleFirebaseServicesEnabled) { + // Import the BoM for the Firebase platform + implementation platform('com.google.firebase:firebase-bom:32.1.0') + // Add the dependencies for the Crashlytics and Analytics libraries + // When using the BoM, you don't specify versions in Firebase library dependencies + implementation 'com.google.firebase:firebase-crashlytics' + implementation 'com.google.firebase:firebase-crashlytics-ndk' + } + + + // Kotlin + implementation 'androidx.core:core-ktx:1.10.1' + implementation(platform("org.jetbrains.kotlin:kotlin-bom:$kotlin_version")) + + // Dependencies for Jetpack Compose + // See https://developer.android.com/jetpack/compose/setup#setup-compose + def composeBom = platform('androidx.compose:compose-bom:2023.04.01') + implementation composeBom + androidTestImplementation composeBom + // Material Design 2 + implementation 'androidx.compose.material:material' + // Android Studio Preview support + implementation 'androidx.compose.ui:ui-tooling-preview' + debugImplementation 'androidx.compose.ui:ui-tooling' + // Optional - Integration with activities + implementation 'androidx.activity:activity-compose:1.7.1' + // Optional - Integration with ViewModels + implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1' + // Optional - Integration with LiveData + implementation 'androidx.compose.runtime:runtime-livedata' + // Optional - Allows controlling status bar and navigation bar + implementation "com.google.accompanist:accompanist-systemuicontroller:0.31.2-alpha" + + implementation 'androidx.annotation:annotation:1.6.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.fragment:fragment:1.5.7' + implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.work:work-runtime:2.8.1' + implementation 'com.google.android.material:material:1.9.0' + implementation 'com.google.code.gson:gson:2.10.1' + implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha' + implementation 'net.jcip:jcip-annotations:1.0' + + // Test Dependencies + testImplementation 'junit:junit:4.13.2' + testImplementation 'org.mockito:mockito-core:5.3.1' + testImplementation 'org.mockito:mockito-inline:5.2.0' +} + +def run(cmd) { + def stdout = new ByteArrayOutputStream() + exec { + commandLine = cmd + standardOutput = stdout + } + return stdout.toString() +} + + +import com.github.triplet.gradle.androidpublisher.ReleaseStatus +import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform + +def getVersion() { + def isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows() + def bash = isWindows ? 'C:\\Program Files\\Git\\bin\\bash.exe' : 'bash' + def versionCode = Integer.parseInt(run([bash, '../../tools/unix/version.sh', 'android_code']).trim()) + def versionName = run([bash, '../../tools/unix/version.sh', 'android_name']).trim() + return new Tuple2(versionCode, versionName) +} + +def getCommitMessage() { + return run(['git', '--no-pager', 'show', '-s', '--format=%s%n%n%b', 'HEAD']).trim() +} + +def osName = System.properties['os.name'].toLowerCase() + +project.ext.appId = 'app.organicmaps' +project.ext.appName = 'Organic Maps' + +android { + namespace 'app.organicmaps' + + buildFeatures { + dataBinding = true + compose true + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11 + } + + composeOptions { + kotlinCompilerExtensionVersion = "1.5.2" + } + // All properties are read from gradle.properties file + compileSdkVersion propCompileSdkVersion.toInteger() + buildToolsVersion propBuildToolsVersion + + ndkVersion '25.2.9519653' + + defaultConfig { + // Default package name is taken from the manifest and should be app.organicmaps + def ver = getVersion() + versionCode = ver.V1 + versionName = ver.V2 + println('Version: ' + versionName) + println('VersionCode: ' + versionCode) + minSdkVersion propMinSdkVersion.toInteger() + targetSdkVersion propTargetSdkVersion.toInteger() + applicationId project.ext.appId + buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"' + // Should be customized in flavors. + buildConfigField 'String', 'REVIEW_URL', '""' + resourceConfigurations += [project.ext.supportedLocalizations] + + multiDexEnabled true + multiDexKeepFile file('multidex-config.txt') + + externalNativeBuild { + def pchFlag = 'OFF' + if (project.hasProperty('pch')) pchFlag = 'ON' + + def njobs = '' + if (project.hasProperty('njobs')) njobs = project.getProperty('njobs') + + cmake { + cppFlags '-fexceptions', '-frtti' + // There is no sense to enable sections without gcc's --gc-sections flag. + cFlags '-fno-function-sections', '-fno-data-sections', + '-Wno-extern-c-compat' + arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', + "-DOS=$osName", '-DSKIP_TESTS=ON', "-DUSE_PCH=$pchFlag", + "-DNJOBS=$njobs" + targets 'organicmaps' + } + } + + // Use, for example, -Parm32 gradle parameter to build only for armeabi-v7a. + ndk { + abiFilters = new HashSet<>() + if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) { + abiFilters.add('armeabi-v7a') + } + if (project.hasProperty('arm64') || project.hasProperty('arm64-v8a')) { + abiFilters.add('arm64-v8a') + } + if (project.hasProperty('x86')) { + abiFilters.add('x86') + } + if (project.hasProperty('x86_64') || project.hasProperty('x64')) { + abiFilters.add('x86_64') + } + if (abiFilters.isEmpty()) { + abiFilters.add('armeabi-v7a') + abiFilters.add('arm64-v8a') + // For the emulator, chromebooks and some Intel Atom devices. + abiFilters.add('x86_64') + } + println("Building for " + abiFilters + " archs.") + } + + setProperty("archivesBaseName", appName.replaceAll("\\s","") + "-" + defaultConfig.versionCode) + } + + sourceSets.main { +// manifest.srcFile 'AndroidManifest.xml' +// res.srcDirs = ['res'] +// java.srcDirs = ['src'] + if (googleMobileServicesEnabled) { + java.srcDirs += 'src/flavors/gms-enabled' + } else { + java.srcDirs += 'src/flavors/gms-disabled' + } + if (googleFirebaseServicesEnabled) { + java.srcDirs += 'src/flavors/firebase-enabled' + } else { + java.srcDirs += 'src/flavors/firebase-disabled' + } + assets.srcDirs = ['assets'] + } + + flavorDimensions 'default' + + productFlavors { + // 01 is a historical artefact, sorry. + final int HUAWEI_VERSION_CODE_BASE = 01_00_00_00_00 + + google { + dimension "default" + versionName = android.defaultConfig.versionName + '-Google' + buildConfigField 'String', 'SUPPORT_MAIL', '"googleplay@organicmaps.app"' + buildConfigField 'String', 'REVIEW_URL', '"market://details?id=app.organicmaps"' + android.sourceSets.google.assets.srcDirs = ['flavors/world-enabled'] + } + + web { + dimension "default" + versionName = android.defaultConfig.versionName + '-Web' + buildConfigField 'String', 'SUPPORT_MAIL', '"apk@organicmaps.app"' + //android.sourceSets.web.assets.srcDirs = ['flavors/world-enabled'] + } + + fdroid { + dimension "default" + versionName = android.defaultConfig.versionName + '-FDroid' + buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@organicmaps.app"' + //android.sourceSets.fdroid.assets.srcDirs = ['flavors/world-enabled'] + } + + huawei { + dimension "default" + versionName = android.defaultConfig.versionName + '-Huawei' + versionCode = HUAWEI_VERSION_CODE_BASE + android.defaultConfig.versionCode + buildConfigField 'String', 'SUPPORT_MAIL', '"huawei@organicmaps.app"' + buildConfigField 'String', 'REVIEW_URL', '"appmarket://details?id=app.organicmaps"' + android.sourceSets.huawei.assets.srcDirs = ['flavors/world-enabled'] + } + } + + playConfigs { + googleRelease { + enabled.set(true) + } + } + + splits.abi { + boolean enabled = project.hasProperty('splitApk') + println ("Create separate apks: " + enabled) + enable enabled + reset() + include 'x86', 'armeabi-v7a', 'arm64-v8a', 'x86_64' + universalApk true + } + + lint { + disable 'MissingTranslation' + // https://github.com/organicmaps/organicmaps/issues/3551 + disable 'MissingQuantity', 'UnusedQuantity' + // https://github.com/organicmaps/organicmaps/issues/3550 + disable 'ByteOrderMark' + // https://github.com/organicmaps/organicmaps/issues/1077 + disable 'CustomSplashScreen' + // https://github.com/organicmaps/organicmaps/issues/3610 + disable 'InsecureBaseConfiguration' + // https://github.com/organicmaps/organicmaps/issues/3608 + disable 'UnusedResources' + abortOnError true + } + + gradle.projectsEvaluated { + android.applicationVariants.all { variant -> + def task = variant.name.capitalize() + project.task(type: Exec, "run${task}", dependsOn: "install${task}") { + commandLine android.getAdbExe(), 'shell', 'am', 'start', '-n', "${applicationId}/app.organicmaps.SplashActivity" + } + } + } + + signingConfigs { + debug { + storeFile file('debug.keystore') + storePassword '12345678' + keyAlias 'debug' + keyPassword '12345678' + } + + release { + storeFile file(spropStoreFile) + storePassword spropStorePassword + keyAlias spropKeyAlias + keyPassword spropKeyPassword + } + } + + buildTypes { + + benchmark { + initWith release + signingConfig signingConfigs.debug + matchingFallbacks = ['release'] + debuggable false + resValue 'string', 'app_id', android.defaultConfig.applicationId + resValue 'string', 'app_name', project.ext.appName + } + debug { + applicationIdSuffix '.debug' // Allows to install debug and release builds together + versionNameSuffix '-debug' + jniDebuggable true // Enable jni debug build + zipAlignEnabled true + signingConfig signingConfigs.debug + resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix + resValue 'string', 'app_name', project.ext.appName + ' ' + '(Debug)' + // Do not generate separate debug symbols for debug apps, because we don't distribute them. + ndk.debugSymbolLevel = 'none' + + if (googleFirebaseServicesEnabled) { + // Keep debug symbols for test lab. + ndk.debugSymbolLevel = 'symbol_table' + firebaseCrashlytics { + nativeSymbolUploadEnabled true + } + } + } + + release { + signingConfig signingConfigs.release + minifyEnabled true + shrinkResources true + // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin. + // To learn more, go to the documentation section about R8 configuration files. + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-mwm.txt' + resValue 'string', 'app_id', android.defaultConfig.applicationId + resValue 'string', 'app_name', project.ext.appName + // Full size symbols are too big for Google, 217mb aab vs 95mb. + ndk.debugSymbolLevel = 'symbol_table' + + if (googleFirebaseServicesEnabled) { + firebaseCrashlytics { + nativeSymbolUploadEnabled true + } + } + } + + beta { + applicationIdSuffix '.beta' + versionNameSuffix '-beta' + signingConfig signingConfigs.release + minifyEnabled true + shrinkResources true + // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin. + // To learn more, go to the documentation section about R8 configuration files. + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-mwm.txt' + matchingFallbacks = ['debug', 'release'] + resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix + resValue 'string', 'app_name', project.ext.appName + ' ' + '(Beta)' + // Full size symbols are too big for Google, 217mb aab vs 95mb. + ndk.debugSymbolLevel = 'symbol_table' + + if (googleFirebaseServicesEnabled) { + firebaseCrashlytics { + nativeSymbolUploadEnabled true + } + firebaseAppDistribution { + // A new beta release is created for each commit. + // Use the last commit message for the release notes. + releaseNotes = getCommitMessage() + groups = "qa" // Notify only selected people. + serviceCredentialsFile = "firebase-app-distribution.json" + } + } + } + } + + externalNativeBuild { + cmake { + version "3.22.1+" + buildStagingDirectory "./nativeOutputs" + path "../../CMakeLists.txt" + } + } + + // We don't compress these extensions in assets/ because our random FileReader can't read zip-compressed files from apk. + // TODO: Load all minor files via separate call to ReadAsString which can correctly handle compressed files in zip containers. + androidResources { + ignoreAssetsPattern '!.svn:!.git:!.DS_Store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~' + noCompress 'txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + packagingOptions.jniLibs { + excludes += [ + 'lib/**/libVkLayer_khronos_validation.so', + 'lib/**/libVkLayer_core_validation.so', + 'lib/**/libVkLayer_threading.so', + 'lib/**/libVkLayer_image.so', + 'lib/**/libVkLayer_parameter_validation.so', + 'lib/**/libVkLayer_object_tracker.so', + 'lib/**/libVkLayer_swapchain.so', + 'lib/**/libVkLayer_unique_objects.so', + ] + } +} + +tasks.withType(JavaCompile) { + options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation' +} + +android.buildTypes.all { buildType -> + def suffix = applicationIdSuffix != null ? applicationIdSuffix : "" + def authorityValue = android.defaultConfig.applicationId + suffix + ".provider" + def authority = "\"" + authorityValue + "\"" + buildConfigField 'String', 'FILE_PROVIDER_AUTHORITY', authority + manifestPlaceholders += [FILE_PROVIDER_PLACEHOLDER : authorityValue] +} + +task prepareGoogleReleaseListing { + // Prepares Google Play metainfo from F-Droid metainfo. + final sourceFlavor = 'fdroid' + final targetFlavor = 'google' + doLast { + final sourceDir = new File("${projectDir}/src/main/$sourceFlavor/play/listings") + final targetDir = new File("${projectDir}/src/main/$targetFlavor/play/listings") + final sourceFiles = fileTree(dir: sourceDir, + include: "**/*.txt", exclude: "**/*-${targetFlavor}.txt") + sourceFiles.each { File sourceFile -> + final locale = sourceFile.parentFile.getName() + final targetLocaleDir = new File(targetDir, locale) + if (!targetLocaleDir.isDirectory()) + targetLocaleDir.mkdirs() + final targetFile = new File(targetLocaleDir, sourceFile.getName()) + // Override Google-specific values by using ${name}-google.txt files. + final overrideFile = new File(sourceFile.getPath().replace(".txt", "-${targetFlavor}.txt")) + targetFile.text = overrideFile.exists() ? overrideFile.text : sourceFile.text + } + copy { + from "${projectDir}/../../screenshots/android" + into targetDir + } + } +} + +play { + enabled.set(false) + track.set("production") + userFraction.set(Double.valueOf(0.10)) // 10% + defaultToAppBundles.set(true) + releaseStatus.set(ReleaseStatus.IN_PROGRESS) + serviceAccountCredentials.set(file("google-play.json")) +} + +huaweiPublish { + instances { + huaweiRelease { + credentialsPath = "$rootDir/huawei-appgallery.json" + buildFormat = 'aab' + deployType = 'draft' // confirm manually + releaseNotes = [] + def localeOverride = [ + 'am' : 'am-ET', + 'gu': 'gu_IN', + 'iw-IL': 'he_IL', + 'kn-IN': 'kn_IN', + 'ml-IN': 'ml_IN', + 'mn-MN': 'mn_MN', + 'mr-IN': 'mr_IN', + 'ta-IN': 'ta_IN', + 'te-IN': 'te_IN', + ] + def files = fileTree(dir: "$projectDir/src/main/fdroid/play/listings", + include: '**/release-notes.txt') + files.each { File file -> + def path = file.getPath() + def locale = file.parentFile.getName() + locale = localeOverride.get(locale, locale) + releaseNotes.add(new ru.cian.huawei.publish.ReleaseNote(locale, path)) + } + } + } +} diff --git a/android/debug.keystore b/android/app/debug.keystore similarity index 100% rename from android/debug.keystore rename to android/app/debug.keystore diff --git a/android/ic_launcher-playstore.png b/android/app/ic_launcher-playstore.png similarity index 100% rename from android/ic_launcher-playstore.png rename to android/app/ic_launcher-playstore.png diff --git a/android/multidex-config.txt b/android/app/multidex-config.txt similarity index 100% rename from android/multidex-config.txt rename to android/app/multidex-config.txt diff --git a/android/proguard-mwm.txt b/android/app/proguard-mwm.txt similarity index 100% rename from android/proguard-mwm.txt rename to android/app/proguard-mwm.txt diff --git a/android/app/src/androidTest/java/app/organicmaps/ExampleInstrumentedTest.java b/android/app/src/androidTest/java/app/organicmaps/ExampleInstrumentedTest.java new file mode 100644 index 0000000000..189da5efc3 --- /dev/null +++ b/android/app/src/androidTest/java/app/organicmaps/ExampleInstrumentedTest.java @@ -0,0 +1,28 @@ +package app.organicmaps; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest +{ + @Test + public void useAppContext() + { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("app.organicmaps", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/android/flavors/firebase-disabled/app/organicmaps/util/CrashlyticsUtils.java b/android/app/src/flavors/firebase-disabled/app/organicmaps/util/CrashlyticsUtils.java similarity index 100% rename from android/flavors/firebase-disabled/app/organicmaps/util/CrashlyticsUtils.java rename to android/app/src/flavors/firebase-disabled/app/organicmaps/util/CrashlyticsUtils.java diff --git a/android/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java b/android/app/src/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java similarity index 100% rename from android/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java rename to android/app/src/flavors/firebase-enabled/com/mapswithme/util/CrashlyticsUtils.java diff --git a/android/flavors/gms-disabled/com/mapswithme/maps/location/LocationProviderFactory.java b/android/app/src/flavors/gms-disabled/com/mapswithme/maps/location/LocationProviderFactory.java similarity index 100% rename from android/flavors/gms-disabled/com/mapswithme/maps/location/LocationProviderFactory.java rename to android/app/src/flavors/gms-disabled/com/mapswithme/maps/location/LocationProviderFactory.java diff --git a/android/flavors/gms-enabled/AndroidManifest.xml b/android/app/src/flavors/gms-enabled/AndroidManifest.xml similarity index 100% rename from android/flavors/gms-enabled/AndroidManifest.xml rename to android/app/src/flavors/gms-enabled/AndroidManifest.xml diff --git a/android/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java b/android/app/src/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java similarity index 100% rename from android/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java rename to android/app/src/flavors/gms-enabled/app/organicmaps/location/GoogleFusedLocationProvider.java diff --git a/android/flavors/gms-enabled/app/organicmaps/location/LocationProviderFactory.java b/android/app/src/flavors/gms-enabled/app/organicmaps/location/LocationProviderFactory.java similarity index 100% rename from android/flavors/gms-enabled/app/organicmaps/location/LocationProviderFactory.java rename to android/app/src/flavors/gms-enabled/app/organicmaps/location/LocationProviderFactory.java diff --git a/android/flavors/world-enabled/World.mwm b/android/app/src/flavors/world-enabled/World.mwm similarity index 100% rename from android/flavors/world-enabled/World.mwm rename to android/app/src/flavors/world-enabled/World.mwm diff --git a/android/flavors/world-enabled/WorldCoasts.mwm b/android/app/src/flavors/world-enabled/WorldCoasts.mwm similarity index 100% rename from android/flavors/world-enabled/WorldCoasts.mwm rename to android/app/src/flavors/world-enabled/WorldCoasts.mwm diff --git a/android/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml similarity index 99% rename from android/AndroidManifest.xml rename to android/app/src/main/AndroidManifest.xml index a9685110af..c52539217c 100644 --- a/android/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -69,7 +69,7 @@ android:supportsRtl="true" android:networkSecurityConfig="@xml/network_security_config" tools:targetApi="t"> - + diff --git a/android/jni/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt similarity index 99% rename from android/jni/CMakeLists.txt rename to android/app/src/main/cpp/CMakeLists.txt index 1d7ca25dbc..97b186e23b 100644 --- a/android/jni/CMakeLists.txt +++ b/android/app/src/main/cpp/CMakeLists.txt @@ -4,7 +4,7 @@ project(organicmaps C CXX) set(SRC # JNI headers - ../../private.h + ../../../../../private.h app/organicmaps/core/jni_helper.hpp app/organicmaps/core/jni_java_methods.hpp app/organicmaps/core/logging.hpp diff --git a/android/jni/app/organicmaps/DisplayedCategories.cpp b/android/app/src/main/cpp/app/organicmaps/DisplayedCategories.cpp similarity index 100% rename from android/jni/app/organicmaps/DisplayedCategories.cpp rename to android/app/src/main/cpp/app/organicmaps/DisplayedCategories.cpp diff --git a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp b/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp similarity index 100% rename from android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp rename to android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp diff --git a/android/jni/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/Framework.cpp similarity index 100% rename from android/jni/app/organicmaps/Framework.cpp rename to android/app/src/main/cpp/app/organicmaps/Framework.cpp diff --git a/android/jni/app/organicmaps/Framework.hpp b/android/app/src/main/cpp/app/organicmaps/Framework.hpp similarity index 100% rename from android/jni/app/organicmaps/Framework.hpp rename to android/app/src/main/cpp/app/organicmaps/Framework.hpp diff --git a/android/jni/app/organicmaps/LocationState.cpp b/android/app/src/main/cpp/app/organicmaps/LocationState.cpp similarity index 100% rename from android/jni/app/organicmaps/LocationState.cpp rename to android/app/src/main/cpp/app/organicmaps/LocationState.cpp diff --git a/android/jni/app/organicmaps/Map.cpp b/android/app/src/main/cpp/app/organicmaps/Map.cpp similarity index 100% rename from android/jni/app/organicmaps/Map.cpp rename to android/app/src/main/cpp/app/organicmaps/Map.cpp diff --git a/android/jni/app/organicmaps/MapManager.cpp b/android/app/src/main/cpp/app/organicmaps/MapManager.cpp similarity index 100% rename from android/jni/app/organicmaps/MapManager.cpp rename to android/app/src/main/cpp/app/organicmaps/MapManager.cpp diff --git a/android/jni/app/organicmaps/MwmApplication.cpp b/android/app/src/main/cpp/app/organicmaps/MwmApplication.cpp similarity index 100% rename from android/jni/app/organicmaps/MwmApplication.cpp rename to android/app/src/main/cpp/app/organicmaps/MwmApplication.cpp diff --git a/android/jni/app/organicmaps/SearchEngine.cpp b/android/app/src/main/cpp/app/organicmaps/SearchEngine.cpp similarity index 100% rename from android/jni/app/organicmaps/SearchEngine.cpp rename to android/app/src/main/cpp/app/organicmaps/SearchEngine.cpp diff --git a/android/jni/app/organicmaps/SearchRecents.cpp b/android/app/src/main/cpp/app/organicmaps/SearchRecents.cpp similarity index 100% rename from android/jni/app/organicmaps/SearchRecents.cpp rename to android/app/src/main/cpp/app/organicmaps/SearchRecents.cpp diff --git a/android/jni/app/organicmaps/TrackRecorder.cpp b/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp similarity index 100% rename from android/jni/app/organicmaps/TrackRecorder.cpp rename to android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp diff --git a/android/jni/app/organicmaps/TrafficState.cpp b/android/app/src/main/cpp/app/organicmaps/TrafficState.cpp similarity index 100% rename from android/jni/app/organicmaps/TrafficState.cpp rename to android/app/src/main/cpp/app/organicmaps/TrafficState.cpp diff --git a/android/jni/app/organicmaps/UserMarkHelper.cpp b/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp similarity index 100% rename from android/jni/app/organicmaps/UserMarkHelper.cpp rename to android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp diff --git a/android/jni/app/organicmaps/UserMarkHelper.hpp b/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp similarity index 100% rename from android/jni/app/organicmaps/UserMarkHelper.hpp rename to android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp diff --git a/android/jni/app/organicmaps/VideoTimer.cpp b/android/app/src/main/cpp/app/organicmaps/VideoTimer.cpp similarity index 100% rename from android/jni/app/organicmaps/VideoTimer.cpp rename to android/app/src/main/cpp/app/organicmaps/VideoTimer.cpp diff --git a/android/jni/app/organicmaps/VideoTimer.hpp b/android/app/src/main/cpp/app/organicmaps/VideoTimer.hpp similarity index 100% rename from android/jni/app/organicmaps/VideoTimer.hpp rename to android/app/src/main/cpp/app/organicmaps/VideoTimer.hpp diff --git a/android/jni/app/organicmaps/bookmarks/data/BookmarkManager.cpp b/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp similarity index 100% rename from android/jni/app/organicmaps/bookmarks/data/BookmarkManager.cpp rename to android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp diff --git a/android/jni/app/organicmaps/core/ScopedEnv.hpp b/android/app/src/main/cpp/app/organicmaps/core/ScopedEnv.hpp similarity index 100% rename from android/jni/app/organicmaps/core/ScopedEnv.hpp rename to android/app/src/main/cpp/app/organicmaps/core/ScopedEnv.hpp diff --git a/android/jni/app/organicmaps/core/ScopedLocalRef.hpp b/android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp similarity index 100% rename from android/jni/app/organicmaps/core/ScopedLocalRef.hpp rename to android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp diff --git a/android/jni/app/organicmaps/core/jni_helper.cpp b/android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp similarity index 100% rename from android/jni/app/organicmaps/core/jni_helper.cpp rename to android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp diff --git a/android/jni/app/organicmaps/core/jni_helper.hpp b/android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp similarity index 100% rename from android/jni/app/organicmaps/core/jni_helper.hpp rename to android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp diff --git a/android/jni/app/organicmaps/core/jni_java_methods.cpp b/android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.cpp similarity index 100% rename from android/jni/app/organicmaps/core/jni_java_methods.cpp rename to android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.cpp diff --git a/android/jni/app/organicmaps/core/jni_java_methods.hpp b/android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.hpp similarity index 100% rename from android/jni/app/organicmaps/core/jni_java_methods.hpp rename to android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.hpp diff --git a/android/jni/app/organicmaps/core/logging.cpp b/android/app/src/main/cpp/app/organicmaps/core/logging.cpp similarity index 100% rename from android/jni/app/organicmaps/core/logging.cpp rename to android/app/src/main/cpp/app/organicmaps/core/logging.cpp diff --git a/android/jni/app/organicmaps/core/logging.hpp b/android/app/src/main/cpp/app/organicmaps/core/logging.hpp similarity index 100% rename from android/jni/app/organicmaps/core/logging.hpp rename to android/app/src/main/cpp/app/organicmaps/core/logging.hpp diff --git a/android/jni/app/organicmaps/core/render_context.cpp b/android/app/src/main/cpp/app/organicmaps/core/render_context.cpp similarity index 100% rename from android/jni/app/organicmaps/core/render_context.cpp rename to android/app/src/main/cpp/app/organicmaps/core/render_context.cpp diff --git a/android/jni/app/organicmaps/core/render_context.hpp b/android/app/src/main/cpp/app/organicmaps/core/render_context.hpp similarity index 100% rename from android/jni/app/organicmaps/core/render_context.hpp rename to android/app/src/main/cpp/app/organicmaps/core/render_context.hpp diff --git a/android/jni/app/organicmaps/editor/Editor.cpp b/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp similarity index 100% rename from android/jni/app/organicmaps/editor/Editor.cpp rename to android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp diff --git a/android/jni/app/organicmaps/editor/OpeningHours.cpp b/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp similarity index 100% rename from android/jni/app/organicmaps/editor/OpeningHours.cpp rename to android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp diff --git a/android/jni/app/organicmaps/editor/OsmOAuth.cpp b/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp similarity index 100% rename from android/jni/app/organicmaps/editor/OsmOAuth.cpp rename to android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp diff --git a/android/jni/app/organicmaps/isolines/IsolinesManager.cpp b/android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp similarity index 100% rename from android/jni/app/organicmaps/isolines/IsolinesManager.cpp rename to android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp diff --git a/android/jni/app/organicmaps/opengl/android_gl_utils.cpp b/android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.cpp similarity index 100% rename from android/jni/app/organicmaps/opengl/android_gl_utils.cpp rename to android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.cpp diff --git a/android/jni/app/organicmaps/opengl/android_gl_utils.hpp b/android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.hpp similarity index 100% rename from android/jni/app/organicmaps/opengl/android_gl_utils.hpp rename to android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.hpp diff --git a/android/jni/app/organicmaps/opengl/androidoglcontext.cpp b/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.cpp similarity index 100% rename from android/jni/app/organicmaps/opengl/androidoglcontext.cpp rename to android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.cpp diff --git a/android/jni/app/organicmaps/opengl/androidoglcontext.hpp b/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.hpp similarity index 100% rename from android/jni/app/organicmaps/opengl/androidoglcontext.hpp rename to android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.hpp diff --git a/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp b/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp similarity index 100% rename from android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp rename to android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp diff --git a/android/jni/app/organicmaps/opengl/androidoglcontextfactory.hpp b/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp similarity index 100% rename from android/jni/app/organicmaps/opengl/androidoglcontextfactory.hpp rename to android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp diff --git a/android/jni/app/organicmaps/opengl/gl3stub.cpp b/android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.cpp similarity index 100% rename from android/jni/app/organicmaps/opengl/gl3stub.cpp rename to android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.cpp diff --git a/android/jni/app/organicmaps/opengl/gl3stub.h b/android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h similarity index 100% rename from android/jni/app/organicmaps/opengl/gl3stub.h rename to android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h diff --git a/android/jni/app/organicmaps/platform/AndroidPlatform.cpp b/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/AndroidPlatform.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp diff --git a/android/jni/app/organicmaps/platform/AndroidPlatform.hpp b/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.hpp similarity index 100% rename from android/jni/app/organicmaps/platform/AndroidPlatform.hpp rename to android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.hpp diff --git a/android/jni/app/organicmaps/platform/GuiThread.cpp b/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/GuiThread.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp diff --git a/android/jni/app/organicmaps/platform/GuiThread.hpp b/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.hpp similarity index 100% rename from android/jni/app/organicmaps/platform/GuiThread.hpp rename to android/app/src/main/cpp/app/organicmaps/platform/GuiThread.hpp diff --git a/android/jni/app/organicmaps/platform/HttpThread.cpp b/android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/HttpThread.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp diff --git a/android/jni/app/organicmaps/platform/Language.cpp b/android/app/src/main/cpp/app/organicmaps/platform/Language.cpp similarity index 93% rename from android/jni/app/organicmaps/platform/Language.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/Language.cpp index 17142a4b69..ebcd6adbdd 100644 --- a/android/jni/app/organicmaps/platform/Language.cpp +++ b/android/app/src/main/cpp/app/organicmaps/platform/Language.cpp @@ -1,5 +1,5 @@ -#include "android/jni/app/organicmaps/core/jni_helper.hpp" -#include "android/jni/app/organicmaps/core/ScopedLocalRef.hpp" +#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp" #include "platform/locale.hpp" diff --git a/android/jni/app/organicmaps/platform/Localization.cpp b/android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/Localization.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp diff --git a/android/jni/app/organicmaps/platform/PThreadImpl.cpp b/android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/PThreadImpl.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp diff --git a/android/jni/app/organicmaps/platform/SecureStorage.cpp b/android/app/src/main/cpp/app/organicmaps/platform/SecureStorage.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/SecureStorage.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/SecureStorage.cpp diff --git a/android/jni/app/organicmaps/platform/SocketImpl.cpp b/android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp similarity index 100% rename from android/jni/app/organicmaps/platform/SocketImpl.cpp rename to android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp diff --git a/android/jni/app/organicmaps/routing/RoutingOptions.cpp b/android/app/src/main/cpp/app/organicmaps/routing/RoutingOptions.cpp similarity index 92% rename from android/jni/app/organicmaps/routing/RoutingOptions.cpp rename to android/app/src/main/cpp/app/organicmaps/routing/RoutingOptions.cpp index 09fe85c2d2..5480edd46d 100644 --- a/android/jni/app/organicmaps/routing/RoutingOptions.cpp +++ b/android/app/src/main/cpp/app/organicmaps/routing/RoutingOptions.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include "routing/routing_options.hpp" routing::RoutingOptions::Road makeValue(jint option) diff --git a/android/jni/app/organicmaps/settings/UnitLocale.cpp b/android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp similarity index 100% rename from android/jni/app/organicmaps/settings/UnitLocale.cpp rename to android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp diff --git a/android/jni/app/organicmaps/sound/tts.cpp b/android/app/src/main/cpp/app/organicmaps/sound/tts.cpp similarity index 100% rename from android/jni/app/organicmaps/sound/tts.cpp rename to android/app/src/main/cpp/app/organicmaps/sound/tts.cpp diff --git a/android/jni/app/organicmaps/subway/SubwayManager.cpp b/android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp similarity index 94% rename from android/jni/app/organicmaps/subway/SubwayManager.cpp rename to android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp index b217fa20c2..d65c018926 100644 --- a/android/jni/app/organicmaps/subway/SubwayManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "app/organicmaps/core/jni_helper.hpp" #include "app/organicmaps/platform/AndroidPlatform.hpp" diff --git a/android/jni/app/organicmaps/util/Config.cpp b/android/app/src/main/cpp/app/organicmaps/util/Config.cpp similarity index 100% rename from android/jni/app/organicmaps/util/Config.cpp rename to android/app/src/main/cpp/app/organicmaps/util/Config.cpp diff --git a/android/jni/app/organicmaps/util/Distance.hpp b/android/app/src/main/cpp/app/organicmaps/util/Distance.hpp similarity index 100% rename from android/jni/app/organicmaps/util/Distance.hpp rename to android/app/src/main/cpp/app/organicmaps/util/Distance.hpp diff --git a/android/jni/app/organicmaps/util/FeatureIdBuilder.hpp b/android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp similarity index 100% rename from android/jni/app/organicmaps/util/FeatureIdBuilder.hpp rename to android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp diff --git a/android/jni/app/organicmaps/util/GeoUtils.cpp b/android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp similarity index 86% rename from android/jni/app/organicmaps/util/GeoUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp index 19ae2b3629..67518c3363 100644 --- a/android/jni/app/organicmaps/util/GeoUtils.cpp +++ b/android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp @@ -1,4 +1,4 @@ -#include "android/jni/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" #include "geometry/mercator.hpp" diff --git a/android/jni/app/organicmaps/util/HttpBackgroundUploader.cpp b/android/app/src/main/cpp/app/organicmaps/util/HttpBackgroundUploader.cpp similarity index 100% rename from android/jni/app/organicmaps/util/HttpBackgroundUploader.cpp rename to android/app/src/main/cpp/app/organicmaps/util/HttpBackgroundUploader.cpp diff --git a/android/jni/app/organicmaps/util/HttpClient.cpp b/android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp similarity index 100% rename from android/jni/app/organicmaps/util/HttpClient.cpp rename to android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp diff --git a/android/jni/app/organicmaps/util/HttpUploader.cpp b/android/app/src/main/cpp/app/organicmaps/util/HttpUploader.cpp similarity index 100% rename from android/jni/app/organicmaps/util/HttpUploader.cpp rename to android/app/src/main/cpp/app/organicmaps/util/HttpUploader.cpp diff --git a/android/jni/app/organicmaps/util/HttpUploaderUtils.cpp b/android/app/src/main/cpp/app/organicmaps/util/HttpUploaderUtils.cpp similarity index 100% rename from android/jni/app/organicmaps/util/HttpUploaderUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/util/HttpUploaderUtils.cpp diff --git a/android/jni/app/organicmaps/util/HttpUploaderUtils.hpp b/android/app/src/main/cpp/app/organicmaps/util/HttpUploaderUtils.hpp similarity index 100% rename from android/jni/app/organicmaps/util/HttpUploaderUtils.hpp rename to android/app/src/main/cpp/app/organicmaps/util/HttpUploaderUtils.hpp diff --git a/android/jni/app/organicmaps/util/Language.cpp b/android/app/src/main/cpp/app/organicmaps/util/Language.cpp similarity index 80% rename from android/jni/app/organicmaps/util/Language.cpp rename to android/app/src/main/cpp/app/organicmaps/util/Language.cpp index f574e00f44..21aa697dc1 100644 --- a/android/jni/app/organicmaps/util/Language.cpp +++ b/android/app/src/main/cpp/app/organicmaps/util/Language.cpp @@ -1,4 +1,4 @@ -#include "android/jni/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" #include "platform/preferred_languages.hpp" extern "C" diff --git a/android/jni/app/organicmaps/util/LogsManager.cpp b/android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp similarity index 100% rename from android/jni/app/organicmaps/util/LogsManager.cpp rename to android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp diff --git a/android/jni/app/organicmaps/util/NetworkPolicy.cpp b/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp similarity index 100% rename from android/jni/app/organicmaps/util/NetworkPolicy.cpp rename to android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp diff --git a/android/jni/app/organicmaps/util/NetworkPolicy.hpp b/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.hpp similarity index 100% rename from android/jni/app/organicmaps/util/NetworkPolicy.hpp rename to android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.hpp diff --git a/android/jni/app/organicmaps/util/StringUtils.cpp b/android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp similarity index 100% rename from android/jni/app/organicmaps/util/StringUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp diff --git a/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp b/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp similarity index 100% rename from android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp rename to android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp diff --git a/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.hpp b/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp similarity index 100% rename from android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.hpp rename to android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp diff --git a/android/src/fdroid/play/contact-email.txt b/android/app/src/main/fdroid/play/contact-email.txt similarity index 100% rename from android/src/fdroid/play/contact-email.txt rename to android/app/src/main/fdroid/play/contact-email.txt diff --git a/android/src/fdroid/play/contact-website.txt b/android/app/src/main/fdroid/play/contact-website.txt similarity index 100% rename from android/src/fdroid/play/contact-website.txt rename to android/app/src/main/fdroid/play/contact-website.txt diff --git a/android/src/fdroid/play/default-language.txt b/android/app/src/main/fdroid/play/default-language.txt similarity index 100% rename from android/src/fdroid/play/default-language.txt rename to android/app/src/main/fdroid/play/default-language.txt diff --git a/android/src/fdroid/play/listings/ar/full-description.txt b/android/app/src/main/fdroid/play/listings/ar/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ar/full-description.txt rename to android/app/src/main/fdroid/play/listings/ar/full-description.txt diff --git a/android/src/fdroid/play/listings/ar/release-notes.txt b/android/app/src/main/fdroid/play/listings/ar/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ar/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ar/release-notes.txt diff --git a/android/src/fdroid/play/listings/ar/short-description.txt b/android/app/src/main/fdroid/play/listings/ar/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ar/short-description.txt rename to android/app/src/main/fdroid/play/listings/ar/short-description.txt diff --git a/android/src/fdroid/play/listings/ar/title-google.txt b/android/app/src/main/fdroid/play/listings/ar/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ar/title-google.txt rename to android/app/src/main/fdroid/play/listings/ar/title-google.txt diff --git a/android/src/fdroid/play/listings/ar/title.txt b/android/app/src/main/fdroid/play/listings/ar/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ar/title.txt rename to android/app/src/main/fdroid/play/listings/ar/title.txt diff --git a/android/src/fdroid/play/listings/ar/video-url.txt b/android/app/src/main/fdroid/play/listings/ar/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ar/video-url.txt rename to android/app/src/main/fdroid/play/listings/ar/video-url.txt diff --git a/android/src/fdroid/play/listings/az-AZ/full-description.txt b/android/app/src/main/fdroid/play/listings/az-AZ/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/az-AZ/full-description.txt rename to android/app/src/main/fdroid/play/listings/az-AZ/full-description.txt diff --git a/android/src/fdroid/play/listings/az-AZ/release-notes.txt b/android/app/src/main/fdroid/play/listings/az-AZ/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/az-AZ/release-notes.txt rename to android/app/src/main/fdroid/play/listings/az-AZ/release-notes.txt diff --git a/android/src/fdroid/play/listings/az-AZ/short-description.txt b/android/app/src/main/fdroid/play/listings/az-AZ/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/az-AZ/short-description.txt rename to android/app/src/main/fdroid/play/listings/az-AZ/short-description.txt diff --git a/android/src/fdroid/play/listings/az-AZ/title-google.txt b/android/app/src/main/fdroid/play/listings/az-AZ/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/az-AZ/title-google.txt rename to android/app/src/main/fdroid/play/listings/az-AZ/title-google.txt diff --git a/android/src/fdroid/play/listings/az-AZ/title.txt b/android/app/src/main/fdroid/play/listings/az-AZ/title.txt similarity index 100% rename from android/src/fdroid/play/listings/az-AZ/title.txt rename to android/app/src/main/fdroid/play/listings/az-AZ/title.txt diff --git a/android/src/fdroid/play/listings/az-AZ/video-url.txt b/android/app/src/main/fdroid/play/listings/az-AZ/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/az-AZ/video-url.txt rename to android/app/src/main/fdroid/play/listings/az-AZ/video-url.txt diff --git a/android/src/fdroid/play/listings/be/full-description.txt b/android/app/src/main/fdroid/play/listings/be/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/be/full-description.txt rename to android/app/src/main/fdroid/play/listings/be/full-description.txt diff --git a/android/src/fdroid/play/listings/be/release-notes.txt b/android/app/src/main/fdroid/play/listings/be/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/be/release-notes.txt rename to android/app/src/main/fdroid/play/listings/be/release-notes.txt diff --git a/android/src/fdroid/play/listings/be/short-description.txt b/android/app/src/main/fdroid/play/listings/be/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/be/short-description.txt rename to android/app/src/main/fdroid/play/listings/be/short-description.txt diff --git a/android/src/fdroid/play/listings/be/title-google.txt b/android/app/src/main/fdroid/play/listings/be/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/be/title-google.txt rename to android/app/src/main/fdroid/play/listings/be/title-google.txt diff --git a/android/src/fdroid/play/listings/be/title.txt b/android/app/src/main/fdroid/play/listings/be/title.txt similarity index 100% rename from android/src/fdroid/play/listings/be/title.txt rename to android/app/src/main/fdroid/play/listings/be/title.txt diff --git a/android/src/fdroid/play/listings/be/video-url.txt b/android/app/src/main/fdroid/play/listings/be/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/be/video-url.txt rename to android/app/src/main/fdroid/play/listings/be/video-url.txt diff --git a/android/src/fdroid/play/listings/bg/full-description.txt b/android/app/src/main/fdroid/play/listings/bg/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/bg/full-description.txt rename to android/app/src/main/fdroid/play/listings/bg/full-description.txt diff --git a/android/src/fdroid/play/listings/bg/release-notes.txt b/android/app/src/main/fdroid/play/listings/bg/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/bg/release-notes.txt rename to android/app/src/main/fdroid/play/listings/bg/release-notes.txt diff --git a/android/src/fdroid/play/listings/bg/short-description.txt b/android/app/src/main/fdroid/play/listings/bg/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/bg/short-description.txt rename to android/app/src/main/fdroid/play/listings/bg/short-description.txt diff --git a/android/src/fdroid/play/listings/bg/title-google.txt b/android/app/src/main/fdroid/play/listings/bg/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/bg/title-google.txt rename to android/app/src/main/fdroid/play/listings/bg/title-google.txt diff --git a/android/src/fdroid/play/listings/bg/title.txt b/android/app/src/main/fdroid/play/listings/bg/title.txt similarity index 100% rename from android/src/fdroid/play/listings/bg/title.txt rename to android/app/src/main/fdroid/play/listings/bg/title.txt diff --git a/android/src/fdroid/play/listings/bg/video-url.txt b/android/app/src/main/fdroid/play/listings/bg/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/bg/video-url.txt rename to android/app/src/main/fdroid/play/listings/bg/video-url.txt diff --git a/android/src/fdroid/play/listings/bn-BD/full-description.txt b/android/app/src/main/fdroid/play/listings/bn-BD/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/bn-BD/full-description.txt rename to android/app/src/main/fdroid/play/listings/bn-BD/full-description.txt diff --git a/android/src/fdroid/play/listings/bn-BD/release-notes.txt b/android/app/src/main/fdroid/play/listings/bn-BD/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/bn-BD/release-notes.txt rename to android/app/src/main/fdroid/play/listings/bn-BD/release-notes.txt diff --git a/android/src/fdroid/play/listings/bn-BD/short-description.txt b/android/app/src/main/fdroid/play/listings/bn-BD/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/bn-BD/short-description.txt rename to android/app/src/main/fdroid/play/listings/bn-BD/short-description.txt diff --git a/android/src/fdroid/play/listings/bn-BD/title-google.txt b/android/app/src/main/fdroid/play/listings/bn-BD/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/bn-BD/title-google.txt rename to android/app/src/main/fdroid/play/listings/bn-BD/title-google.txt diff --git a/android/src/fdroid/play/listings/bn-BD/title.txt b/android/app/src/main/fdroid/play/listings/bn-BD/title.txt similarity index 100% rename from android/src/fdroid/play/listings/bn-BD/title.txt rename to android/app/src/main/fdroid/play/listings/bn-BD/title.txt diff --git a/android/src/fdroid/play/listings/bn-BD/video-url.txt b/android/app/src/main/fdroid/play/listings/bn-BD/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/bn-BD/video-url.txt rename to android/app/src/main/fdroid/play/listings/bn-BD/video-url.txt diff --git a/android/src/fdroid/play/listings/ca/full-description.txt b/android/app/src/main/fdroid/play/listings/ca/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ca/full-description.txt rename to android/app/src/main/fdroid/play/listings/ca/full-description.txt diff --git a/android/src/fdroid/play/listings/ca/release-notes.txt b/android/app/src/main/fdroid/play/listings/ca/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ca/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ca/release-notes.txt diff --git a/android/src/fdroid/play/listings/ca/short-description.txt b/android/app/src/main/fdroid/play/listings/ca/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ca/short-description.txt rename to android/app/src/main/fdroid/play/listings/ca/short-description.txt diff --git a/android/src/fdroid/play/listings/ca/title-google.txt b/android/app/src/main/fdroid/play/listings/ca/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ca/title-google.txt rename to android/app/src/main/fdroid/play/listings/ca/title-google.txt diff --git a/android/src/fdroid/play/listings/ca/title.txt b/android/app/src/main/fdroid/play/listings/ca/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ca/title.txt rename to android/app/src/main/fdroid/play/listings/ca/title.txt diff --git a/android/src/fdroid/play/listings/ca/video-url.txt b/android/app/src/main/fdroid/play/listings/ca/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ca/video-url.txt rename to android/app/src/main/fdroid/play/listings/ca/video-url.txt diff --git a/android/src/fdroid/play/listings/cs-CZ/full-description.txt b/android/app/src/main/fdroid/play/listings/cs-CZ/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/cs-CZ/full-description.txt rename to android/app/src/main/fdroid/play/listings/cs-CZ/full-description.txt diff --git a/android/src/fdroid/play/listings/cs-CZ/release-notes.txt b/android/app/src/main/fdroid/play/listings/cs-CZ/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/cs-CZ/release-notes.txt rename to android/app/src/main/fdroid/play/listings/cs-CZ/release-notes.txt diff --git a/android/src/fdroid/play/listings/cs-CZ/short-description.txt b/android/app/src/main/fdroid/play/listings/cs-CZ/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/cs-CZ/short-description.txt rename to android/app/src/main/fdroid/play/listings/cs-CZ/short-description.txt diff --git a/android/src/fdroid/play/listings/cs-CZ/title-google.txt b/android/app/src/main/fdroid/play/listings/cs-CZ/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/cs-CZ/title-google.txt rename to android/app/src/main/fdroid/play/listings/cs-CZ/title-google.txt diff --git a/android/src/fdroid/play/listings/cs-CZ/title.txt b/android/app/src/main/fdroid/play/listings/cs-CZ/title.txt similarity index 100% rename from android/src/fdroid/play/listings/cs-CZ/title.txt rename to android/app/src/main/fdroid/play/listings/cs-CZ/title.txt diff --git a/android/src/fdroid/play/listings/cs-CZ/video-url.txt b/android/app/src/main/fdroid/play/listings/cs-CZ/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/cs-CZ/video-url.txt rename to android/app/src/main/fdroid/play/listings/cs-CZ/video-url.txt diff --git a/android/src/fdroid/play/listings/da-DK/full-description.txt b/android/app/src/main/fdroid/play/listings/da-DK/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/da-DK/full-description.txt rename to android/app/src/main/fdroid/play/listings/da-DK/full-description.txt diff --git a/android/src/fdroid/play/listings/da-DK/release-notes.txt b/android/app/src/main/fdroid/play/listings/da-DK/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/da-DK/release-notes.txt rename to android/app/src/main/fdroid/play/listings/da-DK/release-notes.txt diff --git a/android/src/fdroid/play/listings/da-DK/short-description.txt b/android/app/src/main/fdroid/play/listings/da-DK/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/da-DK/short-description.txt rename to android/app/src/main/fdroid/play/listings/da-DK/short-description.txt diff --git a/android/src/fdroid/play/listings/da-DK/title-google.txt b/android/app/src/main/fdroid/play/listings/da-DK/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/da-DK/title-google.txt rename to android/app/src/main/fdroid/play/listings/da-DK/title-google.txt diff --git a/android/src/fdroid/play/listings/da-DK/title.txt b/android/app/src/main/fdroid/play/listings/da-DK/title.txt similarity index 100% rename from android/src/fdroid/play/listings/da-DK/title.txt rename to android/app/src/main/fdroid/play/listings/da-DK/title.txt diff --git a/android/src/fdroid/play/listings/da-DK/video-url.txt b/android/app/src/main/fdroid/play/listings/da-DK/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/da-DK/video-url.txt rename to android/app/src/main/fdroid/play/listings/da-DK/video-url.txt diff --git a/android/src/fdroid/play/listings/de-DE/full-description.txt b/android/app/src/main/fdroid/play/listings/de-DE/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/full-description.txt rename to android/app/src/main/fdroid/play/listings/de-DE/full-description.txt diff --git a/android/src/fdroid/play/listings/de-DE/release-notes.txt b/android/app/src/main/fdroid/play/listings/de-DE/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/release-notes.txt rename to android/app/src/main/fdroid/play/listings/de-DE/release-notes.txt diff --git a/android/src/fdroid/play/listings/de-DE/short-description.txt b/android/app/src/main/fdroid/play/listings/de-DE/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/short-description.txt rename to android/app/src/main/fdroid/play/listings/de-DE/short-description.txt diff --git a/android/src/fdroid/play/listings/de-DE/title-google.txt b/android/app/src/main/fdroid/play/listings/de-DE/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/title-google.txt rename to android/app/src/main/fdroid/play/listings/de-DE/title-google.txt diff --git a/android/src/fdroid/play/listings/de-DE/title.txt b/android/app/src/main/fdroid/play/listings/de-DE/title.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/title.txt rename to android/app/src/main/fdroid/play/listings/de-DE/title.txt diff --git a/android/src/fdroid/play/listings/de-DE/video-url.txt b/android/app/src/main/fdroid/play/listings/de-DE/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/de-DE/video-url.txt rename to android/app/src/main/fdroid/play/listings/de-DE/video-url.txt diff --git a/android/src/fdroid/play/listings/el-GR/full-description.txt b/android/app/src/main/fdroid/play/listings/el-GR/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/el-GR/full-description.txt rename to android/app/src/main/fdroid/play/listings/el-GR/full-description.txt diff --git a/android/src/fdroid/play/listings/el-GR/release-notes.txt b/android/app/src/main/fdroid/play/listings/el-GR/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/el-GR/release-notes.txt rename to android/app/src/main/fdroid/play/listings/el-GR/release-notes.txt diff --git a/android/src/fdroid/play/listings/el-GR/short-description.txt b/android/app/src/main/fdroid/play/listings/el-GR/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/el-GR/short-description.txt rename to android/app/src/main/fdroid/play/listings/el-GR/short-description.txt diff --git a/android/src/fdroid/play/listings/el-GR/title-google.txt b/android/app/src/main/fdroid/play/listings/el-GR/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/el-GR/title-google.txt rename to android/app/src/main/fdroid/play/listings/el-GR/title-google.txt diff --git a/android/src/fdroid/play/listings/el-GR/title.txt b/android/app/src/main/fdroid/play/listings/el-GR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/el-GR/title.txt rename to android/app/src/main/fdroid/play/listings/el-GR/title.txt diff --git a/android/src/fdroid/play/listings/el-GR/video-url.txt b/android/app/src/main/fdroid/play/listings/el-GR/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/el-GR/video-url.txt rename to android/app/src/main/fdroid/play/listings/el-GR/video-url.txt diff --git a/android/src/fdroid/play/listings/en-US/full-description.txt b/android/app/src/main/fdroid/play/listings/en-US/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/en-US/full-description.txt rename to android/app/src/main/fdroid/play/listings/en-US/full-description.txt diff --git a/android/src/fdroid/play/listings/en-US/graphics/icon/1.png b/android/app/src/main/fdroid/play/listings/en-US/graphics/icon/1.png similarity index 100% rename from android/src/fdroid/play/listings/en-US/graphics/icon/1.png rename to android/app/src/main/fdroid/play/listings/en-US/graphics/icon/1.png diff --git a/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg b/android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg similarity index 100% rename from android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg rename to android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg diff --git a/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg b/android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg similarity index 100% rename from android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg rename to android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg diff --git a/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg b/android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg similarity index 100% rename from android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg rename to android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg diff --git a/android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg b/android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg similarity index 100% rename from android/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg rename to android/app/src/main/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg diff --git a/android/src/fdroid/play/listings/en-US/release-notes.txt b/android/app/src/main/fdroid/play/listings/en-US/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/en-US/release-notes.txt rename to android/app/src/main/fdroid/play/listings/en-US/release-notes.txt diff --git a/android/src/fdroid/play/listings/en-US/short-description.txt b/android/app/src/main/fdroid/play/listings/en-US/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/en-US/short-description.txt rename to android/app/src/main/fdroid/play/listings/en-US/short-description.txt diff --git a/android/src/fdroid/play/listings/en-US/title-google.txt b/android/app/src/main/fdroid/play/listings/en-US/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/en-US/title-google.txt rename to android/app/src/main/fdroid/play/listings/en-US/title-google.txt diff --git a/android/src/fdroid/play/listings/en-US/title.txt b/android/app/src/main/fdroid/play/listings/en-US/title.txt similarity index 100% rename from android/src/fdroid/play/listings/en-US/title.txt rename to android/app/src/main/fdroid/play/listings/en-US/title.txt diff --git a/android/src/fdroid/play/listings/en-US/video-url.txt b/android/app/src/main/fdroid/play/listings/en-US/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/en-US/video-url.txt rename to android/app/src/main/fdroid/play/listings/en-US/video-url.txt diff --git a/android/src/fdroid/play/listings/es-ES/full-description.txt b/android/app/src/main/fdroid/play/listings/es-ES/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/es-ES/full-description.txt rename to android/app/src/main/fdroid/play/listings/es-ES/full-description.txt diff --git a/android/src/fdroid/play/listings/es-ES/release-notes.txt b/android/app/src/main/fdroid/play/listings/es-ES/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/es-ES/release-notes.txt rename to android/app/src/main/fdroid/play/listings/es-ES/release-notes.txt diff --git a/android/src/fdroid/play/listings/es-ES/short-description.txt b/android/app/src/main/fdroid/play/listings/es-ES/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/es-ES/short-description.txt rename to android/app/src/main/fdroid/play/listings/es-ES/short-description.txt diff --git a/android/src/fdroid/play/listings/es-ES/title-google.txt b/android/app/src/main/fdroid/play/listings/es-ES/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/es-ES/title-google.txt rename to android/app/src/main/fdroid/play/listings/es-ES/title-google.txt diff --git a/android/src/fdroid/play/listings/es-ES/title.txt b/android/app/src/main/fdroid/play/listings/es-ES/title.txt similarity index 100% rename from android/src/fdroid/play/listings/es-ES/title.txt rename to android/app/src/main/fdroid/play/listings/es-ES/title.txt diff --git a/android/src/fdroid/play/listings/es-ES/video-url.txt b/android/app/src/main/fdroid/play/listings/es-ES/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/es-ES/video-url.txt rename to android/app/src/main/fdroid/play/listings/es-ES/video-url.txt diff --git a/android/src/fdroid/play/listings/et/full-description.txt b/android/app/src/main/fdroid/play/listings/et/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/et/full-description.txt rename to android/app/src/main/fdroid/play/listings/et/full-description.txt diff --git a/android/src/fdroid/play/listings/et/release-notes.txt b/android/app/src/main/fdroid/play/listings/et/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/et/release-notes.txt rename to android/app/src/main/fdroid/play/listings/et/release-notes.txt diff --git a/android/src/fdroid/play/listings/et/short-description.txt b/android/app/src/main/fdroid/play/listings/et/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/et/short-description.txt rename to android/app/src/main/fdroid/play/listings/et/short-description.txt diff --git a/android/src/fdroid/play/listings/et/title-google.txt b/android/app/src/main/fdroid/play/listings/et/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/et/title-google.txt rename to android/app/src/main/fdroid/play/listings/et/title-google.txt diff --git a/android/src/fdroid/play/listings/et/title.txt b/android/app/src/main/fdroid/play/listings/et/title.txt similarity index 100% rename from android/src/fdroid/play/listings/et/title.txt rename to android/app/src/main/fdroid/play/listings/et/title.txt diff --git a/android/src/fdroid/play/listings/et/video-url.txt b/android/app/src/main/fdroid/play/listings/et/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/et/video-url.txt rename to android/app/src/main/fdroid/play/listings/et/video-url.txt diff --git a/android/src/fdroid/play/listings/eu-ES/full-description.txt b/android/app/src/main/fdroid/play/listings/eu-ES/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/eu-ES/full-description.txt rename to android/app/src/main/fdroid/play/listings/eu-ES/full-description.txt diff --git a/android/src/fdroid/play/listings/eu-ES/release-notes.txt b/android/app/src/main/fdroid/play/listings/eu-ES/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/eu-ES/release-notes.txt rename to android/app/src/main/fdroid/play/listings/eu-ES/release-notes.txt diff --git a/android/src/fdroid/play/listings/eu-ES/short-description.txt b/android/app/src/main/fdroid/play/listings/eu-ES/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/eu-ES/short-description.txt rename to android/app/src/main/fdroid/play/listings/eu-ES/short-description.txt diff --git a/android/src/fdroid/play/listings/eu-ES/title-google.txt b/android/app/src/main/fdroid/play/listings/eu-ES/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/eu-ES/title-google.txt rename to android/app/src/main/fdroid/play/listings/eu-ES/title-google.txt diff --git a/android/src/fdroid/play/listings/eu-ES/title.txt b/android/app/src/main/fdroid/play/listings/eu-ES/title.txt similarity index 100% rename from android/src/fdroid/play/listings/eu-ES/title.txt rename to android/app/src/main/fdroid/play/listings/eu-ES/title.txt diff --git a/android/src/fdroid/play/listings/eu-ES/video-url.txt b/android/app/src/main/fdroid/play/listings/eu-ES/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/eu-ES/video-url.txt rename to android/app/src/main/fdroid/play/listings/eu-ES/video-url.txt diff --git a/android/src/fdroid/play/listings/fa/full-description.txt b/android/app/src/main/fdroid/play/listings/fa/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/fa/full-description.txt rename to android/app/src/main/fdroid/play/listings/fa/full-description.txt diff --git a/android/src/fdroid/play/listings/fa/release-notes.txt b/android/app/src/main/fdroid/play/listings/fa/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/fa/release-notes.txt rename to android/app/src/main/fdroid/play/listings/fa/release-notes.txt diff --git a/android/src/fdroid/play/listings/fa/short-description.txt b/android/app/src/main/fdroid/play/listings/fa/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/fa/short-description.txt rename to android/app/src/main/fdroid/play/listings/fa/short-description.txt diff --git a/android/src/fdroid/play/listings/fa/title-google.txt b/android/app/src/main/fdroid/play/listings/fa/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/fa/title-google.txt rename to android/app/src/main/fdroid/play/listings/fa/title-google.txt diff --git a/android/src/fdroid/play/listings/fa/title.txt b/android/app/src/main/fdroid/play/listings/fa/title.txt similarity index 100% rename from android/src/fdroid/play/listings/fa/title.txt rename to android/app/src/main/fdroid/play/listings/fa/title.txt diff --git a/android/src/fdroid/play/listings/fa/video-url.txt b/android/app/src/main/fdroid/play/listings/fa/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/fa/video-url.txt rename to android/app/src/main/fdroid/play/listings/fa/video-url.txt diff --git a/android/src/fdroid/play/listings/fi-FI/full-description.txt b/android/app/src/main/fdroid/play/listings/fi-FI/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/fi-FI/full-description.txt rename to android/app/src/main/fdroid/play/listings/fi-FI/full-description.txt diff --git a/android/src/fdroid/play/listings/fi-FI/release-notes.txt b/android/app/src/main/fdroid/play/listings/fi-FI/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/fi-FI/release-notes.txt rename to android/app/src/main/fdroid/play/listings/fi-FI/release-notes.txt diff --git a/android/src/fdroid/play/listings/fi-FI/short-description.txt b/android/app/src/main/fdroid/play/listings/fi-FI/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/fi-FI/short-description.txt rename to android/app/src/main/fdroid/play/listings/fi-FI/short-description.txt diff --git a/android/src/fdroid/play/listings/fi-FI/title-google.txt b/android/app/src/main/fdroid/play/listings/fi-FI/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/fi-FI/title-google.txt rename to android/app/src/main/fdroid/play/listings/fi-FI/title-google.txt diff --git a/android/src/fdroid/play/listings/fi-FI/title.txt b/android/app/src/main/fdroid/play/listings/fi-FI/title.txt similarity index 100% rename from android/src/fdroid/play/listings/fi-FI/title.txt rename to android/app/src/main/fdroid/play/listings/fi-FI/title.txt diff --git a/android/src/fdroid/play/listings/fi-FI/video-url.txt b/android/app/src/main/fdroid/play/listings/fi-FI/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/fi-FI/video-url.txt rename to android/app/src/main/fdroid/play/listings/fi-FI/video-url.txt diff --git a/android/src/fdroid/play/listings/fr-FR/full-description.txt b/android/app/src/main/fdroid/play/listings/fr-FR/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/full-description.txt rename to android/app/src/main/fdroid/play/listings/fr-FR/full-description.txt diff --git a/android/src/fdroid/play/listings/fr-FR/release-notes.txt b/android/app/src/main/fdroid/play/listings/fr-FR/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/release-notes.txt rename to android/app/src/main/fdroid/play/listings/fr-FR/release-notes.txt diff --git a/android/src/fdroid/play/listings/fr-FR/short-description.txt b/android/app/src/main/fdroid/play/listings/fr-FR/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/short-description.txt rename to android/app/src/main/fdroid/play/listings/fr-FR/short-description.txt diff --git a/android/src/fdroid/play/listings/fr-FR/title-google.txt b/android/app/src/main/fdroid/play/listings/fr-FR/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/title-google.txt rename to android/app/src/main/fdroid/play/listings/fr-FR/title-google.txt diff --git a/android/src/fdroid/play/listings/fr-FR/title.txt b/android/app/src/main/fdroid/play/listings/fr-FR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/title.txt rename to android/app/src/main/fdroid/play/listings/fr-FR/title.txt diff --git a/android/src/fdroid/play/listings/fr-FR/video-url.txt b/android/app/src/main/fdroid/play/listings/fr-FR/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/fr-FR/video-url.txt rename to android/app/src/main/fdroid/play/listings/fr-FR/video-url.txt diff --git a/android/src/fdroid/play/listings/gl-ES/full-description.txt b/android/app/src/main/fdroid/play/listings/gl-ES/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/gl-ES/full-description.txt rename to android/app/src/main/fdroid/play/listings/gl-ES/full-description.txt diff --git a/android/src/fdroid/play/listings/gl-ES/release-notes.txt b/android/app/src/main/fdroid/play/listings/gl-ES/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/gl-ES/release-notes.txt rename to android/app/src/main/fdroid/play/listings/gl-ES/release-notes.txt diff --git a/android/src/fdroid/play/listings/gl-ES/short-description.txt b/android/app/src/main/fdroid/play/listings/gl-ES/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/gl-ES/short-description.txt rename to android/app/src/main/fdroid/play/listings/gl-ES/short-description.txt diff --git a/android/src/fdroid/play/listings/gl-ES/title-google.txt b/android/app/src/main/fdroid/play/listings/gl-ES/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/gl-ES/title-google.txt rename to android/app/src/main/fdroid/play/listings/gl-ES/title-google.txt diff --git a/android/src/fdroid/play/listings/gl-ES/title.txt b/android/app/src/main/fdroid/play/listings/gl-ES/title.txt similarity index 100% rename from android/src/fdroid/play/listings/gl-ES/title.txt rename to android/app/src/main/fdroid/play/listings/gl-ES/title.txt diff --git a/android/src/fdroid/play/listings/gl-ES/video-url.txt b/android/app/src/main/fdroid/play/listings/gl-ES/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/gl-ES/video-url.txt rename to android/app/src/main/fdroid/play/listings/gl-ES/video-url.txt diff --git a/android/src/fdroid/play/listings/gu/full-description.txt b/android/app/src/main/fdroid/play/listings/gu/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/gu/full-description.txt rename to android/app/src/main/fdroid/play/listings/gu/full-description.txt diff --git a/android/src/fdroid/play/listings/gu/release-notes.txt b/android/app/src/main/fdroid/play/listings/gu/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/gu/release-notes.txt rename to android/app/src/main/fdroid/play/listings/gu/release-notes.txt diff --git a/android/src/fdroid/play/listings/gu/short-description.txt b/android/app/src/main/fdroid/play/listings/gu/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/gu/short-description.txt rename to android/app/src/main/fdroid/play/listings/gu/short-description.txt diff --git a/android/src/fdroid/play/listings/gu/title-google.txt b/android/app/src/main/fdroid/play/listings/gu/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/gu/title-google.txt rename to android/app/src/main/fdroid/play/listings/gu/title-google.txt diff --git a/android/src/fdroid/play/listings/gu/title.txt b/android/app/src/main/fdroid/play/listings/gu/title.txt similarity index 100% rename from android/src/fdroid/play/listings/gu/title.txt rename to android/app/src/main/fdroid/play/listings/gu/title.txt diff --git a/android/src/fdroid/play/listings/gu/video-url.txt b/android/app/src/main/fdroid/play/listings/gu/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/gu/video-url.txt rename to android/app/src/main/fdroid/play/listings/gu/video-url.txt diff --git a/android/src/fdroid/play/listings/hi-IN/full-description.txt b/android/app/src/main/fdroid/play/listings/hi-IN/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/hi-IN/full-description.txt rename to android/app/src/main/fdroid/play/listings/hi-IN/full-description.txt diff --git a/android/src/fdroid/play/listings/hi-IN/release-notes.txt b/android/app/src/main/fdroid/play/listings/hi-IN/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/hi-IN/release-notes.txt rename to android/app/src/main/fdroid/play/listings/hi-IN/release-notes.txt diff --git a/android/src/fdroid/play/listings/hi-IN/short-description.txt b/android/app/src/main/fdroid/play/listings/hi-IN/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/hi-IN/short-description.txt rename to android/app/src/main/fdroid/play/listings/hi-IN/short-description.txt diff --git a/android/src/fdroid/play/listings/hi-IN/title-google.txt b/android/app/src/main/fdroid/play/listings/hi-IN/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/hi-IN/title-google.txt rename to android/app/src/main/fdroid/play/listings/hi-IN/title-google.txt diff --git a/android/src/fdroid/play/listings/hi-IN/title.txt b/android/app/src/main/fdroid/play/listings/hi-IN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/hi-IN/title.txt rename to android/app/src/main/fdroid/play/listings/hi-IN/title.txt diff --git a/android/src/fdroid/play/listings/hi-IN/video-url.txt b/android/app/src/main/fdroid/play/listings/hi-IN/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/hi-IN/video-url.txt rename to android/app/src/main/fdroid/play/listings/hi-IN/video-url.txt diff --git a/android/src/fdroid/play/listings/hr/full-description.txt b/android/app/src/main/fdroid/play/listings/hr/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/hr/full-description.txt rename to android/app/src/main/fdroid/play/listings/hr/full-description.txt diff --git a/android/src/fdroid/play/listings/hr/release-notes.txt b/android/app/src/main/fdroid/play/listings/hr/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/hr/release-notes.txt rename to android/app/src/main/fdroid/play/listings/hr/release-notes.txt diff --git a/android/src/fdroid/play/listings/hr/short-description.txt b/android/app/src/main/fdroid/play/listings/hr/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/hr/short-description.txt rename to android/app/src/main/fdroid/play/listings/hr/short-description.txt diff --git a/android/src/fdroid/play/listings/hr/title-google.txt b/android/app/src/main/fdroid/play/listings/hr/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/hr/title-google.txt rename to android/app/src/main/fdroid/play/listings/hr/title-google.txt diff --git a/android/src/fdroid/play/listings/hr/title.txt b/android/app/src/main/fdroid/play/listings/hr/title.txt similarity index 100% rename from android/src/fdroid/play/listings/hr/title.txt rename to android/app/src/main/fdroid/play/listings/hr/title.txt diff --git a/android/src/fdroid/play/listings/hr/video-url.txt b/android/app/src/main/fdroid/play/listings/hr/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/hr/video-url.txt rename to android/app/src/main/fdroid/play/listings/hr/video-url.txt diff --git a/android/src/fdroid/play/listings/hu-HU/full-description.txt b/android/app/src/main/fdroid/play/listings/hu-HU/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/hu-HU/full-description.txt rename to android/app/src/main/fdroid/play/listings/hu-HU/full-description.txt diff --git a/android/src/fdroid/play/listings/hu-HU/release-notes.txt b/android/app/src/main/fdroid/play/listings/hu-HU/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/hu-HU/release-notes.txt rename to android/app/src/main/fdroid/play/listings/hu-HU/release-notes.txt diff --git a/android/src/fdroid/play/listings/hu-HU/short-description.txt b/android/app/src/main/fdroid/play/listings/hu-HU/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/hu-HU/short-description.txt rename to android/app/src/main/fdroid/play/listings/hu-HU/short-description.txt diff --git a/android/src/fdroid/play/listings/hu-HU/title-google.txt b/android/app/src/main/fdroid/play/listings/hu-HU/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/hu-HU/title-google.txt rename to android/app/src/main/fdroid/play/listings/hu-HU/title-google.txt diff --git a/android/src/fdroid/play/listings/hu-HU/title.txt b/android/app/src/main/fdroid/play/listings/hu-HU/title.txt similarity index 100% rename from android/src/fdroid/play/listings/hu-HU/title.txt rename to android/app/src/main/fdroid/play/listings/hu-HU/title.txt diff --git a/android/src/fdroid/play/listings/hu-HU/video-url.txt b/android/app/src/main/fdroid/play/listings/hu-HU/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/hu-HU/video-url.txt rename to android/app/src/main/fdroid/play/listings/hu-HU/video-url.txt diff --git a/android/src/fdroid/play/listings/id/full-description.txt b/android/app/src/main/fdroid/play/listings/id/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/id/full-description.txt rename to android/app/src/main/fdroid/play/listings/id/full-description.txt diff --git a/android/src/fdroid/play/listings/id/release-notes.txt b/android/app/src/main/fdroid/play/listings/id/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/id/release-notes.txt rename to android/app/src/main/fdroid/play/listings/id/release-notes.txt diff --git a/android/src/fdroid/play/listings/id/short-description.txt b/android/app/src/main/fdroid/play/listings/id/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/id/short-description.txt rename to android/app/src/main/fdroid/play/listings/id/short-description.txt diff --git a/android/src/fdroid/play/listings/id/title-google.txt b/android/app/src/main/fdroid/play/listings/id/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/id/title-google.txt rename to android/app/src/main/fdroid/play/listings/id/title-google.txt diff --git a/android/src/fdroid/play/listings/id/title.txt b/android/app/src/main/fdroid/play/listings/id/title.txt similarity index 100% rename from android/src/fdroid/play/listings/id/title.txt rename to android/app/src/main/fdroid/play/listings/id/title.txt diff --git a/android/src/fdroid/play/listings/id/video-url.txt b/android/app/src/main/fdroid/play/listings/id/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/id/video-url.txt rename to android/app/src/main/fdroid/play/listings/id/video-url.txt diff --git a/android/src/fdroid/play/listings/it-IT/full-description.txt b/android/app/src/main/fdroid/play/listings/it-IT/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/full-description.txt rename to android/app/src/main/fdroid/play/listings/it-IT/full-description.txt diff --git a/android/src/fdroid/play/listings/it-IT/release-notes.txt b/android/app/src/main/fdroid/play/listings/it-IT/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/release-notes.txt rename to android/app/src/main/fdroid/play/listings/it-IT/release-notes.txt diff --git a/android/src/fdroid/play/listings/it-IT/short-description.txt b/android/app/src/main/fdroid/play/listings/it-IT/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/short-description.txt rename to android/app/src/main/fdroid/play/listings/it-IT/short-description.txt diff --git a/android/src/fdroid/play/listings/it-IT/title-google.txt b/android/app/src/main/fdroid/play/listings/it-IT/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/title-google.txt rename to android/app/src/main/fdroid/play/listings/it-IT/title-google.txt diff --git a/android/src/fdroid/play/listings/it-IT/title.txt b/android/app/src/main/fdroid/play/listings/it-IT/title.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/title.txt rename to android/app/src/main/fdroid/play/listings/it-IT/title.txt diff --git a/android/src/fdroid/play/listings/it-IT/video-url.txt b/android/app/src/main/fdroid/play/listings/it-IT/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/it-IT/video-url.txt rename to android/app/src/main/fdroid/play/listings/it-IT/video-url.txt diff --git a/android/src/fdroid/play/listings/iw-IL/full-description.txt b/android/app/src/main/fdroid/play/listings/iw-IL/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/iw-IL/full-description.txt rename to android/app/src/main/fdroid/play/listings/iw-IL/full-description.txt diff --git a/android/src/fdroid/play/listings/iw-IL/release-notes.txt b/android/app/src/main/fdroid/play/listings/iw-IL/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/iw-IL/release-notes.txt rename to android/app/src/main/fdroid/play/listings/iw-IL/release-notes.txt diff --git a/android/src/fdroid/play/listings/iw-IL/short-description.txt b/android/app/src/main/fdroid/play/listings/iw-IL/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/iw-IL/short-description.txt rename to android/app/src/main/fdroid/play/listings/iw-IL/short-description.txt diff --git a/android/src/fdroid/play/listings/iw-IL/title-google.txt b/android/app/src/main/fdroid/play/listings/iw-IL/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/iw-IL/title-google.txt rename to android/app/src/main/fdroid/play/listings/iw-IL/title-google.txt diff --git a/android/src/fdroid/play/listings/iw-IL/title.txt b/android/app/src/main/fdroid/play/listings/iw-IL/title.txt similarity index 100% rename from android/src/fdroid/play/listings/iw-IL/title.txt rename to android/app/src/main/fdroid/play/listings/iw-IL/title.txt diff --git a/android/src/fdroid/play/listings/iw-IL/video-url.txt b/android/app/src/main/fdroid/play/listings/iw-IL/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/iw-IL/video-url.txt rename to android/app/src/main/fdroid/play/listings/iw-IL/video-url.txt diff --git a/android/src/fdroid/play/listings/ja-JP/full-description.txt b/android/app/src/main/fdroid/play/listings/ja-JP/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ja-JP/full-description.txt rename to android/app/src/main/fdroid/play/listings/ja-JP/full-description.txt diff --git a/android/src/fdroid/play/listings/ja-JP/release-notes.txt b/android/app/src/main/fdroid/play/listings/ja-JP/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ja-JP/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ja-JP/release-notes.txt diff --git a/android/src/fdroid/play/listings/ja-JP/short-description.txt b/android/app/src/main/fdroid/play/listings/ja-JP/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ja-JP/short-description.txt rename to android/app/src/main/fdroid/play/listings/ja-JP/short-description.txt diff --git a/android/src/fdroid/play/listings/ja-JP/title-google.txt b/android/app/src/main/fdroid/play/listings/ja-JP/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ja-JP/title-google.txt rename to android/app/src/main/fdroid/play/listings/ja-JP/title-google.txt diff --git a/android/src/fdroid/play/listings/ja-JP/title.txt b/android/app/src/main/fdroid/play/listings/ja-JP/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ja-JP/title.txt rename to android/app/src/main/fdroid/play/listings/ja-JP/title.txt diff --git a/android/src/fdroid/play/listings/ja-JP/video-url.txt b/android/app/src/main/fdroid/play/listings/ja-JP/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ja-JP/video-url.txt rename to android/app/src/main/fdroid/play/listings/ja-JP/video-url.txt diff --git a/android/src/fdroid/play/listings/ka-GE/full-description.txt b/android/app/src/main/fdroid/play/listings/ka-GE/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ka-GE/full-description.txt rename to android/app/src/main/fdroid/play/listings/ka-GE/full-description.txt diff --git a/android/src/fdroid/play/listings/ka-GE/release-notes.txt b/android/app/src/main/fdroid/play/listings/ka-GE/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ka-GE/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ka-GE/release-notes.txt diff --git a/android/src/fdroid/play/listings/ka-GE/short-description.txt b/android/app/src/main/fdroid/play/listings/ka-GE/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ka-GE/short-description.txt rename to android/app/src/main/fdroid/play/listings/ka-GE/short-description.txt diff --git a/android/src/fdroid/play/listings/ka-GE/title-google.txt b/android/app/src/main/fdroid/play/listings/ka-GE/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ka-GE/title-google.txt rename to android/app/src/main/fdroid/play/listings/ka-GE/title-google.txt diff --git a/android/src/fdroid/play/listings/ka-GE/title.txt b/android/app/src/main/fdroid/play/listings/ka-GE/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ka-GE/title.txt rename to android/app/src/main/fdroid/play/listings/ka-GE/title.txt diff --git a/android/src/fdroid/play/listings/ka-GE/video-url.txt b/android/app/src/main/fdroid/play/listings/ka-GE/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ka-GE/video-url.txt rename to android/app/src/main/fdroid/play/listings/ka-GE/video-url.txt diff --git a/android/src/fdroid/play/listings/kk/full-description.txt b/android/app/src/main/fdroid/play/listings/kk/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/kk/full-description.txt rename to android/app/src/main/fdroid/play/listings/kk/full-description.txt diff --git a/android/src/fdroid/play/listings/kk/release-notes.txt b/android/app/src/main/fdroid/play/listings/kk/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/kk/release-notes.txt rename to android/app/src/main/fdroid/play/listings/kk/release-notes.txt diff --git a/android/src/fdroid/play/listings/kk/short-description.txt b/android/app/src/main/fdroid/play/listings/kk/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/kk/short-description.txt rename to android/app/src/main/fdroid/play/listings/kk/short-description.txt diff --git a/android/src/fdroid/play/listings/kk/title-google.txt b/android/app/src/main/fdroid/play/listings/kk/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/kk/title-google.txt rename to android/app/src/main/fdroid/play/listings/kk/title-google.txt diff --git a/android/src/fdroid/play/listings/kk/title.txt b/android/app/src/main/fdroid/play/listings/kk/title.txt similarity index 100% rename from android/src/fdroid/play/listings/kk/title.txt rename to android/app/src/main/fdroid/play/listings/kk/title.txt diff --git a/android/src/fdroid/play/listings/kk/video-url.txt b/android/app/src/main/fdroid/play/listings/kk/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/kk/video-url.txt rename to android/app/src/main/fdroid/play/listings/kk/video-url.txt diff --git a/android/src/fdroid/play/listings/km-KH/full-description.txt b/android/app/src/main/fdroid/play/listings/km-KH/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/km-KH/full-description.txt rename to android/app/src/main/fdroid/play/listings/km-KH/full-description.txt diff --git a/android/src/fdroid/play/listings/km-KH/release-notes.txt b/android/app/src/main/fdroid/play/listings/km-KH/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/km-KH/release-notes.txt rename to android/app/src/main/fdroid/play/listings/km-KH/release-notes.txt diff --git a/android/src/fdroid/play/listings/km-KH/short-description.txt b/android/app/src/main/fdroid/play/listings/km-KH/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/km-KH/short-description.txt rename to android/app/src/main/fdroid/play/listings/km-KH/short-description.txt diff --git a/android/src/fdroid/play/listings/km-KH/title-google.txt b/android/app/src/main/fdroid/play/listings/km-KH/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/km-KH/title-google.txt rename to android/app/src/main/fdroid/play/listings/km-KH/title-google.txt diff --git a/android/src/fdroid/play/listings/km-KH/title.txt b/android/app/src/main/fdroid/play/listings/km-KH/title.txt similarity index 100% rename from android/src/fdroid/play/listings/km-KH/title.txt rename to android/app/src/main/fdroid/play/listings/km-KH/title.txt diff --git a/android/src/fdroid/play/listings/km-KH/video-url.txt b/android/app/src/main/fdroid/play/listings/km-KH/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/km-KH/video-url.txt rename to android/app/src/main/fdroid/play/listings/km-KH/video-url.txt diff --git a/android/src/fdroid/play/listings/kn-IN/full-description.txt b/android/app/src/main/fdroid/play/listings/kn-IN/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/kn-IN/full-description.txt rename to android/app/src/main/fdroid/play/listings/kn-IN/full-description.txt diff --git a/android/src/fdroid/play/listings/kn-IN/release-notes.txt b/android/app/src/main/fdroid/play/listings/kn-IN/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/kn-IN/release-notes.txt rename to android/app/src/main/fdroid/play/listings/kn-IN/release-notes.txt diff --git a/android/src/fdroid/play/listings/kn-IN/short-description.txt b/android/app/src/main/fdroid/play/listings/kn-IN/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/kn-IN/short-description.txt rename to android/app/src/main/fdroid/play/listings/kn-IN/short-description.txt diff --git a/android/src/fdroid/play/listings/kn-IN/title-google.txt b/android/app/src/main/fdroid/play/listings/kn-IN/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/kn-IN/title-google.txt rename to android/app/src/main/fdroid/play/listings/kn-IN/title-google.txt diff --git a/android/src/fdroid/play/listings/kn-IN/title.txt b/android/app/src/main/fdroid/play/listings/kn-IN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/kn-IN/title.txt rename to android/app/src/main/fdroid/play/listings/kn-IN/title.txt diff --git a/android/src/fdroid/play/listings/kn-IN/video-url.txt b/android/app/src/main/fdroid/play/listings/kn-IN/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/kn-IN/video-url.txt rename to android/app/src/main/fdroid/play/listings/kn-IN/video-url.txt diff --git a/android/src/fdroid/play/listings/ko-KR/full-description.txt b/android/app/src/main/fdroid/play/listings/ko-KR/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ko-KR/full-description.txt rename to android/app/src/main/fdroid/play/listings/ko-KR/full-description.txt diff --git a/android/src/fdroid/play/listings/ko-KR/release-notes.txt b/android/app/src/main/fdroid/play/listings/ko-KR/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ko-KR/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ko-KR/release-notes.txt diff --git a/android/src/fdroid/play/listings/ko-KR/short-description.txt b/android/app/src/main/fdroid/play/listings/ko-KR/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ko-KR/short-description.txt rename to android/app/src/main/fdroid/play/listings/ko-KR/short-description.txt diff --git a/android/src/fdroid/play/listings/ko-KR/title-google.txt b/android/app/src/main/fdroid/play/listings/ko-KR/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ko-KR/title-google.txt rename to android/app/src/main/fdroid/play/listings/ko-KR/title-google.txt diff --git a/android/src/fdroid/play/listings/ko-KR/title.txt b/android/app/src/main/fdroid/play/listings/ko-KR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ko-KR/title.txt rename to android/app/src/main/fdroid/play/listings/ko-KR/title.txt diff --git a/android/src/fdroid/play/listings/ko-KR/video-url.txt b/android/app/src/main/fdroid/play/listings/ko-KR/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ko-KR/video-url.txt rename to android/app/src/main/fdroid/play/listings/ko-KR/video-url.txt diff --git a/android/src/fdroid/play/listings/lo-LA/full-description.txt b/android/app/src/main/fdroid/play/listings/lo-LA/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/lo-LA/full-description.txt rename to android/app/src/main/fdroid/play/listings/lo-LA/full-description.txt diff --git a/android/src/fdroid/play/listings/lo-LA/release-notes.txt b/android/app/src/main/fdroid/play/listings/lo-LA/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/lo-LA/release-notes.txt rename to android/app/src/main/fdroid/play/listings/lo-LA/release-notes.txt diff --git a/android/src/fdroid/play/listings/lo-LA/short-description.txt b/android/app/src/main/fdroid/play/listings/lo-LA/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/lo-LA/short-description.txt rename to android/app/src/main/fdroid/play/listings/lo-LA/short-description.txt diff --git a/android/src/fdroid/play/listings/lo-LA/title-google.txt b/android/app/src/main/fdroid/play/listings/lo-LA/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/lo-LA/title-google.txt rename to android/app/src/main/fdroid/play/listings/lo-LA/title-google.txt diff --git a/android/src/fdroid/play/listings/lo-LA/title.txt b/android/app/src/main/fdroid/play/listings/lo-LA/title.txt similarity index 100% rename from android/src/fdroid/play/listings/lo-LA/title.txt rename to android/app/src/main/fdroid/play/listings/lo-LA/title.txt diff --git a/android/src/fdroid/play/listings/lo-LA/video-url.txt b/android/app/src/main/fdroid/play/listings/lo-LA/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/lo-LA/video-url.txt rename to android/app/src/main/fdroid/play/listings/lo-LA/video-url.txt diff --git a/android/src/fdroid/play/listings/lt/full-description.txt b/android/app/src/main/fdroid/play/listings/lt/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/lt/full-description.txt rename to android/app/src/main/fdroid/play/listings/lt/full-description.txt diff --git a/android/src/fdroid/play/listings/lt/release-notes.txt b/android/app/src/main/fdroid/play/listings/lt/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/lt/release-notes.txt rename to android/app/src/main/fdroid/play/listings/lt/release-notes.txt diff --git a/android/src/fdroid/play/listings/lt/short-description.txt b/android/app/src/main/fdroid/play/listings/lt/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/lt/short-description.txt rename to android/app/src/main/fdroid/play/listings/lt/short-description.txt diff --git a/android/src/fdroid/play/listings/lt/title-google.txt b/android/app/src/main/fdroid/play/listings/lt/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/lt/title-google.txt rename to android/app/src/main/fdroid/play/listings/lt/title-google.txt diff --git a/android/src/fdroid/play/listings/lt/title.txt b/android/app/src/main/fdroid/play/listings/lt/title.txt similarity index 100% rename from android/src/fdroid/play/listings/lt/title.txt rename to android/app/src/main/fdroid/play/listings/lt/title.txt diff --git a/android/src/fdroid/play/listings/lt/video-url.txt b/android/app/src/main/fdroid/play/listings/lt/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/lt/video-url.txt rename to android/app/src/main/fdroid/play/listings/lt/video-url.txt diff --git a/android/src/fdroid/play/listings/lv/full-description.txt b/android/app/src/main/fdroid/play/listings/lv/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/lv/full-description.txt rename to android/app/src/main/fdroid/play/listings/lv/full-description.txt diff --git a/android/src/fdroid/play/listings/lv/release-notes.txt b/android/app/src/main/fdroid/play/listings/lv/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/lv/release-notes.txt rename to android/app/src/main/fdroid/play/listings/lv/release-notes.txt diff --git a/android/src/fdroid/play/listings/lv/short-description.txt b/android/app/src/main/fdroid/play/listings/lv/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/lv/short-description.txt rename to android/app/src/main/fdroid/play/listings/lv/short-description.txt diff --git a/android/src/fdroid/play/listings/lv/title-google.txt b/android/app/src/main/fdroid/play/listings/lv/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/lv/title-google.txt rename to android/app/src/main/fdroid/play/listings/lv/title-google.txt diff --git a/android/src/fdroid/play/listings/lv/title.txt b/android/app/src/main/fdroid/play/listings/lv/title.txt similarity index 100% rename from android/src/fdroid/play/listings/lv/title.txt rename to android/app/src/main/fdroid/play/listings/lv/title.txt diff --git a/android/src/fdroid/play/listings/lv/video-url.txt b/android/app/src/main/fdroid/play/listings/lv/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/lv/video-url.txt rename to android/app/src/main/fdroid/play/listings/lv/video-url.txt diff --git a/android/src/fdroid/play/listings/mk-MK/full-description.txt b/android/app/src/main/fdroid/play/listings/mk-MK/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/mk-MK/full-description.txt rename to android/app/src/main/fdroid/play/listings/mk-MK/full-description.txt diff --git a/android/src/fdroid/play/listings/mk-MK/release-notes.txt b/android/app/src/main/fdroid/play/listings/mk-MK/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/mk-MK/release-notes.txt rename to android/app/src/main/fdroid/play/listings/mk-MK/release-notes.txt diff --git a/android/src/fdroid/play/listings/mk-MK/short-description.txt b/android/app/src/main/fdroid/play/listings/mk-MK/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/mk-MK/short-description.txt rename to android/app/src/main/fdroid/play/listings/mk-MK/short-description.txt diff --git a/android/src/fdroid/play/listings/mk-MK/title-google.txt b/android/app/src/main/fdroid/play/listings/mk-MK/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/mk-MK/title-google.txt rename to android/app/src/main/fdroid/play/listings/mk-MK/title-google.txt diff --git a/android/src/fdroid/play/listings/mk-MK/title.txt b/android/app/src/main/fdroid/play/listings/mk-MK/title.txt similarity index 100% rename from android/src/fdroid/play/listings/mk-MK/title.txt rename to android/app/src/main/fdroid/play/listings/mk-MK/title.txt diff --git a/android/src/fdroid/play/listings/mk-MK/video-url.txt b/android/app/src/main/fdroid/play/listings/mk-MK/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/mk-MK/video-url.txt rename to android/app/src/main/fdroid/play/listings/mk-MK/video-url.txt diff --git a/android/src/fdroid/play/listings/ml-IN/full-description.txt b/android/app/src/main/fdroid/play/listings/ml-IN/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ml-IN/full-description.txt rename to android/app/src/main/fdroid/play/listings/ml-IN/full-description.txt diff --git a/android/src/fdroid/play/listings/ml-IN/release-notes.txt b/android/app/src/main/fdroid/play/listings/ml-IN/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ml-IN/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ml-IN/release-notes.txt diff --git a/android/src/fdroid/play/listings/ml-IN/short-description.txt b/android/app/src/main/fdroid/play/listings/ml-IN/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ml-IN/short-description.txt rename to android/app/src/main/fdroid/play/listings/ml-IN/short-description.txt diff --git a/android/src/fdroid/play/listings/ml-IN/title-google.txt b/android/app/src/main/fdroid/play/listings/ml-IN/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ml-IN/title-google.txt rename to android/app/src/main/fdroid/play/listings/ml-IN/title-google.txt diff --git a/android/src/fdroid/play/listings/ml-IN/title.txt b/android/app/src/main/fdroid/play/listings/ml-IN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ml-IN/title.txt rename to android/app/src/main/fdroid/play/listings/ml-IN/title.txt diff --git a/android/src/fdroid/play/listings/ml-IN/video-url.txt b/android/app/src/main/fdroid/play/listings/ml-IN/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ml-IN/video-url.txt rename to android/app/src/main/fdroid/play/listings/ml-IN/video-url.txt diff --git a/android/src/fdroid/play/listings/mr-IN/full-description.txt b/android/app/src/main/fdroid/play/listings/mr-IN/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/full-description.txt rename to android/app/src/main/fdroid/play/listings/mr-IN/full-description.txt diff --git a/android/src/fdroid/play/listings/mr-IN/release-notes.txt b/android/app/src/main/fdroid/play/listings/mr-IN/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/release-notes.txt rename to android/app/src/main/fdroid/play/listings/mr-IN/release-notes.txt diff --git a/android/src/fdroid/play/listings/mr-IN/short-description.txt b/android/app/src/main/fdroid/play/listings/mr-IN/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/short-description.txt rename to android/app/src/main/fdroid/play/listings/mr-IN/short-description.txt diff --git a/android/src/fdroid/play/listings/mr-IN/title-google.txt b/android/app/src/main/fdroid/play/listings/mr-IN/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/title-google.txt rename to android/app/src/main/fdroid/play/listings/mr-IN/title-google.txt diff --git a/android/src/fdroid/play/listings/mr-IN/title.txt b/android/app/src/main/fdroid/play/listings/mr-IN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/title.txt rename to android/app/src/main/fdroid/play/listings/mr-IN/title.txt diff --git a/android/src/fdroid/play/listings/mr-IN/video-url.txt b/android/app/src/main/fdroid/play/listings/mr-IN/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/mr-IN/video-url.txt rename to android/app/src/main/fdroid/play/listings/mr-IN/video-url.txt diff --git a/android/src/fdroid/play/listings/ms/full-description.txt b/android/app/src/main/fdroid/play/listings/ms/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ms/full-description.txt rename to android/app/src/main/fdroid/play/listings/ms/full-description.txt diff --git a/android/src/fdroid/play/listings/ms/release-notes.txt b/android/app/src/main/fdroid/play/listings/ms/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ms/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ms/release-notes.txt diff --git a/android/src/fdroid/play/listings/ms/short-description.txt b/android/app/src/main/fdroid/play/listings/ms/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ms/short-description.txt rename to android/app/src/main/fdroid/play/listings/ms/short-description.txt diff --git a/android/src/fdroid/play/listings/ms/title-google.txt b/android/app/src/main/fdroid/play/listings/ms/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ms/title-google.txt rename to android/app/src/main/fdroid/play/listings/ms/title-google.txt diff --git a/android/src/fdroid/play/listings/ms/title.txt b/android/app/src/main/fdroid/play/listings/ms/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ms/title.txt rename to android/app/src/main/fdroid/play/listings/ms/title.txt diff --git a/android/src/fdroid/play/listings/ms/video-url.txt b/android/app/src/main/fdroid/play/listings/ms/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ms/video-url.txt rename to android/app/src/main/fdroid/play/listings/ms/video-url.txt diff --git a/android/src/fdroid/play/listings/ne-NP/full-description.txt b/android/app/src/main/fdroid/play/listings/ne-NP/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ne-NP/full-description.txt rename to android/app/src/main/fdroid/play/listings/ne-NP/full-description.txt diff --git a/android/src/fdroid/play/listings/ne-NP/release-notes.txt b/android/app/src/main/fdroid/play/listings/ne-NP/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ne-NP/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ne-NP/release-notes.txt diff --git a/android/src/fdroid/play/listings/ne-NP/short-description.txt b/android/app/src/main/fdroid/play/listings/ne-NP/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ne-NP/short-description.txt rename to android/app/src/main/fdroid/play/listings/ne-NP/short-description.txt diff --git a/android/src/fdroid/play/listings/ne-NP/title-google.txt b/android/app/src/main/fdroid/play/listings/ne-NP/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ne-NP/title-google.txt rename to android/app/src/main/fdroid/play/listings/ne-NP/title-google.txt diff --git a/android/src/fdroid/play/listings/ne-NP/title.txt b/android/app/src/main/fdroid/play/listings/ne-NP/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ne-NP/title.txt rename to android/app/src/main/fdroid/play/listings/ne-NP/title.txt diff --git a/android/src/fdroid/play/listings/ne-NP/video-url.txt b/android/app/src/main/fdroid/play/listings/ne-NP/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ne-NP/video-url.txt rename to android/app/src/main/fdroid/play/listings/ne-NP/video-url.txt diff --git a/android/src/fdroid/play/listings/nl-NL/full-description.txt b/android/app/src/main/fdroid/play/listings/nl-NL/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/nl-NL/full-description.txt rename to android/app/src/main/fdroid/play/listings/nl-NL/full-description.txt diff --git a/android/src/fdroid/play/listings/nl-NL/release-notes.txt b/android/app/src/main/fdroid/play/listings/nl-NL/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/nl-NL/release-notes.txt rename to android/app/src/main/fdroid/play/listings/nl-NL/release-notes.txt diff --git a/android/src/fdroid/play/listings/nl-NL/short-description.txt b/android/app/src/main/fdroid/play/listings/nl-NL/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/nl-NL/short-description.txt rename to android/app/src/main/fdroid/play/listings/nl-NL/short-description.txt diff --git a/android/src/fdroid/play/listings/nl-NL/title-google.txt b/android/app/src/main/fdroid/play/listings/nl-NL/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/nl-NL/title-google.txt rename to android/app/src/main/fdroid/play/listings/nl-NL/title-google.txt diff --git a/android/src/fdroid/play/listings/nl-NL/title.txt b/android/app/src/main/fdroid/play/listings/nl-NL/title.txt similarity index 100% rename from android/src/fdroid/play/listings/nl-NL/title.txt rename to android/app/src/main/fdroid/play/listings/nl-NL/title.txt diff --git a/android/src/fdroid/play/listings/nl-NL/video-url.txt b/android/app/src/main/fdroid/play/listings/nl-NL/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/nl-NL/video-url.txt rename to android/app/src/main/fdroid/play/listings/nl-NL/video-url.txt diff --git a/android/src/fdroid/play/listings/no-NO/full-description.txt b/android/app/src/main/fdroid/play/listings/no-NO/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/no-NO/full-description.txt rename to android/app/src/main/fdroid/play/listings/no-NO/full-description.txt diff --git a/android/src/fdroid/play/listings/no-NO/release-notes.txt b/android/app/src/main/fdroid/play/listings/no-NO/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/no-NO/release-notes.txt rename to android/app/src/main/fdroid/play/listings/no-NO/release-notes.txt diff --git a/android/src/fdroid/play/listings/no-NO/short-description.txt b/android/app/src/main/fdroid/play/listings/no-NO/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/no-NO/short-description.txt rename to android/app/src/main/fdroid/play/listings/no-NO/short-description.txt diff --git a/android/src/fdroid/play/listings/no-NO/title-google.txt b/android/app/src/main/fdroid/play/listings/no-NO/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/no-NO/title-google.txt rename to android/app/src/main/fdroid/play/listings/no-NO/title-google.txt diff --git a/android/src/fdroid/play/listings/no-NO/title.txt b/android/app/src/main/fdroid/play/listings/no-NO/title.txt similarity index 100% rename from android/src/fdroid/play/listings/no-NO/title.txt rename to android/app/src/main/fdroid/play/listings/no-NO/title.txt diff --git a/android/src/fdroid/play/listings/no-NO/video-url.txt b/android/app/src/main/fdroid/play/listings/no-NO/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/no-NO/video-url.txt rename to android/app/src/main/fdroid/play/listings/no-NO/video-url.txt diff --git a/android/src/fdroid/play/listings/pl-PL/full-description.txt b/android/app/src/main/fdroid/play/listings/pl-PL/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/pl-PL/full-description.txt rename to android/app/src/main/fdroid/play/listings/pl-PL/full-description.txt diff --git a/android/src/fdroid/play/listings/pl-PL/release-notes.txt b/android/app/src/main/fdroid/play/listings/pl-PL/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/pl-PL/release-notes.txt rename to android/app/src/main/fdroid/play/listings/pl-PL/release-notes.txt diff --git a/android/src/fdroid/play/listings/pl-PL/short-description.txt b/android/app/src/main/fdroid/play/listings/pl-PL/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/pl-PL/short-description.txt rename to android/app/src/main/fdroid/play/listings/pl-PL/short-description.txt diff --git a/android/src/fdroid/play/listings/pl-PL/title-google.txt b/android/app/src/main/fdroid/play/listings/pl-PL/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/pl-PL/title-google.txt rename to android/app/src/main/fdroid/play/listings/pl-PL/title-google.txt diff --git a/android/src/fdroid/play/listings/pl-PL/title.txt b/android/app/src/main/fdroid/play/listings/pl-PL/title.txt similarity index 100% rename from android/src/fdroid/play/listings/pl-PL/title.txt rename to android/app/src/main/fdroid/play/listings/pl-PL/title.txt diff --git a/android/src/fdroid/play/listings/pl-PL/video-url.txt b/android/app/src/main/fdroid/play/listings/pl-PL/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/pl-PL/video-url.txt rename to android/app/src/main/fdroid/play/listings/pl-PL/video-url.txt diff --git a/android/src/fdroid/play/listings/pt-BR/full-description.txt b/android/app/src/main/fdroid/play/listings/pt-BR/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-BR/full-description.txt rename to android/app/src/main/fdroid/play/listings/pt-BR/full-description.txt diff --git a/android/src/fdroid/play/listings/pt-BR/release-notes.txt b/android/app/src/main/fdroid/play/listings/pt-BR/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-BR/release-notes.txt rename to android/app/src/main/fdroid/play/listings/pt-BR/release-notes.txt diff --git a/android/src/fdroid/play/listings/pt-BR/short-description.txt b/android/app/src/main/fdroid/play/listings/pt-BR/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-BR/short-description.txt rename to android/app/src/main/fdroid/play/listings/pt-BR/short-description.txt diff --git a/android/src/fdroid/play/listings/pt-BR/title-google.txt b/android/app/src/main/fdroid/play/listings/pt-BR/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-BR/title-google.txt rename to android/app/src/main/fdroid/play/listings/pt-BR/title-google.txt diff --git a/android/src/fdroid/play/listings/pt-BR/title.txt b/android/app/src/main/fdroid/play/listings/pt-BR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-BR/title.txt rename to android/app/src/main/fdroid/play/listings/pt-BR/title.txt diff --git a/android/src/fdroid/play/listings/pt-BR/video-url.txt b/android/app/src/main/fdroid/play/listings/pt-BR/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-BR/video-url.txt rename to android/app/src/main/fdroid/play/listings/pt-BR/video-url.txt diff --git a/android/src/fdroid/play/listings/pt-PT/full-description.txt b/android/app/src/main/fdroid/play/listings/pt-PT/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-PT/full-description.txt rename to android/app/src/main/fdroid/play/listings/pt-PT/full-description.txt diff --git a/android/src/fdroid/play/listings/pt-PT/release-notes.txt b/android/app/src/main/fdroid/play/listings/pt-PT/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-PT/release-notes.txt rename to android/app/src/main/fdroid/play/listings/pt-PT/release-notes.txt diff --git a/android/src/fdroid/play/listings/pt-PT/short-description.txt b/android/app/src/main/fdroid/play/listings/pt-PT/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-PT/short-description.txt rename to android/app/src/main/fdroid/play/listings/pt-PT/short-description.txt diff --git a/android/src/fdroid/play/listings/pt-PT/title-google.txt b/android/app/src/main/fdroid/play/listings/pt-PT/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-PT/title-google.txt rename to android/app/src/main/fdroid/play/listings/pt-PT/title-google.txt diff --git a/android/src/fdroid/play/listings/pt-PT/title.txt b/android/app/src/main/fdroid/play/listings/pt-PT/title.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-PT/title.txt rename to android/app/src/main/fdroid/play/listings/pt-PT/title.txt diff --git a/android/src/fdroid/play/listings/pt-PT/video-url.txt b/android/app/src/main/fdroid/play/listings/pt-PT/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/pt-PT/video-url.txt rename to android/app/src/main/fdroid/play/listings/pt-PT/video-url.txt diff --git a/android/src/fdroid/play/listings/ro/full-description.txt b/android/app/src/main/fdroid/play/listings/ro/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ro/full-description.txt rename to android/app/src/main/fdroid/play/listings/ro/full-description.txt diff --git a/android/src/fdroid/play/listings/ro/release-notes.txt b/android/app/src/main/fdroid/play/listings/ro/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ro/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ro/release-notes.txt diff --git a/android/src/fdroid/play/listings/ro/short-description.txt b/android/app/src/main/fdroid/play/listings/ro/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ro/short-description.txt rename to android/app/src/main/fdroid/play/listings/ro/short-description.txt diff --git a/android/src/fdroid/play/listings/ro/title-google.txt b/android/app/src/main/fdroid/play/listings/ro/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ro/title-google.txt rename to android/app/src/main/fdroid/play/listings/ro/title-google.txt diff --git a/android/src/fdroid/play/listings/ro/title.txt b/android/app/src/main/fdroid/play/listings/ro/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ro/title.txt rename to android/app/src/main/fdroid/play/listings/ro/title.txt diff --git a/android/src/fdroid/play/listings/ro/video-url.txt b/android/app/src/main/fdroid/play/listings/ro/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ro/video-url.txt rename to android/app/src/main/fdroid/play/listings/ro/video-url.txt diff --git a/android/src/fdroid/play/listings/ru-RU/full-description.txt b/android/app/src/main/fdroid/play/listings/ru-RU/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/full-description.txt rename to android/app/src/main/fdroid/play/listings/ru-RU/full-description.txt diff --git a/android/src/fdroid/play/listings/ru-RU/release-notes.txt b/android/app/src/main/fdroid/play/listings/ru-RU/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ru-RU/release-notes.txt diff --git a/android/src/fdroid/play/listings/ru-RU/short-description.txt b/android/app/src/main/fdroid/play/listings/ru-RU/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/short-description.txt rename to android/app/src/main/fdroid/play/listings/ru-RU/short-description.txt diff --git a/android/src/fdroid/play/listings/ru-RU/title-google.txt b/android/app/src/main/fdroid/play/listings/ru-RU/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/title-google.txt rename to android/app/src/main/fdroid/play/listings/ru-RU/title-google.txt diff --git a/android/src/fdroid/play/listings/ru-RU/title.txt b/android/app/src/main/fdroid/play/listings/ru-RU/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/title.txt rename to android/app/src/main/fdroid/play/listings/ru-RU/title.txt diff --git a/android/src/fdroid/play/listings/ru-RU/video-url.txt b/android/app/src/main/fdroid/play/listings/ru-RU/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ru-RU/video-url.txt rename to android/app/src/main/fdroid/play/listings/ru-RU/video-url.txt diff --git a/android/src/fdroid/play/listings/si-LK/full-description.txt b/android/app/src/main/fdroid/play/listings/si-LK/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/si-LK/full-description.txt rename to android/app/src/main/fdroid/play/listings/si-LK/full-description.txt diff --git a/android/src/fdroid/play/listings/si-LK/release-notes.txt b/android/app/src/main/fdroid/play/listings/si-LK/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/si-LK/release-notes.txt rename to android/app/src/main/fdroid/play/listings/si-LK/release-notes.txt diff --git a/android/src/fdroid/play/listings/si-LK/short-description.txt b/android/app/src/main/fdroid/play/listings/si-LK/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/si-LK/short-description.txt rename to android/app/src/main/fdroid/play/listings/si-LK/short-description.txt diff --git a/android/src/fdroid/play/listings/si-LK/title-google.txt b/android/app/src/main/fdroid/play/listings/si-LK/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/si-LK/title-google.txt rename to android/app/src/main/fdroid/play/listings/si-LK/title-google.txt diff --git a/android/src/fdroid/play/listings/si-LK/title.txt b/android/app/src/main/fdroid/play/listings/si-LK/title.txt similarity index 100% rename from android/src/fdroid/play/listings/si-LK/title.txt rename to android/app/src/main/fdroid/play/listings/si-LK/title.txt diff --git a/android/src/fdroid/play/listings/si-LK/video-url.txt b/android/app/src/main/fdroid/play/listings/si-LK/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/si-LK/video-url.txt rename to android/app/src/main/fdroid/play/listings/si-LK/video-url.txt diff --git a/android/src/fdroid/play/listings/sk/full-description.txt b/android/app/src/main/fdroid/play/listings/sk/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sk/full-description.txt rename to android/app/src/main/fdroid/play/listings/sk/full-description.txt diff --git a/android/src/fdroid/play/listings/sk/release-notes.txt b/android/app/src/main/fdroid/play/listings/sk/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/sk/release-notes.txt rename to android/app/src/main/fdroid/play/listings/sk/release-notes.txt diff --git a/android/src/fdroid/play/listings/sk/short-description.txt b/android/app/src/main/fdroid/play/listings/sk/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sk/short-description.txt rename to android/app/src/main/fdroid/play/listings/sk/short-description.txt diff --git a/android/src/fdroid/play/listings/sk/title-google.txt b/android/app/src/main/fdroid/play/listings/sk/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/sk/title-google.txt rename to android/app/src/main/fdroid/play/listings/sk/title-google.txt diff --git a/android/src/fdroid/play/listings/sk/title.txt b/android/app/src/main/fdroid/play/listings/sk/title.txt similarity index 100% rename from android/src/fdroid/play/listings/sk/title.txt rename to android/app/src/main/fdroid/play/listings/sk/title.txt diff --git a/android/src/fdroid/play/listings/sk/video-url.txt b/android/app/src/main/fdroid/play/listings/sk/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/sk/video-url.txt rename to android/app/src/main/fdroid/play/listings/sk/video-url.txt diff --git a/android/src/fdroid/play/listings/sl/full-description.txt b/android/app/src/main/fdroid/play/listings/sl/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sl/full-description.txt rename to android/app/src/main/fdroid/play/listings/sl/full-description.txt diff --git a/android/src/fdroid/play/listings/sl/release-notes.txt b/android/app/src/main/fdroid/play/listings/sl/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/sl/release-notes.txt rename to android/app/src/main/fdroid/play/listings/sl/release-notes.txt diff --git a/android/src/fdroid/play/listings/sl/short-description.txt b/android/app/src/main/fdroid/play/listings/sl/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sl/short-description.txt rename to android/app/src/main/fdroid/play/listings/sl/short-description.txt diff --git a/android/src/fdroid/play/listings/sl/title-google.txt b/android/app/src/main/fdroid/play/listings/sl/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/sl/title-google.txt rename to android/app/src/main/fdroid/play/listings/sl/title-google.txt diff --git a/android/src/fdroid/play/listings/sl/title.txt b/android/app/src/main/fdroid/play/listings/sl/title.txt similarity index 100% rename from android/src/fdroid/play/listings/sl/title.txt rename to android/app/src/main/fdroid/play/listings/sl/title.txt diff --git a/android/src/fdroid/play/listings/sl/video-url.txt b/android/app/src/main/fdroid/play/listings/sl/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/sl/video-url.txt rename to android/app/src/main/fdroid/play/listings/sl/video-url.txt diff --git a/android/src/fdroid/play/listings/sr/full-description.txt b/android/app/src/main/fdroid/play/listings/sr/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sr/full-description.txt rename to android/app/src/main/fdroid/play/listings/sr/full-description.txt diff --git a/android/src/fdroid/play/listings/sr/release-notes.txt b/android/app/src/main/fdroid/play/listings/sr/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/sr/release-notes.txt rename to android/app/src/main/fdroid/play/listings/sr/release-notes.txt diff --git a/android/src/fdroid/play/listings/sr/short-description.txt b/android/app/src/main/fdroid/play/listings/sr/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sr/short-description.txt rename to android/app/src/main/fdroid/play/listings/sr/short-description.txt diff --git a/android/src/fdroid/play/listings/sr/title-google.txt b/android/app/src/main/fdroid/play/listings/sr/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/sr/title-google.txt rename to android/app/src/main/fdroid/play/listings/sr/title-google.txt diff --git a/android/src/fdroid/play/listings/sr/title.txt b/android/app/src/main/fdroid/play/listings/sr/title.txt similarity index 100% rename from android/src/fdroid/play/listings/sr/title.txt rename to android/app/src/main/fdroid/play/listings/sr/title.txt diff --git a/android/src/fdroid/play/listings/sr/video-url.txt b/android/app/src/main/fdroid/play/listings/sr/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/sr/video-url.txt rename to android/app/src/main/fdroid/play/listings/sr/video-url.txt diff --git a/android/src/fdroid/play/listings/sv-SE/full-description.txt b/android/app/src/main/fdroid/play/listings/sv-SE/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sv-SE/full-description.txt rename to android/app/src/main/fdroid/play/listings/sv-SE/full-description.txt diff --git a/android/src/fdroid/play/listings/sv-SE/release-notes.txt b/android/app/src/main/fdroid/play/listings/sv-SE/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/sv-SE/release-notes.txt rename to android/app/src/main/fdroid/play/listings/sv-SE/release-notes.txt diff --git a/android/src/fdroid/play/listings/sv-SE/short-description.txt b/android/app/src/main/fdroid/play/listings/sv-SE/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/sv-SE/short-description.txt rename to android/app/src/main/fdroid/play/listings/sv-SE/short-description.txt diff --git a/android/src/fdroid/play/listings/sv-SE/title-google.txt b/android/app/src/main/fdroid/play/listings/sv-SE/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/sv-SE/title-google.txt rename to android/app/src/main/fdroid/play/listings/sv-SE/title-google.txt diff --git a/android/src/fdroid/play/listings/sv-SE/title.txt b/android/app/src/main/fdroid/play/listings/sv-SE/title.txt similarity index 100% rename from android/src/fdroid/play/listings/sv-SE/title.txt rename to android/app/src/main/fdroid/play/listings/sv-SE/title.txt diff --git a/android/src/fdroid/play/listings/sv-SE/video-url.txt b/android/app/src/main/fdroid/play/listings/sv-SE/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/sv-SE/video-url.txt rename to android/app/src/main/fdroid/play/listings/sv-SE/video-url.txt diff --git a/android/src/fdroid/play/listings/th/full-description.txt b/android/app/src/main/fdroid/play/listings/th/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/th/full-description.txt rename to android/app/src/main/fdroid/play/listings/th/full-description.txt diff --git a/android/src/fdroid/play/listings/th/release-notes.txt b/android/app/src/main/fdroid/play/listings/th/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/th/release-notes.txt rename to android/app/src/main/fdroid/play/listings/th/release-notes.txt diff --git a/android/src/fdroid/play/listings/th/short-description.txt b/android/app/src/main/fdroid/play/listings/th/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/th/short-description.txt rename to android/app/src/main/fdroid/play/listings/th/short-description.txt diff --git a/android/src/fdroid/play/listings/th/title-google.txt b/android/app/src/main/fdroid/play/listings/th/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/th/title-google.txt rename to android/app/src/main/fdroid/play/listings/th/title-google.txt diff --git a/android/src/fdroid/play/listings/th/title.txt b/android/app/src/main/fdroid/play/listings/th/title.txt similarity index 100% rename from android/src/fdroid/play/listings/th/title.txt rename to android/app/src/main/fdroid/play/listings/th/title.txt diff --git a/android/src/fdroid/play/listings/th/video-url.txt b/android/app/src/main/fdroid/play/listings/th/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/th/video-url.txt rename to android/app/src/main/fdroid/play/listings/th/video-url.txt diff --git a/android/src/fdroid/play/listings/tr-TR/full-description.txt b/android/app/src/main/fdroid/play/listings/tr-TR/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/full-description.txt rename to android/app/src/main/fdroid/play/listings/tr-TR/full-description.txt diff --git a/android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/1.jpg b/android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/1.jpg similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/1.jpg rename to android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/1.jpg diff --git a/android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/2.jpg b/android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/2.jpg similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/2.jpg rename to android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/2.jpg diff --git a/android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/3.jpg b/android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/3.jpg similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/3.jpg rename to android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/3.jpg diff --git a/android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/4.jpg b/android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/4.jpg similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/graphics/phone-screenshots/4.jpg rename to android/app/src/main/fdroid/play/listings/tr-TR/graphics/phone-screenshots/4.jpg diff --git a/android/src/fdroid/play/listings/tr-TR/release-notes.txt b/android/app/src/main/fdroid/play/listings/tr-TR/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/release-notes.txt rename to android/app/src/main/fdroid/play/listings/tr-TR/release-notes.txt diff --git a/android/src/fdroid/play/listings/tr-TR/short-description.txt b/android/app/src/main/fdroid/play/listings/tr-TR/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/short-description.txt rename to android/app/src/main/fdroid/play/listings/tr-TR/short-description.txt diff --git a/android/src/fdroid/play/listings/tr-TR/title-google.txt b/android/app/src/main/fdroid/play/listings/tr-TR/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/title-google.txt rename to android/app/src/main/fdroid/play/listings/tr-TR/title-google.txt diff --git a/android/src/fdroid/play/listings/tr-TR/title.txt b/android/app/src/main/fdroid/play/listings/tr-TR/title.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/title.txt rename to android/app/src/main/fdroid/play/listings/tr-TR/title.txt diff --git a/android/src/fdroid/play/listings/tr-TR/video-url.txt b/android/app/src/main/fdroid/play/listings/tr-TR/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/tr-TR/video-url.txt rename to android/app/src/main/fdroid/play/listings/tr-TR/video-url.txt diff --git a/android/src/fdroid/play/listings/uk/full-description.txt b/android/app/src/main/fdroid/play/listings/uk/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/uk/full-description.txt rename to android/app/src/main/fdroid/play/listings/uk/full-description.txt diff --git a/android/src/fdroid/play/listings/uk/release-notes.txt b/android/app/src/main/fdroid/play/listings/uk/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/uk/release-notes.txt rename to android/app/src/main/fdroid/play/listings/uk/release-notes.txt diff --git a/android/src/fdroid/play/listings/uk/short-description.txt b/android/app/src/main/fdroid/play/listings/uk/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/uk/short-description.txt rename to android/app/src/main/fdroid/play/listings/uk/short-description.txt diff --git a/android/src/fdroid/play/listings/uk/title-google.txt b/android/app/src/main/fdroid/play/listings/uk/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/uk/title-google.txt rename to android/app/src/main/fdroid/play/listings/uk/title-google.txt diff --git a/android/src/fdroid/play/listings/uk/title.txt b/android/app/src/main/fdroid/play/listings/uk/title.txt similarity index 100% rename from android/src/fdroid/play/listings/uk/title.txt rename to android/app/src/main/fdroid/play/listings/uk/title.txt diff --git a/android/src/fdroid/play/listings/uk/video-url.txt b/android/app/src/main/fdroid/play/listings/uk/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/uk/video-url.txt rename to android/app/src/main/fdroid/play/listings/uk/video-url.txt diff --git a/android/src/fdroid/play/listings/ur/full-description.txt b/android/app/src/main/fdroid/play/listings/ur/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ur/full-description.txt rename to android/app/src/main/fdroid/play/listings/ur/full-description.txt diff --git a/android/src/fdroid/play/listings/ur/release-notes.txt b/android/app/src/main/fdroid/play/listings/ur/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/ur/release-notes.txt rename to android/app/src/main/fdroid/play/listings/ur/release-notes.txt diff --git a/android/src/fdroid/play/listings/ur/short-description.txt b/android/app/src/main/fdroid/play/listings/ur/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/ur/short-description.txt rename to android/app/src/main/fdroid/play/listings/ur/short-description.txt diff --git a/android/src/fdroid/play/listings/ur/title-google.txt b/android/app/src/main/fdroid/play/listings/ur/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/ur/title-google.txt rename to android/app/src/main/fdroid/play/listings/ur/title-google.txt diff --git a/android/src/fdroid/play/listings/ur/title.txt b/android/app/src/main/fdroid/play/listings/ur/title.txt similarity index 100% rename from android/src/fdroid/play/listings/ur/title.txt rename to android/app/src/main/fdroid/play/listings/ur/title.txt diff --git a/android/src/fdroid/play/listings/ur/video-url.txt b/android/app/src/main/fdroid/play/listings/ur/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/ur/video-url.txt rename to android/app/src/main/fdroid/play/listings/ur/video-url.txt diff --git a/android/src/fdroid/play/listings/vi/full-description.txt b/android/app/src/main/fdroid/play/listings/vi/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/vi/full-description.txt rename to android/app/src/main/fdroid/play/listings/vi/full-description.txt diff --git a/android/src/fdroid/play/listings/vi/release-notes.txt b/android/app/src/main/fdroid/play/listings/vi/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/vi/release-notes.txt rename to android/app/src/main/fdroid/play/listings/vi/release-notes.txt diff --git a/android/src/fdroid/play/listings/vi/short-description.txt b/android/app/src/main/fdroid/play/listings/vi/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/vi/short-description.txt rename to android/app/src/main/fdroid/play/listings/vi/short-description.txt diff --git a/android/src/fdroid/play/listings/vi/title-google.txt b/android/app/src/main/fdroid/play/listings/vi/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/vi/title-google.txt rename to android/app/src/main/fdroid/play/listings/vi/title-google.txt diff --git a/android/src/fdroid/play/listings/vi/title.txt b/android/app/src/main/fdroid/play/listings/vi/title.txt similarity index 100% rename from android/src/fdroid/play/listings/vi/title.txt rename to android/app/src/main/fdroid/play/listings/vi/title.txt diff --git a/android/src/fdroid/play/listings/vi/video-url.txt b/android/app/src/main/fdroid/play/listings/vi/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/vi/video-url.txt rename to android/app/src/main/fdroid/play/listings/vi/video-url.txt diff --git a/android/src/fdroid/play/listings/zh-CN/full-description.txt b/android/app/src/main/fdroid/play/listings/zh-CN/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/full-description.txt rename to android/app/src/main/fdroid/play/listings/zh-CN/full-description.txt diff --git a/android/src/fdroid/play/listings/zh-CN/release-notes.txt b/android/app/src/main/fdroid/play/listings/zh-CN/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/release-notes.txt rename to android/app/src/main/fdroid/play/listings/zh-CN/release-notes.txt diff --git a/android/src/fdroid/play/listings/zh-CN/short-description.txt b/android/app/src/main/fdroid/play/listings/zh-CN/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/short-description.txt rename to android/app/src/main/fdroid/play/listings/zh-CN/short-description.txt diff --git a/android/src/fdroid/play/listings/zh-CN/title-google.txt b/android/app/src/main/fdroid/play/listings/zh-CN/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/title-google.txt rename to android/app/src/main/fdroid/play/listings/zh-CN/title-google.txt diff --git a/android/src/fdroid/play/listings/zh-CN/title.txt b/android/app/src/main/fdroid/play/listings/zh-CN/title.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/title.txt rename to android/app/src/main/fdroid/play/listings/zh-CN/title.txt diff --git a/android/src/fdroid/play/listings/zh-CN/video-url.txt b/android/app/src/main/fdroid/play/listings/zh-CN/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-CN/video-url.txt rename to android/app/src/main/fdroid/play/listings/zh-CN/video-url.txt diff --git a/android/src/fdroid/play/listings/zh-HK/full-description.txt b/android/app/src/main/fdroid/play/listings/zh-HK/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-HK/full-description.txt rename to android/app/src/main/fdroid/play/listings/zh-HK/full-description.txt diff --git a/android/src/fdroid/play/listings/zh-HK/release-notes.txt b/android/app/src/main/fdroid/play/listings/zh-HK/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-HK/release-notes.txt rename to android/app/src/main/fdroid/play/listings/zh-HK/release-notes.txt diff --git a/android/src/fdroid/play/listings/zh-HK/short-description.txt b/android/app/src/main/fdroid/play/listings/zh-HK/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-HK/short-description.txt rename to android/app/src/main/fdroid/play/listings/zh-HK/short-description.txt diff --git a/android/src/fdroid/play/listings/zh-HK/title-google.txt b/android/app/src/main/fdroid/play/listings/zh-HK/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-HK/title-google.txt rename to android/app/src/main/fdroid/play/listings/zh-HK/title-google.txt diff --git a/android/src/fdroid/play/listings/zh-HK/title.txt b/android/app/src/main/fdroid/play/listings/zh-HK/title.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-HK/title.txt rename to android/app/src/main/fdroid/play/listings/zh-HK/title.txt diff --git a/android/src/fdroid/play/listings/zh-HK/video-url.txt b/android/app/src/main/fdroid/play/listings/zh-HK/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-HK/video-url.txt rename to android/app/src/main/fdroid/play/listings/zh-HK/video-url.txt diff --git a/android/src/fdroid/play/listings/zh-TW/full-description.txt b/android/app/src/main/fdroid/play/listings/zh-TW/full-description.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-TW/full-description.txt rename to android/app/src/main/fdroid/play/listings/zh-TW/full-description.txt diff --git a/android/src/fdroid/play/listings/zh-TW/release-notes.txt b/android/app/src/main/fdroid/play/listings/zh-TW/release-notes.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-TW/release-notes.txt rename to android/app/src/main/fdroid/play/listings/zh-TW/release-notes.txt diff --git a/android/src/fdroid/play/listings/zh-TW/short-description.txt b/android/app/src/main/fdroid/play/listings/zh-TW/short-description.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-TW/short-description.txt rename to android/app/src/main/fdroid/play/listings/zh-TW/short-description.txt diff --git a/android/src/fdroid/play/listings/zh-TW/title-google.txt b/android/app/src/main/fdroid/play/listings/zh-TW/title-google.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-TW/title-google.txt rename to android/app/src/main/fdroid/play/listings/zh-TW/title-google.txt diff --git a/android/src/fdroid/play/listings/zh-TW/title.txt b/android/app/src/main/fdroid/play/listings/zh-TW/title.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-TW/title.txt rename to android/app/src/main/fdroid/play/listings/zh-TW/title.txt diff --git a/android/src/fdroid/play/listings/zh-TW/video-url.txt b/android/app/src/main/fdroid/play/listings/zh-TW/video-url.txt similarity index 100% rename from android/src/fdroid/play/listings/zh-TW/video-url.txt rename to android/app/src/main/fdroid/play/listings/zh-TW/video-url.txt diff --git a/android/src/fdroid/play/release-notes/ar/default.txt b/android/app/src/main/fdroid/play/release-notes/ar/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ar/default.txt rename to android/app/src/main/fdroid/play/release-notes/ar/default.txt diff --git a/android/src/fdroid/play/release-notes/az-AZ/default.txt b/android/app/src/main/fdroid/play/release-notes/az-AZ/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/az-AZ/default.txt rename to android/app/src/main/fdroid/play/release-notes/az-AZ/default.txt diff --git a/android/src/fdroid/play/release-notes/be/default.txt b/android/app/src/main/fdroid/play/release-notes/be/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/be/default.txt rename to android/app/src/main/fdroid/play/release-notes/be/default.txt diff --git a/android/src/fdroid/play/release-notes/bg/default.txt b/android/app/src/main/fdroid/play/release-notes/bg/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/bg/default.txt rename to android/app/src/main/fdroid/play/release-notes/bg/default.txt diff --git a/android/src/fdroid/play/release-notes/bn-BD/default.txt b/android/app/src/main/fdroid/play/release-notes/bn-BD/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/bn-BD/default.txt rename to android/app/src/main/fdroid/play/release-notes/bn-BD/default.txt diff --git a/android/src/fdroid/play/release-notes/ca/default.txt b/android/app/src/main/fdroid/play/release-notes/ca/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ca/default.txt rename to android/app/src/main/fdroid/play/release-notes/ca/default.txt diff --git a/android/src/fdroid/play/release-notes/cs-CZ/default.txt b/android/app/src/main/fdroid/play/release-notes/cs-CZ/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/cs-CZ/default.txt rename to android/app/src/main/fdroid/play/release-notes/cs-CZ/default.txt diff --git a/android/src/fdroid/play/release-notes/da-DK/default.txt b/android/app/src/main/fdroid/play/release-notes/da-DK/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/da-DK/default.txt rename to android/app/src/main/fdroid/play/release-notes/da-DK/default.txt diff --git a/android/src/fdroid/play/release-notes/de-DE/default.txt b/android/app/src/main/fdroid/play/release-notes/de-DE/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/de-DE/default.txt rename to android/app/src/main/fdroid/play/release-notes/de-DE/default.txt diff --git a/android/src/fdroid/play/release-notes/el-GR/default.txt b/android/app/src/main/fdroid/play/release-notes/el-GR/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/el-GR/default.txt rename to android/app/src/main/fdroid/play/release-notes/el-GR/default.txt diff --git a/android/src/fdroid/play/release-notes/en-US/default.txt b/android/app/src/main/fdroid/play/release-notes/en-US/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/en-US/default.txt rename to android/app/src/main/fdroid/play/release-notes/en-US/default.txt diff --git a/android/src/fdroid/play/release-notes/es-ES/default.txt b/android/app/src/main/fdroid/play/release-notes/es-ES/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/es-ES/default.txt rename to android/app/src/main/fdroid/play/release-notes/es-ES/default.txt diff --git a/android/src/fdroid/play/release-notes/et/default.txt b/android/app/src/main/fdroid/play/release-notes/et/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/et/default.txt rename to android/app/src/main/fdroid/play/release-notes/et/default.txt diff --git a/android/src/fdroid/play/release-notes/eu-ES/default.txt b/android/app/src/main/fdroid/play/release-notes/eu-ES/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/eu-ES/default.txt rename to android/app/src/main/fdroid/play/release-notes/eu-ES/default.txt diff --git a/android/src/fdroid/play/release-notes/fa/default.txt b/android/app/src/main/fdroid/play/release-notes/fa/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/fa/default.txt rename to android/app/src/main/fdroid/play/release-notes/fa/default.txt diff --git a/android/src/fdroid/play/release-notes/fi-FI/default.txt b/android/app/src/main/fdroid/play/release-notes/fi-FI/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/fi-FI/default.txt rename to android/app/src/main/fdroid/play/release-notes/fi-FI/default.txt diff --git a/android/src/fdroid/play/release-notes/fr-FR/default.txt b/android/app/src/main/fdroid/play/release-notes/fr-FR/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/fr-FR/default.txt rename to android/app/src/main/fdroid/play/release-notes/fr-FR/default.txt diff --git a/android/src/fdroid/play/release-notes/gl-ES/default.txt b/android/app/src/main/fdroid/play/release-notes/gl-ES/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/gl-ES/default.txt rename to android/app/src/main/fdroid/play/release-notes/gl-ES/default.txt diff --git a/android/src/fdroid/play/release-notes/gu/default.txt b/android/app/src/main/fdroid/play/release-notes/gu/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/gu/default.txt rename to android/app/src/main/fdroid/play/release-notes/gu/default.txt diff --git a/android/src/fdroid/play/release-notes/hi-IN/default.txt b/android/app/src/main/fdroid/play/release-notes/hi-IN/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/hi-IN/default.txt rename to android/app/src/main/fdroid/play/release-notes/hi-IN/default.txt diff --git a/android/src/fdroid/play/release-notes/hr/default.txt b/android/app/src/main/fdroid/play/release-notes/hr/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/hr/default.txt rename to android/app/src/main/fdroid/play/release-notes/hr/default.txt diff --git a/android/src/fdroid/play/release-notes/hu-HU/default.txt b/android/app/src/main/fdroid/play/release-notes/hu-HU/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/hu-HU/default.txt rename to android/app/src/main/fdroid/play/release-notes/hu-HU/default.txt diff --git a/android/src/fdroid/play/release-notes/id/default.txt b/android/app/src/main/fdroid/play/release-notes/id/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/id/default.txt rename to android/app/src/main/fdroid/play/release-notes/id/default.txt diff --git a/android/src/fdroid/play/release-notes/it-IT/default.txt b/android/app/src/main/fdroid/play/release-notes/it-IT/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/it-IT/default.txt rename to android/app/src/main/fdroid/play/release-notes/it-IT/default.txt diff --git a/android/src/fdroid/play/release-notes/iw-IL/default.txt b/android/app/src/main/fdroid/play/release-notes/iw-IL/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/iw-IL/default.txt rename to android/app/src/main/fdroid/play/release-notes/iw-IL/default.txt diff --git a/android/src/fdroid/play/release-notes/ja-JP/default.txt b/android/app/src/main/fdroid/play/release-notes/ja-JP/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ja-JP/default.txt rename to android/app/src/main/fdroid/play/release-notes/ja-JP/default.txt diff --git a/android/src/fdroid/play/release-notes/ka-GE/default.txt b/android/app/src/main/fdroid/play/release-notes/ka-GE/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ka-GE/default.txt rename to android/app/src/main/fdroid/play/release-notes/ka-GE/default.txt diff --git a/android/src/fdroid/play/release-notes/kk/default.txt b/android/app/src/main/fdroid/play/release-notes/kk/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/kk/default.txt rename to android/app/src/main/fdroid/play/release-notes/kk/default.txt diff --git a/android/src/fdroid/play/release-notes/km-KH/default.txt b/android/app/src/main/fdroid/play/release-notes/km-KH/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/km-KH/default.txt rename to android/app/src/main/fdroid/play/release-notes/km-KH/default.txt diff --git a/android/src/fdroid/play/release-notes/kn-IN/default.txt b/android/app/src/main/fdroid/play/release-notes/kn-IN/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/kn-IN/default.txt rename to android/app/src/main/fdroid/play/release-notes/kn-IN/default.txt diff --git a/android/src/fdroid/play/release-notes/ko-KR/default.txt b/android/app/src/main/fdroid/play/release-notes/ko-KR/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ko-KR/default.txt rename to android/app/src/main/fdroid/play/release-notes/ko-KR/default.txt diff --git a/android/src/fdroid/play/release-notes/lo-LA/default.txt b/android/app/src/main/fdroid/play/release-notes/lo-LA/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/lo-LA/default.txt rename to android/app/src/main/fdroid/play/release-notes/lo-LA/default.txt diff --git a/android/src/fdroid/play/release-notes/lt/default.txt b/android/app/src/main/fdroid/play/release-notes/lt/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/lt/default.txt rename to android/app/src/main/fdroid/play/release-notes/lt/default.txt diff --git a/android/src/fdroid/play/release-notes/lv/default.txt b/android/app/src/main/fdroid/play/release-notes/lv/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/lv/default.txt rename to android/app/src/main/fdroid/play/release-notes/lv/default.txt diff --git a/android/src/fdroid/play/release-notes/mk-MK/default.txt b/android/app/src/main/fdroid/play/release-notes/mk-MK/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/mk-MK/default.txt rename to android/app/src/main/fdroid/play/release-notes/mk-MK/default.txt diff --git a/android/src/fdroid/play/release-notes/ml-IN/default.txt b/android/app/src/main/fdroid/play/release-notes/ml-IN/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ml-IN/default.txt rename to android/app/src/main/fdroid/play/release-notes/ml-IN/default.txt diff --git a/android/src/fdroid/play/release-notes/mr-IN/default.txt b/android/app/src/main/fdroid/play/release-notes/mr-IN/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/mr-IN/default.txt rename to android/app/src/main/fdroid/play/release-notes/mr-IN/default.txt diff --git a/android/src/fdroid/play/release-notes/ms/default.txt b/android/app/src/main/fdroid/play/release-notes/ms/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ms/default.txt rename to android/app/src/main/fdroid/play/release-notes/ms/default.txt diff --git a/android/src/fdroid/play/release-notes/ne-NP/default.txt b/android/app/src/main/fdroid/play/release-notes/ne-NP/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ne-NP/default.txt rename to android/app/src/main/fdroid/play/release-notes/ne-NP/default.txt diff --git a/android/src/fdroid/play/release-notes/nl-NL/default.txt b/android/app/src/main/fdroid/play/release-notes/nl-NL/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/nl-NL/default.txt rename to android/app/src/main/fdroid/play/release-notes/nl-NL/default.txt diff --git a/android/src/fdroid/play/release-notes/no-NO/default.txt b/android/app/src/main/fdroid/play/release-notes/no-NO/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/no-NO/default.txt rename to android/app/src/main/fdroid/play/release-notes/no-NO/default.txt diff --git a/android/src/fdroid/play/release-notes/pl-PL/default.txt b/android/app/src/main/fdroid/play/release-notes/pl-PL/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/pl-PL/default.txt rename to android/app/src/main/fdroid/play/release-notes/pl-PL/default.txt diff --git a/android/src/fdroid/play/release-notes/pt-BR/default.txt b/android/app/src/main/fdroid/play/release-notes/pt-BR/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/pt-BR/default.txt rename to android/app/src/main/fdroid/play/release-notes/pt-BR/default.txt diff --git a/android/src/fdroid/play/release-notes/pt-PT/default.txt b/android/app/src/main/fdroid/play/release-notes/pt-PT/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/pt-PT/default.txt rename to android/app/src/main/fdroid/play/release-notes/pt-PT/default.txt diff --git a/android/src/fdroid/play/release-notes/ro/default.txt b/android/app/src/main/fdroid/play/release-notes/ro/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ro/default.txt rename to android/app/src/main/fdroid/play/release-notes/ro/default.txt diff --git a/android/src/fdroid/play/release-notes/ru-RU/default.txt b/android/app/src/main/fdroid/play/release-notes/ru-RU/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ru-RU/default.txt rename to android/app/src/main/fdroid/play/release-notes/ru-RU/default.txt diff --git a/android/src/fdroid/play/release-notes/si-LK/default.txt b/android/app/src/main/fdroid/play/release-notes/si-LK/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/si-LK/default.txt rename to android/app/src/main/fdroid/play/release-notes/si-LK/default.txt diff --git a/android/src/fdroid/play/release-notes/sk/default.txt b/android/app/src/main/fdroid/play/release-notes/sk/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/sk/default.txt rename to android/app/src/main/fdroid/play/release-notes/sk/default.txt diff --git a/android/src/fdroid/play/release-notes/sl/default.txt b/android/app/src/main/fdroid/play/release-notes/sl/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/sl/default.txt rename to android/app/src/main/fdroid/play/release-notes/sl/default.txt diff --git a/android/src/fdroid/play/release-notes/sr/default.txt b/android/app/src/main/fdroid/play/release-notes/sr/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/sr/default.txt rename to android/app/src/main/fdroid/play/release-notes/sr/default.txt diff --git a/android/src/fdroid/play/release-notes/sv-SE/default.txt b/android/app/src/main/fdroid/play/release-notes/sv-SE/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/sv-SE/default.txt rename to android/app/src/main/fdroid/play/release-notes/sv-SE/default.txt diff --git a/android/src/fdroid/play/release-notes/th/default.txt b/android/app/src/main/fdroid/play/release-notes/th/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/th/default.txt rename to android/app/src/main/fdroid/play/release-notes/th/default.txt diff --git a/android/src/fdroid/play/release-notes/tr-TR/default.txt b/android/app/src/main/fdroid/play/release-notes/tr-TR/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/tr-TR/default.txt rename to android/app/src/main/fdroid/play/release-notes/tr-TR/default.txt diff --git a/android/src/fdroid/play/release-notes/uk/default.txt b/android/app/src/main/fdroid/play/release-notes/uk/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/uk/default.txt rename to android/app/src/main/fdroid/play/release-notes/uk/default.txt diff --git a/android/src/fdroid/play/release-notes/ur/default.txt b/android/app/src/main/fdroid/play/release-notes/ur/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/ur/default.txt rename to android/app/src/main/fdroid/play/release-notes/ur/default.txt diff --git a/android/src/fdroid/play/release-notes/vi/default.txt b/android/app/src/main/fdroid/play/release-notes/vi/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/vi/default.txt rename to android/app/src/main/fdroid/play/release-notes/vi/default.txt diff --git a/android/src/fdroid/play/release-notes/zh-CN/default.txt b/android/app/src/main/fdroid/play/release-notes/zh-CN/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/zh-CN/default.txt rename to android/app/src/main/fdroid/play/release-notes/zh-CN/default.txt diff --git a/android/src/fdroid/play/release-notes/zh-HK/default.txt b/android/app/src/main/fdroid/play/release-notes/zh-HK/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/zh-HK/default.txt rename to android/app/src/main/fdroid/play/release-notes/zh-HK/default.txt diff --git a/android/src/fdroid/play/release-notes/zh-TW/default.txt b/android/app/src/main/fdroid/play/release-notes/zh-TW/default.txt similarity index 100% rename from android/src/fdroid/play/release-notes/zh-TW/default.txt rename to android/app/src/main/fdroid/play/release-notes/zh-TW/default.txt diff --git a/android/src/fdroid/play/version.yaml b/android/app/src/main/fdroid/play/version.yaml similarity index 100% rename from android/src/fdroid/play/version.yaml rename to android/app/src/main/fdroid/play/version.yaml diff --git a/android/src/google/play/contact-email.txt b/android/app/src/main/google/play/contact-email.txt similarity index 100% rename from android/src/google/play/contact-email.txt rename to android/app/src/main/google/play/contact-email.txt diff --git a/android/src/google/play/contact-website.txt b/android/app/src/main/google/play/contact-website.txt similarity index 100% rename from android/src/google/play/contact-website.txt rename to android/app/src/main/google/play/contact-website.txt diff --git a/android/src/google/play/default-language.txt b/android/app/src/main/google/play/default-language.txt similarity index 100% rename from android/src/google/play/default-language.txt rename to android/app/src/main/google/play/default-language.txt diff --git a/android/src/google/play/release-notes b/android/app/src/main/google/play/release-notes similarity index 100% rename from android/src/google/play/release-notes rename to android/app/src/main/google/play/release-notes diff --git a/android/src/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java similarity index 100% rename from android/src/app/organicmaps/ChartController.java rename to android/app/src/main/java/app/organicmaps/ChartController.java diff --git a/android/src/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java similarity index 100% rename from android/src/app/organicmaps/DownloadResourcesLegacyActivity.java rename to android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java diff --git a/android/src/app/organicmaps/Framework.java b/android/app/src/main/java/app/organicmaps/Framework.java similarity index 100% rename from android/src/app/organicmaps/Framework.java rename to android/app/src/main/java/app/organicmaps/Framework.java diff --git a/android/src/app/organicmaps/Map.java b/android/app/src/main/java/app/organicmaps/Map.java similarity index 100% rename from android/src/app/organicmaps/Map.java rename to android/app/src/main/java/app/organicmaps/Map.java diff --git a/android/src/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java similarity index 100% rename from android/src/app/organicmaps/MapFragment.java rename to android/app/src/main/java/app/organicmaps/MapFragment.java diff --git a/android/src/app/organicmaps/MapRenderingListener.java b/android/app/src/main/java/app/organicmaps/MapRenderingListener.java similarity index 100% rename from android/src/app/organicmaps/MapRenderingListener.java rename to android/app/src/main/java/app/organicmaps/MapRenderingListener.java diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java similarity index 100% rename from android/src/app/organicmaps/MwmActivity.java rename to android/app/src/main/java/app/organicmaps/MwmActivity.java diff --git a/android/src/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java similarity index 100% rename from android/src/app/organicmaps/MwmApplication.java rename to android/app/src/main/java/app/organicmaps/MwmApplication.java diff --git a/android/src/app/organicmaps/MwmBroadcastReceiver.java b/android/app/src/main/java/app/organicmaps/MwmBroadcastReceiver.java similarity index 100% rename from android/src/app/organicmaps/MwmBroadcastReceiver.java rename to android/app/src/main/java/app/organicmaps/MwmBroadcastReceiver.java diff --git a/android/src/app/organicmaps/PanelAnimator.java b/android/app/src/main/java/app/organicmaps/PanelAnimator.java similarity index 100% rename from android/src/app/organicmaps/PanelAnimator.java rename to android/app/src/main/java/app/organicmaps/PanelAnimator.java diff --git a/android/src/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java similarity index 100% rename from android/src/app/organicmaps/SplashActivity.java rename to android/app/src/main/java/app/organicmaps/SplashActivity.java diff --git a/android/src/app/organicmaps/WebContainerDelegate.java b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java similarity index 100% rename from android/src/app/organicmaps/WebContainerDelegate.java rename to android/app/src/main/java/app/organicmaps/WebContainerDelegate.java diff --git a/android/src/app/organicmaps/adapter/DisabledChildSimpleExpandableListAdapter.java b/android/app/src/main/java/app/organicmaps/adapter/DisabledChildSimpleExpandableListAdapter.java similarity index 100% rename from android/src/app/organicmaps/adapter/DisabledChildSimpleExpandableListAdapter.java rename to android/app/src/main/java/app/organicmaps/adapter/DisabledChildSimpleExpandableListAdapter.java diff --git a/android/src/app/organicmaps/adapter/OnItemClickListener.java b/android/app/src/main/java/app/organicmaps/adapter/OnItemClickListener.java similarity index 100% rename from android/src/app/organicmaps/adapter/OnItemClickListener.java rename to android/app/src/main/java/app/organicmaps/adapter/OnItemClickListener.java diff --git a/android/src/app/organicmaps/api/Const.java b/android/app/src/main/java/app/organicmaps/api/Const.java similarity index 100% rename from android/src/app/organicmaps/api/Const.java rename to android/app/src/main/java/app/organicmaps/api/Const.java diff --git a/android/src/app/organicmaps/api/ParsedMwmRequest.java b/android/app/src/main/java/app/organicmaps/api/ParsedMwmRequest.java similarity index 100% rename from android/src/app/organicmaps/api/ParsedMwmRequest.java rename to android/app/src/main/java/app/organicmaps/api/ParsedMwmRequest.java diff --git a/android/src/app/organicmaps/api/ParsedRoutingData.java b/android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java similarity index 100% rename from android/src/app/organicmaps/api/ParsedRoutingData.java rename to android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java diff --git a/android/src/app/organicmaps/api/ParsedSearchRequest.java b/android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java similarity index 100% rename from android/src/app/organicmaps/api/ParsedSearchRequest.java rename to android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java diff --git a/android/src/app/organicmaps/api/ParsingResult.java b/android/app/src/main/java/app/organicmaps/api/ParsingResult.java similarity index 100% rename from android/src/app/organicmaps/api/ParsingResult.java rename to android/app/src/main/java/app/organicmaps/api/ParsingResult.java diff --git a/android/src/app/organicmaps/api/RoutePoint.java b/android/app/src/main/java/app/organicmaps/api/RoutePoint.java similarity index 100% rename from android/src/app/organicmaps/api/RoutePoint.java rename to android/app/src/main/java/app/organicmaps/api/RoutePoint.java diff --git a/android/src/app/organicmaps/background/AppBackgroundTracker.java b/android/app/src/main/java/app/organicmaps/background/AppBackgroundTracker.java similarity index 100% rename from android/src/app/organicmaps/background/AppBackgroundTracker.java rename to android/app/src/main/java/app/organicmaps/background/AppBackgroundTracker.java diff --git a/android/src/app/organicmaps/background/NotificationChannelFactory.java b/android/app/src/main/java/app/organicmaps/background/NotificationChannelFactory.java similarity index 100% rename from android/src/app/organicmaps/background/NotificationChannelFactory.java rename to android/app/src/main/java/app/organicmaps/background/NotificationChannelFactory.java diff --git a/android/src/app/organicmaps/background/NotificationChannelProvider.java b/android/app/src/main/java/app/organicmaps/background/NotificationChannelProvider.java similarity index 100% rename from android/src/app/organicmaps/background/NotificationChannelProvider.java rename to android/app/src/main/java/app/organicmaps/background/NotificationChannelProvider.java diff --git a/android/src/app/organicmaps/background/Notifier.java b/android/app/src/main/java/app/organicmaps/background/Notifier.java similarity index 100% rename from android/src/app/organicmaps/background/Notifier.java rename to android/app/src/main/java/app/organicmaps/background/Notifier.java diff --git a/android/src/app/organicmaps/background/OreoCompatNotificationChannelProvider.java b/android/app/src/main/java/app/organicmaps/background/OreoCompatNotificationChannelProvider.java similarity index 100% rename from android/src/app/organicmaps/background/OreoCompatNotificationChannelProvider.java rename to android/app/src/main/java/app/organicmaps/background/OreoCompatNotificationChannelProvider.java diff --git a/android/src/app/organicmaps/background/OsmUploadWork.java b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java similarity index 100% rename from android/src/app/organicmaps/background/OsmUploadWork.java rename to android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java diff --git a/android/src/app/organicmaps/background/StubNotificationChannelProvider.java b/android/app/src/main/java/app/organicmaps/background/StubNotificationChannelProvider.java similarity index 100% rename from android/src/app/organicmaps/background/StubNotificationChannelProvider.java rename to android/app/src/main/java/app/organicmaps/background/StubNotificationChannelProvider.java diff --git a/android/src/app/organicmaps/background/UpgradeReceiver.java b/android/app/src/main/java/app/organicmaps/background/UpgradeReceiver.java similarity index 100% rename from android/src/app/organicmaps/background/UpgradeReceiver.java rename to android/app/src/main/java/app/organicmaps/background/UpgradeReceiver.java diff --git a/android/src/app/organicmaps/base/BaseActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseActivity.java similarity index 100% rename from android/src/app/organicmaps/base/BaseActivity.java rename to android/app/src/main/java/app/organicmaps/base/BaseActivity.java diff --git a/android/src/app/organicmaps/base/BaseActivityDelegate.java b/android/app/src/main/java/app/organicmaps/base/BaseActivityDelegate.java similarity index 100% rename from android/src/app/organicmaps/base/BaseActivityDelegate.java rename to android/app/src/main/java/app/organicmaps/base/BaseActivityDelegate.java diff --git a/android/src/app/organicmaps/base/BaseAsyncOperationFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseAsyncOperationFragment.java similarity index 100% rename from android/src/app/organicmaps/base/BaseAsyncOperationFragment.java rename to android/app/src/main/java/app/organicmaps/base/BaseAsyncOperationFragment.java diff --git a/android/src/app/organicmaps/base/BaseMwmDialogFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/base/BaseMwmDialogFragment.java rename to android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java diff --git a/android/src/app/organicmaps/base/BaseMwmFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java similarity index 100% rename from android/src/app/organicmaps/base/BaseMwmFragment.java rename to android/app/src/main/java/app/organicmaps/base/BaseMwmFragment.java diff --git a/android/src/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java similarity index 100% rename from android/src/app/organicmaps/base/BaseMwmFragmentActivity.java rename to android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java diff --git a/android/src/app/organicmaps/base/BaseMwmRecyclerFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java similarity index 100% rename from android/src/app/organicmaps/base/BaseMwmRecyclerFragment.java rename to android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java diff --git a/android/src/app/organicmaps/base/BaseMwmToolbarFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java similarity index 100% rename from android/src/app/organicmaps/base/BaseMwmToolbarFragment.java rename to android/app/src/main/java/app/organicmaps/base/BaseMwmToolbarFragment.java diff --git a/android/src/app/organicmaps/base/BaseToolbarActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java similarity index 100% rename from android/src/app/organicmaps/base/BaseToolbarActivity.java rename to android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java diff --git a/android/src/app/organicmaps/base/CustomNavigateUpListener.java b/android/app/src/main/java/app/organicmaps/base/CustomNavigateUpListener.java similarity index 100% rename from android/src/app/organicmaps/base/CustomNavigateUpListener.java rename to android/app/src/main/java/app/organicmaps/base/CustomNavigateUpListener.java diff --git a/android/src/app/organicmaps/base/DataChangedListener.java b/android/app/src/main/java/app/organicmaps/base/DataChangedListener.java similarity index 100% rename from android/src/app/organicmaps/base/DataChangedListener.java rename to android/app/src/main/java/app/organicmaps/base/DataChangedListener.java diff --git a/android/src/app/organicmaps/base/Detachable.java b/android/app/src/main/java/app/organicmaps/base/Detachable.java similarity index 100% rename from android/src/app/organicmaps/base/Detachable.java rename to android/app/src/main/java/app/organicmaps/base/Detachable.java diff --git a/android/src/app/organicmaps/base/Hideable.java b/android/app/src/main/java/app/organicmaps/base/Hideable.java similarity index 100% rename from android/src/app/organicmaps/base/Hideable.java rename to android/app/src/main/java/app/organicmaps/base/Hideable.java diff --git a/android/src/app/organicmaps/base/Initializable.java b/android/app/src/main/java/app/organicmaps/base/Initializable.java similarity index 100% rename from android/src/app/organicmaps/base/Initializable.java rename to android/app/src/main/java/app/organicmaps/base/Initializable.java diff --git a/android/src/app/organicmaps/base/MediaPlayerWrapper.java b/android/app/src/main/java/app/organicmaps/base/MediaPlayerWrapper.java similarity index 100% rename from android/src/app/organicmaps/base/MediaPlayerWrapper.java rename to android/app/src/main/java/app/organicmaps/base/MediaPlayerWrapper.java diff --git a/android/src/app/organicmaps/base/NoConnectionListener.java b/android/app/src/main/java/app/organicmaps/base/NoConnectionListener.java similarity index 100% rename from android/src/app/organicmaps/base/NoConnectionListener.java rename to android/app/src/main/java/app/organicmaps/base/NoConnectionListener.java diff --git a/android/src/app/organicmaps/base/Observable.java b/android/app/src/main/java/app/organicmaps/base/Observable.java similarity index 100% rename from android/src/app/organicmaps/base/Observable.java rename to android/app/src/main/java/app/organicmaps/base/Observable.java diff --git a/android/src/app/organicmaps/base/OnBackPressListener.java b/android/app/src/main/java/app/organicmaps/base/OnBackPressListener.java similarity index 100% rename from android/src/app/organicmaps/base/OnBackPressListener.java rename to android/app/src/main/java/app/organicmaps/base/OnBackPressListener.java diff --git a/android/src/app/organicmaps/base/Savable.java b/android/app/src/main/java/app/organicmaps/base/Savable.java similarity index 100% rename from android/src/app/organicmaps/base/Savable.java rename to android/app/src/main/java/app/organicmaps/base/Savable.java diff --git a/android/src/app/organicmaps/base/Supportable.java b/android/app/src/main/java/app/organicmaps/base/Supportable.java similarity index 100% rename from android/src/app/organicmaps/base/Supportable.java rename to android/app/src/main/java/app/organicmaps/base/Supportable.java diff --git a/android/src/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkListActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkListActivity.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarkListAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarkListAdapter.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarksListFragment.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarksSharingHelper.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarksSharingHelper.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java diff --git a/android/src/app/organicmaps/bookmarks/BookmarksToolbarController.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksToolbarController.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/BookmarksToolbarController.java rename to android/app/src/main/java/app/organicmaps/bookmarks/BookmarksToolbarController.java diff --git a/android/src/app/organicmaps/bookmarks/CategoryListCallback.java b/android/app/src/main/java/app/organicmaps/bookmarks/CategoryListCallback.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/CategoryListCallback.java rename to android/app/src/main/java/app/organicmaps/bookmarks/CategoryListCallback.java diff --git a/android/src/app/organicmaps/bookmarks/CategoryValidator.java b/android/app/src/main/java/app/organicmaps/bookmarks/CategoryValidator.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/CategoryValidator.java rename to android/app/src/main/java/app/organicmaps/bookmarks/CategoryValidator.java diff --git a/android/src/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java rename to android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java diff --git a/android/src/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java rename to android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java diff --git a/android/src/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java rename to android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java diff --git a/android/src/app/organicmaps/bookmarks/Holders.java b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/Holders.java rename to android/app/src/main/java/app/organicmaps/bookmarks/Holders.java diff --git a/android/src/app/organicmaps/bookmarks/IconsAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/IconsAdapter.java rename to android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java diff --git a/android/src/app/organicmaps/bookmarks/OnItemLongClickListener.java b/android/app/src/main/java/app/organicmaps/bookmarks/OnItemLongClickListener.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/OnItemLongClickListener.java rename to android/app/src/main/java/app/organicmaps/bookmarks/OnItemLongClickListener.java diff --git a/android/src/app/organicmaps/bookmarks/OnItemMoreClickListener.java b/android/app/src/main/java/app/organicmaps/bookmarks/OnItemMoreClickListener.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/OnItemMoreClickListener.java rename to android/app/src/main/java/app/organicmaps/bookmarks/OnItemMoreClickListener.java diff --git a/android/src/app/organicmaps/bookmarks/OperationStatus.java b/android/app/src/main/java/app/organicmaps/bookmarks/OperationStatus.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/OperationStatus.java rename to android/app/src/main/java/app/organicmaps/bookmarks/OperationStatus.java diff --git a/android/src/app/organicmaps/bookmarks/SectionPosition.java b/android/app/src/main/java/app/organicmaps/bookmarks/SectionPosition.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/SectionPosition.java rename to android/app/src/main/java/app/organicmaps/bookmarks/SectionPosition.java diff --git a/android/src/app/organicmaps/bookmarks/data/Bookmark.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/Bookmark.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java diff --git a/android/src/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java diff --git a/android/src/app/organicmaps/bookmarks/data/BookmarkCategory.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/BookmarkCategory.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java diff --git a/android/src/app/organicmaps/bookmarks/data/BookmarkInfo.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/BookmarkInfo.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java diff --git a/android/src/app/organicmaps/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/BookmarkManager.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java diff --git a/android/src/app/organicmaps/bookmarks/data/BookmarkSharingResult.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/BookmarkSharingResult.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java diff --git a/android/src/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java diff --git a/android/src/app/organicmaps/bookmarks/data/CategoryDataSource.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/CategoryDataSource.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java diff --git a/android/src/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java diff --git a/android/src/app/organicmaps/bookmarks/data/DistanceAndAzimut.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/DistanceAndAzimut.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java diff --git a/android/src/app/organicmaps/bookmarks/data/ElevationInfo.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/ElevationInfo.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java diff --git a/android/src/app/organicmaps/bookmarks/data/Error.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/Error.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java diff --git a/android/src/app/organicmaps/bookmarks/data/FeatureId.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/FeatureId.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java diff --git a/android/src/app/organicmaps/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/Icon.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java diff --git a/android/src/app/organicmaps/bookmarks/data/MapObject.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/MapObject.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java diff --git a/android/src/app/organicmaps/bookmarks/data/Metadata.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/Metadata.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java diff --git a/android/src/app/organicmaps/bookmarks/data/ParcelablePointD.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/ParcelablePointD.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java diff --git a/android/src/app/organicmaps/bookmarks/data/Result.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/Result.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java diff --git a/android/src/app/organicmaps/bookmarks/data/RoadWarningMarkType.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/RoadWarningMarkType.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java diff --git a/android/src/app/organicmaps/bookmarks/data/SortedBlock.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/SortedBlock.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java diff --git a/android/src/app/organicmaps/bookmarks/data/Track.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java similarity index 100% rename from android/src/app/organicmaps/bookmarks/data/Track.java rename to android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java diff --git a/android/src/app/organicmaps/content/DataSource.java b/android/app/src/main/java/app/organicmaps/content/DataSource.java similarity index 100% rename from android/src/app/organicmaps/content/DataSource.java rename to android/app/src/main/java/app/organicmaps/content/DataSource.java diff --git a/android/src/app/organicmaps/dialog/EditTextDialogFragment.java b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/dialog/EditTextDialogFragment.java rename to android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java diff --git a/android/src/app/organicmaps/dialog/ProgressDialogFragment.java b/android/app/src/main/java/app/organicmaps/dialog/ProgressDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/dialog/ProgressDialogFragment.java rename to android/app/src/main/java/app/organicmaps/dialog/ProgressDialogFragment.java diff --git a/android/src/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java similarity index 100% rename from android/src/app/organicmaps/downloader/BottomPanel.java rename to android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java diff --git a/android/src/app/organicmaps/downloader/ChunkTask.java b/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java similarity index 100% rename from android/src/app/organicmaps/downloader/ChunkTask.java rename to android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java diff --git a/android/src/app/organicmaps/downloader/CountryItem.java b/android/app/src/main/java/app/organicmaps/downloader/CountryItem.java similarity index 100% rename from android/src/app/organicmaps/downloader/CountryItem.java rename to android/app/src/main/java/app/organicmaps/downloader/CountryItem.java diff --git a/android/src/app/organicmaps/downloader/CountrySuggestFragment.java b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java similarity index 100% rename from android/src/app/organicmaps/downloader/CountrySuggestFragment.java rename to android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java diff --git a/android/src/app/organicmaps/downloader/DownloaderActivity.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java similarity index 100% rename from android/src/app/organicmaps/downloader/DownloaderActivity.java rename to android/app/src/main/java/app/organicmaps/downloader/DownloaderActivity.java diff --git a/android/src/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java similarity index 100% rename from android/src/app/organicmaps/downloader/DownloaderAdapter.java rename to android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java diff --git a/android/src/app/organicmaps/downloader/DownloaderFragment.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java similarity index 100% rename from android/src/app/organicmaps/downloader/DownloaderFragment.java rename to android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java diff --git a/android/src/app/organicmaps/downloader/DownloaderStatusIcon.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java similarity index 100% rename from android/src/app/organicmaps/downloader/DownloaderStatusIcon.java rename to android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java diff --git a/android/src/app/organicmaps/downloader/DownloaderToolbarController.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java similarity index 100% rename from android/src/app/organicmaps/downloader/DownloaderToolbarController.java rename to android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java diff --git a/android/src/app/organicmaps/downloader/ExpandRetryConfirmationListener.java b/android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java similarity index 100% rename from android/src/app/organicmaps/downloader/ExpandRetryConfirmationListener.java rename to android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java diff --git a/android/src/app/organicmaps/downloader/MapManager.java b/android/app/src/main/java/app/organicmaps/downloader/MapManager.java similarity index 100% rename from android/src/app/organicmaps/downloader/MapManager.java rename to android/app/src/main/java/app/organicmaps/downloader/MapManager.java diff --git a/android/src/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java similarity index 100% rename from android/src/app/organicmaps/downloader/OnmapDownloader.java rename to android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java diff --git a/android/src/app/organicmaps/downloader/RetryFailedDownloadConfirmationListener.java b/android/app/src/main/java/app/organicmaps/downloader/RetryFailedDownloadConfirmationListener.java similarity index 100% rename from android/src/app/organicmaps/downloader/RetryFailedDownloadConfirmationListener.java rename to android/app/src/main/java/app/organicmaps/downloader/RetryFailedDownloadConfirmationListener.java diff --git a/android/src/app/organicmaps/downloader/UpdateInfo.java b/android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java similarity index 100% rename from android/src/app/organicmaps/downloader/UpdateInfo.java rename to android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java diff --git a/android/src/app/organicmaps/editor/AdvancedTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/AdvancedTimetableFragment.java rename to android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java diff --git a/android/src/app/organicmaps/editor/CuisineAdapter.java b/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/CuisineAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java diff --git a/android/src/app/organicmaps/editor/CuisineFragment.java b/android/app/src/main/java/app/organicmaps/editor/CuisineFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/CuisineFragment.java rename to android/app/src/main/java/app/organicmaps/editor/CuisineFragment.java diff --git a/android/src/app/organicmaps/editor/Editor.java b/android/app/src/main/java/app/organicmaps/editor/Editor.java similarity index 100% rename from android/src/app/organicmaps/editor/Editor.java rename to android/app/src/main/java/app/organicmaps/editor/Editor.java diff --git a/android/src/app/organicmaps/editor/EditorActivity.java b/android/app/src/main/java/app/organicmaps/editor/EditorActivity.java similarity index 100% rename from android/src/app/organicmaps/editor/EditorActivity.java rename to android/app/src/main/java/app/organicmaps/editor/EditorActivity.java diff --git a/android/src/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/EditorFragment.java rename to android/app/src/main/java/app/organicmaps/editor/EditorFragment.java diff --git a/android/src/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/EditorHostFragment.java rename to android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java diff --git a/android/src/app/organicmaps/editor/FeatureCategoryActivity.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java similarity index 100% rename from android/src/app/organicmaps/editor/FeatureCategoryActivity.java rename to android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java diff --git a/android/src/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/FeatureCategoryAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java diff --git a/android/src/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/FeatureCategoryFragment.java rename to android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java diff --git a/android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/HoursMinutesPickerFragment.java rename to android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java diff --git a/android/src/app/organicmaps/editor/LanguagesAdapter.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/LanguagesAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java diff --git a/android/src/app/organicmaps/editor/LanguagesFragment.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/LanguagesFragment.java rename to android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java diff --git a/android/src/app/organicmaps/editor/MultilanguageAdapter.java b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/MultilanguageAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java diff --git a/android/src/app/organicmaps/editor/OpeningHours.java b/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java similarity index 100% rename from android/src/app/organicmaps/editor/OpeningHours.java rename to android/app/src/main/java/app/organicmaps/editor/OpeningHours.java diff --git a/android/src/app/organicmaps/editor/OsmLoginActivity.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginActivity.java similarity index 100% rename from android/src/app/organicmaps/editor/OsmLoginActivity.java rename to android/app/src/main/java/app/organicmaps/editor/OsmLoginActivity.java diff --git a/android/src/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/OsmLoginFragment.java rename to android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java diff --git a/android/src/app/organicmaps/editor/OsmOAuth.java b/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java similarity index 100% rename from android/src/app/organicmaps/editor/OsmOAuth.java rename to android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java diff --git a/android/src/app/organicmaps/editor/PhoneListAdapter.java b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/PhoneListAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java diff --git a/android/src/app/organicmaps/editor/ProfileActivity.java b/android/app/src/main/java/app/organicmaps/editor/ProfileActivity.java similarity index 100% rename from android/src/app/organicmaps/editor/ProfileActivity.java rename to android/app/src/main/java/app/organicmaps/editor/ProfileActivity.java diff --git a/android/src/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/ProfileFragment.java rename to android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java diff --git a/android/src/app/organicmaps/editor/ReportActivity.java b/android/app/src/main/java/app/organicmaps/editor/ReportActivity.java similarity index 100% rename from android/src/app/organicmaps/editor/ReportActivity.java rename to android/app/src/main/java/app/organicmaps/editor/ReportActivity.java diff --git a/android/src/app/organicmaps/editor/ReportFragment.java b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/ReportFragment.java rename to android/app/src/main/java/app/organicmaps/editor/ReportFragment.java diff --git a/android/src/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/SimpleTimetableAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java diff --git a/android/src/app/organicmaps/editor/SimpleTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/SimpleTimetableFragment.java rename to android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java diff --git a/android/src/app/organicmaps/editor/StreetAdapter.java b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java similarity index 100% rename from android/src/app/organicmaps/editor/StreetAdapter.java rename to android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java diff --git a/android/src/app/organicmaps/editor/StreetFragment.java b/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/StreetFragment.java rename to android/app/src/main/java/app/organicmaps/editor/StreetFragment.java diff --git a/android/src/app/organicmaps/editor/TimetableChangedListener.java b/android/app/src/main/java/app/organicmaps/editor/TimetableChangedListener.java similarity index 100% rename from android/src/app/organicmaps/editor/TimetableChangedListener.java rename to android/app/src/main/java/app/organicmaps/editor/TimetableChangedListener.java diff --git a/android/src/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/TimetableContainerFragment.java rename to android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java diff --git a/android/src/app/organicmaps/editor/TimetableProvider.java b/android/app/src/main/java/app/organicmaps/editor/TimetableProvider.java similarity index 100% rename from android/src/app/organicmaps/editor/TimetableProvider.java rename to android/app/src/main/java/app/organicmaps/editor/TimetableProvider.java diff --git a/android/src/app/organicmaps/editor/data/FeatureCategory.java b/android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java similarity index 100% rename from android/src/app/organicmaps/editor/data/FeatureCategory.java rename to android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java diff --git a/android/src/app/organicmaps/editor/data/HoursMinutes.java b/android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java similarity index 100% rename from android/src/app/organicmaps/editor/data/HoursMinutes.java rename to android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java diff --git a/android/src/app/organicmaps/editor/data/Language.java b/android/app/src/main/java/app/organicmaps/editor/data/Language.java similarity index 100% rename from android/src/app/organicmaps/editor/data/Language.java rename to android/app/src/main/java/app/organicmaps/editor/data/Language.java diff --git a/android/src/app/organicmaps/editor/data/LocalizedName.java b/android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java similarity index 100% rename from android/src/app/organicmaps/editor/data/LocalizedName.java rename to android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java diff --git a/android/src/app/organicmaps/editor/data/LocalizedStreet.java b/android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java similarity index 100% rename from android/src/app/organicmaps/editor/data/LocalizedStreet.java rename to android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java diff --git a/android/src/app/organicmaps/editor/data/NamesDataSource.java b/android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java similarity index 100% rename from android/src/app/organicmaps/editor/data/NamesDataSource.java rename to android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java diff --git a/android/src/app/organicmaps/editor/data/PhoneFragment.java b/android/app/src/main/java/app/organicmaps/editor/data/PhoneFragment.java similarity index 100% rename from android/src/app/organicmaps/editor/data/PhoneFragment.java rename to android/app/src/main/java/app/organicmaps/editor/data/PhoneFragment.java diff --git a/android/src/app/organicmaps/editor/data/TimeFormatUtils.java b/android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java similarity index 100% rename from android/src/app/organicmaps/editor/data/TimeFormatUtils.java rename to android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java diff --git a/android/src/app/organicmaps/editor/data/Timespan.java b/android/app/src/main/java/app/organicmaps/editor/data/Timespan.java similarity index 100% rename from android/src/app/organicmaps/editor/data/Timespan.java rename to android/app/src/main/java/app/organicmaps/editor/data/Timespan.java diff --git a/android/src/app/organicmaps/editor/data/Timetable.java b/android/app/src/main/java/app/organicmaps/editor/data/Timetable.java similarity index 100% rename from android/src/app/organicmaps/editor/data/Timetable.java rename to android/app/src/main/java/app/organicmaps/editor/data/Timetable.java diff --git a/android/src/app/organicmaps/help/CopyrightFragment.java b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java similarity index 91% rename from android/src/app/organicmaps/help/CopyrightFragment.java rename to android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java index 0308b56001..5ff013adef 100644 --- a/android/src/app/organicmaps/help/CopyrightFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java @@ -40,7 +40,7 @@ public class CopyrightFragment extends BaseMwmFragment implements OnBackPressLis { if (!mDelegate.onBackPressed()) { - ((HelpActivity) requireActivity()).stackFragment(HelpFragment.class, getString(R.string.help), null); +// ((HelpActivity) requireActivity()).stackFragment(HelpFragment.class, getString(R.string.help), null); } return true; diff --git a/android/src/app/organicmaps/help/FaqFragment.java b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java similarity index 100% rename from android/src/app/organicmaps/help/FaqFragment.java rename to android/app/src/main/java/app/organicmaps/help/FaqFragment.java diff --git a/android/app/src/main/java/app/organicmaps/help/HelpActivity.kt b/android/app/src/main/java/app/organicmaps/help/HelpActivity.kt new file mode 100644 index 0000000000..1de0843e32 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/help/HelpActivity.kt @@ -0,0 +1,100 @@ +package app.organicmaps.help + +import android.app.Activity +import android.content.res.Configuration.UI_MODE_NIGHT_YES +import android.os.Bundle +import androidx.activity.compose.setContent +import androidx.appcompat.app.AppCompatActivity +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.Icon +import androidx.compose.material.IconButton +import androidx.compose.material.Scaffold +import androidx.compose.material.Text +import androidx.compose.material.TopAppBar +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.dimensionResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import app.organicmaps.R +import app.organicmaps.util.Theme + +class HelpActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + HelpContent() + } + } +} + +@Composable +private fun HelpContent() { + val context = LocalContext.current + Theme { + Scaffold( + topBar = { + TopAppBar( + title = { + Text( + stringResource(id = R.string.about_menu_title) + ) + }, + navigationIcon = { + IconButton(onClick = { (context as Activity).finish() }) { + Icon( + Icons.Filled.ArrowBack, + contentDescription = stringResource(id = R.string.back) + ) + } + }, + ) + }, + ) { contentPadding -> + Box( + Modifier + .padding(contentPadding) + .verticalScroll( + rememberScrollState() + ) + ) { + Column( + Modifier + .padding(dimensionResource(id = R.dimen.margin_base)) + ) { + Spacer(modifier = Modifier.height(dimensionResource(id = R.dimen.margin_base))) + HelpHeader() + HelpItemList(Modifier.padding(top = dimensionResource(id = R.dimen.margin_half))) + } + + } + } + } +} + +@Preview( + name = "dark theme", + uiMode = UI_MODE_NIGHT_YES +) +@Preview(name = "light theme") +@Preview( + name = "landscape", + device = "spec:width=700dp,height=300dp,dpi=480,orientation=landscape" +) +annotation class HelpPreviews + +@HelpPreviews +@Composable +private fun HelpPreview() { + HelpContent() +} diff --git a/android/app/src/main/java/app/organicmaps/help/HelpHeader.kt b/android/app/src/main/java/app/organicmaps/help/HelpHeader.kt new file mode 100644 index 0000000000..776dd36e98 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/help/HelpHeader.kt @@ -0,0 +1,165 @@ +package app.organicmaps.help + +import android.app.Activity +import android.text.TextUtils +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.material.Button +import androidx.compose.material.ButtonDefaults +import androidx.compose.material.Icon +import androidx.compose.material.OutlinedButton +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalInspectionMode +import androidx.compose.ui.res.dimensionResource +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import app.organicmaps.BuildConfig +import app.organicmaps.Framework +import app.organicmaps.R +import app.organicmaps.util.Config +import app.organicmaps.util.DateUtils +import app.organicmaps.util.ExtendedMaterialTheme +import app.organicmaps.util.Theme +import app.organicmaps.util.Utils + +@Composable +fun HelpHeader() { + BoxWithConstraints { + if (maxWidth < 400.dp) { + Column { + HelpHeaderLeft() + HelpHeaderRight() + } + } else { + Row { + HelpHeaderLeft(Modifier.weight(1f)) + HelpHeaderRight(Modifier.weight(1f)) + } + } + } +} + +@Composable +fun HelpHeaderLeft(modifier: Modifier = Modifier) { + Column(modifier, horizontalAlignment = Alignment.CenterHorizontally) { + Icon( + painter = painterResource(R.drawable.logo), + contentDescription = stringResource(id = R.string.app_name), + tint = ExtendedMaterialTheme.colors.colorLogo, + modifier = Modifier + .size(96.dp) + ) + SelectionContainer { + Text( + BuildConfig.VERSION_NAME, + modifier = Modifier + .fillMaxWidth() + .padding(vertical = dimensionResource(id = R.dimen.margin_half)), + textAlign = TextAlign.Center, + style = ExtendedMaterialTheme.typography.caption + ) + } + Text( + stringResource(id = R.string.about_headline), + modifier = Modifier + .fillMaxWidth() + .padding(bottom = dimensionResource(id = R.dimen.margin_base)), + textAlign = TextAlign.Center, + style = ExtendedMaterialTheme.typography.h6 + ) + + Text( + stringResource(id = R.string.about_proposition_1), + modifier = Modifier + .fillMaxWidth() + .padding(bottom = dimensionResource(id = R.dimen.margin_half)), + ) + Text( + stringResource(id = R.string.about_proposition_2), + modifier = Modifier + .fillMaxWidth() + .padding(bottom = dimensionResource(id = R.dimen.margin_half)), + ) + Text( + stringResource(id = R.string.about_proposition_3), + modifier = Modifier + .fillMaxWidth() + .padding(bottom = dimensionResource(id = R.dimen.margin_half)), + ) + } +} + +@Composable +fun HelpHeaderRight(modifier: Modifier = Modifier) { + val context = LocalContext.current + val omWebsite = stringResource(id = R.string.translated_om_site_url) + // Do not read the config while in the preview + var donateUrl = if (!LocalInspectionMode.current) Config.getDonateUrl() else "" + if (TextUtils.isEmpty(donateUrl) && BuildConfig.FLAVOR != "google" && BuildConfig.FLAVOR != "huawei") + donateUrl = omWebsite + "donate/" + + val dataVersion = if (!LocalInspectionMode.current) DateUtils.getShortDateFormatter() + .format(Framework.getDataVersion()) else "DATA_VERSION" + + Column(modifier) { + Text( + stringResource(id = R.string.about_developed_by_enthusiasts), + modifier = Modifier + .fillMaxWidth() + .padding(bottom = dimensionResource(id = R.dimen.margin_half)), + fontWeight = FontWeight.Bold + ) + Row(verticalAlignment = Alignment.CenterVertically) { + Image( + painter = painterResource(id = R.drawable.ic_openstreetmap_color), + contentDescription = stringResource(id = R.string.openstreetmap), + modifier = Modifier + .size(dimensionResource(id = R.dimen.osm_logo)) + ) + Text( + stringResource(id = R.string.osm_presentation, dataVersion), + modifier = Modifier.padding(start = dimensionResource(id = R.dimen.margin_half)), + ) + } + Button( + onClick = { Utils.openUrl(context, donateUrl) }, + colors = ButtonDefaults.buttonColors(backgroundColor = ExtendedMaterialTheme.colors.material.secondary), + modifier = Modifier + .fillMaxWidth() + .padding(top = dimensionResource(id = R.dimen.margin_half)) + ) { + Text(stringResource(id = R.string.donate)) + } + OutlinedButton( + onClick = { Utils.sendBugReport(context as Activity, "") }, + colors = ButtonDefaults.buttonColors(backgroundColor = ExtendedMaterialTheme.colors.material.surface), + modifier = Modifier.fillMaxWidth() + ) { + Text(stringResource(id = R.string.report_a_bug)) + } + } +} + +@HelpPreviews +@Composable +private fun HelpHeaderPreview() { + Theme { + Surface { + HelpHeader() + } + } +} \ No newline at end of file diff --git a/android/app/src/main/java/app/organicmaps/help/HelpItemList.kt b/android/app/src/main/java/app/organicmaps/help/HelpItemList.kt new file mode 100644 index 0000000000..8710fceac0 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/help/HelpItemList.kt @@ -0,0 +1,232 @@ +package app.organicmaps.help + +import android.app.Activity +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material.Divider +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.dimensionResource +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import app.organicmaps.BuildConfig +import app.organicmaps.R +import app.organicmaps.util.Constants +import app.organicmaps.util.ExtendedMaterialTheme +import app.organicmaps.util.Theme +import app.organicmaps.util.Utils + +@Composable +fun HelpItemList(modifier: Modifier = Modifier) { + val context = LocalContext.current + val omWebsite = stringResource(id = R.string.translated_om_site_url) + + fun openUrl(url: String) { + Utils.openUrl(context, url) + } + Column(modifier) { + BoxWithConstraints { + if (maxWidth < 400.dp) { + Column { + HelpItemsLeft() + HelpItemsRight() + } + } else { + Row { + HelpItemsLeft(Modifier.weight(1f)) + HelpItemsRight(Modifier.weight(1f)) + } + } + } + Divider() + HelpItem( + text = stringResource(id = R.string.privacy_policy), + onClick = { openUrl(omWebsite + "privacy/") } + ) + HelpItem( + text = stringResource(id = R.string.terms_of_use), + onClick = { openUrl(omWebsite + "terms/") } + ) + HelpItem( + text = stringResource(id = R.string.copyright), + onClick = {} // TODO migrate that screen to compose as well + ) + } +} + +@Composable +fun HelpItemsLeft(modifier: Modifier = Modifier) { + val context = LocalContext.current + val omWebsite = stringResource(id = R.string.translated_om_site_url) + val telegram = stringResource(id = R.string.telegram_url) + + fun openUrl(url: String) { + Utils.openUrl(context, url) + } + Column(modifier) { + HelpItem( + icon = painterResource(id = R.drawable.ic_donate), + tintIcon = true, + text = stringResource(id = R.string.how_to_support_us), + onClick = { Utils.openUrl(context, omWebsite + "support-us/") }, + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_question_mark), + tintIcon = true, + text = stringResource(id = R.string.faq), + onClick = {} // TODO migrate that screen to compose as well + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_news), + tintIcon = true, + text = stringResource(id = R.string.news), + onClick = { openUrl(omWebsite + "news/") }, + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_rate), + tintIcon = true, + text = stringResource(id = R.string.rate_the_app), + onClick = { Utils.openAppInMarket(context as Activity, BuildConfig.REVIEW_URL) }, + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_telegram), + text = stringResource(id = R.string.telegram), + onClick = { openUrl(telegram) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_github), + tintIcon = true, + text = stringResource(id = R.string.github), + onClick = { openUrl(Constants.Url.GITHUB) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_website), + tintIcon = true, + text = stringResource(id = R.string.website), + onClick = { openUrl(omWebsite) } + ) + } +} + + +@Composable +fun HelpItemsRight(modifier: Modifier = Modifier) { + val context = LocalContext.current + val instagram = stringResource(id = R.string.instagram_url) + val osm = stringResource(id = R.string.osm_wiki_about_url) + + fun openUrl(url: String) { + Utils.openUrl(context, url) + } + Column(modifier) { + HelpItem( + icon = painterResource(id = R.drawable.ic_email), + tintIcon = true, + text = stringResource(id = R.string.email), + onClick = { Utils.sendTo(context, BuildConfig.SUPPORT_MAIL, "Organic Maps") } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_matrix), + tintIcon = true, + text = stringResource(id = R.string.matrix), + onClick = { openUrl(Constants.Url.MATRIX) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_mastodon), + text = stringResource(id = R.string.mastodon), + onClick = { openUrl(Constants.Url.MASTODON) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_facebook), + text = stringResource(id = R.string.facebook), + onClick = { Utils.showFacebookPage(context as Activity) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_twitterx), + tintIcon = true, + text = stringResource(id = R.string.twitter), + onClick = { openUrl(Constants.Url.TWITTER) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_instagram), + text = stringResource(id = R.string.instagram), + onClick = { openUrl(instagram) } + ) + HelpItem( + icon = painterResource(id = R.drawable.ic_openstreetmap), + tintIcon = true, + text = stringResource(id = R.string.openstreetmap), + onClick = { openUrl(osm) } + ) + } +} + + +@Composable +fun HelpItem( + text: String, + modifier: Modifier = Modifier, + icon: Painter? = null, + tintIcon: Boolean = false, + onClick: () -> Unit = {}, +) { + Box(modifier.clickable { onClick() }) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier + .height(dimensionResource(id = R.dimen.height_item_oneline)) + .padding(horizontal = dimensionResource(id = R.dimen.margin_base)) + .fillMaxWidth() + ) { + if (icon != null) Image( + icon, contentDescription = "", + colorFilter = if (tintIcon) ColorFilter.tint(ExtendedMaterialTheme.colors.iconTint) else null + ) + Text( + text, + modifier = if (icon != null) Modifier.padding(start = dimensionResource(id = R.dimen.margin_base_plus)) else Modifier + ) + } + } + +} + +@Preview +@Composable +private fun HelpItemPreview() { + Theme { + Surface { + HelpItem( + icon = painterResource(id = R.drawable.ic_openstreetmap), + tintIcon = true, + text = stringResource(id = R.string.openstreetmap), + onClick = { /* Nothing */ } + ) + } + } +} + +@HelpPreviews +@Composable +private fun HelpHeaderPreview() { + Theme { + Surface { + HelpItemList() + } + } +} \ No newline at end of file diff --git a/android/src/app/organicmaps/intent/Factory.java b/android/app/src/main/java/app/organicmaps/intent/Factory.java similarity index 100% rename from android/src/app/organicmaps/intent/Factory.java rename to android/app/src/main/java/app/organicmaps/intent/Factory.java diff --git a/android/src/app/organicmaps/intent/IntentProcessor.java b/android/app/src/main/java/app/organicmaps/intent/IntentProcessor.java similarity index 100% rename from android/src/app/organicmaps/intent/IntentProcessor.java rename to android/app/src/main/java/app/organicmaps/intent/IntentProcessor.java diff --git a/android/src/app/organicmaps/intent/MapTask.java b/android/app/src/main/java/app/organicmaps/intent/MapTask.java similarity index 100% rename from android/src/app/organicmaps/intent/MapTask.java rename to android/app/src/main/java/app/organicmaps/intent/MapTask.java diff --git a/android/src/app/organicmaps/location/AndroidNativeProvider.java b/android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java similarity index 100% rename from android/src/app/organicmaps/location/AndroidNativeProvider.java rename to android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java diff --git a/android/src/app/organicmaps/location/BaseLocationProvider.java b/android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java similarity index 100% rename from android/src/app/organicmaps/location/BaseLocationProvider.java rename to android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java diff --git a/android/src/app/organicmaps/location/LocationHelper.java b/android/app/src/main/java/app/organicmaps/location/LocationHelper.java similarity index 100% rename from android/src/app/organicmaps/location/LocationHelper.java rename to android/app/src/main/java/app/organicmaps/location/LocationHelper.java diff --git a/android/src/app/organicmaps/location/LocationListener.java b/android/app/src/main/java/app/organicmaps/location/LocationListener.java similarity index 100% rename from android/src/app/organicmaps/location/LocationListener.java rename to android/app/src/main/java/app/organicmaps/location/LocationListener.java diff --git a/android/src/app/organicmaps/location/LocationState.java b/android/app/src/main/java/app/organicmaps/location/LocationState.java similarity index 100% rename from android/src/app/organicmaps/location/LocationState.java rename to android/app/src/main/java/app/organicmaps/location/LocationState.java diff --git a/android/src/app/organicmaps/location/PlatformSocket.java b/android/app/src/main/java/app/organicmaps/location/PlatformSocket.java similarity index 100% rename from android/src/app/organicmaps/location/PlatformSocket.java rename to android/app/src/main/java/app/organicmaps/location/PlatformSocket.java diff --git a/android/src/app/organicmaps/location/SensorData.java b/android/app/src/main/java/app/organicmaps/location/SensorData.java similarity index 100% rename from android/src/app/organicmaps/location/SensorData.java rename to android/app/src/main/java/app/organicmaps/location/SensorData.java diff --git a/android/src/app/organicmaps/location/SensorHelper.java b/android/app/src/main/java/app/organicmaps/location/SensorHelper.java similarity index 100% rename from android/src/app/organicmaps/location/SensorHelper.java rename to android/app/src/main/java/app/organicmaps/location/SensorHelper.java diff --git a/android/src/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java similarity index 100% rename from android/src/app/organicmaps/maplayer/LayerBottomSheetItem.java rename to android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java diff --git a/android/src/app/organicmaps/maplayer/LayerHolder.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java similarity index 100% rename from android/src/app/organicmaps/maplayer/LayerHolder.java rename to android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java diff --git a/android/src/app/organicmaps/maplayer/LayersAdapter.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java similarity index 100% rename from android/src/app/organicmaps/maplayer/LayersAdapter.java rename to android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java diff --git a/android/src/app/organicmaps/maplayer/LayersUtils.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java similarity index 100% rename from android/src/app/organicmaps/maplayer/LayersUtils.java rename to android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java diff --git a/android/src/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java similarity index 100% rename from android/src/app/organicmaps/maplayer/MapButtonsController.java rename to android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java diff --git a/android/src/app/organicmaps/maplayer/MapButtonsViewModel.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java similarity index 100% rename from android/src/app/organicmaps/maplayer/MapButtonsViewModel.java rename to android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java diff --git a/android/src/app/organicmaps/maplayer/MapLayersController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapLayersController.java similarity index 100% rename from android/src/app/organicmaps/maplayer/MapLayersController.java rename to android/app/src/main/java/app/organicmaps/maplayer/MapLayersController.java diff --git a/android/src/app/organicmaps/maplayer/Mode.java b/android/app/src/main/java/app/organicmaps/maplayer/Mode.java similarity index 100% rename from android/src/app/organicmaps/maplayer/Mode.java rename to android/app/src/main/java/app/organicmaps/maplayer/Mode.java diff --git a/android/src/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java similarity index 100% rename from android/src/app/organicmaps/maplayer/SearchWheel.java rename to android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java diff --git a/android/src/app/organicmaps/maplayer/ToggleMapLayerFragment.java b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java similarity index 100% rename from android/src/app/organicmaps/maplayer/ToggleMapLayerFragment.java rename to android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java diff --git a/android/src/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java b/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java similarity index 100% rename from android/src/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java rename to android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java diff --git a/android/src/app/organicmaps/maplayer/isolines/IsolinesManager.java b/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java similarity index 100% rename from android/src/app/organicmaps/maplayer/isolines/IsolinesManager.java rename to android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java diff --git a/android/src/app/organicmaps/maplayer/isolines/IsolinesState.java b/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java similarity index 100% rename from android/src/app/organicmaps/maplayer/isolines/IsolinesState.java rename to android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java diff --git a/android/src/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java b/android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java similarity index 100% rename from android/src/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java rename to android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java diff --git a/android/src/app/organicmaps/maplayer/isolines/OnIsolinesChangedListenerImpl.java b/android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListenerImpl.java similarity index 100% rename from android/src/app/organicmaps/maplayer/isolines/OnIsolinesChangedListenerImpl.java rename to android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListenerImpl.java diff --git a/android/src/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java b/android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java similarity index 100% rename from android/src/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java rename to android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java diff --git a/android/src/app/organicmaps/maplayer/subway/SubwayManager.java b/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java similarity index 100% rename from android/src/app/organicmaps/maplayer/subway/SubwayManager.java rename to android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java diff --git a/android/src/app/organicmaps/maplayer/subway/TransitSchemeState.java b/android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java similarity index 100% rename from android/src/app/organicmaps/maplayer/subway/TransitSchemeState.java rename to android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java diff --git a/android/src/app/organicmaps/maplayer/traffic/TrafficManager.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java similarity index 100% rename from android/src/app/organicmaps/maplayer/traffic/TrafficManager.java rename to android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java diff --git a/android/src/app/organicmaps/maplayer/traffic/TrafficState.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java similarity index 100% rename from android/src/app/organicmaps/maplayer/traffic/TrafficState.java rename to android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java diff --git a/android/src/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java similarity index 100% rename from android/src/app/organicmaps/maplayer/traffic/widget/TrafficButton.java rename to android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java diff --git a/android/src/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java similarity index 100% rename from android/src/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java rename to android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java diff --git a/android/src/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java rename to android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java diff --git a/android/src/app/organicmaps/routing/LanesAdapter.java b/android/app/src/main/java/app/organicmaps/routing/LanesAdapter.java similarity index 100% rename from android/src/app/organicmaps/routing/LanesAdapter.java rename to android/app/src/main/java/app/organicmaps/routing/LanesAdapter.java diff --git a/android/src/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java similarity index 100% rename from android/src/app/organicmaps/routing/NavigationController.java rename to android/app/src/main/java/app/organicmaps/routing/NavigationController.java diff --git a/android/src/app/organicmaps/routing/NavigationService.java b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java similarity index 100% rename from android/src/app/organicmaps/routing/NavigationService.java rename to android/app/src/main/java/app/organicmaps/routing/NavigationService.java diff --git a/android/src/app/organicmaps/routing/ResultCodesHelper.java b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java similarity index 100% rename from android/src/app/organicmaps/routing/ResultCodesHelper.java rename to android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java diff --git a/android/src/app/organicmaps/routing/RouteMarkData.java b/android/app/src/main/java/app/organicmaps/routing/RouteMarkData.java similarity index 100% rename from android/src/app/organicmaps/routing/RouteMarkData.java rename to android/app/src/main/java/app/organicmaps/routing/RouteMarkData.java diff --git a/android/src/app/organicmaps/routing/RoutePointInfo.java b/android/app/src/main/java/app/organicmaps/routing/RoutePointInfo.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutePointInfo.java rename to android/app/src/main/java/app/organicmaps/routing/RoutePointInfo.java diff --git a/android/src/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingBottomMenuController.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java diff --git a/android/src/app/organicmaps/routing/RoutingBottomMenuListener.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuListener.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingBottomMenuListener.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuListener.java diff --git a/android/src/app/organicmaps/routing/RoutingController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingController.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingController.java diff --git a/android/src/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingErrorDialogFragment.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java diff --git a/android/src/app/organicmaps/routing/RoutingInfo.java b/android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingInfo.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingInfo.java diff --git a/android/src/app/organicmaps/routing/RoutingMapsDownloadFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingMapsDownloadFragment.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java diff --git a/android/src/app/organicmaps/routing/RoutingOptions.java b/android/app/src/main/java/app/organicmaps/routing/RoutingOptions.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingOptions.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingOptions.java diff --git a/android/src/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingPlanController.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java diff --git a/android/src/app/organicmaps/routing/RoutingPlanFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingPlanFragment.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java diff --git a/android/src/app/organicmaps/routing/RoutingPlanInplaceController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java similarity index 100% rename from android/src/app/organicmaps/routing/RoutingPlanInplaceController.java rename to android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java diff --git a/android/src/app/organicmaps/routing/SingleLaneInfo.java b/android/app/src/main/java/app/organicmaps/routing/SingleLaneInfo.java similarity index 100% rename from android/src/app/organicmaps/routing/SingleLaneInfo.java rename to android/app/src/main/java/app/organicmaps/routing/SingleLaneInfo.java diff --git a/android/src/app/organicmaps/routing/TransitRouteInfo.java b/android/app/src/main/java/app/organicmaps/routing/TransitRouteInfo.java similarity index 100% rename from android/src/app/organicmaps/routing/TransitRouteInfo.java rename to android/app/src/main/java/app/organicmaps/routing/TransitRouteInfo.java diff --git a/android/src/app/organicmaps/routing/TransitStepAdapter.java b/android/app/src/main/java/app/organicmaps/routing/TransitStepAdapter.java similarity index 100% rename from android/src/app/organicmaps/routing/TransitStepAdapter.java rename to android/app/src/main/java/app/organicmaps/routing/TransitStepAdapter.java diff --git a/android/src/app/organicmaps/routing/TransitStepInfo.java b/android/app/src/main/java/app/organicmaps/routing/TransitStepInfo.java similarity index 100% rename from android/src/app/organicmaps/routing/TransitStepInfo.java rename to android/app/src/main/java/app/organicmaps/routing/TransitStepInfo.java diff --git a/android/src/app/organicmaps/routing/TransitStepType.java b/android/app/src/main/java/app/organicmaps/routing/TransitStepType.java similarity index 100% rename from android/src/app/organicmaps/routing/TransitStepType.java rename to android/app/src/main/java/app/organicmaps/routing/TransitStepType.java diff --git a/android/src/app/organicmaps/routing/TransitStepView.java b/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java similarity index 100% rename from android/src/app/organicmaps/routing/TransitStepView.java rename to android/app/src/main/java/app/organicmaps/routing/TransitStepView.java diff --git a/android/src/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java similarity index 100% rename from android/src/app/organicmaps/search/CategoriesAdapter.java rename to android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java diff --git a/android/src/app/organicmaps/search/DisplayedCategories.java b/android/app/src/main/java/app/organicmaps/search/DisplayedCategories.java similarity index 100% rename from android/src/app/organicmaps/search/DisplayedCategories.java rename to android/app/src/main/java/app/organicmaps/search/DisplayedCategories.java diff --git a/android/src/app/organicmaps/search/FloatingSearchToolbarController.java b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java similarity index 100% rename from android/src/app/organicmaps/search/FloatingSearchToolbarController.java rename to android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java diff --git a/android/src/app/organicmaps/search/HiddenCommand.java b/android/app/src/main/java/app/organicmaps/search/HiddenCommand.java similarity index 100% rename from android/src/app/organicmaps/search/HiddenCommand.java rename to android/app/src/main/java/app/organicmaps/search/HiddenCommand.java diff --git a/android/src/app/organicmaps/search/NativeBookmarkSearchListener.java b/android/app/src/main/java/app/organicmaps/search/NativeBookmarkSearchListener.java similarity index 100% rename from android/src/app/organicmaps/search/NativeBookmarkSearchListener.java rename to android/app/src/main/java/app/organicmaps/search/NativeBookmarkSearchListener.java diff --git a/android/src/app/organicmaps/search/NativeMapSearchListener.java b/android/app/src/main/java/app/organicmaps/search/NativeMapSearchListener.java similarity index 100% rename from android/src/app/organicmaps/search/NativeMapSearchListener.java rename to android/app/src/main/java/app/organicmaps/search/NativeMapSearchListener.java diff --git a/android/src/app/organicmaps/search/NativeSearchListener.java b/android/app/src/main/java/app/organicmaps/search/NativeSearchListener.java similarity index 100% rename from android/src/app/organicmaps/search/NativeSearchListener.java rename to android/app/src/main/java/app/organicmaps/search/NativeSearchListener.java diff --git a/android/src/app/organicmaps/search/Popularity.java b/android/app/src/main/java/app/organicmaps/search/Popularity.java similarity index 100% rename from android/src/app/organicmaps/search/Popularity.java rename to android/app/src/main/java/app/organicmaps/search/Popularity.java diff --git a/android/src/app/organicmaps/search/PopularityProvider.java b/android/app/src/main/java/app/organicmaps/search/PopularityProvider.java similarity index 100% rename from android/src/app/organicmaps/search/PopularityProvider.java rename to android/app/src/main/java/app/organicmaps/search/PopularityProvider.java diff --git a/android/src/app/organicmaps/search/SearchActivity.java b/android/app/src/main/java/app/organicmaps/search/SearchActivity.java similarity index 100% rename from android/src/app/organicmaps/search/SearchActivity.java rename to android/app/src/main/java/app/organicmaps/search/SearchActivity.java diff --git a/android/src/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java similarity index 100% rename from android/src/app/organicmaps/search/SearchAdapter.java rename to android/app/src/main/java/app/organicmaps/search/SearchAdapter.java diff --git a/android/src/app/organicmaps/search/SearchCategoriesFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchCategoriesFragment.java similarity index 100% rename from android/src/app/organicmaps/search/SearchCategoriesFragment.java rename to android/app/src/main/java/app/organicmaps/search/SearchCategoriesFragment.java diff --git a/android/src/app/organicmaps/search/SearchEngine.java b/android/app/src/main/java/app/organicmaps/search/SearchEngine.java similarity index 100% rename from android/src/app/organicmaps/search/SearchEngine.java rename to android/app/src/main/java/app/organicmaps/search/SearchEngine.java diff --git a/android/src/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java similarity index 100% rename from android/src/app/organicmaps/search/SearchFragment.java rename to android/app/src/main/java/app/organicmaps/search/SearchFragment.java diff --git a/android/src/app/organicmaps/search/SearchHistoryAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java similarity index 100% rename from android/src/app/organicmaps/search/SearchHistoryAdapter.java rename to android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java diff --git a/android/src/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java similarity index 100% rename from android/src/app/organicmaps/search/SearchHistoryFragment.java rename to android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java diff --git a/android/src/app/organicmaps/search/SearchRecents.java b/android/app/src/main/java/app/organicmaps/search/SearchRecents.java similarity index 100% rename from android/src/app/organicmaps/search/SearchRecents.java rename to android/app/src/main/java/app/organicmaps/search/SearchRecents.java diff --git a/android/src/app/organicmaps/search/SearchResult.java b/android/app/src/main/java/app/organicmaps/search/SearchResult.java similarity index 100% rename from android/src/app/organicmaps/search/SearchResult.java rename to android/app/src/main/java/app/organicmaps/search/SearchResult.java diff --git a/android/src/app/organicmaps/search/TabAdapter.java b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java similarity index 100% rename from android/src/app/organicmaps/search/TabAdapter.java rename to android/app/src/main/java/app/organicmaps/search/TabAdapter.java diff --git a/android/src/app/organicmaps/settings/BaseSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BaseSettingsFragment.java similarity index 100% rename from android/src/app/organicmaps/settings/BaseSettingsFragment.java rename to android/app/src/main/java/app/organicmaps/settings/BaseSettingsFragment.java diff --git a/android/src/app/organicmaps/settings/BaseXmlSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java similarity index 100% rename from android/src/app/organicmaps/settings/BaseXmlSettingsFragment.java rename to android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java diff --git a/android/src/app/organicmaps/settings/DrivingOptionsActivity.java b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsActivity.java similarity index 100% rename from android/src/app/organicmaps/settings/DrivingOptionsActivity.java rename to android/app/src/main/java/app/organicmaps/settings/DrivingOptionsActivity.java diff --git a/android/src/app/organicmaps/settings/DrivingOptionsFragment.java b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java similarity index 100% rename from android/src/app/organicmaps/settings/DrivingOptionsFragment.java rename to android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java diff --git a/android/src/app/organicmaps/settings/RoadType.java b/android/app/src/main/java/app/organicmaps/settings/RoadType.java similarity index 100% rename from android/src/app/organicmaps/settings/RoadType.java rename to android/app/src/main/java/app/organicmaps/settings/RoadType.java diff --git a/android/src/app/organicmaps/settings/SettingsActivity.java b/android/app/src/main/java/app/organicmaps/settings/SettingsActivity.java similarity index 100% rename from android/src/app/organicmaps/settings/SettingsActivity.java rename to android/app/src/main/java/app/organicmaps/settings/SettingsActivity.java diff --git a/android/src/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java similarity index 100% rename from android/src/app/organicmaps/settings/SettingsPrefsFragment.java rename to android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java diff --git a/android/src/app/organicmaps/settings/StorageItem.java b/android/app/src/main/java/app/organicmaps/settings/StorageItem.java similarity index 100% rename from android/src/app/organicmaps/settings/StorageItem.java rename to android/app/src/main/java/app/organicmaps/settings/StorageItem.java diff --git a/android/src/app/organicmaps/settings/StoragePathAdapter.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java similarity index 100% rename from android/src/app/organicmaps/settings/StoragePathAdapter.java rename to android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java diff --git a/android/src/app/organicmaps/settings/StoragePathFragment.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java similarity index 100% rename from android/src/app/organicmaps/settings/StoragePathFragment.java rename to android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java diff --git a/android/src/app/organicmaps/settings/StoragePathManager.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathManager.java similarity index 100% rename from android/src/app/organicmaps/settings/StoragePathManager.java rename to android/app/src/main/java/app/organicmaps/settings/StoragePathManager.java diff --git a/android/src/app/organicmaps/settings/UnitLocale.java b/android/app/src/main/java/app/organicmaps/settings/UnitLocale.java similarity index 100% rename from android/src/app/organicmaps/settings/UnitLocale.java rename to android/app/src/main/java/app/organicmaps/settings/UnitLocale.java diff --git a/android/src/app/organicmaps/sound/AudioFocusManager.java b/android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java similarity index 100% rename from android/src/app/organicmaps/sound/AudioFocusManager.java rename to android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java diff --git a/android/src/app/organicmaps/sound/LanguageData.java b/android/app/src/main/java/app/organicmaps/sound/LanguageData.java similarity index 100% rename from android/src/app/organicmaps/sound/LanguageData.java rename to android/app/src/main/java/app/organicmaps/sound/LanguageData.java diff --git a/android/src/app/organicmaps/sound/TtsPlayer.java b/android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java similarity index 100% rename from android/src/app/organicmaps/sound/TtsPlayer.java rename to android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java diff --git a/android/src/app/organicmaps/util/AbstractHttpUploader.java b/android/app/src/main/java/app/organicmaps/util/AbstractHttpUploader.java similarity index 100% rename from android/src/app/organicmaps/util/AbstractHttpUploader.java rename to android/app/src/main/java/app/organicmaps/util/AbstractHttpUploader.java diff --git a/android/src/app/organicmaps/util/BatteryState.java b/android/app/src/main/java/app/organicmaps/util/BatteryState.java similarity index 100% rename from android/src/app/organicmaps/util/BatteryState.java rename to android/app/src/main/java/app/organicmaps/util/BatteryState.java diff --git a/android/src/app/organicmaps/util/ClientCertTLSSocketFactory.java b/android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java similarity index 100% rename from android/src/app/organicmaps/util/ClientCertTLSSocketFactory.java rename to android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java diff --git a/android/app/src/main/java/app/organicmaps/util/Colors.kt b/android/app/src/main/java/app/organicmaps/util/Colors.kt new file mode 100644 index 0000000000..ca11e94d9e --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/util/Colors.kt @@ -0,0 +1,21 @@ +package app.organicmaps.util + +import androidx.compose.ui.graphics.Color + +// Light theme +val color_primary = Color(0xFF006C35) +val color_on_primary = Color(0xFFFFFFFF) +val color_secondary = Color(0xFF249CF2) +val color_on_secondary = Color(0xFFFFFFFF) +val color_icon_tint = Color(0x8A000000) +val color_logo = color_primary +val color_status_bar = color_primary + +// Dark theme +val color_primary_dark = Color(0xFF1E2226) +val color_on_primary_dark = Color(0xFF000000) +val color_secondary_dark = Color(0xFF4BB9E6) +val color_on_secondary_dark = Color(0xFF000000) +val color_icon_tint_dark = Color(0xB3FFFFFF) +val color_logo_dark = Color(0xFFFFFFFF) +val color_status_bar_dark = Color(0xFF272727) diff --git a/android/src/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java similarity index 100% rename from android/src/app/organicmaps/util/Config.java rename to android/app/src/main/java/app/organicmaps/util/Config.java diff --git a/android/src/app/organicmaps/util/ConnectionState.java b/android/app/src/main/java/app/organicmaps/util/ConnectionState.java similarity index 100% rename from android/src/app/organicmaps/util/ConnectionState.java rename to android/app/src/main/java/app/organicmaps/util/ConnectionState.java diff --git a/android/src/app/organicmaps/util/Constants.java b/android/app/src/main/java/app/organicmaps/util/Constants.java similarity index 100% rename from android/src/app/organicmaps/util/Constants.java rename to android/app/src/main/java/app/organicmaps/util/Constants.java diff --git a/android/src/app/organicmaps/util/Counters.java b/android/app/src/main/java/app/organicmaps/util/Counters.java similarity index 100% rename from android/src/app/organicmaps/util/Counters.java rename to android/app/src/main/java/app/organicmaps/util/Counters.java diff --git a/android/src/app/organicmaps/util/DateUtils.java b/android/app/src/main/java/app/organicmaps/util/DateUtils.java similarity index 100% rename from android/src/app/organicmaps/util/DateUtils.java rename to android/app/src/main/java/app/organicmaps/util/DateUtils.java diff --git a/android/src/app/organicmaps/util/Distance.java b/android/app/src/main/java/app/organicmaps/util/Distance.java similarity index 100% rename from android/src/app/organicmaps/util/Distance.java rename to android/app/src/main/java/app/organicmaps/util/Distance.java diff --git a/android/src/app/organicmaps/util/FileUploadWorker.java b/android/app/src/main/java/app/organicmaps/util/FileUploadWorker.java similarity index 100% rename from android/src/app/organicmaps/util/FileUploadWorker.java rename to android/app/src/main/java/app/organicmaps/util/FileUploadWorker.java diff --git a/android/src/app/organicmaps/util/FragmentListHelper.java b/android/app/src/main/java/app/organicmaps/util/FragmentListHelper.java similarity index 100% rename from android/src/app/organicmaps/util/FragmentListHelper.java rename to android/app/src/main/java/app/organicmaps/util/FragmentListHelper.java diff --git a/android/src/app/organicmaps/util/GeoUtils.java b/android/app/src/main/java/app/organicmaps/util/GeoUtils.java similarity index 100% rename from android/src/app/organicmaps/util/GeoUtils.java rename to android/app/src/main/java/app/organicmaps/util/GeoUtils.java diff --git a/android/src/app/organicmaps/util/Graphics.java b/android/app/src/main/java/app/organicmaps/util/Graphics.java similarity index 100% rename from android/src/app/organicmaps/util/Graphics.java rename to android/app/src/main/java/app/organicmaps/util/Graphics.java diff --git a/android/src/app/organicmaps/util/Gsonable.java b/android/app/src/main/java/app/organicmaps/util/Gsonable.java similarity index 100% rename from android/src/app/organicmaps/util/Gsonable.java rename to android/app/src/main/java/app/organicmaps/util/Gsonable.java diff --git a/android/src/app/organicmaps/util/HttpBackgroundUploader.java b/android/app/src/main/java/app/organicmaps/util/HttpBackgroundUploader.java similarity index 100% rename from android/src/app/organicmaps/util/HttpBackgroundUploader.java rename to android/app/src/main/java/app/organicmaps/util/HttpBackgroundUploader.java diff --git a/android/src/app/organicmaps/util/HttpClient.java b/android/app/src/main/java/app/organicmaps/util/HttpClient.java similarity index 100% rename from android/src/app/organicmaps/util/HttpClient.java rename to android/app/src/main/java/app/organicmaps/util/HttpClient.java diff --git a/android/src/app/organicmaps/util/HttpPayload.java b/android/app/src/main/java/app/organicmaps/util/HttpPayload.java similarity index 100% rename from android/src/app/organicmaps/util/HttpPayload.java rename to android/app/src/main/java/app/organicmaps/util/HttpPayload.java diff --git a/android/src/app/organicmaps/util/HttpUploader.java b/android/app/src/main/java/app/organicmaps/util/HttpUploader.java similarity index 100% rename from android/src/app/organicmaps/util/HttpUploader.java rename to android/app/src/main/java/app/organicmaps/util/HttpUploader.java diff --git a/android/src/app/organicmaps/util/InputUtils.java b/android/app/src/main/java/app/organicmaps/util/InputUtils.java similarity index 100% rename from android/src/app/organicmaps/util/InputUtils.java rename to android/app/src/main/java/app/organicmaps/util/InputUtils.java diff --git a/android/src/app/organicmaps/util/KeyValue.java b/android/app/src/main/java/app/organicmaps/util/KeyValue.java similarity index 100% rename from android/src/app/organicmaps/util/KeyValue.java rename to android/app/src/main/java/app/organicmaps/util/KeyValue.java diff --git a/android/src/app/organicmaps/util/Language.java b/android/app/src/main/java/app/organicmaps/util/Language.java similarity index 100% rename from android/src/app/organicmaps/util/Language.java rename to android/app/src/main/java/app/organicmaps/util/Language.java diff --git a/android/src/app/organicmaps/util/Listeners.java b/android/app/src/main/java/app/organicmaps/util/Listeners.java similarity index 100% rename from android/src/app/organicmaps/util/Listeners.java rename to android/app/src/main/java/app/organicmaps/util/Listeners.java diff --git a/android/src/app/organicmaps/util/LocationUtils.java b/android/app/src/main/java/app/organicmaps/util/LocationUtils.java similarity index 100% rename from android/src/app/organicmaps/util/LocationUtils.java rename to android/app/src/main/java/app/organicmaps/util/LocationUtils.java diff --git a/android/src/app/organicmaps/util/MathUtils.java b/android/app/src/main/java/app/organicmaps/util/MathUtils.java similarity index 100% rename from android/src/app/organicmaps/util/MathUtils.java rename to android/app/src/main/java/app/organicmaps/util/MathUtils.java diff --git a/android/src/app/organicmaps/util/NetworkPolicy.java b/android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java similarity index 100% rename from android/src/app/organicmaps/util/NetworkPolicy.java rename to android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java diff --git a/android/src/app/organicmaps/util/Option.java b/android/app/src/main/java/app/organicmaps/util/Option.java similarity index 100% rename from android/src/app/organicmaps/util/Option.java rename to android/app/src/main/java/app/organicmaps/util/Option.java diff --git a/android/src/app/organicmaps/util/PowerManagment.java b/android/app/src/main/java/app/organicmaps/util/PowerManagment.java similarity index 100% rename from android/src/app/organicmaps/util/PowerManagment.java rename to android/app/src/main/java/app/organicmaps/util/PowerManagment.java diff --git a/android/src/app/organicmaps/util/Predicate.java b/android/app/src/main/java/app/organicmaps/util/Predicate.java similarity index 100% rename from android/src/app/organicmaps/util/Predicate.java rename to android/app/src/main/java/app/organicmaps/util/Predicate.java diff --git a/android/src/app/organicmaps/util/RtlUtils.java b/android/app/src/main/java/app/organicmaps/util/RtlUtils.java similarity index 100% rename from android/src/app/organicmaps/util/RtlUtils.java rename to android/app/src/main/java/app/organicmaps/util/RtlUtils.java diff --git a/android/src/app/organicmaps/util/SecureStorage.java b/android/app/src/main/java/app/organicmaps/util/SecureStorage.java similarity index 100% rename from android/src/app/organicmaps/util/SecureStorage.java rename to android/app/src/main/java/app/organicmaps/util/SecureStorage.java diff --git a/android/src/app/organicmaps/util/SharedPropertiesUtils.java b/android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java similarity index 100% rename from android/src/app/organicmaps/util/SharedPropertiesUtils.java rename to android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java diff --git a/android/src/app/organicmaps/util/SharingUtils.java b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java similarity index 100% rename from android/src/app/organicmaps/util/SharingUtils.java rename to android/app/src/main/java/app/organicmaps/util/SharingUtils.java diff --git a/android/src/app/organicmaps/util/StorageUtils.java b/android/app/src/main/java/app/organicmaps/util/StorageUtils.java similarity index 100% rename from android/src/app/organicmaps/util/StorageUtils.java rename to android/app/src/main/java/app/organicmaps/util/StorageUtils.java diff --git a/android/src/app/organicmaps/util/StringUtils.java b/android/app/src/main/java/app/organicmaps/util/StringUtils.java similarity index 100% rename from android/src/app/organicmaps/util/StringUtils.java rename to android/app/src/main/java/app/organicmaps/util/StringUtils.java diff --git a/android/app/src/main/java/app/organicmaps/util/Theme.kt b/android/app/src/main/java/app/organicmaps/util/Theme.kt new file mode 100644 index 0000000000..8294a25403 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/util/Theme.kt @@ -0,0 +1,113 @@ +package app.organicmaps.util + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.Colors +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Shapes +import androidx.compose.material.Typography +import androidx.compose.material.darkColors +import androidx.compose.material.lightColors +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.Immutable +import androidx.compose.runtime.staticCompositionLocalOf +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalInspectionMode +import com.google.accompanist.systemuicontroller.rememberSystemUiController + +// ********************************** +// Overwrite material theme colors +// ********************************** +private val LightColors = lightColors( + primary = color_primary, + onPrimary = color_on_primary, + secondary = color_secondary, + onSecondary = color_on_secondary, +) +private val DarkColors = darkColors( + primary = color_primary_dark, + onPrimary = color_on_primary_dark, + secondary = color_secondary_dark, + onSecondary = color_on_secondary_dark, +) + +// ********************************** +// Define new theme colors +// ********************************** + +// Defines a new class to hold material colors along with new ones +// This is only to define the type, for the values see below +@Immutable +data class ExtendedColors( + val material: Colors = LightColors, + val iconTint: Color = Color.Unspecified, + val colorLogo: Color = Color.Unspecified, + val statusBar: Color = Color.Unspecified, +) + +// Define the value for the new colors +private val LightExtendedColors = ExtendedColors( + material = LightColors, + iconTint = color_icon_tint, + colorLogo = color_logo, + statusBar = color_status_bar +) +private val DarkExtendedColors = ExtendedColors( + material = DarkColors, + iconTint = color_icon_tint_dark, + colorLogo = color_logo_dark, + statusBar = color_status_bar_dark +) + +val LocalExtendedColors = staticCompositionLocalOf { + ExtendedColors() +} + +// Create a new theme object extending the material theme with our own colors +// We can use this object to access our custom colors or default Material properties +object ExtendedMaterialTheme { + val colors: ExtendedColors + @Composable + get() = LocalExtendedColors.current + val shapes: Shapes + @Composable + get() = MaterialTheme.shapes + val typography: Typography + @Composable + get() = MaterialTheme.typography +} + + +// ********************************** +// Create the actual theme composable +// ********************************** +@Composable +fun Theme( + content: @Composable () -> Unit +) { + // Do not use ThemeUtils if the component is running in a preview window + val nightMode = if (LocalInspectionMode.current) + isSystemInDarkTheme() + else + ThemeUtils.isNightTheme(LocalContext.current) + + val systemUiController = rememberSystemUiController() + // Return our extended theme for use in our custom components + CompositionLocalProvider(LocalExtendedColors provides if (nightMode) DarkExtendedColors else LightExtendedColors) { + val statusBarColor = ExtendedMaterialTheme.colors.statusBar + DisposableEffect(systemUiController, statusBarColor) { + systemUiController.setStatusBarColor( + color = statusBarColor, + darkIcons = false + ) + onDispose {} + } + // Return MaterialTheme so base components can read our overwritten properties + MaterialTheme( + colors = LocalExtendedColors.current.material, + content = content + ) + } +} \ No newline at end of file diff --git a/android/src/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java similarity index 100% rename from android/src/app/organicmaps/util/ThemeSwitcher.java rename to android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java diff --git a/android/src/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java similarity index 100% rename from android/src/app/organicmaps/util/ThemeUtils.java rename to android/app/src/main/java/app/organicmaps/util/ThemeUtils.java diff --git a/android/src/app/organicmaps/util/TypeConverter.java b/android/app/src/main/java/app/organicmaps/util/TypeConverter.java similarity index 100% rename from android/src/app/organicmaps/util/TypeConverter.java rename to android/app/src/main/java/app/organicmaps/util/TypeConverter.java diff --git a/android/src/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java similarity index 100% rename from android/src/app/organicmaps/util/UiUtils.java rename to android/app/src/main/java/app/organicmaps/util/UiUtils.java diff --git a/android/src/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java similarity index 100% rename from android/src/app/organicmaps/util/Utils.java rename to android/app/src/main/java/app/organicmaps/util/Utils.java diff --git a/android/src/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java similarity index 100% rename from android/src/app/organicmaps/util/bottomsheet/MenuAdapter.java rename to android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java diff --git a/android/src/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java similarity index 100% rename from android/src/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java rename to android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java diff --git a/android/src/app/organicmaps/util/bottomsheet/MenuBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetItem.java similarity index 100% rename from android/src/app/organicmaps/util/bottomsheet/MenuBottomSheetItem.java rename to android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetItem.java diff --git a/android/src/app/organicmaps/util/concurrency/ThreadPool.java b/android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java similarity index 100% rename from android/src/app/organicmaps/util/concurrency/ThreadPool.java rename to android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java diff --git a/android/src/app/organicmaps/util/concurrency/UiThread.java b/android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java similarity index 100% rename from android/src/app/organicmaps/util/concurrency/UiThread.java rename to android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java diff --git a/android/src/app/organicmaps/util/log/Logger.java b/android/app/src/main/java/app/organicmaps/util/log/Logger.java similarity index 100% rename from android/src/app/organicmaps/util/log/Logger.java rename to android/app/src/main/java/app/organicmaps/util/log/Logger.java diff --git a/android/src/app/organicmaps/util/log/LogsManager.java b/android/app/src/main/java/app/organicmaps/util/log/LogsManager.java similarity index 100% rename from android/src/app/organicmaps/util/log/LogsManager.java rename to android/app/src/main/java/app/organicmaps/util/log/LogsManager.java diff --git a/android/src/app/organicmaps/util/log/ZipLogsTask.java b/android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java similarity index 100% rename from android/src/app/organicmaps/util/log/ZipLogsTask.java rename to android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java diff --git a/android/src/app/organicmaps/widget/ArrowView.java b/android/app/src/main/java/app/organicmaps/widget/ArrowView.java similarity index 100% rename from android/src/app/organicmaps/widget/ArrowView.java rename to android/app/src/main/java/app/organicmaps/widget/ArrowView.java diff --git a/android/src/app/organicmaps/widget/CustomTextInputLayout.java b/android/app/src/main/java/app/organicmaps/widget/CustomTextInputLayout.java similarity index 100% rename from android/src/app/organicmaps/widget/CustomTextInputLayout.java rename to android/app/src/main/java/app/organicmaps/widget/CustomTextInputLayout.java diff --git a/android/src/app/organicmaps/widget/FlatProgressView.java b/android/app/src/main/java/app/organicmaps/widget/FlatProgressView.java similarity index 100% rename from android/src/app/organicmaps/widget/FlatProgressView.java rename to android/app/src/main/java/app/organicmaps/widget/FlatProgressView.java diff --git a/android/src/app/organicmaps/widget/HeightLimitedFrameLayout.java b/android/app/src/main/java/app/organicmaps/widget/HeightLimitedFrameLayout.java similarity index 100% rename from android/src/app/organicmaps/widget/HeightLimitedFrameLayout.java rename to android/app/src/main/java/app/organicmaps/widget/HeightLimitedFrameLayout.java diff --git a/android/src/app/organicmaps/widget/NestedScrollViewClickFixed.java b/android/app/src/main/java/app/organicmaps/widget/NestedScrollViewClickFixed.java similarity index 100% rename from android/src/app/organicmaps/widget/NestedScrollViewClickFixed.java rename to android/app/src/main/java/app/organicmaps/widget/NestedScrollViewClickFixed.java diff --git a/android/src/app/organicmaps/widget/ObservableWebView.java b/android/app/src/main/java/app/organicmaps/widget/ObservableWebView.java similarity index 100% rename from android/src/app/organicmaps/widget/ObservableWebView.java rename to android/app/src/main/java/app/organicmaps/widget/ObservableWebView.java diff --git a/android/src/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java similarity index 100% rename from android/src/app/organicmaps/widget/PlaceholderView.java rename to android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java diff --git a/android/src/app/organicmaps/widget/RoutingToolbarButton.java b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java similarity index 100% rename from android/src/app/organicmaps/widget/RoutingToolbarButton.java rename to android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java diff --git a/android/src/app/organicmaps/widget/SearchToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java similarity index 100% rename from android/src/app/organicmaps/widget/SearchToolbarController.java rename to android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java diff --git a/android/src/app/organicmaps/widget/StackedButtonDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/StackedButtonDialogFragment.java rename to android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java diff --git a/android/src/app/organicmaps/widget/StackedButtonsDialog.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java similarity index 100% rename from android/src/app/organicmaps/widget/StackedButtonsDialog.java rename to android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java diff --git a/android/src/app/organicmaps/widget/ToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java similarity index 100% rename from android/src/app/organicmaps/widget/ToolbarController.java rename to android/app/src/main/java/app/organicmaps/widget/ToolbarController.java diff --git a/android/src/app/organicmaps/widget/WheelProgressView.java b/android/app/src/main/java/app/organicmaps/widget/WheelProgressView.java similarity index 100% rename from android/src/app/organicmaps/widget/WheelProgressView.java rename to android/app/src/main/java/app/organicmaps/widget/WheelProgressView.java diff --git a/android/src/app/organicmaps/widget/menu/MainMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java similarity index 100% rename from android/src/app/organicmaps/widget/menu/MainMenu.java rename to android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java diff --git a/android/src/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java similarity index 100% rename from android/src/app/organicmaps/widget/menu/MyPositionButton.java rename to android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java diff --git a/android/src/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java similarity index 100% rename from android/src/app/organicmaps/widget/menu/NavMenu.java rename to android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java diff --git a/android/src/app/organicmaps/widget/placepage/AxisValueFormatter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/AxisValueFormatter.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java diff --git a/android/src/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/CoordinatesFormat.java b/android/app/src/main/java/app/organicmaps/widget/placepage/CoordinatesFormat.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/CoordinatesFormat.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/CoordinatesFormat.java diff --git a/android/src/app/organicmaps/widget/placepage/CurrentLocationMarkerView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/CurrentLocationMarkerView.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/CurrentLocationMarkerView.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/CurrentLocationMarkerView.java diff --git a/android/src/app/organicmaps/widget/placepage/DirectionFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/DirectionFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/EditBookmarkFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/ElevationProfileChart.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileChart.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/ElevationProfileChart.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileChart.java diff --git a/android/src/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java diff --git a/android/src/app/organicmaps/widget/placepage/FloatingMarkerView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/FloatingMarkerView.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java diff --git a/android/src/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java diff --git a/android/src/app/organicmaps/widget/placepage/PlaceDescriptionFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlaceDescriptionFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageButton.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButton.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageButton.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButton.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageButtonFactory.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageButtonFactory.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageButtons.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageButtons.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageController.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageData.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageData.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageStateListener.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageStateListener.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageStateListener.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageStateListener.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageUtils.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageUtils.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageView.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageViewModel.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java diff --git a/android/src/app/organicmaps/widget/placepage/PlacePageViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewRenderer.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/PlacePageViewRenderer.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewRenderer.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java diff --git a/android/src/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java similarity index 100% rename from android/src/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java rename to android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePhoneAdapter.java diff --git a/android/src/app/organicmaps/widget/recycler/DividerItemDecorationWithPadding.java b/android/app/src/main/java/app/organicmaps/widget/recycler/DividerItemDecorationWithPadding.java similarity index 100% rename from android/src/app/organicmaps/widget/recycler/DividerItemDecorationWithPadding.java rename to android/app/src/main/java/app/organicmaps/widget/recycler/DividerItemDecorationWithPadding.java diff --git a/android/src/app/organicmaps/widget/recycler/DotDividerItemDecoration.java b/android/app/src/main/java/app/organicmaps/widget/recycler/DotDividerItemDecoration.java similarity index 100% rename from android/src/app/organicmaps/widget/recycler/DotDividerItemDecoration.java rename to android/app/src/main/java/app/organicmaps/widget/recycler/DotDividerItemDecoration.java diff --git a/android/src/app/organicmaps/widget/recycler/MultilineLayoutManager.java b/android/app/src/main/java/app/organicmaps/widget/recycler/MultilineLayoutManager.java similarity index 100% rename from android/src/app/organicmaps/widget/recycler/MultilineLayoutManager.java rename to android/app/src/main/java/app/organicmaps/widget/recycler/MultilineLayoutManager.java diff --git a/android/src/app/organicmaps/widget/recycler/RecyclerClickListener.java b/android/app/src/main/java/app/organicmaps/widget/recycler/RecyclerClickListener.java similarity index 100% rename from android/src/app/organicmaps/widget/recycler/RecyclerClickListener.java rename to android/app/src/main/java/app/organicmaps/widget/recycler/RecyclerClickListener.java diff --git a/android/src/app/organicmaps/widget/recycler/RecyclerLongClickListener.java b/android/app/src/main/java/app/organicmaps/widget/recycler/RecyclerLongClickListener.java similarity index 100% rename from android/src/app/organicmaps/widget/recycler/RecyclerLongClickListener.java rename to android/app/src/main/java/app/organicmaps/widget/recycler/RecyclerLongClickListener.java diff --git a/android/src/app/organicmaps/widget/recycler/SpanningLinearLayoutManager.java b/android/app/src/main/java/app/organicmaps/widget/recycler/SpanningLinearLayoutManager.java similarity index 100% rename from android/src/app/organicmaps/widget/recycler/SpanningLinearLayoutManager.java rename to android/app/src/main/java/app/organicmaps/widget/recycler/SpanningLinearLayoutManager.java diff --git a/android/res/animator/lift_on_touch.xml b/android/app/src/main/res/animator/lift_on_touch.xml similarity index 100% rename from android/res/animator/lift_on_touch.xml rename to android/app/src/main/res/animator/lift_on_touch.xml diff --git a/android/res/animator/pull_up_on_touch.xml b/android/app/src/main/res/animator/pull_up_on_touch.xml similarity index 100% rename from android/res/animator/pull_up_on_touch.xml rename to android/app/src/main/res/animator/pull_up_on_touch.xml diff --git a/android/res/animator/show_zoom_in_alpha.xml b/android/app/src/main/res/animator/show_zoom_in_alpha.xml similarity index 100% rename from android/res/animator/show_zoom_in_alpha.xml rename to android/app/src/main/res/animator/show_zoom_in_alpha.xml diff --git a/android/res/animator/show_zoom_out_alpha.xml b/android/app/src/main/res/animator/show_zoom_out_alpha.xml similarity index 100% rename from android/res/animator/show_zoom_out_alpha.xml rename to android/app/src/main/res/animator/show_zoom_out_alpha.xml diff --git a/android/res/color/accent_color_selector.xml b/android/app/src/main/res/color/accent_color_selector.xml similarity index 100% rename from android/res/color/accent_color_selector.xml rename to android/app/src/main/res/color/accent_color_selector.xml diff --git a/android/res/color/accent_color_selector_night.xml b/android/app/src/main/res/color/accent_color_selector_night.xml similarity index 100% rename from android/res/color/accent_color_selector_night.xml rename to android/app/src/main/res/color/accent_color_selector_night.xml diff --git a/android/res/color/button.xml b/android/app/src/main/res/color/button.xml similarity index 100% rename from android/res/color/button.xml rename to android/app/src/main/res/color/button.xml diff --git a/android/res/color/button_accent.xml b/android/app/src/main/res/color/button_accent.xml similarity index 100% rename from android/res/color/button_accent.xml rename to android/app/src/main/res/color/button_accent.xml diff --git a/android/res/color/button_accent_night.xml b/android/app/src/main/res/color/button_accent_night.xml similarity index 100% rename from android/res/color/button_accent_night.xml rename to android/app/src/main/res/color/button_accent_night.xml diff --git a/android/res/color/button_night.xml b/android/app/src/main/res/color/button_night.xml similarity index 100% rename from android/res/color/button_night.xml rename to android/app/src/main/res/color/button_night.xml diff --git a/android/res/color/button_text_accent.xml b/android/app/src/main/res/color/button_text_accent.xml similarity index 100% rename from android/res/color/button_text_accent.xml rename to android/app/src/main/res/color/button_text_accent.xml diff --git a/android/res/color/image_view.xml b/android/app/src/main/res/color/image_view.xml similarity index 100% rename from android/res/color/image_view.xml rename to android/app/src/main/res/color/image_view.xml diff --git a/android/res/color/routing_toolbar_icon_tint.xml b/android/app/src/main/res/color/routing_toolbar_icon_tint.xml similarity index 100% rename from android/res/color/routing_toolbar_icon_tint.xml rename to android/app/src/main/res/color/routing_toolbar_icon_tint.xml diff --git a/android/res/color/routing_toolbar_icon_tint_night.xml b/android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml similarity index 100% rename from android/res/color/routing_toolbar_icon_tint_night.xml rename to android/app/src/main/res/color/routing_toolbar_icon_tint_night.xml diff --git a/android/res/drawable-hdpi/abc_ic_ab_back_mtrl_am_alpha.webp b/android/app/src/main/res/drawable-hdpi/abc_ic_ab_back_mtrl_am_alpha.webp similarity index 100% rename from android/res/drawable-hdpi/abc_ic_ab_back_mtrl_am_alpha.webp rename to android/app/src/main/res/drawable-hdpi/abc_ic_ab_back_mtrl_am_alpha.webp diff --git a/android/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp b/android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp similarity index 100% rename from android/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp rename to android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_lightrail.webp diff --git a/android/res/drawable-hdpi/ic_20px_route_planning_metro.webp b/android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_metro.webp similarity index 100% rename from android/res/drawable-hdpi/ic_20px_route_planning_metro.webp rename to android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_metro.webp diff --git a/android/res/drawable-hdpi/ic_20px_route_planning_monorail.webp b/android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_monorail.webp similarity index 100% rename from android/res/drawable-hdpi/ic_20px_route_planning_monorail.webp rename to android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_monorail.webp diff --git a/android/res/drawable-hdpi/ic_20px_route_planning_train.webp b/android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_train.webp similarity index 100% rename from android/res/drawable-hdpi/ic_20px_route_planning_train.webp rename to android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_train.webp diff --git a/android/res/drawable-hdpi/ic_20px_route_planning_walk.webp b/android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_walk.webp similarity index 100% rename from android/res/drawable-hdpi/ic_20px_route_planning_walk.webp rename to android/app/src/main/res/drawable-hdpi/ic_20px_route_planning_walk.webp diff --git a/android/res/drawable-hdpi/ic_arrow_down.png b/android/app/src/main/res/drawable-hdpi/ic_arrow_down.png similarity index 100% rename from android/res/drawable-hdpi/ic_arrow_down.png rename to android/app/src/main/res/drawable-hdpi/ic_arrow_down.png diff --git a/android/res/drawable-hdpi/ic_avoid_ferry.webp b/android/app/src/main/res/drawable-hdpi/ic_avoid_ferry.webp similarity index 100% rename from android/res/drawable-hdpi/ic_avoid_ferry.webp rename to android/app/src/main/res/drawable-hdpi/ic_avoid_ferry.webp diff --git a/android/res/drawable-hdpi/ic_avoid_tolls.webp b/android/app/src/main/res/drawable-hdpi/ic_avoid_tolls.webp similarity index 100% rename from android/res/drawable-hdpi/ic_avoid_tolls.webp rename to android/app/src/main/res/drawable-hdpi/ic_avoid_tolls.webp diff --git a/android/res/drawable-hdpi/ic_avoid_unpaved.webp b/android/app/src/main/res/drawable-hdpi/ic_avoid_unpaved.webp similarity index 100% rename from android/res/drawable-hdpi/ic_avoid_unpaved.webp rename to android/app/src/main/res/drawable-hdpi/ic_avoid_unpaved.webp diff --git a/android/res/drawable-hdpi/ic_bike.webp b/android/app/src/main/res/drawable-hdpi/ic_bike.webp similarity index 100% rename from android/res/drawable-hdpi/ic_bike.webp rename to android/app/src/main/res/drawable-hdpi/ic_bike.webp diff --git a/android/res/drawable-hdpi/ic_cancel.webp b/android/app/src/main/res/drawable-hdpi/ic_cancel.webp similarity index 100% rename from android/res/drawable-hdpi/ic_cancel.webp rename to android/app/src/main/res/drawable-hdpi/ic_cancel.webp diff --git a/android/res/drawable-hdpi/ic_car.webp b/android/app/src/main/res/drawable-hdpi/ic_car.webp similarity index 100% rename from android/res/drawable-hdpi/ic_car.webp rename to android/app/src/main/res/drawable-hdpi/ic_car.webp diff --git a/android/res/drawable-hdpi/ic_chart_pin.webp b/android/app/src/main/res/drawable-hdpi/ic_chart_pin.webp similarity index 100% rename from android/res/drawable-hdpi/ic_chart_pin.webp rename to android/app/src/main/res/drawable-hdpi/ic_chart_pin.webp diff --git a/android/res/drawable-hdpi/ic_checkbox_add.webp b/android/app/src/main/res/drawable-hdpi/ic_checkbox_add.webp similarity index 100% rename from android/res/drawable-hdpi/ic_checkbox_add.webp rename to android/app/src/main/res/drawable-hdpi/ic_checkbox_add.webp diff --git a/android/res/drawable-hdpi/ic_checkmark.webp b/android/app/src/main/res/drawable-hdpi/ic_checkmark.webp similarity index 100% rename from android/res/drawable-hdpi/ic_checkmark.webp rename to android/app/src/main/res/drawable-hdpi/ic_checkmark.webp diff --git a/android/res/drawable-hdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-hdpi/ic_clear_rounded.webp similarity index 100% rename from android/res/drawable-hdpi/ic_clear_rounded.webp rename to android/app/src/main/res/drawable-hdpi/ic_clear_rounded.webp diff --git a/android/res/drawable-hdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-hdpi/ic_clear_rounded_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_clear_rounded_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_clear_rounded_night.webp diff --git a/android/res/drawable-hdpi/ic_close_spinner.webp b/android/app/src/main/res/drawable-hdpi/ic_close_spinner.webp similarity index 100% rename from android/res/drawable-hdpi/ic_close_spinner.webp rename to android/app/src/main/res/drawable-hdpi/ic_close_spinner.webp diff --git a/android/res/drawable-hdpi/ic_direction_fullscreen.webp b/android/app/src/main/res/drawable-hdpi/ic_direction_fullscreen.webp similarity index 100% rename from android/res/drawable-hdpi/ic_direction_fullscreen.webp rename to android/app/src/main/res/drawable-hdpi/ic_direction_fullscreen.webp diff --git a/android/res/drawable-hdpi/ic_direction_pagepreview.webp b/android/app/src/main/res/drawable-hdpi/ic_direction_pagepreview.webp similarity index 100% rename from android/res/drawable-hdpi/ic_direction_pagepreview.webp rename to android/app/src/main/res/drawable-hdpi/ic_direction_pagepreview.webp diff --git a/android/res/drawable-hdpi/ic_done.webp b/android/app/src/main/res/drawable-hdpi/ic_done.webp similarity index 100% rename from android/res/drawable-hdpi/ic_done.webp rename to android/app/src/main/res/drawable-hdpi/ic_done.webp diff --git a/android/res/drawable-hdpi/ic_down.webp b/android/app/src/main/res/drawable-hdpi/ic_down.webp similarity index 100% rename from android/res/drawable-hdpi/ic_down.webp rename to android/app/src/main/res/drawable-hdpi/ic_down.webp diff --git a/android/res/drawable-hdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_done.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_done.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_done.webp diff --git a/android/res/drawable-hdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_done_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_done_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_done_night.webp diff --git a/android/res/drawable-hdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_download.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_download.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_download.webp diff --git a/android/res/drawable-hdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_download_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_download_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_download_night.webp diff --git a/android/res/drawable-hdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_folder.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_folder.webp diff --git a/android/res/drawable-hdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_folder_done.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done.webp diff --git a/android/res/drawable-hdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_folder_done_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_folder_done_night.webp diff --git a/android/res/drawable-hdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_folder_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_folder_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_folder_night.webp diff --git a/android/res/drawable-hdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_retry.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_retry.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_retry.webp diff --git a/android/res/drawable-hdpi/ic_downloader_update.webp b/android/app/src/main/res/drawable-hdpi/ic_downloader_update.webp similarity index 100% rename from android/res/drawable-hdpi/ic_downloader_update.webp rename to android/app/src/main/res/drawable-hdpi/ic_downloader_update.webp diff --git a/android/res/drawable-hdpi/ic_email.webp b/android/app/src/main/res/drawable-hdpi/ic_email.webp similarity index 100% rename from android/res/drawable-hdpi/ic_email.webp rename to android/app/src/main/res/drawable-hdpi/ic_email.webp diff --git a/android/res/drawable-hdpi/ic_entrance.webp b/android/app/src/main/res/drawable-hdpi/ic_entrance.webp similarity index 100% rename from android/res/drawable-hdpi/ic_entrance.webp rename to android/app/src/main/res/drawable-hdpi/ic_entrance.webp diff --git a/android/res/drawable-hdpi/ic_error_white.webp b/android/app/src/main/res/drawable-hdpi/ic_error_white.webp similarity index 100% rename from android/res/drawable-hdpi/ic_error_white.webp rename to android/app/src/main/res/drawable-hdpi/ic_error_white.webp diff --git a/android/res/drawable-hdpi/ic_exit_highway_to_left.webp b/android/app/src/main/res/drawable-hdpi/ic_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-hdpi/ic_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-hdpi/ic_exit_highway_to_left.webp diff --git a/android/res/drawable-hdpi/ic_exit_highway_to_right.webp b/android/app/src/main/res/drawable-hdpi/ic_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-hdpi/ic_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-hdpi/ic_exit_highway_to_right.webp diff --git a/android/res/drawable-hdpi/ic_expand_less.webp b/android/app/src/main/res/drawable-hdpi/ic_expand_less.webp similarity index 100% rename from android/res/drawable-hdpi/ic_expand_less.webp rename to android/app/src/main/res/drawable-hdpi/ic_expand_less.webp diff --git a/android/res/drawable-hdpi/ic_expand_more.webp b/android/app/src/main/res/drawable-hdpi/ic_expand_more.webp similarity index 100% rename from android/res/drawable-hdpi/ic_expand_more.webp rename to android/app/src/main/res/drawable-hdpi/ic_expand_more.webp diff --git a/android/res/drawable-hdpi/ic_explore.webp b/android/app/src/main/res/drawable-hdpi/ic_explore.webp similarity index 100% rename from android/res/drawable-hdpi/ic_explore.webp rename to android/app/src/main/res/drawable-hdpi/ic_explore.webp diff --git a/android/res/drawable-hdpi/ic_facebook.webp b/android/app/src/main/res/drawable-hdpi/ic_facebook.webp similarity index 100% rename from android/res/drawable-hdpi/ic_facebook.webp rename to android/app/src/main/res/drawable-hdpi/ic_facebook.webp diff --git a/android/res/drawable-hdpi/ic_graph_point.webp b/android/app/src/main/res/drawable-hdpi/ic_graph_point.webp similarity index 100% rename from android/res/drawable-hdpi/ic_graph_point.webp rename to android/app/src/main/res/drawable-hdpi/ic_graph_point.webp diff --git a/android/res/drawable-hdpi/ic_link_inline.webp b/android/app/src/main/res/drawable-hdpi/ic_link_inline.webp similarity index 100% rename from android/res/drawable-hdpi/ic_link_inline.webp rename to android/app/src/main/res/drawable-hdpi/ic_link_inline.webp diff --git a/android/res/drawable-hdpi/ic_lock.webp b/android/app/src/main/res/drawable-hdpi/ic_lock.webp similarity index 100% rename from android/res/drawable-hdpi/ic_lock.webp rename to android/app/src/main/res/drawable-hdpi/ic_lock.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_1.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_1.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_1.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_1.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_10.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_10.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_10.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_10.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_10_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_10_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_10_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_10_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_11.png b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_11.png similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_11.png rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_11.png diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_11_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_11_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_11_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_11_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_12.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_12.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_12.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_12.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_12_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_12_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_12_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_12_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_13.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_13.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_13.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_13.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_13_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_13_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_13_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_13_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_14.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_14.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_14.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_14.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_14_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_14_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_14_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_14_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_15.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_15.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_15.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_15.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_15_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_15_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_15_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_15_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_16.png b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_16.png similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_16.png rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_16.png diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_16_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_16_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_16_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_16_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_17.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_17.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_17.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_17.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_17_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_17_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_17_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_17_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_18.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_18.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_18.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_18.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_18_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_18_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_18_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_18_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_19.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_19.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_19.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_19.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_19_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_19_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_19_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_19_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_1_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_1_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_1_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_1_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_2.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_2.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_2.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_2.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_20.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_20.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_20.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_20.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_20_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_20_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_20_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_20_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_2_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_2_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_2_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_2_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_3.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_3.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_3.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_3.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_3_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_3_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_3_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_3_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_4.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_4.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_4.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_4.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_4_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_4_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_4_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_4_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_5.png b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_5.png similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_5.png rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_5.png diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_5_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_5_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_5_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_5_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_6.png b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_6.png similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_6.png rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_6.png diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_6_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_6_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_6_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_6_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_7.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_7.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_7.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_7.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_7_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_7_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_7_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_7_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_8.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_8.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_8.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_8.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_8_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_8_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_8_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_8_night.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_9.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_9.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_9.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_9.webp diff --git a/android/res/drawable-hdpi/ic_menu_location_pending_9_night.webp b/android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_9_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_menu_location_pending_9_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_menu_location_pending_9_night.webp diff --git a/android/res/drawable-hdpi/ic_mic_white.webp b/android/app/src/main/res/drawable-hdpi/ic_mic_white.webp similarity index 100% rename from android/res/drawable-hdpi/ic_mic_white.webp rename to android/app/src/main/res/drawable-hdpi/ic_mic_white.webp diff --git a/android/res/drawable-hdpi/ic_notification.webp b/android/app/src/main/res/drawable-hdpi/ic_notification.webp similarity index 100% rename from android/res/drawable-hdpi/ic_notification.webp rename to android/app/src/main/res/drawable-hdpi/ic_notification.webp diff --git a/android/res/drawable-hdpi/ic_operating_hours.webp b/android/app/src/main/res/drawable-hdpi/ic_operating_hours.webp similarity index 100% rename from android/res/drawable-hdpi/ic_operating_hours.webp rename to android/app/src/main/res/drawable-hdpi/ic_operating_hours.webp diff --git a/android/res/drawable-hdpi/ic_operator.webp b/android/app/src/main/res/drawable-hdpi/ic_operator.webp similarity index 100% rename from android/res/drawable-hdpi/ic_operator.webp rename to android/app/src/main/res/drawable-hdpi/ic_operator.webp diff --git a/android/res/drawable-hdpi/ic_pedestrian.webp b/android/app/src/main/res/drawable-hdpi/ic_pedestrian.webp similarity index 100% rename from android/res/drawable-hdpi/ic_pedestrian.webp rename to android/app/src/main/res/drawable-hdpi/ic_pedestrian.webp diff --git a/android/res/drawable-hdpi/ic_phone.webp b/android/app/src/main/res/drawable-hdpi/ic_phone.webp similarity index 100% rename from android/res/drawable-hdpi/ic_phone.webp rename to android/app/src/main/res/drawable-hdpi/ic_phone.webp diff --git a/android/res/drawable-hdpi/ic_place_page_phone.webp b/android/app/src/main/res/drawable-hdpi/ic_place_page_phone.webp similarity index 100% rename from android/res/drawable-hdpi/ic_place_page_phone.webp rename to android/app/src/main/res/drawable-hdpi/ic_place_page_phone.webp diff --git a/android/res/drawable-hdpi/ic_route_from.webp b/android/app/src/main/res/drawable-hdpi/ic_route_from.webp similarity index 100% rename from android/res/drawable-hdpi/ic_route_from.webp rename to android/app/src/main/res/drawable-hdpi/ic_route_from.webp diff --git a/android/res/drawable-hdpi/ic_route_remove.webp b/android/app/src/main/res/drawable-hdpi/ic_route_remove.webp similarity index 100% rename from android/res/drawable-hdpi/ic_route_remove.webp rename to android/app/src/main/res/drawable-hdpi/ic_route_remove.webp diff --git a/android/res/drawable-hdpi/ic_route_to.webp b/android/app/src/main/res/drawable-hdpi/ic_route_to.webp similarity index 100% rename from android/res/drawable-hdpi/ic_route_to.webp rename to android/app/src/main/res/drawable-hdpi/ic_route_to.webp diff --git a/android/res/drawable-hdpi/ic_route_via.webp b/android/app/src/main/res/drawable-hdpi/ic_route_via.webp similarity index 100% rename from android/res/drawable-hdpi/ic_route_via.webp rename to android/app/src/main/res/drawable-hdpi/ic_route_via.webp diff --git a/android/res/drawable-hdpi/ic_routing_atm_off.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_atm_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_atm_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_atm_off.webp diff --git a/android/res/drawable-hdpi/ic_routing_atm_on.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_atm_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_atm_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_atm_on.webp diff --git a/android/res/drawable-hdpi/ic_routing_eat_off.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_eat_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_eat_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_eat_off.webp diff --git a/android/res/drawable-hdpi/ic_routing_eat_on.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_eat_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_eat_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_eat_on.webp diff --git a/android/res/drawable-hdpi/ic_routing_error.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_error.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_error.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_error.webp diff --git a/android/res/drawable-hdpi/ic_routing_food_off.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_food_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_food_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_food_off.webp diff --git a/android/res/drawable-hdpi/ic_routing_food_on.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_food_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_food_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_food_on.webp diff --git a/android/res/drawable-hdpi/ic_routing_fuel_off.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_fuel_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_fuel_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_fuel_off.webp diff --git a/android/res/drawable-hdpi/ic_routing_fuel_on.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_fuel_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_fuel_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_fuel_on.webp diff --git a/android/res/drawable-hdpi/ic_routing_parking_off.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_parking_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_parking_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_parking_off.webp diff --git a/android/res/drawable-hdpi/ic_routing_parking_on.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_parking_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_parking_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_parking_on.webp diff --git a/android/res/drawable-hdpi/ic_routing_search_off.webp b/android/app/src/main/res/drawable-hdpi/ic_routing_search_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_routing_search_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_routing_search_off.webp diff --git a/android/res/drawable-hdpi/ic_search_my_position.webp b/android/app/src/main/res/drawable-hdpi/ic_search_my_position.webp similarity index 100% rename from android/res/drawable-hdpi/ic_search_my_position.webp rename to android/app/src/main/res/drawable-hdpi/ic_search_my_position.webp diff --git a/android/res/drawable-hdpi/ic_search_recent.webp b/android/app/src/main/res/drawable-hdpi/ic_search_recent.webp similarity index 100% rename from android/res/drawable-hdpi/ic_search_recent.webp rename to android/app/src/main/res/drawable-hdpi/ic_search_recent.webp diff --git a/android/res/drawable-hdpi/ic_search_suggest.webp b/android/app/src/main/res/drawable-hdpi/ic_search_suggest.webp similarity index 100% rename from android/res/drawable-hdpi/ic_search_suggest.webp rename to android/app/src/main/res/drawable-hdpi/ic_search_suggest.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_10_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_10_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_11_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_11_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_12_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_12_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_13_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_13_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_14_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_14_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_15_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_15_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_16_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_16_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_17_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_17_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_18_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_18_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_1_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_1_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_2_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_2_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_3_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_3_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_4_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_4_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_5_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_5_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_6_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_6_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_7_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_7_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_8_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_8_night.webp diff --git a/android/res/drawable-hdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-hdpi/ic_spinner_pending_9_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_spinner_pending_9_night.webp diff --git a/android/res/drawable-hdpi/ic_then_exit_highway_to_left.webp b/android/app/src/main/res/drawable-hdpi/ic_then_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_exit_highway_to_left.webp diff --git a/android/res/drawable-hdpi/ic_then_exit_highway_to_right.webp b/android/app/src/main/res/drawable-hdpi/ic_then_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_exit_highway_to_right.webp diff --git a/android/res/drawable-hdpi/ic_then_finish.webp b/android/app/src/main/res/drawable-hdpi/ic_then_finish.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_finish.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_finish.webp diff --git a/android/res/drawable-hdpi/ic_then_left.webp b/android/app/src/main/res/drawable-hdpi/ic_then_left.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_left.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_left.webp diff --git a/android/res/drawable-hdpi/ic_then_left_sharp.webp b/android/app/src/main/res/drawable-hdpi/ic_then_left_sharp.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_left_sharp.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_left_sharp.webp diff --git a/android/res/drawable-hdpi/ic_then_left_slight.webp b/android/app/src/main/res/drawable-hdpi/ic_then_left_slight.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_left_slight.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_left_slight.webp diff --git a/android/res/drawable-hdpi/ic_then_right.webp b/android/app/src/main/res/drawable-hdpi/ic_then_right.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_right.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_right.webp diff --git a/android/res/drawable-hdpi/ic_then_right_sharp.webp b/android/app/src/main/res/drawable-hdpi/ic_then_right_sharp.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_right_sharp.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_right_sharp.webp diff --git a/android/res/drawable-hdpi/ic_then_right_slight.webp b/android/app/src/main/res/drawable-hdpi/ic_then_right_slight.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_right_slight.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_right_slight.webp diff --git a/android/res/drawable-hdpi/ic_then_round.webp b/android/app/src/main/res/drawable-hdpi/ic_then_round.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_round.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_round.webp diff --git a/android/res/drawable-hdpi/ic_then_uleft.webp b/android/app/src/main/res/drawable-hdpi/ic_then_uleft.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_uleft.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_uleft.webp diff --git a/android/res/drawable-hdpi/ic_then_uright.webp b/android/app/src/main/res/drawable-hdpi/ic_then_uright.webp similarity index 100% rename from android/res/drawable-hdpi/ic_then_uright.webp rename to android/app/src/main/res/drawable-hdpi/ic_then_uright.webp diff --git a/android/res/drawable-hdpi/ic_thumb_up.webp b/android/app/src/main/res/drawable-hdpi/ic_thumb_up.webp similarity index 100% rename from android/res/drawable-hdpi/ic_thumb_up.webp rename to android/app/src/main/res/drawable-hdpi/ic_thumb_up.webp diff --git a/android/res/drawable-hdpi/ic_traffic_download_1.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_download_1.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_download_1.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_download_1.webp diff --git a/android/res/drawable-hdpi/ic_traffic_download_2.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_download_2.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_download_2.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_download_2.webp diff --git a/android/res/drawable-hdpi/ic_traffic_download_3.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_download_3.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_download_3.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_download_3.webp diff --git a/android/res/drawable-hdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_1.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_1.webp diff --git a/android/res/drawable-hdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_2.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_2.webp diff --git a/android/res/drawable-hdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_3.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_download_night_3.webp diff --git a/android/res/drawable-hdpi/ic_traffic_on.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_on.webp diff --git a/android/res/drawable-hdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_on_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_on_night.webp diff --git a/android/res/drawable-hdpi/ic_traffic_outdated.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_outdated.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_outdated.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_outdated.webp diff --git a/android/res/drawable-hdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-hdpi/ic_traffic_outdated_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_traffic_outdated_night.webp diff --git a/android/res/drawable-hdpi/ic_transit.webp b/android/app/src/main/res/drawable-hdpi/ic_transit.webp similarity index 100% rename from android/res/drawable-hdpi/ic_transit.webp rename to android/app/src/main/res/drawable-hdpi/ic_transit.webp diff --git a/android/res/drawable-hdpi/ic_triangle.webp b/android/app/src/main/res/drawable-hdpi/ic_triangle.webp similarity index 100% rename from android/res/drawable-hdpi/ic_triangle.webp rename to android/app/src/main/res/drawable-hdpi/ic_triangle.webp diff --git a/android/res/drawable-hdpi/ic_triangle_elevation.webp b/android/app/src/main/res/drawable-hdpi/ic_triangle_elevation.webp similarity index 100% rename from android/res/drawable-hdpi/ic_triangle_elevation.webp rename to android/app/src/main/res/drawable-hdpi/ic_triangle_elevation.webp diff --git a/android/res/drawable-hdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-hdpi/ic_triangle_elevation_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_triangle_elevation_night.webp diff --git a/android/res/drawable-hdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-hdpi/ic_triangle_night.webp similarity index 100% rename from android/res/drawable-hdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-hdpi/ic_triangle_night.webp diff --git a/android/res/drawable-hdpi/ic_turn_finish.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_finish.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_finish.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_finish.webp diff --git a/android/res/drawable-hdpi/ic_turn_left.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_left.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_left.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_left.webp diff --git a/android/res/drawable-hdpi/ic_turn_left_sharp.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_left_sharp.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_left_sharp.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_left_sharp.webp diff --git a/android/res/drawable-hdpi/ic_turn_left_slight.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_left_slight.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_left_slight.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_left_slight.webp diff --git a/android/res/drawable-hdpi/ic_turn_right.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_right.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_right.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_right.webp diff --git a/android/res/drawable-hdpi/ic_turn_right_sharp.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_right_sharp.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_right_sharp.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_right_sharp.webp diff --git a/android/res/drawable-hdpi/ic_turn_right_slight.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_right_slight.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_right_slight.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_right_slight.webp diff --git a/android/res/drawable-hdpi/ic_turn_round.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_round.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_round.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_round.webp diff --git a/android/res/drawable-hdpi/ic_turn_straight.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_straight.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_straight.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_straight.webp diff --git a/android/res/drawable-hdpi/ic_turn_uleft.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_uleft.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_uleft.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_uleft.webp diff --git a/android/res/drawable-hdpi/ic_turn_uright.webp b/android/app/src/main/res/drawable-hdpi/ic_turn_uright.webp similarity index 100% rename from android/res/drawable-hdpi/ic_turn_uright.webp rename to android/app/src/main/res/drawable-hdpi/ic_turn_uright.webp diff --git a/android/res/drawable-hdpi/ic_type_text.webp b/android/app/src/main/res/drawable-hdpi/ic_type_text.webp similarity index 100% rename from android/res/drawable-hdpi/ic_type_text.webp rename to android/app/src/main/res/drawable-hdpi/ic_type_text.webp diff --git a/android/res/drawable-hdpi/ic_update.webp b/android/app/src/main/res/drawable-hdpi/ic_update.webp similarity index 100% rename from android/res/drawable-hdpi/ic_update.webp rename to android/app/src/main/res/drawable-hdpi/ic_update.webp diff --git a/android/res/drawable-hdpi/ic_voice_off.webp b/android/app/src/main/res/drawable-hdpi/ic_voice_off.webp similarity index 100% rename from android/res/drawable-hdpi/ic_voice_off.webp rename to android/app/src/main/res/drawable-hdpi/ic_voice_off.webp diff --git a/android/res/drawable-hdpi/ic_voice_on.webp b/android/app/src/main/res/drawable-hdpi/ic_voice_on.webp similarity index 100% rename from android/res/drawable-hdpi/ic_voice_on.webp rename to android/app/src/main/res/drawable-hdpi/ic_voice_on.webp diff --git a/android/res/drawable-hdpi/ic_wiki.webp b/android/app/src/main/res/drawable-hdpi/ic_wiki.webp similarity index 100% rename from android/res/drawable-hdpi/ic_wiki.webp rename to android/app/src/main/res/drawable-hdpi/ic_wiki.webp diff --git a/android/res/drawable-hdpi/ic_you_marker.webp b/android/app/src/main/res/drawable-hdpi/ic_you_marker.webp similarity index 100% rename from android/res/drawable-hdpi/ic_you_marker.webp rename to android/app/src/main/res/drawable-hdpi/ic_you_marker.webp diff --git a/android/res/drawable-hdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-hdpi/img_empty_bookmarks.webp similarity index 100% rename from android/res/drawable-hdpi/img_empty_bookmarks.webp rename to android/app/src/main/res/drawable-hdpi/img_empty_bookmarks.webp diff --git a/android/res/drawable-hdpi/img_search_no_maps.webp b/android/app/src/main/res/drawable-hdpi/img_search_no_maps.webp similarity index 100% rename from android/res/drawable-hdpi/img_search_no_maps.webp rename to android/app/src/main/res/drawable-hdpi/img_search_no_maps.webp diff --git a/android/res/drawable-hdpi/shadow_bottom.9.png b/android/app/src/main/res/drawable-hdpi/shadow_bottom.9.png similarity index 100% rename from android/res/drawable-hdpi/shadow_bottom.9.png rename to android/app/src/main/res/drawable-hdpi/shadow_bottom.9.png diff --git a/android/res/drawable-hdpi/shadow_card.9.png b/android/app/src/main/res/drawable-hdpi/shadow_card.9.png similarity index 100% rename from android/res/drawable-hdpi/shadow_card.9.png rename to android/app/src/main/res/drawable-hdpi/shadow_card.9.png diff --git a/android/res/drawable-hdpi/shadow_top.9.png b/android/app/src/main/res/drawable-hdpi/shadow_top.9.png similarity index 100% rename from android/res/drawable-hdpi/shadow_top.9.png rename to android/app/src/main/res/drawable-hdpi/shadow_top.9.png diff --git a/android/res/drawable-mdpi/abc_ic_ab_back_mtrl_am_alpha.webp b/android/app/src/main/res/drawable-mdpi/abc_ic_ab_back_mtrl_am_alpha.webp similarity index 100% rename from android/res/drawable-mdpi/abc_ic_ab_back_mtrl_am_alpha.webp rename to android/app/src/main/res/drawable-mdpi/abc_ic_ab_back_mtrl_am_alpha.webp diff --git a/android/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp b/android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp similarity index 100% rename from android/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp rename to android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_lightrail.webp diff --git a/android/res/drawable-mdpi/ic_20px_route_planning_metro.webp b/android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_metro.webp similarity index 100% rename from android/res/drawable-mdpi/ic_20px_route_planning_metro.webp rename to android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_metro.webp diff --git a/android/res/drawable-mdpi/ic_20px_route_planning_monorail.webp b/android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_monorail.webp similarity index 100% rename from android/res/drawable-mdpi/ic_20px_route_planning_monorail.webp rename to android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_monorail.webp diff --git a/android/res/drawable-mdpi/ic_20px_route_planning_train.webp b/android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_train.webp similarity index 100% rename from android/res/drawable-mdpi/ic_20px_route_planning_train.webp rename to android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_train.webp diff --git a/android/res/drawable-mdpi/ic_20px_route_planning_walk.webp b/android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_walk.webp similarity index 100% rename from android/res/drawable-mdpi/ic_20px_route_planning_walk.webp rename to android/app/src/main/res/drawable-mdpi/ic_20px_route_planning_walk.webp diff --git a/android/res/drawable-mdpi/ic_arrow_down.png b/android/app/src/main/res/drawable-mdpi/ic_arrow_down.png similarity index 100% rename from android/res/drawable-mdpi/ic_arrow_down.png rename to android/app/src/main/res/drawable-mdpi/ic_arrow_down.png diff --git a/android/res/drawable-mdpi/ic_avoid_ferry.webp b/android/app/src/main/res/drawable-mdpi/ic_avoid_ferry.webp similarity index 100% rename from android/res/drawable-mdpi/ic_avoid_ferry.webp rename to android/app/src/main/res/drawable-mdpi/ic_avoid_ferry.webp diff --git a/android/res/drawable-mdpi/ic_avoid_tolls.webp b/android/app/src/main/res/drawable-mdpi/ic_avoid_tolls.webp similarity index 100% rename from android/res/drawable-mdpi/ic_avoid_tolls.webp rename to android/app/src/main/res/drawable-mdpi/ic_avoid_tolls.webp diff --git a/android/res/drawable-mdpi/ic_avoid_unpaved.webp b/android/app/src/main/res/drawable-mdpi/ic_avoid_unpaved.webp similarity index 100% rename from android/res/drawable-mdpi/ic_avoid_unpaved.webp rename to android/app/src/main/res/drawable-mdpi/ic_avoid_unpaved.webp diff --git a/android/res/drawable-mdpi/ic_bike.webp b/android/app/src/main/res/drawable-mdpi/ic_bike.webp similarity index 100% rename from android/res/drawable-mdpi/ic_bike.webp rename to android/app/src/main/res/drawable-mdpi/ic_bike.webp diff --git a/android/res/drawable-mdpi/ic_cancel.webp b/android/app/src/main/res/drawable-mdpi/ic_cancel.webp similarity index 100% rename from android/res/drawable-mdpi/ic_cancel.webp rename to android/app/src/main/res/drawable-mdpi/ic_cancel.webp diff --git a/android/res/drawable-mdpi/ic_car.webp b/android/app/src/main/res/drawable-mdpi/ic_car.webp similarity index 100% rename from android/res/drawable-mdpi/ic_car.webp rename to android/app/src/main/res/drawable-mdpi/ic_car.webp diff --git a/android/res/drawable-mdpi/ic_chart_pin.webp b/android/app/src/main/res/drawable-mdpi/ic_chart_pin.webp similarity index 100% rename from android/res/drawable-mdpi/ic_chart_pin.webp rename to android/app/src/main/res/drawable-mdpi/ic_chart_pin.webp diff --git a/android/res/drawable-mdpi/ic_checkbox_add.webp b/android/app/src/main/res/drawable-mdpi/ic_checkbox_add.webp similarity index 100% rename from android/res/drawable-mdpi/ic_checkbox_add.webp rename to android/app/src/main/res/drawable-mdpi/ic_checkbox_add.webp diff --git a/android/res/drawable-mdpi/ic_checkmark.webp b/android/app/src/main/res/drawable-mdpi/ic_checkmark.webp similarity index 100% rename from android/res/drawable-mdpi/ic_checkmark.webp rename to android/app/src/main/res/drawable-mdpi/ic_checkmark.webp diff --git a/android/res/drawable-mdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-mdpi/ic_clear_rounded.webp similarity index 100% rename from android/res/drawable-mdpi/ic_clear_rounded.webp rename to android/app/src/main/res/drawable-mdpi/ic_clear_rounded.webp diff --git a/android/res/drawable-mdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-mdpi/ic_clear_rounded_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_clear_rounded_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_clear_rounded_night.webp diff --git a/android/res/drawable-mdpi/ic_close_spinner.webp b/android/app/src/main/res/drawable-mdpi/ic_close_spinner.webp similarity index 100% rename from android/res/drawable-mdpi/ic_close_spinner.webp rename to android/app/src/main/res/drawable-mdpi/ic_close_spinner.webp diff --git a/android/res/drawable-mdpi/ic_direction_fullscreen.webp b/android/app/src/main/res/drawable-mdpi/ic_direction_fullscreen.webp similarity index 100% rename from android/res/drawable-mdpi/ic_direction_fullscreen.webp rename to android/app/src/main/res/drawable-mdpi/ic_direction_fullscreen.webp diff --git a/android/res/drawable-mdpi/ic_direction_pagepreview.webp b/android/app/src/main/res/drawable-mdpi/ic_direction_pagepreview.webp similarity index 100% rename from android/res/drawable-mdpi/ic_direction_pagepreview.webp rename to android/app/src/main/res/drawable-mdpi/ic_direction_pagepreview.webp diff --git a/android/res/drawable-mdpi/ic_done.webp b/android/app/src/main/res/drawable-mdpi/ic_done.webp similarity index 100% rename from android/res/drawable-mdpi/ic_done.webp rename to android/app/src/main/res/drawable-mdpi/ic_done.webp diff --git a/android/res/drawable-mdpi/ic_down.webp b/android/app/src/main/res/drawable-mdpi/ic_down.webp similarity index 100% rename from android/res/drawable-mdpi/ic_down.webp rename to android/app/src/main/res/drawable-mdpi/ic_down.webp diff --git a/android/res/drawable-mdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_done.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_done.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_done.webp diff --git a/android/res/drawable-mdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_done_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_done_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_done_night.webp diff --git a/android/res/drawable-mdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_download.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_download.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_download.webp diff --git a/android/res/drawable-mdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_download_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_download_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_download_night.webp diff --git a/android/res/drawable-mdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_folder.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_folder.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_folder.webp diff --git a/android/res/drawable-mdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_folder_done.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_folder_done.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_folder_done.webp diff --git a/android/res/drawable-mdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_folder_done_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_folder_done_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_folder_done_night.webp diff --git a/android/res/drawable-mdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_folder_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_folder_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_folder_night.webp diff --git a/android/res/drawable-mdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_retry.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_retry.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_retry.webp diff --git a/android/res/drawable-mdpi/ic_downloader_update.webp b/android/app/src/main/res/drawable-mdpi/ic_downloader_update.webp similarity index 100% rename from android/res/drawable-mdpi/ic_downloader_update.webp rename to android/app/src/main/res/drawable-mdpi/ic_downloader_update.webp diff --git a/android/res/drawable-mdpi/ic_email.webp b/android/app/src/main/res/drawable-mdpi/ic_email.webp similarity index 100% rename from android/res/drawable-mdpi/ic_email.webp rename to android/app/src/main/res/drawable-mdpi/ic_email.webp diff --git a/android/res/drawable-mdpi/ic_entrance.webp b/android/app/src/main/res/drawable-mdpi/ic_entrance.webp similarity index 100% rename from android/res/drawable-mdpi/ic_entrance.webp rename to android/app/src/main/res/drawable-mdpi/ic_entrance.webp diff --git a/android/res/drawable-mdpi/ic_error_white.webp b/android/app/src/main/res/drawable-mdpi/ic_error_white.webp similarity index 100% rename from android/res/drawable-mdpi/ic_error_white.webp rename to android/app/src/main/res/drawable-mdpi/ic_error_white.webp diff --git a/android/res/drawable-mdpi/ic_exit_highway_to_left.webp b/android/app/src/main/res/drawable-mdpi/ic_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-mdpi/ic_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-mdpi/ic_exit_highway_to_left.webp diff --git a/android/res/drawable-mdpi/ic_exit_highway_to_right.webp b/android/app/src/main/res/drawable-mdpi/ic_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-mdpi/ic_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-mdpi/ic_exit_highway_to_right.webp diff --git a/android/res/drawable-mdpi/ic_expand_less.webp b/android/app/src/main/res/drawable-mdpi/ic_expand_less.webp similarity index 100% rename from android/res/drawable-mdpi/ic_expand_less.webp rename to android/app/src/main/res/drawable-mdpi/ic_expand_less.webp diff --git a/android/res/drawable-mdpi/ic_expand_more.webp b/android/app/src/main/res/drawable-mdpi/ic_expand_more.webp similarity index 100% rename from android/res/drawable-mdpi/ic_expand_more.webp rename to android/app/src/main/res/drawable-mdpi/ic_expand_more.webp diff --git a/android/res/drawable-mdpi/ic_explore.webp b/android/app/src/main/res/drawable-mdpi/ic_explore.webp similarity index 100% rename from android/res/drawable-mdpi/ic_explore.webp rename to android/app/src/main/res/drawable-mdpi/ic_explore.webp diff --git a/android/res/drawable-mdpi/ic_facebook.webp b/android/app/src/main/res/drawable-mdpi/ic_facebook.webp similarity index 100% rename from android/res/drawable-mdpi/ic_facebook.webp rename to android/app/src/main/res/drawable-mdpi/ic_facebook.webp diff --git a/android/res/drawable-mdpi/ic_graph_point.webp b/android/app/src/main/res/drawable-mdpi/ic_graph_point.webp similarity index 100% rename from android/res/drawable-mdpi/ic_graph_point.webp rename to android/app/src/main/res/drawable-mdpi/ic_graph_point.webp diff --git a/android/res/drawable-mdpi/ic_link_inline.webp b/android/app/src/main/res/drawable-mdpi/ic_link_inline.webp similarity index 100% rename from android/res/drawable-mdpi/ic_link_inline.webp rename to android/app/src/main/res/drawable-mdpi/ic_link_inline.webp diff --git a/android/res/drawable-mdpi/ic_lock.webp b/android/app/src/main/res/drawable-mdpi/ic_lock.webp similarity index 100% rename from android/res/drawable-mdpi/ic_lock.webp rename to android/app/src/main/res/drawable-mdpi/ic_lock.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_1.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_1.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_1.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_1.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_10.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_10.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_10.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_10.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_10_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_10_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_10_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_10_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_11.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_11.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_11.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_11.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_11_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_11_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_11_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_11_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_12.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_12.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_12.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_12.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_12_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_12_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_12_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_12_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_13.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_13.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_13.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_13.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_13_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_13_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_13_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_13_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_14.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_14.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_14.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_14.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_14_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_14_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_14_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_14_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_15.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_15.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_15.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_15.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_15_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_15_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_15_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_15_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_16.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_16.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_16.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_16.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_16_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_16_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_16_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_16_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_17.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_17.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_17.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_17.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_17_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_17_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_17_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_17_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_18.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_18.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_18.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_18.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_18_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_18_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_18_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_18_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_19.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_19.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_19.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_19.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_19_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_19_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_19_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_19_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_1_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_1_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_1_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_1_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_2.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_2.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_2.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_2.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_20.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_20.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_20.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_20.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_20_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_20_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_20_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_20_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_2_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_2_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_2_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_2_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_3.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_3.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_3.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_3.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_3_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_3_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_3_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_3_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_4.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_4.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_4.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_4.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_4_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_4_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_4_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_4_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_5.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_5.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_5.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_5.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_5_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_5_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_5_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_5_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_6.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_6.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_6.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_6.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_6_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_6_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_6_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_6_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_7.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_7.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_7.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_7.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_7_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_7_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_7_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_7_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_8.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_8.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_8.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_8.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_8_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_8_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_8_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_8_night.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_9.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_9.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_9.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_9.webp diff --git a/android/res/drawable-mdpi/ic_menu_location_pending_9_night.webp b/android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_9_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_menu_location_pending_9_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_menu_location_pending_9_night.webp diff --git a/android/res/drawable-mdpi/ic_mic_white.webp b/android/app/src/main/res/drawable-mdpi/ic_mic_white.webp similarity index 100% rename from android/res/drawable-mdpi/ic_mic_white.webp rename to android/app/src/main/res/drawable-mdpi/ic_mic_white.webp diff --git a/android/res/drawable-mdpi/ic_notification.webp b/android/app/src/main/res/drawable-mdpi/ic_notification.webp similarity index 100% rename from android/res/drawable-mdpi/ic_notification.webp rename to android/app/src/main/res/drawable-mdpi/ic_notification.webp diff --git a/android/res/drawable-mdpi/ic_operating_hours.webp b/android/app/src/main/res/drawable-mdpi/ic_operating_hours.webp similarity index 100% rename from android/res/drawable-mdpi/ic_operating_hours.webp rename to android/app/src/main/res/drawable-mdpi/ic_operating_hours.webp diff --git a/android/res/drawable-mdpi/ic_operator.webp b/android/app/src/main/res/drawable-mdpi/ic_operator.webp similarity index 100% rename from android/res/drawable-mdpi/ic_operator.webp rename to android/app/src/main/res/drawable-mdpi/ic_operator.webp diff --git a/android/res/drawable-mdpi/ic_pedestrian.webp b/android/app/src/main/res/drawable-mdpi/ic_pedestrian.webp similarity index 100% rename from android/res/drawable-mdpi/ic_pedestrian.webp rename to android/app/src/main/res/drawable-mdpi/ic_pedestrian.webp diff --git a/android/res/drawable-mdpi/ic_phone.webp b/android/app/src/main/res/drawable-mdpi/ic_phone.webp similarity index 100% rename from android/res/drawable-mdpi/ic_phone.webp rename to android/app/src/main/res/drawable-mdpi/ic_phone.webp diff --git a/android/res/drawable-mdpi/ic_place_page_phone.webp b/android/app/src/main/res/drawable-mdpi/ic_place_page_phone.webp similarity index 100% rename from android/res/drawable-mdpi/ic_place_page_phone.webp rename to android/app/src/main/res/drawable-mdpi/ic_place_page_phone.webp diff --git a/android/res/drawable-mdpi/ic_route_from.webp b/android/app/src/main/res/drawable-mdpi/ic_route_from.webp similarity index 100% rename from android/res/drawable-mdpi/ic_route_from.webp rename to android/app/src/main/res/drawable-mdpi/ic_route_from.webp diff --git a/android/res/drawable-mdpi/ic_route_remove.webp b/android/app/src/main/res/drawable-mdpi/ic_route_remove.webp similarity index 100% rename from android/res/drawable-mdpi/ic_route_remove.webp rename to android/app/src/main/res/drawable-mdpi/ic_route_remove.webp diff --git a/android/res/drawable-mdpi/ic_route_to.webp b/android/app/src/main/res/drawable-mdpi/ic_route_to.webp similarity index 100% rename from android/res/drawable-mdpi/ic_route_to.webp rename to android/app/src/main/res/drawable-mdpi/ic_route_to.webp diff --git a/android/res/drawable-mdpi/ic_route_via.webp b/android/app/src/main/res/drawable-mdpi/ic_route_via.webp similarity index 100% rename from android/res/drawable-mdpi/ic_route_via.webp rename to android/app/src/main/res/drawable-mdpi/ic_route_via.webp diff --git a/android/res/drawable-mdpi/ic_routing_atm_off.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_atm_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_atm_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_atm_off.webp diff --git a/android/res/drawable-mdpi/ic_routing_atm_on.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_atm_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_atm_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_atm_on.webp diff --git a/android/res/drawable-mdpi/ic_routing_eat_off.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_eat_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_eat_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_eat_off.webp diff --git a/android/res/drawable-mdpi/ic_routing_eat_on.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_eat_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_eat_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_eat_on.webp diff --git a/android/res/drawable-mdpi/ic_routing_error.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_error.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_error.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_error.webp diff --git a/android/res/drawable-mdpi/ic_routing_food_off.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_food_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_food_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_food_off.webp diff --git a/android/res/drawable-mdpi/ic_routing_food_on.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_food_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_food_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_food_on.webp diff --git a/android/res/drawable-mdpi/ic_routing_fuel_off.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_fuel_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_fuel_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_fuel_off.webp diff --git a/android/res/drawable-mdpi/ic_routing_fuel_on.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_fuel_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_fuel_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_fuel_on.webp diff --git a/android/res/drawable-mdpi/ic_routing_parking_off.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_parking_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_parking_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_parking_off.webp diff --git a/android/res/drawable-mdpi/ic_routing_parking_on.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_parking_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_parking_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_parking_on.webp diff --git a/android/res/drawable-mdpi/ic_routing_search_off.webp b/android/app/src/main/res/drawable-mdpi/ic_routing_search_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_routing_search_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_routing_search_off.webp diff --git a/android/res/drawable-mdpi/ic_search_my_position.webp b/android/app/src/main/res/drawable-mdpi/ic_search_my_position.webp similarity index 100% rename from android/res/drawable-mdpi/ic_search_my_position.webp rename to android/app/src/main/res/drawable-mdpi/ic_search_my_position.webp diff --git a/android/res/drawable-mdpi/ic_search_recent.webp b/android/app/src/main/res/drawable-mdpi/ic_search_recent.webp similarity index 100% rename from android/res/drawable-mdpi/ic_search_recent.webp rename to android/app/src/main/res/drawable-mdpi/ic_search_recent.webp diff --git a/android/res/drawable-mdpi/ic_search_suggest.webp b/android/app/src/main/res/drawable-mdpi/ic_search_suggest.webp similarity index 100% rename from android/res/drawable-mdpi/ic_search_suggest.webp rename to android/app/src/main/res/drawable-mdpi/ic_search_suggest.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_10_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_10_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_11_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_11_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_12_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_12_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_13_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_13_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_14_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_14_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_15_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_15_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_16_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_16_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_17_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_17_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_18_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_18_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_1_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_1_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_2_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_2_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_3_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_3_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_4_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_4_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_5_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_5_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_6_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_6_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_7_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_7_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_8_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_8_night.webp diff --git a/android/res/drawable-mdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-mdpi/ic_spinner_pending_9_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_spinner_pending_9_night.webp diff --git a/android/res/drawable-mdpi/ic_then_exit_highway_to_left.webp b/android/app/src/main/res/drawable-mdpi/ic_then_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_exit_highway_to_left.webp diff --git a/android/res/drawable-mdpi/ic_then_exit_highway_to_right.webp b/android/app/src/main/res/drawable-mdpi/ic_then_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_exit_highway_to_right.webp diff --git a/android/res/drawable-mdpi/ic_then_finish.webp b/android/app/src/main/res/drawable-mdpi/ic_then_finish.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_finish.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_finish.webp diff --git a/android/res/drawable-mdpi/ic_then_left.webp b/android/app/src/main/res/drawable-mdpi/ic_then_left.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_left.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_left.webp diff --git a/android/res/drawable-mdpi/ic_then_left_sharp.webp b/android/app/src/main/res/drawable-mdpi/ic_then_left_sharp.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_left_sharp.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_left_sharp.webp diff --git a/android/res/drawable-mdpi/ic_then_left_slight.webp b/android/app/src/main/res/drawable-mdpi/ic_then_left_slight.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_left_slight.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_left_slight.webp diff --git a/android/res/drawable-mdpi/ic_then_right.webp b/android/app/src/main/res/drawable-mdpi/ic_then_right.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_right.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_right.webp diff --git a/android/res/drawable-mdpi/ic_then_right_sharp.webp b/android/app/src/main/res/drawable-mdpi/ic_then_right_sharp.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_right_sharp.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_right_sharp.webp diff --git a/android/res/drawable-mdpi/ic_then_right_slight.webp b/android/app/src/main/res/drawable-mdpi/ic_then_right_slight.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_right_slight.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_right_slight.webp diff --git a/android/res/drawable-mdpi/ic_then_round.webp b/android/app/src/main/res/drawable-mdpi/ic_then_round.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_round.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_round.webp diff --git a/android/res/drawable-mdpi/ic_then_uleft.webp b/android/app/src/main/res/drawable-mdpi/ic_then_uleft.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_uleft.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_uleft.webp diff --git a/android/res/drawable-mdpi/ic_then_uright.webp b/android/app/src/main/res/drawable-mdpi/ic_then_uright.webp similarity index 100% rename from android/res/drawable-mdpi/ic_then_uright.webp rename to android/app/src/main/res/drawable-mdpi/ic_then_uright.webp diff --git a/android/res/drawable-mdpi/ic_thumb_up.webp b/android/app/src/main/res/drawable-mdpi/ic_thumb_up.webp similarity index 100% rename from android/res/drawable-mdpi/ic_thumb_up.webp rename to android/app/src/main/res/drawable-mdpi/ic_thumb_up.webp diff --git a/android/res/drawable-mdpi/ic_traffic_download_1.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_download_1.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_download_1.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_download_1.webp diff --git a/android/res/drawable-mdpi/ic_traffic_download_2.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_download_2.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_download_2.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_download_2.webp diff --git a/android/res/drawable-mdpi/ic_traffic_download_3.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_download_3.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_download_3.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_download_3.webp diff --git a/android/res/drawable-mdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_1.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_1.webp diff --git a/android/res/drawable-mdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_2.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_2.webp diff --git a/android/res/drawable-mdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_3.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_download_night_3.webp diff --git a/android/res/drawable-mdpi/ic_traffic_on.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_on.webp diff --git a/android/res/drawable-mdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_on_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_on_night.webp diff --git a/android/res/drawable-mdpi/ic_traffic_outdated.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_outdated.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_outdated.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_outdated.webp diff --git a/android/res/drawable-mdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-mdpi/ic_traffic_outdated_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_traffic_outdated_night.webp diff --git a/android/res/drawable-mdpi/ic_transit.webp b/android/app/src/main/res/drawable-mdpi/ic_transit.webp similarity index 100% rename from android/res/drawable-mdpi/ic_transit.webp rename to android/app/src/main/res/drawable-mdpi/ic_transit.webp diff --git a/android/res/drawable-mdpi/ic_triangle.webp b/android/app/src/main/res/drawable-mdpi/ic_triangle.webp similarity index 100% rename from android/res/drawable-mdpi/ic_triangle.webp rename to android/app/src/main/res/drawable-mdpi/ic_triangle.webp diff --git a/android/res/drawable-mdpi/ic_triangle_elevation.webp b/android/app/src/main/res/drawable-mdpi/ic_triangle_elevation.webp similarity index 100% rename from android/res/drawable-mdpi/ic_triangle_elevation.webp rename to android/app/src/main/res/drawable-mdpi/ic_triangle_elevation.webp diff --git a/android/res/drawable-mdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-mdpi/ic_triangle_elevation_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_triangle_elevation_night.webp diff --git a/android/res/drawable-mdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-mdpi/ic_triangle_night.webp similarity index 100% rename from android/res/drawable-mdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-mdpi/ic_triangle_night.webp diff --git a/android/res/drawable-mdpi/ic_turn_finish.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_finish.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_finish.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_finish.webp diff --git a/android/res/drawable-mdpi/ic_turn_left.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_left.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_left.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_left.webp diff --git a/android/res/drawable-mdpi/ic_turn_left_sharp.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_left_sharp.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_left_sharp.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_left_sharp.webp diff --git a/android/res/drawable-mdpi/ic_turn_left_slight.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_left_slight.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_left_slight.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_left_slight.webp diff --git a/android/res/drawable-mdpi/ic_turn_right.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_right.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_right.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_right.webp diff --git a/android/res/drawable-mdpi/ic_turn_right_sharp.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_right_sharp.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_right_sharp.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_right_sharp.webp diff --git a/android/res/drawable-mdpi/ic_turn_right_slight.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_right_slight.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_right_slight.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_right_slight.webp diff --git a/android/res/drawable-mdpi/ic_turn_round.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_round.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_round.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_round.webp diff --git a/android/res/drawable-mdpi/ic_turn_straight.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_straight.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_straight.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_straight.webp diff --git a/android/res/drawable-mdpi/ic_turn_uleft.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_uleft.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_uleft.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_uleft.webp diff --git a/android/res/drawable-mdpi/ic_turn_uright.webp b/android/app/src/main/res/drawable-mdpi/ic_turn_uright.webp similarity index 100% rename from android/res/drawable-mdpi/ic_turn_uright.webp rename to android/app/src/main/res/drawable-mdpi/ic_turn_uright.webp diff --git a/android/res/drawable-mdpi/ic_type_text.webp b/android/app/src/main/res/drawable-mdpi/ic_type_text.webp similarity index 100% rename from android/res/drawable-mdpi/ic_type_text.webp rename to android/app/src/main/res/drawable-mdpi/ic_type_text.webp diff --git a/android/res/drawable-mdpi/ic_update.webp b/android/app/src/main/res/drawable-mdpi/ic_update.webp similarity index 100% rename from android/res/drawable-mdpi/ic_update.webp rename to android/app/src/main/res/drawable-mdpi/ic_update.webp diff --git a/android/res/drawable-mdpi/ic_voice_off.webp b/android/app/src/main/res/drawable-mdpi/ic_voice_off.webp similarity index 100% rename from android/res/drawable-mdpi/ic_voice_off.webp rename to android/app/src/main/res/drawable-mdpi/ic_voice_off.webp diff --git a/android/res/drawable-mdpi/ic_voice_on.webp b/android/app/src/main/res/drawable-mdpi/ic_voice_on.webp similarity index 100% rename from android/res/drawable-mdpi/ic_voice_on.webp rename to android/app/src/main/res/drawable-mdpi/ic_voice_on.webp diff --git a/android/res/drawable-mdpi/ic_wiki.webp b/android/app/src/main/res/drawable-mdpi/ic_wiki.webp similarity index 100% rename from android/res/drawable-mdpi/ic_wiki.webp rename to android/app/src/main/res/drawable-mdpi/ic_wiki.webp diff --git a/android/res/drawable-mdpi/ic_you_marker.webp b/android/app/src/main/res/drawable-mdpi/ic_you_marker.webp similarity index 100% rename from android/res/drawable-mdpi/ic_you_marker.webp rename to android/app/src/main/res/drawable-mdpi/ic_you_marker.webp diff --git a/android/res/drawable-mdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-mdpi/img_empty_bookmarks.webp similarity index 100% rename from android/res/drawable-mdpi/img_empty_bookmarks.webp rename to android/app/src/main/res/drawable-mdpi/img_empty_bookmarks.webp diff --git a/android/res/drawable-mdpi/img_search_no_maps.webp b/android/app/src/main/res/drawable-mdpi/img_search_no_maps.webp similarity index 100% rename from android/res/drawable-mdpi/img_search_no_maps.webp rename to android/app/src/main/res/drawable-mdpi/img_search_no_maps.webp diff --git a/android/res/drawable-mdpi/shadow_bottom.9.png b/android/app/src/main/res/drawable-mdpi/shadow_bottom.9.png similarity index 100% rename from android/res/drawable-mdpi/shadow_bottom.9.png rename to android/app/src/main/res/drawable-mdpi/shadow_bottom.9.png diff --git a/android/res/drawable-mdpi/shadow_card.9.png b/android/app/src/main/res/drawable-mdpi/shadow_card.9.png similarity index 100% rename from android/res/drawable-mdpi/shadow_card.9.png rename to android/app/src/main/res/drawable-mdpi/shadow_card.9.png diff --git a/android/res/drawable-mdpi/shadow_top.9.png b/android/app/src/main/res/drawable-mdpi/shadow_top.9.png similarity index 100% rename from android/res/drawable-mdpi/shadow_top.9.png rename to android/app/src/main/res/drawable-mdpi/shadow_top.9.png diff --git a/android/res/drawable-sw600dp-hdpi/ic_direction_fullscreen.webp b/android/app/src/main/res/drawable-sw600dp-hdpi/ic_direction_fullscreen.webp similarity index 100% rename from android/res/drawable-sw600dp-hdpi/ic_direction_fullscreen.webp rename to android/app/src/main/res/drawable-sw600dp-hdpi/ic_direction_fullscreen.webp diff --git a/android/res/drawable-sw600dp-mdpi/ic_direction_fullscreen.webp b/android/app/src/main/res/drawable-sw600dp-mdpi/ic_direction_fullscreen.webp similarity index 100% rename from android/res/drawable-sw600dp-mdpi/ic_direction_fullscreen.webp rename to android/app/src/main/res/drawable-sw600dp-mdpi/ic_direction_fullscreen.webp diff --git a/android/res/drawable-sw600dp-xhdpi/ic_direction_fullscreen.png b/android/app/src/main/res/drawable-sw600dp-xhdpi/ic_direction_fullscreen.png similarity index 100% rename from android/res/drawable-sw600dp-xhdpi/ic_direction_fullscreen.png rename to android/app/src/main/res/drawable-sw600dp-xhdpi/ic_direction_fullscreen.png diff --git a/android/res/drawable-sw600dp-xxhdpi/ic_direction_fullscreen.png b/android/app/src/main/res/drawable-sw600dp-xxhdpi/ic_direction_fullscreen.png similarity index 100% rename from android/res/drawable-sw600dp-xxhdpi/ic_direction_fullscreen.png rename to android/app/src/main/res/drawable-sw600dp-xxhdpi/ic_direction_fullscreen.png diff --git a/android/res/drawable-xhdpi/abc_ic_ab_back_mtrl_am_alpha.webp b/android/app/src/main/res/drawable-xhdpi/abc_ic_ab_back_mtrl_am_alpha.webp similarity index 100% rename from android/res/drawable-xhdpi/abc_ic_ab_back_mtrl_am_alpha.webp rename to android/app/src/main/res/drawable-xhdpi/abc_ic_ab_back_mtrl_am_alpha.webp diff --git a/android/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp b/android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp rename to android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_lightrail.webp diff --git a/android/res/drawable-xhdpi/ic_20px_route_planning_metro.webp b/android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_metro.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_20px_route_planning_metro.webp rename to android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_metro.webp diff --git a/android/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp b/android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp rename to android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_monorail.webp diff --git a/android/res/drawable-xhdpi/ic_20px_route_planning_train.webp b/android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_train.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_20px_route_planning_train.webp rename to android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_train.webp diff --git a/android/res/drawable-xhdpi/ic_20px_route_planning_walk.webp b/android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_walk.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_20px_route_planning_walk.webp rename to android/app/src/main/res/drawable-xhdpi/ic_20px_route_planning_walk.webp diff --git a/android/res/drawable-xhdpi/ic_arrow_down.png b/android/app/src/main/res/drawable-xhdpi/ic_arrow_down.png similarity index 100% rename from android/res/drawable-xhdpi/ic_arrow_down.png rename to android/app/src/main/res/drawable-xhdpi/ic_arrow_down.png diff --git a/android/res/drawable-xhdpi/ic_avoid_ferry.webp b/android/app/src/main/res/drawable-xhdpi/ic_avoid_ferry.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_avoid_ferry.webp rename to android/app/src/main/res/drawable-xhdpi/ic_avoid_ferry.webp diff --git a/android/res/drawable-xhdpi/ic_avoid_tolls.webp b/android/app/src/main/res/drawable-xhdpi/ic_avoid_tolls.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_avoid_tolls.webp rename to android/app/src/main/res/drawable-xhdpi/ic_avoid_tolls.webp diff --git a/android/res/drawable-xhdpi/ic_avoid_unpaved.webp b/android/app/src/main/res/drawable-xhdpi/ic_avoid_unpaved.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_avoid_unpaved.webp rename to android/app/src/main/res/drawable-xhdpi/ic_avoid_unpaved.webp diff --git a/android/res/drawable-xhdpi/ic_bike.webp b/android/app/src/main/res/drawable-xhdpi/ic_bike.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_bike.webp rename to android/app/src/main/res/drawable-xhdpi/ic_bike.webp diff --git a/android/res/drawable-xhdpi/ic_cancel.webp b/android/app/src/main/res/drawable-xhdpi/ic_cancel.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_cancel.webp rename to android/app/src/main/res/drawable-xhdpi/ic_cancel.webp diff --git a/android/res/drawable-xhdpi/ic_car.webp b/android/app/src/main/res/drawable-xhdpi/ic_car.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_car.webp rename to android/app/src/main/res/drawable-xhdpi/ic_car.webp diff --git a/android/res/drawable-xhdpi/ic_chart_pin.webp b/android/app/src/main/res/drawable-xhdpi/ic_chart_pin.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_chart_pin.webp rename to android/app/src/main/res/drawable-xhdpi/ic_chart_pin.webp diff --git a/android/res/drawable-xhdpi/ic_checkbox_add.webp b/android/app/src/main/res/drawable-xhdpi/ic_checkbox_add.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_checkbox_add.webp rename to android/app/src/main/res/drawable-xhdpi/ic_checkbox_add.webp diff --git a/android/res/drawable-xhdpi/ic_checkmark.webp b/android/app/src/main/res/drawable-xhdpi/ic_checkmark.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_checkmark.webp rename to android/app/src/main/res/drawable-xhdpi/ic_checkmark.webp diff --git a/android/res/drawable-xhdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-xhdpi/ic_clear_rounded.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_clear_rounded.webp rename to android/app/src/main/res/drawable-xhdpi/ic_clear_rounded.webp diff --git a/android/res/drawable-xhdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_clear_rounded_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_clear_rounded_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_clear_rounded_night.webp diff --git a/android/res/drawable-xhdpi/ic_close_spinner.webp b/android/app/src/main/res/drawable-xhdpi/ic_close_spinner.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_close_spinner.webp rename to android/app/src/main/res/drawable-xhdpi/ic_close_spinner.webp diff --git a/android/res/drawable-xhdpi/ic_direction_fullscreen.webp b/android/app/src/main/res/drawable-xhdpi/ic_direction_fullscreen.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_direction_fullscreen.webp rename to android/app/src/main/res/drawable-xhdpi/ic_direction_fullscreen.webp diff --git a/android/res/drawable-xhdpi/ic_direction_pagepreview.webp b/android/app/src/main/res/drawable-xhdpi/ic_direction_pagepreview.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_direction_pagepreview.webp rename to android/app/src/main/res/drawable-xhdpi/ic_direction_pagepreview.webp diff --git a/android/res/drawable-xhdpi/ic_done.webp b/android/app/src/main/res/drawable-xhdpi/ic_done.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_done.webp rename to android/app/src/main/res/drawable-xhdpi/ic_done.webp diff --git a/android/res/drawable-xhdpi/ic_down.webp b/android/app/src/main/res/drawable-xhdpi/ic_down.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_down.webp rename to android/app/src/main/res/drawable-xhdpi/ic_down.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_done.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_done.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_done.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_done_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_done_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_done_night.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_download.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_download.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_download.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_download_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_download_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_download_night.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_folder.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_folder.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_folder_done.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_folder_done_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_done_night.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_folder_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_folder_night.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_retry.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_retry.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_retry.webp diff --git a/android/res/drawable-xhdpi/ic_downloader_update.webp b/android/app/src/main/res/drawable-xhdpi/ic_downloader_update.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_downloader_update.webp rename to android/app/src/main/res/drawable-xhdpi/ic_downloader_update.webp diff --git a/android/res/drawable-xhdpi/ic_email.webp b/android/app/src/main/res/drawable-xhdpi/ic_email.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_email.webp rename to android/app/src/main/res/drawable-xhdpi/ic_email.webp diff --git a/android/res/drawable-xhdpi/ic_entrance.webp b/android/app/src/main/res/drawable-xhdpi/ic_entrance.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_entrance.webp rename to android/app/src/main/res/drawable-xhdpi/ic_entrance.webp diff --git a/android/res/drawable-xhdpi/ic_error_white.webp b/android/app/src/main/res/drawable-xhdpi/ic_error_white.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_error_white.webp rename to android/app/src/main/res/drawable-xhdpi/ic_error_white.webp diff --git a/android/res/drawable-xhdpi/ic_exit_highway_to_left.webp b/android/app/src/main/res/drawable-xhdpi/ic_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-xhdpi/ic_exit_highway_to_left.webp diff --git a/android/res/drawable-xhdpi/ic_exit_highway_to_right.webp b/android/app/src/main/res/drawable-xhdpi/ic_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-xhdpi/ic_exit_highway_to_right.webp diff --git a/android/res/drawable-xhdpi/ic_expand_less.webp b/android/app/src/main/res/drawable-xhdpi/ic_expand_less.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_expand_less.webp rename to android/app/src/main/res/drawable-xhdpi/ic_expand_less.webp diff --git a/android/res/drawable-xhdpi/ic_expand_more.webp b/android/app/src/main/res/drawable-xhdpi/ic_expand_more.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_expand_more.webp rename to android/app/src/main/res/drawable-xhdpi/ic_expand_more.webp diff --git a/android/res/drawable-xhdpi/ic_explore.webp b/android/app/src/main/res/drawable-xhdpi/ic_explore.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_explore.webp rename to android/app/src/main/res/drawable-xhdpi/ic_explore.webp diff --git a/android/res/drawable-xhdpi/ic_facebook.webp b/android/app/src/main/res/drawable-xhdpi/ic_facebook.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_facebook.webp rename to android/app/src/main/res/drawable-xhdpi/ic_facebook.webp diff --git a/android/res/drawable-xhdpi/ic_graph_point.webp b/android/app/src/main/res/drawable-xhdpi/ic_graph_point.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_graph_point.webp rename to android/app/src/main/res/drawable-xhdpi/ic_graph_point.webp diff --git a/android/res/drawable-xhdpi/ic_link_inline.webp b/android/app/src/main/res/drawable-xhdpi/ic_link_inline.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_link_inline.webp rename to android/app/src/main/res/drawable-xhdpi/ic_link_inline.webp diff --git a/android/res/drawable-xhdpi/ic_lock.webp b/android/app/src/main/res/drawable-xhdpi/ic_lock.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_lock.webp rename to android/app/src/main/res/drawable-xhdpi/ic_lock.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_1.png b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_1.png similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_1.png rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_1.png diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_10.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_10.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_10.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_10.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_10_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_10_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_10_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_10_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_11.png b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_11.png similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_11.png rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_11.png diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_11_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_11_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_11_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_11_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_12.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_12.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_12.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_12.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_12_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_12_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_12_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_12_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_13.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_13.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_13.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_13.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_13_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_13_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_13_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_13_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_14.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_14.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_14.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_14.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_14_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_14_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_14_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_14_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_15.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_15.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_15.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_15.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_15_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_15_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_15_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_15_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_16.png b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_16.png similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_16.png rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_16.png diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_16_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_16_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_16_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_16_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_17.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_17.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_17.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_17.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_17_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_17_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_17_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_17_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_18.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_18.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_18.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_18.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_18_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_18_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_18_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_18_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_19.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_19.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_19.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_19.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_19_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_19_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_19_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_19_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_1_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_1_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_1_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_1_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_2.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_2.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_2.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_2.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_20.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_20.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_20.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_20.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_20_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_20_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_20_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_20_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_2_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_2_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_2_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_2_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_3.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_3.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_3.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_3.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_3_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_3_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_3_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_3_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_4.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_4.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_4.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_4.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_4_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_4_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_4_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_4_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_5.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_5.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_5.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_5.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_5_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_5_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_5_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_5_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_6.png b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_6.png similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_6.png rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_6.png diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_6_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_6_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_6_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_6_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_7.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_7.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_7.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_7.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_7_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_7_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_7_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_7_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_8.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_8.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_8.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_8.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_8_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_8_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_8_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_8_night.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_9.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_9.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_9.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_9.webp diff --git a/android/res/drawable-xhdpi/ic_menu_location_pending_9_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_9_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_menu_location_pending_9_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_menu_location_pending_9_night.webp diff --git a/android/res/drawable-xhdpi/ic_mic_white.webp b/android/app/src/main/res/drawable-xhdpi/ic_mic_white.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_mic_white.webp rename to android/app/src/main/res/drawable-xhdpi/ic_mic_white.webp diff --git a/android/res/drawable-xhdpi/ic_notification.webp b/android/app/src/main/res/drawable-xhdpi/ic_notification.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_notification.webp rename to android/app/src/main/res/drawable-xhdpi/ic_notification.webp diff --git a/android/res/drawable-xhdpi/ic_operating_hours.webp b/android/app/src/main/res/drawable-xhdpi/ic_operating_hours.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_operating_hours.webp rename to android/app/src/main/res/drawable-xhdpi/ic_operating_hours.webp diff --git a/android/res/drawable-xhdpi/ic_operator.webp b/android/app/src/main/res/drawable-xhdpi/ic_operator.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_operator.webp rename to android/app/src/main/res/drawable-xhdpi/ic_operator.webp diff --git a/android/res/drawable-xhdpi/ic_pedestrian.webp b/android/app/src/main/res/drawable-xhdpi/ic_pedestrian.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_pedestrian.webp rename to android/app/src/main/res/drawable-xhdpi/ic_pedestrian.webp diff --git a/android/res/drawable-xhdpi/ic_phone.webp b/android/app/src/main/res/drawable-xhdpi/ic_phone.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_phone.webp rename to android/app/src/main/res/drawable-xhdpi/ic_phone.webp diff --git a/android/res/drawable-xhdpi/ic_place_page_phone.webp b/android/app/src/main/res/drawable-xhdpi/ic_place_page_phone.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_place_page_phone.webp rename to android/app/src/main/res/drawable-xhdpi/ic_place_page_phone.webp diff --git a/android/res/drawable-xhdpi/ic_route_from.webp b/android/app/src/main/res/drawable-xhdpi/ic_route_from.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_route_from.webp rename to android/app/src/main/res/drawable-xhdpi/ic_route_from.webp diff --git a/android/res/drawable-xhdpi/ic_route_remove.webp b/android/app/src/main/res/drawable-xhdpi/ic_route_remove.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_route_remove.webp rename to android/app/src/main/res/drawable-xhdpi/ic_route_remove.webp diff --git a/android/res/drawable-xhdpi/ic_route_to.webp b/android/app/src/main/res/drawable-xhdpi/ic_route_to.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_route_to.webp rename to android/app/src/main/res/drawable-xhdpi/ic_route_to.webp diff --git a/android/res/drawable-xhdpi/ic_route_via.webp b/android/app/src/main/res/drawable-xhdpi/ic_route_via.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_route_via.webp rename to android/app/src/main/res/drawable-xhdpi/ic_route_via.webp diff --git a/android/res/drawable-xhdpi/ic_routing_atm_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_atm_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_atm_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_atm_off.webp diff --git a/android/res/drawable-xhdpi/ic_routing_atm_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_atm_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_atm_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_atm_on.webp diff --git a/android/res/drawable-xhdpi/ic_routing_eat_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_eat_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_eat_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_eat_off.webp diff --git a/android/res/drawable-xhdpi/ic_routing_eat_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_eat_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_eat_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_eat_on.webp diff --git a/android/res/drawable-xhdpi/ic_routing_error.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_error.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_error.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_error.webp diff --git a/android/res/drawable-xhdpi/ic_routing_food_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_food_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_food_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_food_off.webp diff --git a/android/res/drawable-xhdpi/ic_routing_food_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_food_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_food_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_food_on.webp diff --git a/android/res/drawable-xhdpi/ic_routing_fuel_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_fuel_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_fuel_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_fuel_off.webp diff --git a/android/res/drawable-xhdpi/ic_routing_fuel_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_fuel_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_fuel_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_fuel_on.webp diff --git a/android/res/drawable-xhdpi/ic_routing_parking_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_parking_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_parking_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_parking_off.webp diff --git a/android/res/drawable-xhdpi/ic_routing_parking_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_parking_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_parking_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_parking_on.webp diff --git a/android/res/drawable-xhdpi/ic_routing_search_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_routing_search_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_routing_search_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_routing_search_off.webp diff --git a/android/res/drawable-xhdpi/ic_search_my_position.webp b/android/app/src/main/res/drawable-xhdpi/ic_search_my_position.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_search_my_position.webp rename to android/app/src/main/res/drawable-xhdpi/ic_search_my_position.webp diff --git a/android/res/drawable-xhdpi/ic_search_recent.webp b/android/app/src/main/res/drawable-xhdpi/ic_search_recent.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_search_recent.webp rename to android/app/src/main/res/drawable-xhdpi/ic_search_recent.webp diff --git a/android/res/drawable-xhdpi/ic_search_suggest.webp b/android/app/src/main/res/drawable-xhdpi/ic_search_suggest.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_search_suggest.webp rename to android/app/src/main/res/drawable-xhdpi/ic_search_suggest.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_10_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_10_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_11_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_11_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_12_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_12_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_13_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_13_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_14_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_14_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_15_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_15_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_16_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_16_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_17_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_17_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_18_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_18_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_1_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_1_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_2_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_2_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_3_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_3_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_4_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_4_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_5_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_5_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_6_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_6_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_7_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_7_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_8_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_8_night.webp diff --git a/android/res/drawable-xhdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_9_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_spinner_pending_9_night.webp diff --git a/android/res/drawable-xhdpi/ic_then_exit_highway_to_left.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_exit_highway_to_left.webp diff --git a/android/res/drawable-xhdpi/ic_then_exit_highway_to_right.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_exit_highway_to_right.webp diff --git a/android/res/drawable-xhdpi/ic_then_finish.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_finish.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_finish.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_finish.webp diff --git a/android/res/drawable-xhdpi/ic_then_left.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_left.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_left.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_left.webp diff --git a/android/res/drawable-xhdpi/ic_then_left_sharp.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_left_sharp.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_left_sharp.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_left_sharp.webp diff --git a/android/res/drawable-xhdpi/ic_then_left_slight.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_left_slight.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_left_slight.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_left_slight.webp diff --git a/android/res/drawable-xhdpi/ic_then_right.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_right.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_right.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_right.webp diff --git a/android/res/drawable-xhdpi/ic_then_right_sharp.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_right_sharp.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_right_sharp.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_right_sharp.webp diff --git a/android/res/drawable-xhdpi/ic_then_right_slight.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_right_slight.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_right_slight.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_right_slight.webp diff --git a/android/res/drawable-xhdpi/ic_then_round.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_round.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_round.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_round.webp diff --git a/android/res/drawable-xhdpi/ic_then_uleft.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_uleft.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_uleft.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_uleft.webp diff --git a/android/res/drawable-xhdpi/ic_then_uright.webp b/android/app/src/main/res/drawable-xhdpi/ic_then_uright.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_then_uright.webp rename to android/app/src/main/res/drawable-xhdpi/ic_then_uright.webp diff --git a/android/res/drawable-xhdpi/ic_thumb_up.webp b/android/app/src/main/res/drawable-xhdpi/ic_thumb_up.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_thumb_up.webp rename to android/app/src/main/res/drawable-xhdpi/ic_thumb_up.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_download_1.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_1.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_download_1.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_download_1.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_download_2.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_2.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_download_2.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_download_2.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_download_3.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_3.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_download_3.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_download_3.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_1.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_1.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_2.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_2.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_3.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_download_night_3.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_on.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_on_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_on_night.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_outdated.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_outdated.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_outdated.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_outdated.webp diff --git a/android/res/drawable-xhdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_traffic_outdated_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_traffic_outdated_night.webp diff --git a/android/res/drawable-xhdpi/ic_transit.webp b/android/app/src/main/res/drawable-xhdpi/ic_transit.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_transit.webp rename to android/app/src/main/res/drawable-xhdpi/ic_transit.webp diff --git a/android/res/drawable-xhdpi/ic_triangle.webp b/android/app/src/main/res/drawable-xhdpi/ic_triangle.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_triangle.webp rename to android/app/src/main/res/drawable-xhdpi/ic_triangle.webp diff --git a/android/res/drawable-xhdpi/ic_triangle_elevation.webp b/android/app/src/main/res/drawable-xhdpi/ic_triangle_elevation.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_triangle_elevation.webp rename to android/app/src/main/res/drawable-xhdpi/ic_triangle_elevation.webp diff --git a/android/res/drawable-xhdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_triangle_elevation_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_triangle_elevation_night.webp diff --git a/android/res/drawable-xhdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-xhdpi/ic_triangle_night.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-xhdpi/ic_triangle_night.webp diff --git a/android/res/drawable-xhdpi/ic_turn_finish.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_finish.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_finish.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_finish.webp diff --git a/android/res/drawable-xhdpi/ic_turn_left.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_left.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_left.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_left.webp diff --git a/android/res/drawable-xhdpi/ic_turn_left_sharp.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_left_sharp.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_left_sharp.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_left_sharp.webp diff --git a/android/res/drawable-xhdpi/ic_turn_left_slight.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_left_slight.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_left_slight.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_left_slight.webp diff --git a/android/res/drawable-xhdpi/ic_turn_right.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_right.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_right.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_right.webp diff --git a/android/res/drawable-xhdpi/ic_turn_right_sharp.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_right_sharp.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_right_sharp.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_right_sharp.webp diff --git a/android/res/drawable-xhdpi/ic_turn_right_slight.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_right_slight.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_right_slight.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_right_slight.webp diff --git a/android/res/drawable-xhdpi/ic_turn_round.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_round.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_round.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_round.webp diff --git a/android/res/drawable-xhdpi/ic_turn_straight.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_straight.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_straight.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_straight.webp diff --git a/android/res/drawable-xhdpi/ic_turn_uleft.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_uleft.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_uleft.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_uleft.webp diff --git a/android/res/drawable-xhdpi/ic_turn_uright.webp b/android/app/src/main/res/drawable-xhdpi/ic_turn_uright.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_turn_uright.webp rename to android/app/src/main/res/drawable-xhdpi/ic_turn_uright.webp diff --git a/android/res/drawable-xhdpi/ic_type_text.webp b/android/app/src/main/res/drawable-xhdpi/ic_type_text.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_type_text.webp rename to android/app/src/main/res/drawable-xhdpi/ic_type_text.webp diff --git a/android/res/drawable-xhdpi/ic_update.webp b/android/app/src/main/res/drawable-xhdpi/ic_update.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_update.webp rename to android/app/src/main/res/drawable-xhdpi/ic_update.webp diff --git a/android/res/drawable-xhdpi/ic_voice_off.webp b/android/app/src/main/res/drawable-xhdpi/ic_voice_off.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_voice_off.webp rename to android/app/src/main/res/drawable-xhdpi/ic_voice_off.webp diff --git a/android/res/drawable-xhdpi/ic_voice_on.webp b/android/app/src/main/res/drawable-xhdpi/ic_voice_on.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_voice_on.webp rename to android/app/src/main/res/drawable-xhdpi/ic_voice_on.webp diff --git a/android/res/drawable-xhdpi/ic_wiki.webp b/android/app/src/main/res/drawable-xhdpi/ic_wiki.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_wiki.webp rename to android/app/src/main/res/drawable-xhdpi/ic_wiki.webp diff --git a/android/res/drawable-xhdpi/ic_you_marker.webp b/android/app/src/main/res/drawable-xhdpi/ic_you_marker.webp similarity index 100% rename from android/res/drawable-xhdpi/ic_you_marker.webp rename to android/app/src/main/res/drawable-xhdpi/ic_you_marker.webp diff --git a/android/res/drawable-xhdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-xhdpi/img_empty_bookmarks.webp similarity index 100% rename from android/res/drawable-xhdpi/img_empty_bookmarks.webp rename to android/app/src/main/res/drawable-xhdpi/img_empty_bookmarks.webp diff --git a/android/res/drawable-xhdpi/img_search_no_maps.webp b/android/app/src/main/res/drawable-xhdpi/img_search_no_maps.webp similarity index 100% rename from android/res/drawable-xhdpi/img_search_no_maps.webp rename to android/app/src/main/res/drawable-xhdpi/img_search_no_maps.webp diff --git a/android/res/drawable-xhdpi/shadow_bottom.9.png b/android/app/src/main/res/drawable-xhdpi/shadow_bottom.9.png similarity index 100% rename from android/res/drawable-xhdpi/shadow_bottom.9.png rename to android/app/src/main/res/drawable-xhdpi/shadow_bottom.9.png diff --git a/android/res/drawable-xhdpi/shadow_card.9.png b/android/app/src/main/res/drawable-xhdpi/shadow_card.9.png similarity index 100% rename from android/res/drawable-xhdpi/shadow_card.9.png rename to android/app/src/main/res/drawable-xhdpi/shadow_card.9.png diff --git a/android/res/drawable-xhdpi/shadow_top.9.png b/android/app/src/main/res/drawable-xhdpi/shadow_top.9.png similarity index 100% rename from android/res/drawable-xhdpi/shadow_top.9.png rename to android/app/src/main/res/drawable-xhdpi/shadow_top.9.png diff --git a/android/res/drawable-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp b/android/app/src/main/res/drawable-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp similarity index 100% rename from android/res/drawable-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp rename to android/app/src/main/res/drawable-xxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp diff --git a/android/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp b/android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_lightrail.webp diff --git a/android/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp b/android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_metro.webp diff --git a/android/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp b/android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_monorail.webp diff --git a/android/res/drawable-xxhdpi/ic_20px_route_planning_train.webp b/android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_train.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_20px_route_planning_train.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_train.webp diff --git a/android/res/drawable-xxhdpi/ic_20px_route_planning_walk.webp b/android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_walk.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_20px_route_planning_walk.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_20px_route_planning_walk.webp diff --git a/android/res/drawable-xxhdpi/ic_arrow_down.webp b/android/app/src/main/res/drawable-xxhdpi/ic_arrow_down.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_arrow_down.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_arrow_down.webp diff --git a/android/res/drawable-xxhdpi/ic_avoid_ferry.webp b/android/app/src/main/res/drawable-xxhdpi/ic_avoid_ferry.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_avoid_ferry.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_avoid_ferry.webp diff --git a/android/res/drawable-xxhdpi/ic_avoid_tolls.webp b/android/app/src/main/res/drawable-xxhdpi/ic_avoid_tolls.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_avoid_tolls.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_avoid_tolls.webp diff --git a/android/res/drawable-xxhdpi/ic_avoid_unpaved.webp b/android/app/src/main/res/drawable-xxhdpi/ic_avoid_unpaved.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_avoid_unpaved.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_avoid_unpaved.webp diff --git a/android/res/drawable-xxhdpi/ic_bike.webp b/android/app/src/main/res/drawable-xxhdpi/ic_bike.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_bike.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_bike.webp diff --git a/android/res/drawable-xxhdpi/ic_cancel.webp b/android/app/src/main/res/drawable-xxhdpi/ic_cancel.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_cancel.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_cancel.webp diff --git a/android/res/drawable-xxhdpi/ic_car.webp b/android/app/src/main/res/drawable-xxhdpi/ic_car.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_car.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_car.webp diff --git a/android/res/drawable-xxhdpi/ic_chart_pin.webp b/android/app/src/main/res/drawable-xxhdpi/ic_chart_pin.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_chart_pin.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_chart_pin.webp diff --git a/android/res/drawable-xxhdpi/ic_checkbox_add.webp b/android/app/src/main/res/drawable-xxhdpi/ic_checkbox_add.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_checkbox_add.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_checkbox_add.webp diff --git a/android/res/drawable-xxhdpi/ic_checkmark.webp b/android/app/src/main/res/drawable-xxhdpi/ic_checkmark.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_checkmark.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_checkmark.webp diff --git a/android/res/drawable-xxhdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_clear_rounded.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded.webp diff --git a/android/res/drawable-xxhdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_clear_rounded_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_clear_rounded_night.webp diff --git a/android/res/drawable-xxhdpi/ic_close_spinner.webp b/android/app/src/main/res/drawable-xxhdpi/ic_close_spinner.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_close_spinner.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_close_spinner.webp diff --git a/android/res/drawable-xxhdpi/ic_direction_fullscreen.webp b/android/app/src/main/res/drawable-xxhdpi/ic_direction_fullscreen.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_direction_fullscreen.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_direction_fullscreen.webp diff --git a/android/res/drawable-xxhdpi/ic_direction_pagepreview.webp b/android/app/src/main/res/drawable-xxhdpi/ic_direction_pagepreview.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_direction_pagepreview.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_direction_pagepreview.webp diff --git a/android/res/drawable-xxhdpi/ic_done.webp b/android/app/src/main/res/drawable-xxhdpi/ic_done.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_done.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_done.webp diff --git a/android/res/drawable-xxhdpi/ic_down.webp b/android/app/src/main/res/drawable-xxhdpi/ic_down.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_down.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_down.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_done.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_done.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_done.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_done_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_done_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_done_night.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_download.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_download.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_download.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_download_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_download_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_download_night.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_folder.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_done.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_folder_done.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_done.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_done_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_folder_done_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_done_night.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_folder_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_folder_night.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_retry.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_retry.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_retry.webp diff --git a/android/res/drawable-xxhdpi/ic_downloader_update.webp b/android/app/src/main/res/drawable-xxhdpi/ic_downloader_update.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_downloader_update.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_downloader_update.webp diff --git a/android/res/drawable-xxhdpi/ic_email.webp b/android/app/src/main/res/drawable-xxhdpi/ic_email.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_email.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_email.webp diff --git a/android/res/drawable-xxhdpi/ic_entrance.webp b/android/app/src/main/res/drawable-xxhdpi/ic_entrance.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_entrance.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_entrance.webp diff --git a/android/res/drawable-xxhdpi/ic_error_white.webp b/android/app/src/main/res/drawable-xxhdpi/ic_error_white.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_error_white.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_error_white.webp diff --git a/android/res/drawable-xxhdpi/ic_exit_highway_to_left.webp b/android/app/src/main/res/drawable-xxhdpi/ic_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_exit_highway_to_left.webp diff --git a/android/res/drawable-xxhdpi/ic_exit_highway_to_right.webp b/android/app/src/main/res/drawable-xxhdpi/ic_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_exit_highway_to_right.webp diff --git a/android/res/drawable-xxhdpi/ic_expand_less.webp b/android/app/src/main/res/drawable-xxhdpi/ic_expand_less.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_expand_less.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_expand_less.webp diff --git a/android/res/drawable-xxhdpi/ic_expand_more.webp b/android/app/src/main/res/drawable-xxhdpi/ic_expand_more.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_expand_more.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_expand_more.webp diff --git a/android/res/drawable-xxhdpi/ic_explore.webp b/android/app/src/main/res/drawable-xxhdpi/ic_explore.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_explore.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_explore.webp diff --git a/android/res/drawable-xxhdpi/ic_facebook.webp b/android/app/src/main/res/drawable-xxhdpi/ic_facebook.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_facebook.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_facebook.webp diff --git a/android/res/drawable-xxhdpi/ic_graph_point.webp b/android/app/src/main/res/drawable-xxhdpi/ic_graph_point.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_graph_point.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_graph_point.webp diff --git a/android/res/drawable-xxhdpi/ic_link_inline.webp b/android/app/src/main/res/drawable-xxhdpi/ic_link_inline.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_link_inline.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_link_inline.webp diff --git a/android/res/drawable-xxhdpi/ic_lock.webp b/android/app/src/main/res/drawable-xxhdpi/ic_lock.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_lock.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_lock.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_1.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_1.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_1.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_1.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_10.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_10.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_10.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_10.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_10_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_10_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_10_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_10_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_11.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_11.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_11.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_11.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_11_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_11_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_11_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_11_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_12.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_12.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_12.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_12.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_12_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_12_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_12_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_12_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_13.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_13.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_13.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_13.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_13_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_13_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_13_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_13_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_14.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_14.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_14.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_14.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_14_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_14_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_14_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_14_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_15.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_15.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_15.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_15.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_15_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_15_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_15_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_15_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_16.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_16.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_16.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_16.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_16_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_16_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_16_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_16_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_17.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_17.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_17.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_17.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_17_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_17_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_17_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_17_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_18.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_18.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_18.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_18.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_18_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_18_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_18_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_18_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_19.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_19.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_19.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_19.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_19_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_19_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_19_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_19_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_1_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_1_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_1_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_1_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_2.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_2.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_2.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_2.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_20.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_20.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_20.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_20.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_20_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_20_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_20_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_20_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_2_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_2_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_2_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_2_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_3.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_3.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_3.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_3.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_3_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_3_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_3_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_3_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_4.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_4.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_4.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_4.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_4_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_4_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_4_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_4_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_5.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_5.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_5.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_5.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_5_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_5_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_5_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_5_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_6.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_6.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_6.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_6.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_6_night.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_6_night.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_6_night.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_6_night.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_7.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_7.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_7.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_7.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_7_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_7_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_7_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_7_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_8.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_8.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_8.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_8.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_8_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_8_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_8_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_8_night.webp diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_9.png b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_9.png similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_9.png rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_9.png diff --git a/android/res/drawable-xxhdpi/ic_menu_location_pending_9_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_9_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_menu_location_pending_9_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_menu_location_pending_9_night.webp diff --git a/android/res/drawable-xxhdpi/ic_mic_white.webp b/android/app/src/main/res/drawable-xxhdpi/ic_mic_white.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_mic_white.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_mic_white.webp diff --git a/android/res/drawable-xxhdpi/ic_notification.webp b/android/app/src/main/res/drawable-xxhdpi/ic_notification.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_notification.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_notification.webp diff --git a/android/res/drawable-xxhdpi/ic_operating_hours.webp b/android/app/src/main/res/drawable-xxhdpi/ic_operating_hours.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_operating_hours.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_operating_hours.webp diff --git a/android/res/drawable-xxhdpi/ic_operator.webp b/android/app/src/main/res/drawable-xxhdpi/ic_operator.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_operator.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_operator.webp diff --git a/android/res/drawable-xxhdpi/ic_pedestrian.webp b/android/app/src/main/res/drawable-xxhdpi/ic_pedestrian.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_pedestrian.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_pedestrian.webp diff --git a/android/res/drawable-xxhdpi/ic_phone.webp b/android/app/src/main/res/drawable-xxhdpi/ic_phone.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_phone.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_phone.webp diff --git a/android/res/drawable-xxhdpi/ic_place_page_phone.webp b/android/app/src/main/res/drawable-xxhdpi/ic_place_page_phone.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_place_page_phone.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_place_page_phone.webp diff --git a/android/res/drawable-xxhdpi/ic_route_from.webp b/android/app/src/main/res/drawable-xxhdpi/ic_route_from.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_route_from.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_route_from.webp diff --git a/android/res/drawable-xxhdpi/ic_route_remove.webp b/android/app/src/main/res/drawable-xxhdpi/ic_route_remove.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_route_remove.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_route_remove.webp diff --git a/android/res/drawable-xxhdpi/ic_route_to.webp b/android/app/src/main/res/drawable-xxhdpi/ic_route_to.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_route_to.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_route_to.webp diff --git a/android/res/drawable-xxhdpi/ic_route_via.webp b/android/app/src/main/res/drawable-xxhdpi/ic_route_via.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_route_via.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_route_via.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_atm_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_atm_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_atm_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_atm_off.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_atm_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_atm_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_atm_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_atm_on.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_eat_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_eat_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_eat_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_eat_off.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_eat_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_eat_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_eat_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_eat_on.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_error.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_error.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_error.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_error.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_food_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_food_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_food_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_food_off.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_food_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_food_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_food_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_food_on.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_fuel_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_fuel_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_fuel_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_fuel_off.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_fuel_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_fuel_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_fuel_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_fuel_on.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_parking_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_parking_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_parking_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_parking_off.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_parking_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_parking_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_parking_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_parking_on.webp diff --git a/android/res/drawable-xxhdpi/ic_routing_search_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_routing_search_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_routing_search_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_routing_search_off.webp diff --git a/android/res/drawable-xxhdpi/ic_search_my_position.webp b/android/app/src/main/res/drawable-xxhdpi/ic_search_my_position.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_search_my_position.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_search_my_position.webp diff --git a/android/res/drawable-xxhdpi/ic_search_recent.webp b/android/app/src/main/res/drawable-xxhdpi/ic_search_recent.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_search_recent.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_search_recent.webp diff --git a/android/res/drawable-xxhdpi/ic_search_suggest.webp b/android/app/src/main/res/drawable-xxhdpi/ic_search_suggest.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_search_suggest.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_search_suggest.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_10_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_10_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_11_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_11_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_12_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_12_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_13_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_13_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_14_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_14_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_15_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_15_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_16_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_16_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_17_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_17_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_18_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_18_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_1_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_1_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_2_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_2_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_3_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_3_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_4_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_4_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_5_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_5_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_6_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_6_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_7_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_7_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_8_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_8_night.webp diff --git a/android/res/drawable-xxhdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_9_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_spinner_pending_9_night.webp diff --git a/android/res/drawable-xxhdpi/ic_then_exit_highway_to_left.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_exit_highway_to_left.webp diff --git a/android/res/drawable-xxhdpi/ic_then_exit_highway_to_right.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_exit_highway_to_right.webp diff --git a/android/res/drawable-xxhdpi/ic_then_finish.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_finish.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_finish.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_finish.webp diff --git a/android/res/drawable-xxhdpi/ic_then_left.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_left.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_left.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_left.webp diff --git a/android/res/drawable-xxhdpi/ic_then_left_sharp.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_left_sharp.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_left_sharp.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_left_sharp.webp diff --git a/android/res/drawable-xxhdpi/ic_then_left_slight.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_left_slight.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_left_slight.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_left_slight.webp diff --git a/android/res/drawable-xxhdpi/ic_then_right.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_right.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_right.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_right.webp diff --git a/android/res/drawable-xxhdpi/ic_then_right_sharp.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_right_sharp.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_right_sharp.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_right_sharp.webp diff --git a/android/res/drawable-xxhdpi/ic_then_right_slight.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_right_slight.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_right_slight.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_right_slight.webp diff --git a/android/res/drawable-xxhdpi/ic_then_round.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_round.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_round.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_round.webp diff --git a/android/res/drawable-xxhdpi/ic_then_uleft.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_uleft.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_uleft.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_uleft.webp diff --git a/android/res/drawable-xxhdpi/ic_then_uright.webp b/android/app/src/main/res/drawable-xxhdpi/ic_then_uright.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_then_uright.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_then_uright.webp diff --git a/android/res/drawable-xxhdpi/ic_thumb_up.webp b/android/app/src/main/res/drawable-xxhdpi/ic_thumb_up.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_thumb_up.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_thumb_up.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_download_1.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_1.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_download_1.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_1.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_download_2.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_2.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_download_2.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_2.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_download_3.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_3.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_download_3.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_3.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_1.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_1.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_2.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_2.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_3.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_download_night_3.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_on.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_on_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_on_night.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_outdated.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_outdated.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_outdated.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_outdated.webp diff --git a/android/res/drawable-xxhdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_traffic_outdated_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_traffic_outdated_night.webp diff --git a/android/res/drawable-xxhdpi/ic_transit.webp b/android/app/src/main/res/drawable-xxhdpi/ic_transit.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_transit.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_transit.webp diff --git a/android/res/drawable-xxhdpi/ic_triangle.webp b/android/app/src/main/res/drawable-xxhdpi/ic_triangle.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_triangle.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_triangle.webp diff --git a/android/res/drawable-xxhdpi/ic_triangle_elevation.webp b/android/app/src/main/res/drawable-xxhdpi/ic_triangle_elevation.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_triangle_elevation.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_triangle_elevation.webp diff --git a/android/res/drawable-xxhdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_triangle_elevation_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_triangle_elevation_night.webp diff --git a/android/res/drawable-xxhdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-xxhdpi/ic_triangle_night.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_triangle_night.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_finish.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_finish.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_finish.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_finish.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_left.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_left.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_left.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_left.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_left_sharp.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_left_sharp.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_left_sharp.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_left_sharp.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_left_slight.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_left_slight.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_left_slight.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_left_slight.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_right.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_right.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_right.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_right.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_right_sharp.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_right_sharp.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_right_sharp.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_right_sharp.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_right_slight.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_right_slight.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_right_slight.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_right_slight.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_round.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_round.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_round.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_round.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_straight.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_straight.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_straight.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_straight.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_uleft.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_uleft.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_uleft.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_uleft.webp diff --git a/android/res/drawable-xxhdpi/ic_turn_uright.webp b/android/app/src/main/res/drawable-xxhdpi/ic_turn_uright.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_turn_uright.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_turn_uright.webp diff --git a/android/res/drawable-xxhdpi/ic_type_text.webp b/android/app/src/main/res/drawable-xxhdpi/ic_type_text.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_type_text.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_type_text.webp diff --git a/android/res/drawable-xxhdpi/ic_update.webp b/android/app/src/main/res/drawable-xxhdpi/ic_update.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_update.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_update.webp diff --git a/android/res/drawable-xxhdpi/ic_voice_off.webp b/android/app/src/main/res/drawable-xxhdpi/ic_voice_off.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_voice_off.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_voice_off.webp diff --git a/android/res/drawable-xxhdpi/ic_voice_on.webp b/android/app/src/main/res/drawable-xxhdpi/ic_voice_on.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_voice_on.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_voice_on.webp diff --git a/android/res/drawable-xxhdpi/ic_wiki.webp b/android/app/src/main/res/drawable-xxhdpi/ic_wiki.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_wiki.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_wiki.webp diff --git a/android/res/drawable-xxhdpi/ic_you_marker.webp b/android/app/src/main/res/drawable-xxhdpi/ic_you_marker.webp similarity index 100% rename from android/res/drawable-xxhdpi/ic_you_marker.webp rename to android/app/src/main/res/drawable-xxhdpi/ic_you_marker.webp diff --git a/android/res/drawable-xxhdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-xxhdpi/img_empty_bookmarks.webp similarity index 100% rename from android/res/drawable-xxhdpi/img_empty_bookmarks.webp rename to android/app/src/main/res/drawable-xxhdpi/img_empty_bookmarks.webp diff --git a/android/res/drawable-xxhdpi/img_search_no_maps.webp b/android/app/src/main/res/drawable-xxhdpi/img_search_no_maps.webp similarity index 100% rename from android/res/drawable-xxhdpi/img_search_no_maps.webp rename to android/app/src/main/res/drawable-xxhdpi/img_search_no_maps.webp diff --git a/android/res/drawable-xxhdpi/shadow_bottom.9.png b/android/app/src/main/res/drawable-xxhdpi/shadow_bottom.9.png similarity index 100% rename from android/res/drawable-xxhdpi/shadow_bottom.9.png rename to android/app/src/main/res/drawable-xxhdpi/shadow_bottom.9.png diff --git a/android/res/drawable-xxhdpi/shadow_card.9.png b/android/app/src/main/res/drawable-xxhdpi/shadow_card.9.png similarity index 100% rename from android/res/drawable-xxhdpi/shadow_card.9.png rename to android/app/src/main/res/drawable-xxhdpi/shadow_card.9.png diff --git a/android/res/drawable-xxhdpi/shadow_top.9.png b/android/app/src/main/res/drawable-xxhdpi/shadow_top.9.png similarity index 100% rename from android/res/drawable-xxhdpi/shadow_top.9.png rename to android/app/src/main/res/drawable-xxhdpi/shadow_top.9.png diff --git a/android/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp b/android/app/src/main/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp similarity index 100% rename from android/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp rename to android/app/src/main/res/drawable-xxxhdpi/abc_ic_ab_back_mtrl_am_alpha.webp diff --git a/android/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_lightrail.webp diff --git a/android/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_metro.webp diff --git a/android/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_monorail.webp diff --git a/android/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_train.webp diff --git a/android/res/drawable-xxxhdpi/ic_20px_route_planning_walk.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_walk.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_20px_route_planning_walk.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_20px_route_planning_walk.webp diff --git a/android/res/drawable-xxxhdpi/ic_avoid_ferry.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_avoid_ferry.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_avoid_ferry.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_avoid_ferry.webp diff --git a/android/res/drawable-xxxhdpi/ic_avoid_tolls.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_avoid_tolls.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_avoid_tolls.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_avoid_tolls.webp diff --git a/android/res/drawable-xxxhdpi/ic_avoid_unpaved.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_avoid_unpaved.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_avoid_unpaved.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_avoid_unpaved.webp diff --git a/android/res/drawable-xxxhdpi/ic_bike.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_bike.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_bike.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_bike.webp diff --git a/android/res/drawable-xxxhdpi/ic_cancel.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_cancel.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_cancel.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_cancel.webp diff --git a/android/res/drawable-xxxhdpi/ic_car.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_car.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_car.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_car.webp diff --git a/android/res/drawable-xxxhdpi/ic_chart_pin.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_chart_pin.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_chart_pin.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_chart_pin.webp diff --git a/android/res/drawable-xxxhdpi/ic_checkbox_add.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_checkbox_add.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_checkbox_add.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_checkbox_add.webp diff --git a/android/res/drawable-xxxhdpi/ic_checkmark.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_checkmark.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_checkmark.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_checkmark.webp diff --git a/android/res/drawable-xxxhdpi/ic_clear_rounded.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_clear_rounded.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_clear_rounded.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_clear_rounded.webp diff --git a/android/res/drawable-xxxhdpi/ic_clear_rounded_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_clear_rounded_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_clear_rounded_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_clear_rounded_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_close_spinner.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_close_spinner.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_close_spinner.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_close_spinner.webp diff --git a/android/res/drawable-xxxhdpi/ic_direction_pagepreview.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_direction_pagepreview.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_direction_pagepreview.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_direction_pagepreview.webp diff --git a/android/res/drawable-xxxhdpi/ic_done.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_done.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_done.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_done.webp diff --git a/android/res/drawable-xxxhdpi/ic_down.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_down.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_down.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_down.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_done.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_done.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_done_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_done_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_done_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_download.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_download.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_download.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_download.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_download_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_download_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_download_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_download_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_folder.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_folder.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_folder_done.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_folder_done.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_folder_done_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_folder_done_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_done_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_folder_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_folder_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_folder_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_retry.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_retry.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_retry.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_retry.webp diff --git a/android/res/drawable-xxxhdpi/ic_downloader_update.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_downloader_update.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_downloader_update.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_downloader_update.webp diff --git a/android/res/drawable-xxxhdpi/ic_email.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_email.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_email.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_email.webp diff --git a/android/res/drawable-xxxhdpi/ic_entrance.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_entrance.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_entrance.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_entrance.webp diff --git a/android/res/drawable-xxxhdpi/ic_error_white.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_error_white.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_error_white.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_error_white.webp diff --git a/android/res/drawable-xxxhdpi/ic_exit_highway_to_left.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_exit_highway_to_left.webp diff --git a/android/res/drawable-xxxhdpi/ic_exit_highway_to_right.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_exit_highway_to_right.webp diff --git a/android/res/drawable-xxxhdpi/ic_expand_less.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_expand_less.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_expand_less.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_expand_less.webp diff --git a/android/res/drawable-xxxhdpi/ic_expand_more.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_expand_more.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_expand_more.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_expand_more.webp diff --git a/android/res/drawable-xxxhdpi/ic_explore.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_explore.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_explore.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_explore.webp diff --git a/android/res/drawable-xxxhdpi/ic_facebook.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_facebook.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_facebook.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_facebook.webp diff --git a/android/res/drawable-xxxhdpi/ic_graph_point.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_graph_point.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_graph_point.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_graph_point.webp diff --git a/android/res/drawable-xxxhdpi/ic_link_inline.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_link_inline.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_link_inline.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_link_inline.webp diff --git a/android/res/drawable-xxxhdpi/ic_lock.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_lock.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_lock.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_lock.webp diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_1.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_1.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_1.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_1.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_10.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_10.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_10.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_10.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_10_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_10_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_10_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_10_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_11.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_11.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_11.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_11.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_11_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_11_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_11_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_11_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_12.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_12.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_12.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_12.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_12_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_12_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_12_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_12_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_13.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_13.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_13.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_13.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_13_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_13_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_13_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_13_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_14.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_14.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_14.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_14.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_14_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_14_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_14_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_14_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_15.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_15.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_15.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_15.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_15_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_15_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_15_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_15_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_16.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_16.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_16.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_16.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_16_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_16_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_16_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_16_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_17.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_17.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_17.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_17.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_17_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_17_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_17_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_17_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_18.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_18.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_18.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_18.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_18_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_18_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_18_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_18_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_19.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_19.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_19.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_19.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_19_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_19_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_19_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_19_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_1_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_1_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_1_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_1_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_2.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_2.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_2.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_2.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_20.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_20.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_20.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_20.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_20_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_20_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_20_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_20_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_2_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_2_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_2_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_2_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_3.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_3.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_3.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_3.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_3_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_3_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_3_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_3_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_4.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_4.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_4.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_4.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_4_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_4_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_4_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_4_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_5.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_5.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_5.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_5.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_5_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_5_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_5_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_5_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_6.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_6.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_6.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_6.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_6_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_6_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_6_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_6_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_7.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_7.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_7.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_7.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_7_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_7_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_7_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_7_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_8.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_8.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_8.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_8.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_8_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_8_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_8_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_8_night.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_9.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_9.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_9.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_9.png diff --git a/android/res/drawable-xxxhdpi/ic_menu_location_pending_9_night.png b/android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_9_night.png similarity index 100% rename from android/res/drawable-xxxhdpi/ic_menu_location_pending_9_night.png rename to android/app/src/main/res/drawable-xxxhdpi/ic_menu_location_pending_9_night.png diff --git a/android/res/drawable-xxxhdpi/ic_notification.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_notification.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_notification.webp diff --git a/android/res/drawable-xxxhdpi/ic_operating_hours.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_operating_hours.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_operating_hours.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_operating_hours.webp diff --git a/android/res/drawable-xxxhdpi/ic_operator.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_operator.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_operator.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_operator.webp diff --git a/android/res/drawable-xxxhdpi/ic_pedestrian.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_pedestrian.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_pedestrian.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_pedestrian.webp diff --git a/android/res/drawable-xxxhdpi/ic_phone.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_phone.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_phone.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_phone.webp diff --git a/android/res/drawable-xxxhdpi/ic_place_page_phone.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_place_page_phone.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_place_page_phone.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_place_page_phone.webp diff --git a/android/res/drawable-xxxhdpi/ic_route_from.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_route_from.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_route_from.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_route_from.webp diff --git a/android/res/drawable-xxxhdpi/ic_route_remove.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_route_remove.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_route_remove.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_route_remove.webp diff --git a/android/res/drawable-xxxhdpi/ic_route_to.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_route_to.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_route_to.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_route_to.webp diff --git a/android/res/drawable-xxxhdpi/ic_route_via.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_route_via.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_route_via.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_route_via.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_atm_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_atm_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_atm_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_atm_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_atm_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_atm_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_atm_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_atm_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_eat_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_eat_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_eat_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_eat_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_eat_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_eat_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_eat_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_eat_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_food_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_food_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_food_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_food_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_food_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_food_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_food_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_food_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_fuel_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_fuel_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_fuel_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_fuel_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_fuel_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_fuel_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_fuel_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_fuel_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_parking_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_parking_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_parking_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_parking_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_parking_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_parking_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_parking_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_parking_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_routing_search_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_routing_search_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_routing_search_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_routing_search_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_search_my_position.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_search_my_position.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_search_my_position.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_search_my_position.webp diff --git a/android/res/drawable-xxxhdpi/ic_search_recent.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_search_recent.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_search_recent.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_search_recent.webp diff --git a/android/res/drawable-xxxhdpi/ic_search_suggest.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_search_suggest.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_search_suggest.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_search_suggest.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_10_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_10_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_10_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_10_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_11_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_11_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_11_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_11_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_12_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_12_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_12_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_12_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_13_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_13_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_13_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_13_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_14_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_14_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_14_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_14_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_15_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_15_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_15_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_15_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_16_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_16_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_16_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_16_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_17_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_17_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_17_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_17_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_18_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_18_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_18_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_18_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_1_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_1_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_1_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_1_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_2_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_2_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_2_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_2_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_3_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_3_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_3_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_3_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_4_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_4_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_4_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_4_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_5_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_5_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_5_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_5_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_6_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_6_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_6_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_6_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_7_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_7_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_7_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_7_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_8_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_8_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_8_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_8_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_spinner_pending_9_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_9_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_spinner_pending_9_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_spinner_pending_9_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_exit_highway_to_left.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_exit_highway_to_right.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_finish.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_finish.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_finish.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_finish.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_left.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_left.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_left.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_left.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_left_sharp.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_left_sharp.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_left_sharp.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_left_sharp.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_left_slight.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_left_slight.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_left_slight.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_left_slight.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_right.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_right.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_right.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_right.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_right_sharp.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_right_sharp.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_right_sharp.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_right_sharp.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_right_slight.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_right_slight.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_right_slight.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_right_slight.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_round.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_round.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_round.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_round.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_uleft.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_uleft.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_uleft.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_uleft.webp diff --git a/android/res/drawable-xxxhdpi/ic_then_uright.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_then_uright.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_then_uright.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_then_uright.webp diff --git a/android/res/drawable-xxxhdpi/ic_thumb_up.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_thumb_up.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_thumb_up.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_thumb_up.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_download_1.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_1.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_download_1.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_1.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_download_2.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_2.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_download_2.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_2.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_download_3.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_3.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_download_3.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_3.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_download_night_1.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_1.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_download_night_1.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_1.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_download_night_2.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_2.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_download_night_2.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_2.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_download_night_3.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_3.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_download_night_3.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_download_night_3.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_on_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_on_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_on_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_on_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_outdated.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_outdated.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_outdated.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_outdated.webp diff --git a/android/res/drawable-xxxhdpi/ic_traffic_outdated_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_traffic_outdated_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_traffic_outdated_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_traffic_outdated_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_transit.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_transit.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_transit.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_transit.webp diff --git a/android/res/drawable-xxxhdpi/ic_triangle.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_triangle.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_triangle.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_triangle.webp diff --git a/android/res/drawable-xxxhdpi/ic_triangle_elevation.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_triangle_elevation.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_triangle_elevation.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_triangle_elevation.webp diff --git a/android/res/drawable-xxxhdpi/ic_triangle_elevation_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_triangle_elevation_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_triangle_elevation_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_triangle_elevation_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_triangle_night.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_triangle_night.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_triangle_night.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_triangle_night.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_finish.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_finish.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_finish.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_finish.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_left.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_left.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_left.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_left.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_left_sharp.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_left_sharp.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_left_sharp.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_left_sharp.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_left_slight.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_left_slight.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_left_slight.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_left_slight.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_right.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_right.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_right.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_right.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_right_sharp.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_right_sharp.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_right_sharp.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_right_sharp.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_right_slight.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_right_slight.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_right_slight.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_right_slight.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_round.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_round.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_round.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_round.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_straight.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_straight.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_straight.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_straight.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_uleft.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_uleft.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_uleft.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_uleft.webp diff --git a/android/res/drawable-xxxhdpi/ic_turn_uright.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_turn_uright.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_turn_uright.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_turn_uright.webp diff --git a/android/res/drawable-xxxhdpi/ic_type_text.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_type_text.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_type_text.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_type_text.webp diff --git a/android/res/drawable-xxxhdpi/ic_update.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_update.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_update.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_update.webp diff --git a/android/res/drawable-xxxhdpi/ic_voice_off.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_voice_off.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_voice_off.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_voice_off.webp diff --git a/android/res/drawable-xxxhdpi/ic_voice_on.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_voice_on.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_voice_on.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_voice_on.webp diff --git a/android/res/drawable-xxxhdpi/ic_wiki.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_wiki.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_wiki.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_wiki.webp diff --git a/android/res/drawable-xxxhdpi/ic_you_marker.webp b/android/app/src/main/res/drawable-xxxhdpi/ic_you_marker.webp similarity index 100% rename from android/res/drawable-xxxhdpi/ic_you_marker.webp rename to android/app/src/main/res/drawable-xxxhdpi/ic_you_marker.webp diff --git a/android/res/drawable-xxxhdpi/img_empty_bookmarks.webp b/android/app/src/main/res/drawable-xxxhdpi/img_empty_bookmarks.webp similarity index 100% rename from android/res/drawable-xxxhdpi/img_empty_bookmarks.webp rename to android/app/src/main/res/drawable-xxxhdpi/img_empty_bookmarks.webp diff --git a/android/res/drawable-xxxhdpi/img_search_no_maps.webp b/android/app/src/main/res/drawable-xxxhdpi/img_search_no_maps.webp similarity index 100% rename from android/res/drawable-xxxhdpi/img_search_no_maps.webp rename to android/app/src/main/res/drawable-xxxhdpi/img_search_no_maps.webp diff --git a/android/res/drawable-xxxhdpi/shadow_bottom.9.png b/android/app/src/main/res/drawable-xxxhdpi/shadow_bottom.9.png similarity index 100% rename from android/res/drawable-xxxhdpi/shadow_bottom.9.png rename to android/app/src/main/res/drawable-xxxhdpi/shadow_bottom.9.png diff --git a/android/res/drawable-xxxhdpi/shadow_card.9.png b/android/app/src/main/res/drawable-xxxhdpi/shadow_card.9.png similarity index 100% rename from android/res/drawable-xxxhdpi/shadow_card.9.png rename to android/app/src/main/res/drawable-xxxhdpi/shadow_card.9.png diff --git a/android/res/drawable-xxxhdpi/shadow_top.9.png b/android/app/src/main/res/drawable-xxxhdpi/shadow_top.9.png similarity index 100% rename from android/res/drawable-xxxhdpi/shadow_top.9.png rename to android/app/src/main/res/drawable-xxxhdpi/shadow_top.9.png diff --git a/android/res/drawable/anim_myposition_pending.xml b/android/app/src/main/res/drawable/anim_myposition_pending.xml similarity index 100% rename from android/res/drawable/anim_myposition_pending.xml rename to android/app/src/main/res/drawable/anim_myposition_pending.xml diff --git a/android/res/drawable/anim_myposition_pending_night.xml b/android/app/src/main/res/drawable/anim_myposition_pending_night.xml similarity index 100% rename from android/res/drawable/anim_myposition_pending_night.xml rename to android/app/src/main/res/drawable/anim_myposition_pending_night.xml diff --git a/android/res/drawable/anim_spinner_pending.xml b/android/app/src/main/res/drawable/anim_spinner_pending.xml similarity index 100% rename from android/res/drawable/anim_spinner_pending.xml rename to android/app/src/main/res/drawable/anim_spinner_pending.xml diff --git a/android/res/drawable/anim_traffic_loading.xml b/android/app/src/main/res/drawable/anim_traffic_loading.xml similarity index 100% rename from android/res/drawable/anim_traffic_loading.xml rename to android/app/src/main/res/drawable/anim_traffic_loading.xml diff --git a/android/res/drawable/anim_traffic_loading_night.xml b/android/app/src/main/res/drawable/anim_traffic_loading_night.xml similarity index 100% rename from android/res/drawable/anim_traffic_loading_night.xml rename to android/app/src/main/res/drawable/anim_traffic_loading_night.xml diff --git a/android/res/drawable/back_arrow.xml b/android/app/src/main/res/drawable/back_arrow.xml similarity index 100% rename from android/res/drawable/back_arrow.xml rename to android/app/src/main/res/drawable/back_arrow.xml diff --git a/android/res/drawable/bg_altitude.xml b/android/app/src/main/res/drawable/bg_altitude.xml similarity index 100% rename from android/res/drawable/bg_altitude.xml rename to android/app/src/main/res/drawable/bg_altitude.xml diff --git a/android/res/drawable/bg_altitude_night.xml b/android/app/src/main/res/drawable/bg_altitude_night.xml similarity index 100% rename from android/res/drawable/bg_altitude_night.xml rename to android/app/src/main/res/drawable/bg_altitude_night.xml diff --git a/android/res/drawable/bg_nav_next_next_turn.xml b/android/app/src/main/res/drawable/bg_nav_next_next_turn.xml similarity index 100% rename from android/res/drawable/bg_nav_next_next_turn.xml rename to android/app/src/main/res/drawable/bg_nav_next_next_turn.xml diff --git a/android/res/drawable/bg_nav_next_next_turn_night.xml b/android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml similarity index 100% rename from android/res/drawable/bg_nav_next_next_turn_night.xml rename to android/app/src/main/res/drawable/bg_nav_next_next_turn_night.xml diff --git a/android/res/drawable/bg_nav_next_turn.xml b/android/app/src/main/res/drawable/bg_nav_next_turn.xml similarity index 100% rename from android/res/drawable/bg_nav_next_turn.xml rename to android/app/src/main/res/drawable/bg_nav_next_turn.xml diff --git a/android/res/drawable/bg_nav_next_turn_night.xml b/android/app/src/main/res/drawable/bg_nav_next_turn_night.xml similarity index 100% rename from android/res/drawable/bg_nav_next_turn_night.xml rename to android/app/src/main/res/drawable/bg_nav_next_turn_night.xml diff --git a/android/res/drawable/bg_point_desc.xml b/android/app/src/main/res/drawable/bg_point_desc.xml similarity index 100% rename from android/res/drawable/bg_point_desc.xml rename to android/app/src/main/res/drawable/bg_point_desc.xml diff --git a/android/res/drawable/bg_point_desc_night.xml b/android/app/src/main/res/drawable/bg_point_desc_night.xml similarity index 100% rename from android/res/drawable/bg_point_desc_night.xml rename to android/app/src/main/res/drawable/bg_point_desc_night.xml diff --git a/android/res/drawable/bg_rounded_rect.xml b/android/app/src/main/res/drawable/bg_rounded_rect.xml similarity index 100% rename from android/res/drawable/bg_rounded_rect.xml rename to android/app/src/main/res/drawable/bg_rounded_rect.xml diff --git a/android/res/drawable/bg_rounded_rect_night.xml b/android/app/src/main/res/drawable/bg_rounded_rect_night.xml similarity index 100% rename from android/res/drawable/bg_rounded_rect_night.xml rename to android/app/src/main/res/drawable/bg_rounded_rect_night.xml diff --git a/android/res/drawable/bg_search_wheel_background_rect.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml similarity index 100% rename from android/res/drawable/bg_search_wheel_background_rect.xml rename to android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml diff --git a/android/res/drawable/bg_search_wheel_background_rect_night.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml similarity index 100% rename from android/res/drawable/bg_search_wheel_background_rect_night.xml rename to android/app/src/main/res/drawable/bg_search_wheel_background_rect_night.xml diff --git a/android/res/drawable/bg_search_wheel_background_round.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml similarity index 100% rename from android/res/drawable/bg_search_wheel_background_round.xml rename to android/app/src/main/res/drawable/bg_search_wheel_background_round.xml diff --git a/android/res/drawable/bg_search_wheel_background_round_night.xml b/android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml similarity index 100% rename from android/res/drawable/bg_search_wheel_background_round_night.xml rename to android/app/src/main/res/drawable/bg_search_wheel_background_round_night.xml diff --git a/android/res/drawable/bg_transparent.xml b/android/app/src/main/res/drawable/bg_transparent.xml similarity index 100% rename from android/res/drawable/bg_transparent.xml rename to android/app/src/main/res/drawable/bg_transparent.xml diff --git a/android/res/drawable/bg_your_location_pin.xml b/android/app/src/main/res/drawable/bg_your_location_pin.xml similarity index 100% rename from android/res/drawable/bg_your_location_pin.xml rename to android/app/src/main/res/drawable/bg_your_location_pin.xml diff --git a/android/res/drawable/bg_your_location_pin_night.xml b/android/app/src/main/res/drawable/bg_your_location_pin_night.xml similarity index 100% rename from android/res/drawable/bg_your_location_pin_night.xml rename to android/app/src/main/res/drawable/bg_your_location_pin_night.xml diff --git a/android/res/drawable/bottom_sheet_handle.xml b/android/app/src/main/res/drawable/bottom_sheet_handle.xml similarity index 100% rename from android/res/drawable/bottom_sheet_handle.xml rename to android/app/src/main/res/drawable/bottom_sheet_handle.xml diff --git a/android/res/drawable/button.xml b/android/app/src/main/res/drawable/button.xml similarity index 100% rename from android/res/drawable/button.xml rename to android/app/src/main/res/drawable/button.xml diff --git a/android/res/drawable/button_accent.xml b/android/app/src/main/res/drawable/button_accent.xml similarity index 100% rename from android/res/drawable/button_accent.xml rename to android/app/src/main/res/drawable/button_accent.xml diff --git a/android/res/drawable/button_accent_disabled.xml b/android/app/src/main/res/drawable/button_accent_disabled.xml similarity index 100% rename from android/res/drawable/button_accent_disabled.xml rename to android/app/src/main/res/drawable/button_accent_disabled.xml diff --git a/android/res/drawable/button_accent_disabled_night.xml b/android/app/src/main/res/drawable/button_accent_disabled_night.xml similarity index 100% rename from android/res/drawable/button_accent_disabled_night.xml rename to android/app/src/main/res/drawable/button_accent_disabled_night.xml diff --git a/android/res/drawable/button_accent_internal.xml b/android/app/src/main/res/drawable/button_accent_internal.xml similarity index 100% rename from android/res/drawable/button_accent_internal.xml rename to android/app/src/main/res/drawable/button_accent_internal.xml diff --git a/android/res/drawable/button_accent_night.xml b/android/app/src/main/res/drawable/button_accent_night.xml similarity index 100% rename from android/res/drawable/button_accent_night.xml rename to android/app/src/main/res/drawable/button_accent_night.xml diff --git a/android/res/drawable/button_accent_night_internal.xml b/android/app/src/main/res/drawable/button_accent_night_internal.xml similarity index 100% rename from android/res/drawable/button_accent_night_internal.xml rename to android/app/src/main/res/drawable/button_accent_night_internal.xml diff --git a/android/res/drawable/button_accent_normal.xml b/android/app/src/main/res/drawable/button_accent_normal.xml similarity index 100% rename from android/res/drawable/button_accent_normal.xml rename to android/app/src/main/res/drawable/button_accent_normal.xml diff --git a/android/res/drawable/button_accent_normal_night.xml b/android/app/src/main/res/drawable/button_accent_normal_night.xml similarity index 100% rename from android/res/drawable/button_accent_normal_night.xml rename to android/app/src/main/res/drawable/button_accent_normal_night.xml diff --git a/android/res/drawable/button_accent_pressed.xml b/android/app/src/main/res/drawable/button_accent_pressed.xml similarity index 100% rename from android/res/drawable/button_accent_pressed.xml rename to android/app/src/main/res/drawable/button_accent_pressed.xml diff --git a/android/res/drawable/button_accent_pressed_night.xml b/android/app/src/main/res/drawable/button_accent_pressed_night.xml similarity index 100% rename from android/res/drawable/button_accent_pressed_night.xml rename to android/app/src/main/res/drawable/button_accent_pressed_night.xml diff --git a/android/res/drawable/button_disabled.xml b/android/app/src/main/res/drawable/button_disabled.xml similarity index 100% rename from android/res/drawable/button_disabled.xml rename to android/app/src/main/res/drawable/button_disabled.xml diff --git a/android/res/drawable/button_disabled_night.xml b/android/app/src/main/res/drawable/button_disabled_night.xml similarity index 100% rename from android/res/drawable/button_disabled_night.xml rename to android/app/src/main/res/drawable/button_disabled_night.xml diff --git a/android/res/drawable/button_editor_light.xml b/android/app/src/main/res/drawable/button_editor_light.xml similarity index 100% rename from android/res/drawable/button_editor_light.xml rename to android/app/src/main/res/drawable/button_editor_light.xml diff --git a/android/res/drawable/button_night.xml b/android/app/src/main/res/drawable/button_night.xml similarity index 100% rename from android/res/drawable/button_night.xml rename to android/app/src/main/res/drawable/button_night.xml diff --git a/android/res/drawable/button_normal.xml b/android/app/src/main/res/drawable/button_normal.xml similarity index 100% rename from android/res/drawable/button_normal.xml rename to android/app/src/main/res/drawable/button_normal.xml diff --git a/android/res/drawable/button_normal_night.xml b/android/app/src/main/res/drawable/button_normal_night.xml similarity index 100% rename from android/res/drawable/button_normal_night.xml rename to android/app/src/main/res/drawable/button_normal_night.xml diff --git a/android/res/drawable/button_pressed.xml b/android/app/src/main/res/drawable/button_pressed.xml similarity index 100% rename from android/res/drawable/button_pressed.xml rename to android/app/src/main/res/drawable/button_pressed.xml diff --git a/android/res/drawable/button_pressed_night.xml b/android/app/src/main/res/drawable/button_pressed_night.xml similarity index 100% rename from android/res/drawable/button_pressed_night.xml rename to android/app/src/main/res/drawable/button_pressed_night.xml diff --git a/android/res/drawable/button_red.xml b/android/app/src/main/res/drawable/button_red.xml similarity index 100% rename from android/res/drawable/button_red.xml rename to android/app/src/main/res/drawable/button_red.xml diff --git a/android/res/drawable/button_red_disabled.xml b/android/app/src/main/res/drawable/button_red_disabled.xml similarity index 100% rename from android/res/drawable/button_red_disabled.xml rename to android/app/src/main/res/drawable/button_red_disabled.xml diff --git a/android/res/drawable/button_red_normal.xml b/android/app/src/main/res/drawable/button_red_normal.xml similarity index 100% rename from android/res/drawable/button_red_normal.xml rename to android/app/src/main/res/drawable/button_red_normal.xml diff --git a/android/res/drawable/button_red_pressed.xml b/android/app/src/main/res/drawable/button_red_pressed.xml similarity index 100% rename from android/res/drawable/button_red_pressed.xml rename to android/app/src/main/res/drawable/button_red_pressed.xml diff --git a/android/res/drawable/counter.xml b/android/app/src/main/res/drawable/counter.xml similarity index 100% rename from android/res/drawable/counter.xml rename to android/app/src/main/res/drawable/counter.xml diff --git a/android/res/drawable/cursor_drawable.xml b/android/app/src/main/res/drawable/cursor_drawable.xml similarity index 100% rename from android/res/drawable/cursor_drawable.xml rename to android/app/src/main/res/drawable/cursor_drawable.xml diff --git a/android/res/drawable/dark_red.xml b/android/app/src/main/res/drawable/dark_red.xml similarity index 100% rename from android/res/drawable/dark_red.xml rename to android/app/src/main/res/drawable/dark_red.xml diff --git a/android/res/drawable/divider_base.xml b/android/app/src/main/res/drawable/divider_base.xml similarity index 100% rename from android/res/drawable/divider_base.xml rename to android/app/src/main/res/drawable/divider_base.xml diff --git a/android/res/drawable/divider_shape.xml b/android/app/src/main/res/drawable/divider_shape.xml similarity index 100% rename from android/res/drawable/divider_shape.xml rename to android/app/src/main/res/drawable/divider_shape.xml diff --git a/android/res/drawable/divider_transparent_base.xml b/android/app/src/main/res/drawable/divider_transparent_base.xml similarity index 100% rename from android/res/drawable/divider_transparent_base.xml rename to android/app/src/main/res/drawable/divider_transparent_base.xml diff --git a/android/res/drawable/divider_transparent_half.xml b/android/app/src/main/res/drawable/divider_transparent_half.xml similarity index 100% rename from android/res/drawable/divider_transparent_half.xml rename to android/app/src/main/res/drawable/divider_transparent_half.xml diff --git a/android/res/drawable/divider_transparent_half_plus_eight.xml b/android/app/src/main/res/drawable/divider_transparent_half_plus_eight.xml similarity index 100% rename from android/res/drawable/divider_transparent_half_plus_eight.xml rename to android/app/src/main/res/drawable/divider_transparent_half_plus_eight.xml diff --git a/android/res/drawable/divider_transparent_quarter.xml b/android/app/src/main/res/drawable/divider_transparent_quarter.xml similarity index 100% rename from android/res/drawable/divider_transparent_quarter.xml rename to android/app/src/main/res/drawable/divider_transparent_quarter.xml diff --git a/android/res/drawable/dot_divider.xml b/android/app/src/main/res/drawable/dot_divider.xml similarity index 100% rename from android/res/drawable/dot_divider.xml rename to android/app/src/main/res/drawable/dot_divider.xml diff --git a/android/res/drawable/dot_divider_night.xml b/android/app/src/main/res/drawable/dot_divider_night.xml similarity index 100% rename from android/res/drawable/dot_divider_night.xml rename to android/app/src/main/res/drawable/dot_divider_night.xml diff --git a/android/res/drawable/dot_elevation_difficulty.xml b/android/app/src/main/res/drawable/dot_elevation_difficulty.xml similarity index 100% rename from android/res/drawable/dot_elevation_difficulty.xml rename to android/app/src/main/res/drawable/dot_elevation_difficulty.xml diff --git a/android/res/drawable/downloader_failed.xml b/android/app/src/main/res/drawable/downloader_failed.xml similarity index 100% rename from android/res/drawable/downloader_failed.xml rename to android/app/src/main/res/drawable/downloader_failed.xml diff --git a/android/res/drawable/downloader_update.xml b/android/app/src/main/res/drawable/downloader_update.xml similarity index 100% rename from android/res/drawable/downloader_update.xml rename to android/app/src/main/res/drawable/downloader_update.xml diff --git a/android/res/drawable/ic_address.xml b/android/app/src/main/res/drawable/ic_address.xml similarity index 100% rename from android/res/drawable/ic_address.xml rename to android/app/src/main/res/drawable/ic_address.xml diff --git a/android/res/drawable/ic_ascent.xml b/android/app/src/main/res/drawable/ic_ascent.xml similarity index 100% rename from android/res/drawable/ic_ascent.xml rename to android/app/src/main/res/drawable/ic_ascent.xml diff --git a/android/res/drawable/ic_bank.xml b/android/app/src/main/res/drawable/ic_bank.xml similarity index 100% rename from android/res/drawable/ic_bank.xml rename to android/app/src/main/res/drawable/ic_bank.xml diff --git a/android/res/drawable/ic_bookmark_animals.xml b/android/app/src/main/res/drawable/ic_bookmark_animals.xml similarity index 100% rename from android/res/drawable/ic_bookmark_animals.xml rename to android/app/src/main/res/drawable/ic_bookmark_animals.xml diff --git a/android/res/drawable/ic_bookmark_bar.xml b/android/app/src/main/res/drawable/ic_bookmark_bar.xml similarity index 100% rename from android/res/drawable/ic_bookmark_bar.xml rename to android/app/src/main/res/drawable/ic_bookmark_bar.xml diff --git a/android/res/drawable/ic_bookmark_buddhism.xml b/android/app/src/main/res/drawable/ic_bookmark_buddhism.xml similarity index 100% rename from android/res/drawable/ic_bookmark_buddhism.xml rename to android/app/src/main/res/drawable/ic_bookmark_buddhism.xml diff --git a/android/res/drawable/ic_bookmark_building.xml b/android/app/src/main/res/drawable/ic_bookmark_building.xml similarity index 100% rename from android/res/drawable/ic_bookmark_building.xml rename to android/app/src/main/res/drawable/ic_bookmark_building.xml diff --git a/android/res/drawable/ic_bookmark_christianity.xml b/android/app/src/main/res/drawable/ic_bookmark_christianity.xml similarity index 100% rename from android/res/drawable/ic_bookmark_christianity.xml rename to android/app/src/main/res/drawable/ic_bookmark_christianity.xml diff --git a/android/res/drawable/ic_bookmark_entertainment.xml b/android/app/src/main/res/drawable/ic_bookmark_entertainment.xml similarity index 100% rename from android/res/drawable/ic_bookmark_entertainment.xml rename to android/app/src/main/res/drawable/ic_bookmark_entertainment.xml diff --git a/android/res/drawable/ic_bookmark_finish.xml b/android/app/src/main/res/drawable/ic_bookmark_finish.xml similarity index 100% rename from android/res/drawable/ic_bookmark_finish.xml rename to android/app/src/main/res/drawable/ic_bookmark_finish.xml diff --git a/android/res/drawable/ic_bookmark_food.xml b/android/app/src/main/res/drawable/ic_bookmark_food.xml similarity index 100% rename from android/res/drawable/ic_bookmark_food.xml rename to android/app/src/main/res/drawable/ic_bookmark_food.xml diff --git a/android/res/drawable/ic_bookmark_gas.xml b/android/app/src/main/res/drawable/ic_bookmark_gas.xml similarity index 100% rename from android/res/drawable/ic_bookmark_gas.xml rename to android/app/src/main/res/drawable/ic_bookmark_gas.xml diff --git a/android/res/drawable/ic_bookmark_hotel.xml b/android/app/src/main/res/drawable/ic_bookmark_hotel.xml similarity index 100% rename from android/res/drawable/ic_bookmark_hotel.xml rename to android/app/src/main/res/drawable/ic_bookmark_hotel.xml diff --git a/android/res/drawable/ic_bookmark_islam.xml b/android/app/src/main/res/drawable/ic_bookmark_islam.xml similarity index 100% rename from android/res/drawable/ic_bookmark_islam.xml rename to android/app/src/main/res/drawable/ic_bookmark_islam.xml diff --git a/android/res/drawable/ic_bookmark_judaism.xml b/android/app/src/main/res/drawable/ic_bookmark_judaism.xml similarity index 100% rename from android/res/drawable/ic_bookmark_judaism.xml rename to android/app/src/main/res/drawable/ic_bookmark_judaism.xml diff --git a/android/res/drawable/ic_bookmark_medicine.xml b/android/app/src/main/res/drawable/ic_bookmark_medicine.xml similarity index 100% rename from android/res/drawable/ic_bookmark_medicine.xml rename to android/app/src/main/res/drawable/ic_bookmark_medicine.xml diff --git a/android/res/drawable/ic_bookmark_money.xml b/android/app/src/main/res/drawable/ic_bookmark_money.xml similarity index 100% rename from android/res/drawable/ic_bookmark_money.xml rename to android/app/src/main/res/drawable/ic_bookmark_money.xml diff --git a/android/res/drawable/ic_bookmark_mountain.xml b/android/app/src/main/res/drawable/ic_bookmark_mountain.xml similarity index 100% rename from android/res/drawable/ic_bookmark_mountain.xml rename to android/app/src/main/res/drawable/ic_bookmark_mountain.xml diff --git a/android/res/drawable/ic_bookmark_museum.xml b/android/app/src/main/res/drawable/ic_bookmark_museum.xml similarity index 100% rename from android/res/drawable/ic_bookmark_museum.xml rename to android/app/src/main/res/drawable/ic_bookmark_museum.xml diff --git a/android/res/drawable/ic_bookmark_none.xml b/android/app/src/main/res/drawable/ic_bookmark_none.xml similarity index 100% rename from android/res/drawable/ic_bookmark_none.xml rename to android/app/src/main/res/drawable/ic_bookmark_none.xml diff --git a/android/res/drawable/ic_bookmark_park.xml b/android/app/src/main/res/drawable/ic_bookmark_park.xml similarity index 100% rename from android/res/drawable/ic_bookmark_park.xml rename to android/app/src/main/res/drawable/ic_bookmark_park.xml diff --git a/android/res/drawable/ic_bookmark_parking.xml b/android/app/src/main/res/drawable/ic_bookmark_parking.xml similarity index 100% rename from android/res/drawable/ic_bookmark_parking.xml rename to android/app/src/main/res/drawable/ic_bookmark_parking.xml diff --git a/android/res/drawable/ic_bookmark_shop.xml b/android/app/src/main/res/drawable/ic_bookmark_shop.xml similarity index 100% rename from android/res/drawable/ic_bookmark_shop.xml rename to android/app/src/main/res/drawable/ic_bookmark_shop.xml diff --git a/android/res/drawable/ic_bookmark_sights.xml b/android/app/src/main/res/drawable/ic_bookmark_sights.xml similarity index 100% rename from android/res/drawable/ic_bookmark_sights.xml rename to android/app/src/main/res/drawable/ic_bookmark_sights.xml diff --git a/android/res/drawable/ic_bookmark_sport.xml b/android/app/src/main/res/drawable/ic_bookmark_sport.xml similarity index 100% rename from android/res/drawable/ic_bookmark_sport.xml rename to android/app/src/main/res/drawable/ic_bookmark_sport.xml diff --git a/android/res/drawable/ic_bookmark_start.xml b/android/app/src/main/res/drawable/ic_bookmark_start.xml similarity index 100% rename from android/res/drawable/ic_bookmark_start.xml rename to android/app/src/main/res/drawable/ic_bookmark_start.xml diff --git a/android/res/drawable/ic_bookmark_swim.xml b/android/app/src/main/res/drawable/ic_bookmark_swim.xml similarity index 100% rename from android/res/drawable/ic_bookmark_swim.xml rename to android/app/src/main/res/drawable/ic_bookmark_swim.xml diff --git a/android/res/drawable/ic_bookmark_transport.xml b/android/app/src/main/res/drawable/ic_bookmark_transport.xml similarity index 100% rename from android/res/drawable/ic_bookmark_transport.xml rename to android/app/src/main/res/drawable/ic_bookmark_transport.xml diff --git a/android/res/drawable/ic_bookmark_viewpoint.xml b/android/app/src/main/res/drawable/ic_bookmark_viewpoint.xml similarity index 100% rename from android/res/drawable/ic_bookmark_viewpoint.xml rename to android/app/src/main/res/drawable/ic_bookmark_viewpoint.xml diff --git a/android/res/drawable/ic_bookmark_water.xml b/android/app/src/main/res/drawable/ic_bookmark_water.xml similarity index 100% rename from android/res/drawable/ic_bookmark_water.xml rename to android/app/src/main/res/drawable/ic_bookmark_water.xml diff --git a/android/res/drawable/ic_bookmarks.xml b/android/app/src/main/res/drawable/ic_bookmarks.xml similarity index 100% rename from android/res/drawable/ic_bookmarks.xml rename to android/app/src/main/res/drawable/ic_bookmarks.xml diff --git a/android/res/drawable/ic_bookmarks_off.xml b/android/app/src/main/res/drawable/ic_bookmarks_off.xml similarity index 100% rename from android/res/drawable/ic_bookmarks_off.xml rename to android/app/src/main/res/drawable/ic_bookmarks_off.xml diff --git a/android/res/drawable/ic_bookmarks_on.xml b/android/app/src/main/res/drawable/ic_bookmarks_on.xml similarity index 100% rename from android/res/drawable/ic_bookmarks_on.xml rename to android/app/src/main/res/drawable/ic_bookmarks_on.xml diff --git a/android/res/drawable/ic_category_atm.xml b/android/app/src/main/res/drawable/ic_category_atm.xml similarity index 100% rename from android/res/drawable/ic_category_atm.xml rename to android/app/src/main/res/drawable/ic_category_atm.xml diff --git a/android/res/drawable/ic_category_atm_night.xml b/android/app/src/main/res/drawable/ic_category_atm_night.xml similarity index 100% rename from android/res/drawable/ic_category_atm_night.xml rename to android/app/src/main/res/drawable/ic_category_atm_night.xml diff --git a/android/res/drawable/ic_category_bank.xml b/android/app/src/main/res/drawable/ic_category_bank.xml similarity index 100% rename from android/res/drawable/ic_category_bank.xml rename to android/app/src/main/res/drawable/ic_category_bank.xml diff --git a/android/res/drawable/ic_category_bank_night.xml b/android/app/src/main/res/drawable/ic_category_bank_night.xml similarity index 100% rename from android/res/drawable/ic_category_bank_night.xml rename to android/app/src/main/res/drawable/ic_category_bank_night.xml diff --git a/android/res/drawable/ic_category_children.xml b/android/app/src/main/res/drawable/ic_category_children.xml similarity index 100% rename from android/res/drawable/ic_category_children.xml rename to android/app/src/main/res/drawable/ic_category_children.xml diff --git a/android/res/drawable/ic_category_children_night.xml b/android/app/src/main/res/drawable/ic_category_children_night.xml similarity index 100% rename from android/res/drawable/ic_category_children_night.xml rename to android/app/src/main/res/drawable/ic_category_children_night.xml diff --git a/android/res/drawable/ic_category_eat.xml b/android/app/src/main/res/drawable/ic_category_eat.xml similarity index 100% rename from android/res/drawable/ic_category_eat.xml rename to android/app/src/main/res/drawable/ic_category_eat.xml diff --git a/android/res/drawable/ic_category_eat_night.xml b/android/app/src/main/res/drawable/ic_category_eat_night.xml similarity index 100% rename from android/res/drawable/ic_category_eat_night.xml rename to android/app/src/main/res/drawable/ic_category_eat_night.xml diff --git a/android/res/drawable/ic_category_entertainment.xml b/android/app/src/main/res/drawable/ic_category_entertainment.xml similarity index 100% rename from android/res/drawable/ic_category_entertainment.xml rename to android/app/src/main/res/drawable/ic_category_entertainment.xml diff --git a/android/res/drawable/ic_category_entertainment_night.xml b/android/app/src/main/res/drawable/ic_category_entertainment_night.xml similarity index 100% rename from android/res/drawable/ic_category_entertainment_night.xml rename to android/app/src/main/res/drawable/ic_category_entertainment_night.xml diff --git a/android/res/drawable/ic_category_food.xml b/android/app/src/main/res/drawable/ic_category_food.xml similarity index 100% rename from android/res/drawable/ic_category_food.xml rename to android/app/src/main/res/drawable/ic_category_food.xml diff --git a/android/res/drawable/ic_category_food_night.xml b/android/app/src/main/res/drawable/ic_category_food_night.xml similarity index 100% rename from android/res/drawable/ic_category_food_night.xml rename to android/app/src/main/res/drawable/ic_category_food_night.xml diff --git a/android/res/drawable/ic_category_fuel.xml b/android/app/src/main/res/drawable/ic_category_fuel.xml similarity index 100% rename from android/res/drawable/ic_category_fuel.xml rename to android/app/src/main/res/drawable/ic_category_fuel.xml diff --git a/android/res/drawable/ic_category_fuel_night.xml b/android/app/src/main/res/drawable/ic_category_fuel_night.xml similarity index 100% rename from android/res/drawable/ic_category_fuel_night.xml rename to android/app/src/main/res/drawable/ic_category_fuel_night.xml diff --git a/android/res/drawable/ic_category_hospital.xml b/android/app/src/main/res/drawable/ic_category_hospital.xml similarity index 100% rename from android/res/drawable/ic_category_hospital.xml rename to android/app/src/main/res/drawable/ic_category_hospital.xml diff --git a/android/res/drawable/ic_category_hospital_night.xml b/android/app/src/main/res/drawable/ic_category_hospital_night.xml similarity index 100% rename from android/res/drawable/ic_category_hospital_night.xml rename to android/app/src/main/res/drawable/ic_category_hospital_night.xml diff --git a/android/res/drawable/ic_category_hotel.xml b/android/app/src/main/res/drawable/ic_category_hotel.xml similarity index 100% rename from android/res/drawable/ic_category_hotel.xml rename to android/app/src/main/res/drawable/ic_category_hotel.xml diff --git a/android/res/drawable/ic_category_hotel_night.xml b/android/app/src/main/res/drawable/ic_category_hotel_night.xml similarity index 100% rename from android/res/drawable/ic_category_hotel_night.xml rename to android/app/src/main/res/drawable/ic_category_hotel_night.xml diff --git a/android/res/drawable/ic_category_luggagehero.xml b/android/app/src/main/res/drawable/ic_category_luggagehero.xml similarity index 100% rename from android/res/drawable/ic_category_luggagehero.xml rename to android/app/src/main/res/drawable/ic_category_luggagehero.xml diff --git a/android/res/drawable/ic_category_luggagehero_night.xml b/android/app/src/main/res/drawable/ic_category_luggagehero_night.xml similarity index 100% rename from android/res/drawable/ic_category_luggagehero_night.xml rename to android/app/src/main/res/drawable/ic_category_luggagehero_night.xml diff --git a/android/res/drawable/ic_category_nightlife.xml b/android/app/src/main/res/drawable/ic_category_nightlife.xml similarity index 100% rename from android/res/drawable/ic_category_nightlife.xml rename to android/app/src/main/res/drawable/ic_category_nightlife.xml diff --git a/android/res/drawable/ic_category_nightlife_night.xml b/android/app/src/main/res/drawable/ic_category_nightlife_night.xml similarity index 100% rename from android/res/drawable/ic_category_nightlife_night.xml rename to android/app/src/main/res/drawable/ic_category_nightlife_night.xml diff --git a/android/res/drawable/ic_category_parking.xml b/android/app/src/main/res/drawable/ic_category_parking.xml similarity index 100% rename from android/res/drawable/ic_category_parking.xml rename to android/app/src/main/res/drawable/ic_category_parking.xml diff --git a/android/res/drawable/ic_category_parking_night.xml b/android/app/src/main/res/drawable/ic_category_parking_night.xml similarity index 100% rename from android/res/drawable/ic_category_parking_night.xml rename to android/app/src/main/res/drawable/ic_category_parking_night.xml diff --git a/android/res/drawable/ic_category_pharmacy.xml b/android/app/src/main/res/drawable/ic_category_pharmacy.xml similarity index 100% rename from android/res/drawable/ic_category_pharmacy.xml rename to android/app/src/main/res/drawable/ic_category_pharmacy.xml diff --git a/android/res/drawable/ic_category_pharmacy_night.xml b/android/app/src/main/res/drawable/ic_category_pharmacy_night.xml similarity index 100% rename from android/res/drawable/ic_category_pharmacy_night.xml rename to android/app/src/main/res/drawable/ic_category_pharmacy_night.xml diff --git a/android/res/drawable/ic_category_police.xml b/android/app/src/main/res/drawable/ic_category_police.xml similarity index 100% rename from android/res/drawable/ic_category_police.xml rename to android/app/src/main/res/drawable/ic_category_police.xml diff --git a/android/res/drawable/ic_category_police_night.xml b/android/app/src/main/res/drawable/ic_category_police_night.xml similarity index 100% rename from android/res/drawable/ic_category_police_night.xml rename to android/app/src/main/res/drawable/ic_category_police_night.xml diff --git a/android/res/drawable/ic_category_post.xml b/android/app/src/main/res/drawable/ic_category_post.xml similarity index 100% rename from android/res/drawable/ic_category_post.xml rename to android/app/src/main/res/drawable/ic_category_post.xml diff --git a/android/res/drawable/ic_category_post_night.xml b/android/app/src/main/res/drawable/ic_category_post_night.xml similarity index 100% rename from android/res/drawable/ic_category_post_night.xml rename to android/app/src/main/res/drawable/ic_category_post_night.xml diff --git a/android/res/drawable/ic_category_recycling.xml b/android/app/src/main/res/drawable/ic_category_recycling.xml similarity index 100% rename from android/res/drawable/ic_category_recycling.xml rename to android/app/src/main/res/drawable/ic_category_recycling.xml diff --git a/android/res/drawable/ic_category_recycling_night.xml b/android/app/src/main/res/drawable/ic_category_recycling_night.xml similarity index 100% rename from android/res/drawable/ic_category_recycling_night.xml rename to android/app/src/main/res/drawable/ic_category_recycling_night.xml diff --git a/android/res/drawable/ic_category_rv.xml b/android/app/src/main/res/drawable/ic_category_rv.xml similarity index 100% rename from android/res/drawable/ic_category_rv.xml rename to android/app/src/main/res/drawable/ic_category_rv.xml diff --git a/android/res/drawable/ic_category_rv_night.xml b/android/app/src/main/res/drawable/ic_category_rv_night.xml similarity index 100% rename from android/res/drawable/ic_category_rv_night.xml rename to android/app/src/main/res/drawable/ic_category_rv_night.xml diff --git a/android/res/drawable/ic_category_secondhand.xml b/android/app/src/main/res/drawable/ic_category_secondhand.xml similarity index 100% rename from android/res/drawable/ic_category_secondhand.xml rename to android/app/src/main/res/drawable/ic_category_secondhand.xml diff --git a/android/res/drawable/ic_category_secondhand_night.xml b/android/app/src/main/res/drawable/ic_category_secondhand_night.xml similarity index 100% rename from android/res/drawable/ic_category_secondhand_night.xml rename to android/app/src/main/res/drawable/ic_category_secondhand_night.xml diff --git a/android/res/drawable/ic_category_shopping.xml b/android/app/src/main/res/drawable/ic_category_shopping.xml similarity index 100% rename from android/res/drawable/ic_category_shopping.xml rename to android/app/src/main/res/drawable/ic_category_shopping.xml diff --git a/android/res/drawable/ic_category_shopping_night.xml b/android/app/src/main/res/drawable/ic_category_shopping_night.xml similarity index 100% rename from android/res/drawable/ic_category_shopping_night.xml rename to android/app/src/main/res/drawable/ic_category_shopping_night.xml diff --git a/android/res/drawable/ic_category_toilet.xml b/android/app/src/main/res/drawable/ic_category_toilet.xml similarity index 100% rename from android/res/drawable/ic_category_toilet.xml rename to android/app/src/main/res/drawable/ic_category_toilet.xml diff --git a/android/res/drawable/ic_category_toilet_night.xml b/android/app/src/main/res/drawable/ic_category_toilet_night.xml similarity index 100% rename from android/res/drawable/ic_category_toilet_night.xml rename to android/app/src/main/res/drawable/ic_category_toilet_night.xml diff --git a/android/res/drawable/ic_category_tourism.xml b/android/app/src/main/res/drawable/ic_category_tourism.xml similarity index 100% rename from android/res/drawable/ic_category_tourism.xml rename to android/app/src/main/res/drawable/ic_category_tourism.xml diff --git a/android/res/drawable/ic_category_tourism_night.xml b/android/app/src/main/res/drawable/ic_category_tourism_night.xml similarity index 100% rename from android/res/drawable/ic_category_tourism_night.xml rename to android/app/src/main/res/drawable/ic_category_tourism_night.xml diff --git a/android/res/drawable/ic_category_transport.xml b/android/app/src/main/res/drawable/ic_category_transport.xml similarity index 100% rename from android/res/drawable/ic_category_transport.xml rename to android/app/src/main/res/drawable/ic_category_transport.xml diff --git a/android/res/drawable/ic_category_transport_night.xml b/android/app/src/main/res/drawable/ic_category_transport_night.xml similarity index 100% rename from android/res/drawable/ic_category_transport_night.xml rename to android/app/src/main/res/drawable/ic_category_transport_night.xml diff --git a/android/res/drawable/ic_category_water.xml b/android/app/src/main/res/drawable/ic_category_water.xml similarity index 100% rename from android/res/drawable/ic_category_water.xml rename to android/app/src/main/res/drawable/ic_category_water.xml diff --git a/android/res/drawable/ic_category_water_night.xml b/android/app/src/main/res/drawable/ic_category_water_night.xml similarity index 100% rename from android/res/drawable/ic_category_water_night.xml rename to android/app/src/main/res/drawable/ic_category_water_night.xml diff --git a/android/res/drawable/ic_category_wifi.xml b/android/app/src/main/res/drawable/ic_category_wifi.xml similarity index 100% rename from android/res/drawable/ic_category_wifi.xml rename to android/app/src/main/res/drawable/ic_category_wifi.xml diff --git a/android/res/drawable/ic_category_wifi_night.xml b/android/app/src/main/res/drawable/ic_category_wifi_night.xml similarity index 100% rename from android/res/drawable/ic_category_wifi_night.xml rename to android/app/src/main/res/drawable/ic_category_wifi_night.xml diff --git a/android/res/drawable/ic_close.xml b/android/app/src/main/res/drawable/ic_close.xml similarity index 100% rename from android/res/drawable/ic_close.xml rename to android/app/src/main/res/drawable/ic_close.xml diff --git a/android/res/drawable/ic_contribute.xml b/android/app/src/main/res/drawable/ic_contribute.xml similarity index 100% rename from android/res/drawable/ic_contribute.xml rename to android/app/src/main/res/drawable/ic_contribute.xml diff --git a/android/res/drawable/ic_coordinates.xml b/android/app/src/main/res/drawable/ic_coordinates.xml similarity index 100% rename from android/res/drawable/ic_coordinates.xml rename to android/app/src/main/res/drawable/ic_coordinates.xml diff --git a/android/res/drawable/ic_cuisine.xml b/android/app/src/main/res/drawable/ic_cuisine.xml similarity index 100% rename from android/res/drawable/ic_cuisine.xml rename to android/app/src/main/res/drawable/ic_cuisine.xml diff --git a/android/res/drawable/ic_datepicker.xml b/android/app/src/main/res/drawable/ic_datepicker.xml similarity index 100% rename from android/res/drawable/ic_datepicker.xml rename to android/app/src/main/res/drawable/ic_datepicker.xml diff --git a/android/res/drawable/ic_delete.xml b/android/app/src/main/res/drawable/ic_delete.xml similarity index 100% rename from android/res/drawable/ic_delete.xml rename to android/app/src/main/res/drawable/ic_delete.xml diff --git a/android/res/drawable/ic_descent.xml b/android/app/src/main/res/drawable/ic_descent.xml similarity index 100% rename from android/res/drawable/ic_descent.xml rename to android/app/src/main/res/drawable/ic_descent.xml diff --git a/android/res/drawable/ic_donate.xml b/android/app/src/main/res/drawable/ic_donate.xml similarity index 100% rename from android/res/drawable/ic_donate.xml rename to android/app/src/main/res/drawable/ic_donate.xml diff --git a/android/res/drawable/ic_download.xml b/android/app/src/main/res/drawable/ic_download.xml similarity index 100% rename from android/res/drawable/ic_download.xml rename to android/app/src/main/res/drawable/ic_download.xml diff --git a/android/res/drawable/ic_edit.xml b/android/app/src/main/res/drawable/ic_edit.xml similarity index 100% rename from android/res/drawable/ic_edit.xml rename to android/app/src/main/res/drawable/ic_edit.xml diff --git a/android/res/drawable/ic_facebook_white.xml b/android/app/src/main/res/drawable/ic_facebook_white.xml similarity index 100% rename from android/res/drawable/ic_facebook_white.xml rename to android/app/src/main/res/drawable/ic_facebook_white.xml diff --git a/android/res/drawable/ic_follow.xml b/android/app/src/main/res/drawable/ic_follow.xml similarity index 100% rename from android/res/drawable/ic_follow.xml rename to android/app/src/main/res/drawable/ic_follow.xml diff --git a/android/res/drawable/ic_follow_and_rotate.xml b/android/app/src/main/res/drawable/ic_follow_and_rotate.xml similarity index 100% rename from android/res/drawable/ic_follow_and_rotate.xml rename to android/app/src/main/res/drawable/ic_follow_and_rotate.xml diff --git a/android/res/drawable/ic_github.xml b/android/app/src/main/res/drawable/ic_github.xml similarity index 100% rename from android/res/drawable/ic_github.xml rename to android/app/src/main/res/drawable/ic_github.xml diff --git a/android/res/drawable/ic_hide.xml b/android/app/src/main/res/drawable/ic_hide.xml similarity index 100% rename from android/res/drawable/ic_hide.xml rename to android/app/src/main/res/drawable/ic_hide.xml diff --git a/android/res/drawable/ic_infant.xml b/android/app/src/main/res/drawable/ic_infant.xml similarity index 100% rename from android/res/drawable/ic_infant.xml rename to android/app/src/main/res/drawable/ic_infant.xml diff --git a/android/res/drawable/ic_instagram.xml b/android/app/src/main/res/drawable/ic_instagram.xml similarity index 100% rename from android/res/drawable/ic_instagram.xml rename to android/app/src/main/res/drawable/ic_instagram.xml diff --git a/android/res/drawable/ic_instagram_white.xml b/android/app/src/main/res/drawable/ic_instagram_white.xml similarity index 100% rename from android/res/drawable/ic_instagram_white.xml rename to android/app/src/main/res/drawable/ic_instagram_white.xml diff --git a/android/res/drawable/ic_layers.xml b/android/app/src/main/res/drawable/ic_layers.xml similarity index 100% rename from android/res/drawable/ic_layers.xml rename to android/app/src/main/res/drawable/ic_layers.xml diff --git a/android/res/drawable/ic_layers_clear.xml b/android/app/src/main/res/drawable/ic_layers_clear.xml similarity index 100% rename from android/res/drawable/ic_layers_clear.xml rename to android/app/src/main/res/drawable/ic_layers_clear.xml diff --git a/android/res/drawable/ic_layers_isoline_active.xml b/android/app/src/main/res/drawable/ic_layers_isoline_active.xml similarity index 100% rename from android/res/drawable/ic_layers_isoline_active.xml rename to android/app/src/main/res/drawable/ic_layers_isoline_active.xml diff --git a/android/res/drawable/ic_layers_isoline_active_night.xml b/android/app/src/main/res/drawable/ic_layers_isoline_active_night.xml similarity index 100% rename from android/res/drawable/ic_layers_isoline_active_night.xml rename to android/app/src/main/res/drawable/ic_layers_isoline_active_night.xml diff --git a/android/res/drawable/ic_layers_isoline_inactive.xml b/android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml similarity index 100% rename from android/res/drawable/ic_layers_isoline_inactive.xml rename to android/app/src/main/res/drawable/ic_layers_isoline_inactive.xml diff --git a/android/res/drawable/ic_layers_subway_active.xml b/android/app/src/main/res/drawable/ic_layers_subway_active.xml similarity index 100% rename from android/res/drawable/ic_layers_subway_active.xml rename to android/app/src/main/res/drawable/ic_layers_subway_active.xml diff --git a/android/res/drawable/ic_layers_subway_active_night.xml b/android/app/src/main/res/drawable/ic_layers_subway_active_night.xml similarity index 100% rename from android/res/drawable/ic_layers_subway_active_night.xml rename to android/app/src/main/res/drawable/ic_layers_subway_active_night.xml diff --git a/android/res/drawable/ic_layers_subway_inactive.xml b/android/app/src/main/res/drawable/ic_layers_subway_inactive.xml similarity index 100% rename from android/res/drawable/ic_layers_subway_inactive.xml rename to android/app/src/main/res/drawable/ic_layers_subway_inactive.xml diff --git a/android/res/drawable/ic_layers_traffic_active.xml b/android/app/src/main/res/drawable/ic_layers_traffic_active.xml similarity index 100% rename from android/res/drawable/ic_layers_traffic_active.xml rename to android/app/src/main/res/drawable/ic_layers_traffic_active.xml diff --git a/android/res/drawable/ic_layers_traffic_active_night.xml b/android/app/src/main/res/drawable/ic_layers_traffic_active_night.xml similarity index 100% rename from android/res/drawable/ic_layers_traffic_active_night.xml rename to android/app/src/main/res/drawable/ic_layers_traffic_active_night.xml diff --git a/android/res/drawable/ic_layers_traffic_inactive.xml b/android/app/src/main/res/drawable/ic_layers_traffic_inactive.xml similarity index 100% rename from android/res/drawable/ic_layers_traffic_inactive.xml rename to android/app/src/main/res/drawable/ic_layers_traffic_inactive.xml diff --git a/android/res/drawable/ic_level_white.xml b/android/app/src/main/res/drawable/ic_level_white.xml similarity index 100% rename from android/res/drawable/ic_level_white.xml rename to android/app/src/main/res/drawable/ic_level_white.xml diff --git a/android/res/drawable/ic_line_white.xml b/android/app/src/main/res/drawable/ic_line_white.xml similarity index 100% rename from android/res/drawable/ic_line_white.xml rename to android/app/src/main/res/drawable/ic_line_white.xml diff --git a/android/res/drawable/ic_location_off.xml b/android/app/src/main/res/drawable/ic_location_off.xml similarity index 100% rename from android/res/drawable/ic_location_off.xml rename to android/app/src/main/res/drawable/ic_location_off.xml diff --git a/android/res/drawable/ic_logout.xml b/android/app/src/main/res/drawable/ic_logout.xml similarity index 100% rename from android/res/drawable/ic_logout.xml rename to android/app/src/main/res/drawable/ic_logout.xml diff --git a/android/res/drawable/ic_mastodon.xml b/android/app/src/main/res/drawable/ic_mastodon.xml similarity index 100% rename from android/res/drawable/ic_mastodon.xml rename to android/app/src/main/res/drawable/ic_mastodon.xml diff --git a/android/res/drawable/ic_matrix.xml b/android/app/src/main/res/drawable/ic_matrix.xml similarity index 100% rename from android/res/drawable/ic_matrix.xml rename to android/app/src/main/res/drawable/ic_matrix.xml diff --git a/android/res/drawable/ic_maxalt.xml b/android/app/src/main/res/drawable/ic_maxalt.xml similarity index 100% rename from android/res/drawable/ic_maxalt.xml rename to android/app/src/main/res/drawable/ic_maxalt.xml diff --git a/android/res/drawable/ic_menu_download.xml b/android/app/src/main/res/drawable/ic_menu_download.xml similarity index 100% rename from android/res/drawable/ic_menu_download.xml rename to android/app/src/main/res/drawable/ic_menu_download.xml diff --git a/android/res/drawable/ic_menu_open.xml b/android/app/src/main/res/drawable/ic_menu_open.xml similarity index 100% rename from android/res/drawable/ic_menu_open.xml rename to android/app/src/main/res/drawable/ic_menu_open.xml diff --git a/android/res/drawable/ic_menu_settings.xml b/android/app/src/main/res/drawable/ic_menu_settings.xml similarity index 100% rename from android/res/drawable/ic_menu_settings.xml rename to android/app/src/main/res/drawable/ic_menu_settings.xml diff --git a/android/res/drawable/ic_minalt.xml b/android/app/src/main/res/drawable/ic_minalt.xml similarity index 100% rename from android/res/drawable/ic_minalt.xml rename to android/app/src/main/res/drawable/ic_minalt.xml diff --git a/android/res/drawable/ic_minus.xml b/android/app/src/main/res/drawable/ic_minus.xml similarity index 100% rename from android/res/drawable/ic_minus.xml rename to android/app/src/main/res/drawable/ic_minus.xml diff --git a/android/res/drawable/ic_more.xml b/android/app/src/main/res/drawable/ic_more.xml similarity index 100% rename from android/res/drawable/ic_more.xml rename to android/app/src/main/res/drawable/ic_more.xml diff --git a/android/res/drawable/ic_my_location.xml b/android/app/src/main/res/drawable/ic_my_location.xml similarity index 100% rename from android/res/drawable/ic_my_location.xml rename to android/app/src/main/res/drawable/ic_my_location.xml diff --git a/android/res/drawable/ic_news.xml b/android/app/src/main/res/drawable/ic_news.xml similarity index 100% rename from android/res/drawable/ic_news.xml rename to android/app/src/main/res/drawable/ic_news.xml diff --git a/android/res/drawable/ic_not_follow.xml b/android/app/src/main/res/drawable/ic_not_follow.xml similarity index 100% rename from android/res/drawable/ic_not_follow.xml rename to android/app/src/main/res/drawable/ic_not_follow.xml diff --git a/android/res/drawable/ic_openstreetmap.xml b/android/app/src/main/res/drawable/ic_openstreetmap.xml similarity index 100% rename from android/res/drawable/ic_openstreetmap.xml rename to android/app/src/main/res/drawable/ic_openstreetmap.xml diff --git a/android/res/drawable/ic_openstreetmap_color.webp b/android/app/src/main/res/drawable/ic_openstreetmap_color.webp similarity index 100% rename from android/res/drawable/ic_openstreetmap_color.webp rename to android/app/src/main/res/drawable/ic_openstreetmap_color.webp diff --git a/android/res/drawable/ic_plus.xml b/android/app/src/main/res/drawable/ic_plus.xml similarity index 100% rename from android/res/drawable/ic_plus.xml rename to android/app/src/main/res/drawable/ic_plus.xml diff --git a/android/res/drawable/ic_public_inline.xml b/android/app/src/main/res/drawable/ic_public_inline.xml similarity index 100% rename from android/res/drawable/ic_public_inline.xml rename to android/app/src/main/res/drawable/ic_public_inline.xml diff --git a/android/res/drawable/ic_question_mark.xml b/android/app/src/main/res/drawable/ic_question_mark.xml similarity index 100% rename from android/res/drawable/ic_question_mark.xml rename to android/app/src/main/res/drawable/ic_question_mark.xml diff --git a/android/res/drawable/ic_rate.xml b/android/app/src/main/res/drawable/ic_rate.xml similarity index 100% rename from android/res/drawable/ic_rate.xml rename to android/app/src/main/res/drawable/ic_rate.xml diff --git a/android/res/drawable/ic_report_a_bug.xml b/android/app/src/main/res/drawable/ic_report_a_bug.xml similarity index 100% rename from android/res/drawable/ic_report_a_bug.xml rename to android/app/src/main/res/drawable/ic_report_a_bug.xml diff --git a/android/res/drawable/ic_search.xml b/android/app/src/main/res/drawable/ic_search.xml similarity index 100% rename from android/res/drawable/ic_search.xml rename to android/app/src/main/res/drawable/ic_search.xml diff --git a/android/res/drawable/ic_settings.xml b/android/app/src/main/res/drawable/ic_settings.xml similarity index 100% rename from android/res/drawable/ic_settings.xml rename to android/app/src/main/res/drawable/ic_settings.xml diff --git a/android/res/drawable/ic_share.xml b/android/app/src/main/res/drawable/ic_share.xml similarity index 100% rename from android/res/drawable/ic_share.xml rename to android/app/src/main/res/drawable/ic_share.xml diff --git a/android/res/drawable/ic_show.xml b/android/app/src/main/res/drawable/ic_show.xml similarity index 100% rename from android/res/drawable/ic_show.xml rename to android/app/src/main/res/drawable/ic_show.xml diff --git a/android/res/drawable/ic_show_on_map.xml b/android/app/src/main/res/drawable/ic_show_on_map.xml similarity index 100% rename from android/res/drawable/ic_show_on_map.xml rename to android/app/src/main/res/drawable/ic_show_on_map.xml diff --git a/android/res/drawable/ic_sort.xml b/android/app/src/main/res/drawable/ic_sort.xml similarity index 100% rename from android/res/drawable/ic_sort.xml rename to android/app/src/main/res/drawable/ic_sort.xml diff --git a/android/res/drawable/ic_splash.xml b/android/app/src/main/res/drawable/ic_splash.xml similarity index 100% rename from android/res/drawable/ic_splash.xml rename to android/app/src/main/res/drawable/ic_splash.xml diff --git a/android/res/drawable/ic_storage_light.xml b/android/app/src/main/res/drawable/ic_storage_light.xml similarity index 100% rename from android/res/drawable/ic_storage_light.xml rename to android/app/src/main/res/drawable/ic_storage_light.xml diff --git a/android/res/drawable/ic_storage_permission.xml b/android/app/src/main/res/drawable/ic_storage_permission.xml similarity index 100% rename from android/res/drawable/ic_storage_permission.xml rename to android/app/src/main/res/drawable/ic_storage_permission.xml diff --git a/android/res/drawable/ic_telegram.xml b/android/app/src/main/res/drawable/ic_telegram.xml similarity index 100% rename from android/res/drawable/ic_telegram.xml rename to android/app/src/main/res/drawable/ic_telegram.xml diff --git a/android/res/drawable/ic_twitterx.xml b/android/app/src/main/res/drawable/ic_twitterx.xml similarity index 100% rename from android/res/drawable/ic_twitterx.xml rename to android/app/src/main/res/drawable/ic_twitterx.xml diff --git a/android/res/drawable/ic_twitterx_white.xml b/android/app/src/main/res/drawable/ic_twitterx_white.xml similarity index 100% rename from android/res/drawable/ic_twitterx_white.xml rename to android/app/src/main/res/drawable/ic_twitterx_white.xml diff --git a/android/res/drawable/ic_vk_white.xml b/android/app/src/main/res/drawable/ic_vk_white.xml similarity index 100% rename from android/res/drawable/ic_vk_white.xml rename to android/app/src/main/res/drawable/ic_vk_white.xml diff --git a/android/res/drawable/ic_website.xml b/android/app/src/main/res/drawable/ic_website.xml similarity index 100% rename from android/res/drawable/ic_website.xml rename to android/app/src/main/res/drawable/ic_website.xml diff --git a/android/res/drawable/ic_wifi.xml b/android/app/src/main/res/drawable/ic_wifi.xml similarity index 100% rename from android/res/drawable/ic_wifi.xml rename to android/app/src/main/res/drawable/ic_wifi.xml diff --git a/android/res/drawable/ic_wikimedia_commons_white.xml b/android/app/src/main/res/drawable/ic_wikimedia_commons_white.xml similarity index 100% rename from android/res/drawable/ic_wikimedia_commons_white.xml rename to android/app/src/main/res/drawable/ic_wikimedia_commons_white.xml diff --git a/android/res/drawable/list_divider.xml b/android/app/src/main/res/drawable/list_divider.xml similarity index 100% rename from android/res/drawable/list_divider.xml rename to android/app/src/main/res/drawable/list_divider.xml diff --git a/android/res/drawable/list_divider_night.xml b/android/app/src/main/res/drawable/list_divider_night.xml similarity index 100% rename from android/res/drawable/list_divider_night.xml rename to android/app/src/main/res/drawable/list_divider_night.xml diff --git a/android/res/drawable/logo.xml b/android/app/src/main/res/drawable/logo.xml similarity index 100% rename from android/res/drawable/logo.xml rename to android/app/src/main/res/drawable/logo.xml diff --git a/android/res/drawable/onmap_downloader_background.xml b/android/app/src/main/res/drawable/onmap_downloader_background.xml similarity index 100% rename from android/res/drawable/onmap_downloader_background.xml rename to android/app/src/main/res/drawable/onmap_downloader_background.xml diff --git a/android/res/drawable/ripple_mask.xml b/android/app/src/main/res/drawable/ripple_mask.xml similarity index 100% rename from android/res/drawable/ripple_mask.xml rename to android/app/src/main/res/drawable/ripple_mask.xml diff --git a/android/res/drawable/routing_toolbar_button.xml b/android/app/src/main/res/drawable/routing_toolbar_button.xml similarity index 100% rename from android/res/drawable/routing_toolbar_button.xml rename to android/app/src/main/res/drawable/routing_toolbar_button.xml diff --git a/android/res/drawable/routing_toolbar_button_active.xml b/android/app/src/main/res/drawable/routing_toolbar_button_active.xml similarity index 100% rename from android/res/drawable/routing_toolbar_button_active.xml rename to android/app/src/main/res/drawable/routing_toolbar_button_active.xml diff --git a/android/res/drawable/routing_toolbar_button_night.xml b/android/app/src/main/res/drawable/routing_toolbar_button_night.xml similarity index 100% rename from android/res/drawable/routing_toolbar_button_night.xml rename to android/app/src/main/res/drawable/routing_toolbar_button_night.xml diff --git a/android/res/drawable/routing_toolbar_button_normal.xml b/android/app/src/main/res/drawable/routing_toolbar_button_normal.xml similarity index 100% rename from android/res/drawable/routing_toolbar_button_normal.xml rename to android/app/src/main/res/drawable/routing_toolbar_button_normal.xml diff --git a/android/res/drawable/routing_toolbar_button_normal_night.xml b/android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml similarity index 100% rename from android/res/drawable/routing_toolbar_button_normal_night.xml rename to android/app/src/main/res/drawable/routing_toolbar_button_normal_night.xml diff --git a/android/res/drawable/speed_cams_bg.xml b/android/app/src/main/res/drawable/speed_cams_bg.xml similarity index 100% rename from android/res/drawable/speed_cams_bg.xml rename to android/app/src/main/res/drawable/speed_cams_bg.xml diff --git a/android/res/drawable/splash.xml b/android/app/src/main/res/drawable/splash.xml similarity index 100% rename from android/res/drawable/splash.xml rename to android/app/src/main/res/drawable/splash.xml diff --git a/android/res/font/fredoka_one.ttf b/android/app/src/main/res/font/fredoka_one.ttf similarity index 100% rename from android/res/font/fredoka_one.ttf rename to android/app/src/main/res/font/fredoka_one.ttf diff --git a/android/res/layout-h400dp/map_buttons_layout_navigation.xml b/android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml similarity index 100% rename from android/res/layout-h400dp/map_buttons_layout_navigation.xml rename to android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml diff --git a/android/res/layout-h400dp/map_buttons_layout_planning.xml b/android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml similarity index 100% rename from android/res/layout-h400dp/map_buttons_layout_planning.xml rename to android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml diff --git a/android/res/layout-h400dp/map_buttons_layout_regular.xml b/android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml similarity index 100% rename from android/res/layout-h400dp/map_buttons_layout_regular.xml rename to android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml diff --git a/android/res/layout-h400dp/map_buttons_search_frame.xml b/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml similarity index 100% rename from android/res/layout-h400dp/map_buttons_search_frame.xml rename to android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml diff --git a/android/res/layout-land/activity_download_resources.xml b/android/app/src/main/res/layout-land/activity_download_resources.xml similarity index 100% rename from android/res/layout-land/activity_download_resources.xml rename to android/app/src/main/res/layout-land/activity_download_resources.xml diff --git a/android/res/layout-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-land/altitude_chart_panel.xml similarity index 100% rename from android/res/layout-land/altitude_chart_panel.xml rename to android/app/src/main/res/layout-land/altitude_chart_panel.xml diff --git a/android/res/layout-land/dialog_stacked_buttons.xml b/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml similarity index 100% rename from android/res/layout-land/dialog_stacked_buttons.xml rename to android/app/src/main/res/layout-land/dialog_stacked_buttons.xml diff --git a/android/res/layout-land/elevation_profile_bottom_sheet.xml b/android/app/src/main/res/layout-land/elevation_profile_bottom_sheet.xml similarity index 100% rename from android/res/layout-land/elevation_profile_bottom_sheet.xml rename to android/app/src/main/res/layout-land/elevation_profile_bottom_sheet.xml diff --git a/android/res/layout-land/fragment_direction.xml b/android/app/src/main/res/layout-land/fragment_direction.xml similarity index 100% rename from android/res/layout-land/fragment_direction.xml rename to android/app/src/main/res/layout-land/fragment_direction.xml diff --git a/android/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml similarity index 100% rename from android/res/layout-land/fragment_osm_login.xml rename to android/app/src/main/res/layout-land/fragment_osm_login.xml diff --git a/android/res/layout-land/layout_nav.xml b/android/app/src/main/res/layout-land/layout_nav.xml similarity index 100% rename from android/res/layout-land/layout_nav.xml rename to android/app/src/main/res/layout-land/layout_nav.xml diff --git a/android/res/layout-land/map_buttons_bottom.xml b/android/app/src/main/res/layout-land/map_buttons_bottom.xml similarity index 100% rename from android/res/layout-land/map_buttons_bottom.xml rename to android/app/src/main/res/layout-land/map_buttons_bottom.xml diff --git a/android/res/layout-land/onmap_downloader.xml b/android/app/src/main/res/layout-land/onmap_downloader.xml similarity index 100% rename from android/res/layout-land/onmap_downloader.xml rename to android/app/src/main/res/layout-land/onmap_downloader.xml diff --git a/android/res/layout-land/routing_details.xml b/android/app/src/main/res/layout-land/routing_details.xml similarity index 100% rename from android/res/layout-land/routing_details.xml rename to android/app/src/main/res/layout-land/routing_details.xml diff --git a/android/res/layout-w1020dp-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml similarity index 100% rename from android/res/layout-w1020dp-land/altitude_chart_panel.xml rename to android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml diff --git a/android/res/layout-w1020dp-land/routing_details.xml b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml similarity index 100% rename from android/res/layout-w1020dp-land/routing_details.xml rename to android/app/src/main/res/layout-w1020dp-land/routing_details.xml diff --git a/android/res/layout-w1020dp/activity_settings.xml b/android/app/src/main/res/layout-w1020dp/activity_settings.xml similarity index 100% rename from android/res/layout-w1020dp/activity_settings.xml rename to android/app/src/main/res/layout-w1020dp/activity_settings.xml diff --git a/android/res/layout/accept_decline_button_container.xml b/android/app/src/main/res/layout/accept_decline_button_container.xml similarity index 100% rename from android/res/layout/accept_decline_button_container.xml rename to android/app/src/main/res/layout/accept_decline_button_container.xml diff --git a/android/res/layout/activity_download_resources.xml b/android/app/src/main/res/layout/activity_download_resources.xml similarity index 100% rename from android/res/layout/activity_download_resources.xml rename to android/app/src/main/res/layout/activity_download_resources.xml diff --git a/android/res/layout/activity_fragment_and_toolbar.xml b/android/app/src/main/res/layout/activity_fragment_and_toolbar.xml similarity index 100% rename from android/res/layout/activity_fragment_and_toolbar.xml rename to android/app/src/main/res/layout/activity_fragment_and_toolbar.xml diff --git a/android/res/layout/activity_map.xml b/android/app/src/main/res/layout/activity_map.xml similarity index 100% rename from android/res/layout/activity_map.xml rename to android/app/src/main/res/layout/activity_map.xml diff --git a/android/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml similarity index 100% rename from android/res/layout/activity_settings.xml rename to android/app/src/main/res/layout/activity_settings.xml diff --git a/android/res/layout/activity_splash.xml b/android/app/src/main/res/layout/activity_splash.xml similarity index 100% rename from android/res/layout/activity_splash.xml rename to android/app/src/main/res/layout/activity_splash.xml diff --git a/android/res/layout/altitude_chart_panel.xml b/android/app/src/main/res/layout/altitude_chart_panel.xml similarity index 100% rename from android/res/layout/altitude_chart_panel.xml rename to android/app/src/main/res/layout/altitude_chart_panel.xml diff --git a/android/res/layout/bookmarks_activity.xml b/android/app/src/main/res/layout/bookmarks_activity.xml similarity index 100% rename from android/res/layout/bookmarks_activity.xml rename to android/app/src/main/res/layout/bookmarks_activity.xml diff --git a/android/res/layout/bottom_sheet.xml b/android/app/src/main/res/layout/bottom_sheet.xml similarity index 100% rename from android/res/layout/bottom_sheet.xml rename to android/app/src/main/res/layout/bottom_sheet.xml diff --git a/android/res/layout/bottom_sheet_handle.xml b/android/app/src/main/res/layout/bottom_sheet_handle.xml similarity index 100% rename from android/res/layout/bottom_sheet_handle.xml rename to android/app/src/main/res/layout/bottom_sheet_handle.xml diff --git a/android/res/layout/bottom_sheet_menu_item.xml b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml similarity index 100% rename from android/res/layout/bottom_sheet_menu_item.xml rename to android/app/src/main/res/layout/bottom_sheet_menu_item.xml diff --git a/android/res/layout/button_with_progress.xml b/android/app/src/main/res/layout/button_with_progress.xml similarity index 100% rename from android/res/layout/button_with_progress.xml rename to android/app/src/main/res/layout/button_with_progress.xml diff --git a/android/res/layout/choose_bookmark_category_fragment.xml b/android/app/src/main/res/layout/choose_bookmark_category_fragment.xml similarity index 100% rename from android/res/layout/choose_bookmark_category_fragment.xml rename to android/app/src/main/res/layout/choose_bookmark_category_fragment.xml diff --git a/android/res/layout/color_row.xml b/android/app/src/main/res/layout/color_row.xml similarity index 100% rename from android/res/layout/color_row.xml rename to android/app/src/main/res/layout/color_row.xml diff --git a/android/res/layout/current_location_marker.xml b/android/app/src/main/res/layout/current_location_marker.xml similarity index 100% rename from android/res/layout/current_location_marker.xml rename to android/app/src/main/res/layout/current_location_marker.xml diff --git a/android/res/layout/dialog_edit_text.xml b/android/app/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from android/res/layout/dialog_edit_text.xml rename to android/app/src/main/res/layout/dialog_edit_text.xml diff --git a/android/res/layout/dialog_missed_map.xml b/android/app/src/main/res/layout/dialog_missed_map.xml similarity index 100% rename from android/res/layout/dialog_missed_map.xml rename to android/app/src/main/res/layout/dialog_missed_map.xml diff --git a/android/res/layout/dialog_missed_maps.xml b/android/app/src/main/res/layout/dialog_missed_maps.xml similarity index 100% rename from android/res/layout/dialog_missed_maps.xml rename to android/app/src/main/res/layout/dialog_missed_maps.xml diff --git a/android/res/layout/dialog_sorting_types.xml b/android/app/src/main/res/layout/dialog_sorting_types.xml similarity index 100% rename from android/res/layout/dialog_sorting_types.xml rename to android/app/src/main/res/layout/dialog_sorting_types.xml diff --git a/android/res/layout/dialog_stacked_buttons.xml b/android/app/src/main/res/layout/dialog_stacked_buttons.xml similarity index 100% rename from android/res/layout/dialog_stacked_buttons.xml rename to android/app/src/main/res/layout/dialog_stacked_buttons.xml diff --git a/android/res/layout/dialog_suggest_reroute_title.xml b/android/app/src/main/res/layout/dialog_suggest_reroute_title.xml similarity index 100% rename from android/res/layout/dialog_suggest_reroute_title.xml rename to android/app/src/main/res/layout/dialog_suggest_reroute_title.xml diff --git a/android/res/layout/divider_horizontal.xml b/android/app/src/main/res/layout/divider_horizontal.xml similarity index 100% rename from android/res/layout/divider_horizontal.xml rename to android/app/src/main/res/layout/divider_horizontal.xml diff --git a/android/res/layout/downloader_item.xml b/android/app/src/main/res/layout/downloader_item.xml similarity index 100% rename from android/res/layout/downloader_item.xml rename to android/app/src/main/res/layout/downloader_item.xml diff --git a/android/res/layout/downloader_item_header.xml b/android/app/src/main/res/layout/downloader_item_header.xml similarity index 100% rename from android/res/layout/downloader_item_header.xml rename to android/app/src/main/res/layout/downloader_item_header.xml diff --git a/android/res/layout/downloader_status.xml b/android/app/src/main/res/layout/downloader_status.xml similarity index 100% rename from android/res/layout/downloader_status.xml rename to android/app/src/main/res/layout/downloader_status.xml diff --git a/android/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml similarity index 100% rename from android/res/layout/edit_bookmark_common.xml rename to android/app/src/main/res/layout/edit_bookmark_common.xml diff --git a/android/res/layout/elevation_profile.xml b/android/app/src/main/res/layout/elevation_profile.xml similarity index 100% rename from android/res/layout/elevation_profile.xml rename to android/app/src/main/res/layout/elevation_profile.xml diff --git a/android/res/layout/elevation_profile_bottom_sheet.xml b/android/app/src/main/res/layout/elevation_profile_bottom_sheet.xml similarity index 100% rename from android/res/layout/elevation_profile_bottom_sheet.xml rename to android/app/src/main/res/layout/elevation_profile_bottom_sheet.xml diff --git a/android/res/layout/elevation_profile_internal.xml b/android/app/src/main/res/layout/elevation_profile_internal.xml similarity index 100% rename from android/res/layout/elevation_profile_internal.xml rename to android/app/src/main/res/layout/elevation_profile_internal.xml diff --git a/android/res/layout/floating_marker_view.xml b/android/app/src/main/res/layout/floating_marker_view.xml similarity index 100% rename from android/res/layout/floating_marker_view.xml rename to android/app/src/main/res/layout/floating_marker_view.xml diff --git a/android/res/layout/fragment_bookmark_categories.xml b/android/app/src/main/res/layout/fragment_bookmark_categories.xml similarity index 100% rename from android/res/layout/fragment_bookmark_categories.xml rename to android/app/src/main/res/layout/fragment_bookmark_categories.xml diff --git a/android/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml similarity index 100% rename from android/res/layout/fragment_bookmark_category_settings.xml rename to android/app/src/main/res/layout/fragment_bookmark_category_settings.xml diff --git a/android/res/layout/fragment_bookmark_list.xml b/android/app/src/main/res/layout/fragment_bookmark_list.xml similarity index 100% rename from android/res/layout/fragment_bookmark_list.xml rename to android/app/src/main/res/layout/fragment_bookmark_list.xml diff --git a/android/res/layout/fragment_categories.xml b/android/app/src/main/res/layout/fragment_categories.xml similarity index 100% rename from android/res/layout/fragment_categories.xml rename to android/app/src/main/res/layout/fragment_categories.xml diff --git a/android/res/layout/fragment_color_grid.xml b/android/app/src/main/res/layout/fragment_color_grid.xml similarity index 100% rename from android/res/layout/fragment_color_grid.xml rename to android/app/src/main/res/layout/fragment_color_grid.xml diff --git a/android/res/layout/fragment_container_layout.xml b/android/app/src/main/res/layout/fragment_container_layout.xml similarity index 100% rename from android/res/layout/fragment_container_layout.xml rename to android/app/src/main/res/layout/fragment_container_layout.xml diff --git a/android/res/layout/fragment_direction.xml b/android/app/src/main/res/layout/fragment_direction.xml similarity index 100% rename from android/res/layout/fragment_direction.xml rename to android/app/src/main/res/layout/fragment_direction.xml diff --git a/android/res/layout/fragment_downloader.xml b/android/app/src/main/res/layout/fragment_downloader.xml similarity index 100% rename from android/res/layout/fragment_downloader.xml rename to android/app/src/main/res/layout/fragment_downloader.xml diff --git a/android/res/layout/fragment_driving_options.xml b/android/app/src/main/res/layout/fragment_driving_options.xml similarity index 100% rename from android/res/layout/fragment_driving_options.xml rename to android/app/src/main/res/layout/fragment_driving_options.xml diff --git a/android/res/layout/fragment_edit_bookmark.xml b/android/app/src/main/res/layout/fragment_edit_bookmark.xml similarity index 100% rename from android/res/layout/fragment_edit_bookmark.xml rename to android/app/src/main/res/layout/fragment_edit_bookmark.xml diff --git a/android/res/layout/fragment_edit_description.xml b/android/app/src/main/res/layout/fragment_edit_description.xml similarity index 100% rename from android/res/layout/fragment_edit_description.xml rename to android/app/src/main/res/layout/fragment_edit_description.xml diff --git a/android/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml similarity index 100% rename from android/res/layout/fragment_editor.xml rename to android/app/src/main/res/layout/fragment_editor.xml diff --git a/android/res/layout/fragment_editor_host.xml b/android/app/src/main/res/layout/fragment_editor_host.xml similarity index 100% rename from android/res/layout/fragment_editor_host.xml rename to android/app/src/main/res/layout/fragment_editor_host.xml diff --git a/android/res/layout/fragment_map.xml b/android/app/src/main/res/layout/fragment_map.xml similarity index 100% rename from android/res/layout/fragment_map.xml rename to android/app/src/main/res/layout/fragment_map.xml diff --git a/android/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml similarity index 100% rename from android/res/layout/fragment_osm_login.xml rename to android/app/src/main/res/layout/fragment_osm_login.xml diff --git a/android/res/layout/fragment_osm_profile.xml b/android/app/src/main/res/layout/fragment_osm_profile.xml similarity index 100% rename from android/res/layout/fragment_osm_profile.xml rename to android/app/src/main/res/layout/fragment_osm_profile.xml diff --git a/android/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml similarity index 100% rename from android/res/layout/fragment_phone.xml rename to android/app/src/main/res/layout/fragment_phone.xml diff --git a/android/res/layout/fragment_place_description.xml b/android/app/src/main/res/layout/fragment_place_description.xml similarity index 100% rename from android/res/layout/fragment_place_description.xml rename to android/app/src/main/res/layout/fragment_place_description.xml diff --git a/android/res/layout/fragment_prefs_faq.xml b/android/app/src/main/res/layout/fragment_prefs_faq.xml similarity index 100% rename from android/res/layout/fragment_prefs_faq.xml rename to android/app/src/main/res/layout/fragment_prefs_faq.xml diff --git a/android/res/layout/fragment_prefs_storage.xml b/android/app/src/main/res/layout/fragment_prefs_storage.xml similarity index 100% rename from android/res/layout/fragment_prefs_storage.xml rename to android/app/src/main/res/layout/fragment_prefs_storage.xml diff --git a/android/res/layout/fragment_recycler.xml b/android/app/src/main/res/layout/fragment_recycler.xml similarity index 100% rename from android/res/layout/fragment_recycler.xml rename to android/app/src/main/res/layout/fragment_recycler.xml diff --git a/android/res/layout/fragment_report.xml b/android/app/src/main/res/layout/fragment_report.xml similarity index 100% rename from android/res/layout/fragment_report.xml rename to android/app/src/main/res/layout/fragment_report.xml diff --git a/android/res/layout/fragment_routing.xml b/android/app/src/main/res/layout/fragment_routing.xml similarity index 100% rename from android/res/layout/fragment_routing.xml rename to android/app/src/main/res/layout/fragment_routing.xml diff --git a/android/res/layout/fragment_search.xml b/android/app/src/main/res/layout/fragment_search.xml similarity index 100% rename from android/res/layout/fragment_search.xml rename to android/app/src/main/res/layout/fragment_search.xml diff --git a/android/res/layout/fragment_search_base.xml b/android/app/src/main/res/layout/fragment_search_base.xml similarity index 100% rename from android/res/layout/fragment_search_base.xml rename to android/app/src/main/res/layout/fragment_search_base.xml diff --git a/android/res/layout/fragment_search_categories.xml b/android/app/src/main/res/layout/fragment_search_categories.xml similarity index 100% rename from android/res/layout/fragment_search_categories.xml rename to android/app/src/main/res/layout/fragment_search_categories.xml diff --git a/android/res/layout/fragment_suggest_country_download.xml b/android/app/src/main/res/layout/fragment_suggest_country_download.xml similarity index 100% rename from android/res/layout/fragment_suggest_country_download.xml rename to android/app/src/main/res/layout/fragment_suggest_country_download.xml diff --git a/android/res/layout/fragment_timetable.xml b/android/app/src/main/res/layout/fragment_timetable.xml similarity index 100% rename from android/res/layout/fragment_timetable.xml rename to android/app/src/main/res/layout/fragment_timetable.xml diff --git a/android/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml similarity index 100% rename from android/res/layout/fragment_timetable_advanced.xml rename to android/app/src/main/res/layout/fragment_timetable_advanced.xml diff --git a/android/res/layout/fragment_timetable_picker.xml b/android/app/src/main/res/layout/fragment_timetable_picker.xml similarity index 100% rename from android/res/layout/fragment_timetable_picker.xml rename to android/app/src/main/res/layout/fragment_timetable_picker.xml diff --git a/android/res/layout/fragment_timetable_simple.xml b/android/app/src/main/res/layout/fragment_timetable_simple.xml similarity index 100% rename from android/res/layout/fragment_timetable_simple.xml rename to android/app/src/main/res/layout/fragment_timetable_simple.xml diff --git a/android/res/layout/fragment_toggle_map_layer.xml b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml similarity index 100% rename from android/res/layout/fragment_toggle_map_layer.xml rename to android/app/src/main/res/layout/fragment_toggle_map_layer.xml diff --git a/android/res/layout/fragment_web_view_with_progress.xml b/android/app/src/main/res/layout/fragment_web_view_with_progress.xml similarity index 100% rename from android/res/layout/fragment_web_view_with_progress.xml rename to android/app/src/main/res/layout/fragment_web_view_with_progress.xml diff --git a/android/res/layout/indeterminated_progress_dialog.xml b/android/app/src/main/res/layout/indeterminated_progress_dialog.xml similarity index 100% rename from android/res/layout/indeterminated_progress_dialog.xml rename to android/app/src/main/res/layout/indeterminated_progress_dialog.xml diff --git a/android/res/layout/item_add_street.xml b/android/app/src/main/res/layout/item_add_street.xml similarity index 100% rename from android/res/layout/item_add_street.xml rename to android/app/src/main/res/layout/item_add_street.xml diff --git a/android/res/layout/item_bookmark.xml b/android/app/src/main/res/layout/item_bookmark.xml similarity index 100% rename from android/res/layout/item_bookmark.xml rename to android/app/src/main/res/layout/item_bookmark.xml diff --git a/android/res/layout/item_bookmark_category.xml b/android/app/src/main/res/layout/item_bookmark_category.xml similarity index 100% rename from android/res/layout/item_bookmark_category.xml rename to android/app/src/main/res/layout/item_bookmark_category.xml diff --git a/android/res/layout/item_bookmark_category_choose.xml b/android/app/src/main/res/layout/item_bookmark_category_choose.xml similarity index 100% rename from android/res/layout/item_bookmark_category_choose.xml rename to android/app/src/main/res/layout/item_bookmark_category_choose.xml diff --git a/android/res/layout/item_bookmark_category_create.xml b/android/app/src/main/res/layout/item_bookmark_category_create.xml similarity index 100% rename from android/res/layout/item_bookmark_category_create.xml rename to android/app/src/main/res/layout/item_bookmark_category_create.xml diff --git a/android/res/layout/item_bookmark_collection.xml b/android/app/src/main/res/layout/item_bookmark_collection.xml similarity index 100% rename from android/res/layout/item_bookmark_collection.xml rename to android/app/src/main/res/layout/item_bookmark_collection.xml diff --git a/android/res/layout/item_bookmark_create_group.xml b/android/app/src/main/res/layout/item_bookmark_create_group.xml similarity index 100% rename from android/res/layout/item_bookmark_create_group.xml rename to android/app/src/main/res/layout/item_bookmark_create_group.xml diff --git a/android/res/layout/item_bookmark_group_list_header.xml b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml similarity index 100% rename from android/res/layout/item_bookmark_group_list_header.xml rename to android/app/src/main/res/layout/item_bookmark_group_list_header.xml diff --git a/android/res/layout/item_bookmark_import.xml b/android/app/src/main/res/layout/item_bookmark_import.xml similarity index 100% rename from android/res/layout/item_bookmark_import.xml rename to android/app/src/main/res/layout/item_bookmark_import.xml diff --git a/android/res/layout/item_category_description.xml b/android/app/src/main/res/layout/item_category_description.xml similarity index 100% rename from android/res/layout/item_category_description.xml rename to android/app/src/main/res/layout/item_category_description.xml diff --git a/android/res/layout/item_category_title.xml b/android/app/src/main/res/layout/item_category_title.xml similarity index 100% rename from android/res/layout/item_category_title.xml rename to android/app/src/main/res/layout/item_category_title.xml diff --git a/android/res/layout/item_cuisine.xml b/android/app/src/main/res/layout/item_cuisine.xml similarity index 100% rename from android/res/layout/item_cuisine.xml rename to android/app/src/main/res/layout/item_cuisine.xml diff --git a/android/res/layout/item_editor_input.xml b/android/app/src/main/res/layout/item_editor_input.xml similarity index 100% rename from android/res/layout/item_editor_input.xml rename to android/app/src/main/res/layout/item_editor_input.xml diff --git a/android/res/layout/item_feature_category.xml b/android/app/src/main/res/layout/item_feature_category.xml similarity index 100% rename from android/res/layout/item_feature_category.xml rename to android/app/src/main/res/layout/item_feature_category.xml diff --git a/android/res/layout/item_language.xml b/android/app/src/main/res/layout/item_language.xml similarity index 100% rename from android/res/layout/item_language.xml rename to android/app/src/main/res/layout/item_language.xml diff --git a/android/res/layout/item_layer.xml b/android/app/src/main/res/layout/item_layer.xml similarity index 100% rename from android/res/layout/item_layer.xml rename to android/app/src/main/res/layout/item_layer.xml diff --git a/android/res/layout/item_localized_name.xml b/android/app/src/main/res/layout/item_localized_name.xml similarity index 100% rename from android/res/layout/item_localized_name.xml rename to android/app/src/main/res/layout/item_localized_name.xml diff --git a/android/res/layout/item_missed_map.xml b/android/app/src/main/res/layout/item_missed_map.xml similarity index 100% rename from android/res/layout/item_missed_map.xml rename to android/app/src/main/res/layout/item_missed_map.xml diff --git a/android/res/layout/item_missed_map_group.xml b/android/app/src/main/res/layout/item_missed_map_group.xml similarity index 100% rename from android/res/layout/item_missed_map_group.xml rename to android/app/src/main/res/layout/item_missed_map_group.xml diff --git a/android/res/layout/item_opening_hours.xml b/android/app/src/main/res/layout/item_opening_hours.xml similarity index 100% rename from android/res/layout/item_opening_hours.xml rename to android/app/src/main/res/layout/item_opening_hours.xml diff --git a/android/res/layout/item_phone.xml b/android/app/src/main/res/layout/item_phone.xml similarity index 100% rename from android/res/layout/item_phone.xml rename to android/app/src/main/res/layout/item_phone.xml diff --git a/android/res/layout/item_search_category.xml b/android/app/src/main/res/layout/item_search_category.xml similarity index 100% rename from android/res/layout/item_search_category.xml rename to android/app/src/main/res/layout/item_search_category.xml diff --git a/android/res/layout/item_search_clear_history.xml b/android/app/src/main/res/layout/item_search_clear_history.xml similarity index 100% rename from android/res/layout/item_search_clear_history.xml rename to android/app/src/main/res/layout/item_search_clear_history.xml diff --git a/android/res/layout/item_search_my_position.xml b/android/app/src/main/res/layout/item_search_my_position.xml similarity index 100% rename from android/res/layout/item_search_my_position.xml rename to android/app/src/main/res/layout/item_search_my_position.xml diff --git a/android/res/layout/item_search_recent.xml b/android/app/src/main/res/layout/item_search_recent.xml similarity index 100% rename from android/res/layout/item_search_recent.xml rename to android/app/src/main/res/layout/item_search_recent.xml diff --git a/android/res/layout/item_search_result.xml b/android/app/src/main/res/layout/item_search_result.xml similarity index 100% rename from android/res/layout/item_search_result.xml rename to android/app/src/main/res/layout/item_search_result.xml diff --git a/android/res/layout/item_search_suggest.xml b/android/app/src/main/res/layout/item_search_suggest.xml similarity index 100% rename from android/res/layout/item_search_suggest.xml rename to android/app/src/main/res/layout/item_search_suggest.xml diff --git a/android/res/layout/item_storage.xml b/android/app/src/main/res/layout/item_storage.xml similarity index 100% rename from android/res/layout/item_storage.xml rename to android/app/src/main/res/layout/item_storage.xml diff --git a/android/res/layout/item_street.xml b/android/app/src/main/res/layout/item_street.xml similarity index 100% rename from android/res/layout/item_street.xml rename to android/app/src/main/res/layout/item_street.xml diff --git a/android/res/layout/item_timetable.xml b/android/app/src/main/res/layout/item_timetable.xml similarity index 100% rename from android/res/layout/item_timetable.xml rename to android/app/src/main/res/layout/item_timetable.xml diff --git a/android/res/layout/item_timetable_add.xml b/android/app/src/main/res/layout/item_timetable_add.xml similarity index 100% rename from android/res/layout/item_timetable_add.xml rename to android/app/src/main/res/layout/item_timetable_add.xml diff --git a/android/res/layout/item_timetable_closed_hours.xml b/android/app/src/main/res/layout/item_timetable_closed_hours.xml similarity index 100% rename from android/res/layout/item_timetable_closed_hours.xml rename to android/app/src/main/res/layout/item_timetable_closed_hours.xml diff --git a/android/res/layout/item_track.xml b/android/app/src/main/res/layout/item_track.xml similarity index 100% rename from android/res/layout/item_track.xml rename to android/app/src/main/res/layout/item_track.xml diff --git a/android/res/layout/layout_nav.xml b/android/app/src/main/res/layout/layout_nav.xml similarity index 100% rename from android/res/layout/layout_nav.xml rename to android/app/src/main/res/layout/layout_nav.xml diff --git a/android/res/layout/layout_nav_bottom.xml b/android/app/src/main/res/layout/layout_nav_bottom.xml similarity index 100% rename from android/res/layout/layout_nav_bottom.xml rename to android/app/src/main/res/layout/layout_nav_bottom.xml diff --git a/android/res/layout/layout_nav_bottom_numbers.xml b/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml similarity index 100% rename from android/res/layout/layout_nav_bottom_numbers.xml rename to android/app/src/main/res/layout/layout_nav_bottom_numbers.xml diff --git a/android/res/layout/layout_nav_top.xml b/android/app/src/main/res/layout/layout_nav_top.xml similarity index 100% rename from android/res/layout/layout_nav_top.xml rename to android/app/src/main/res/layout/layout_nav_top.xml diff --git a/android/res/layout/list_divider.xml b/android/app/src/main/res/layout/list_divider.xml similarity index 100% rename from android/res/layout/list_divider.xml rename to android/app/src/main/res/layout/list_divider.xml diff --git a/android/res/layout/localized_name.xml b/android/app/src/main/res/layout/localized_name.xml similarity index 100% rename from android/res/layout/localized_name.xml rename to android/app/src/main/res/layout/localized_name.xml diff --git a/android/res/layout/map_buttons_bookmarks.xml b/android/app/src/main/res/layout/map_buttons_bookmarks.xml similarity index 100% rename from android/res/layout/map_buttons_bookmarks.xml rename to android/app/src/main/res/layout/map_buttons_bookmarks.xml diff --git a/android/res/layout/map_buttons_bookmarks_square.xml b/android/app/src/main/res/layout/map_buttons_bookmarks_square.xml similarity index 100% rename from android/res/layout/map_buttons_bookmarks_square.xml rename to android/app/src/main/res/layout/map_buttons_bookmarks_square.xml diff --git a/android/res/layout/map_buttons_bottom.xml b/android/app/src/main/res/layout/map_buttons_bottom.xml similarity index 100% rename from android/res/layout/map_buttons_bottom.xml rename to android/app/src/main/res/layout/map_buttons_bottom.xml diff --git a/android/res/layout/map_buttons_help.xml b/android/app/src/main/res/layout/map_buttons_help.xml similarity index 100% rename from android/res/layout/map_buttons_help.xml rename to android/app/src/main/res/layout/map_buttons_help.xml diff --git a/android/res/layout/map_buttons_layers.xml b/android/app/src/main/res/layout/map_buttons_layers.xml similarity index 100% rename from android/res/layout/map_buttons_layers.xml rename to android/app/src/main/res/layout/map_buttons_layers.xml diff --git a/android/res/layout/map_buttons_layout_navigation.xml b/android/app/src/main/res/layout/map_buttons_layout_navigation.xml similarity index 100% rename from android/res/layout/map_buttons_layout_navigation.xml rename to android/app/src/main/res/layout/map_buttons_layout_navigation.xml diff --git a/android/res/layout/map_buttons_layout_planning.xml b/android/app/src/main/res/layout/map_buttons_layout_planning.xml similarity index 100% rename from android/res/layout/map_buttons_layout_planning.xml rename to android/app/src/main/res/layout/map_buttons_layout_planning.xml diff --git a/android/res/layout/map_buttons_layout_regular.xml b/android/app/src/main/res/layout/map_buttons_layout_regular.xml similarity index 100% rename from android/res/layout/map_buttons_layout_regular.xml rename to android/app/src/main/res/layout/map_buttons_layout_regular.xml diff --git a/android/res/layout/map_buttons_menu.xml b/android/app/src/main/res/layout/map_buttons_menu.xml similarity index 100% rename from android/res/layout/map_buttons_menu.xml rename to android/app/src/main/res/layout/map_buttons_menu.xml diff --git a/android/res/layout/map_buttons_myposition.xml b/android/app/src/main/res/layout/map_buttons_myposition.xml similarity index 100% rename from android/res/layout/map_buttons_myposition.xml rename to android/app/src/main/res/layout/map_buttons_myposition.xml diff --git a/android/res/layout/map_buttons_search.xml b/android/app/src/main/res/layout/map_buttons_search.xml similarity index 100% rename from android/res/layout/map_buttons_search.xml rename to android/app/src/main/res/layout/map_buttons_search.xml diff --git a/android/res/layout/map_buttons_search_frame.xml b/android/app/src/main/res/layout/map_buttons_search_frame.xml similarity index 100% rename from android/res/layout/map_buttons_search_frame.xml rename to android/app/src/main/res/layout/map_buttons_search_frame.xml diff --git a/android/res/layout/map_buttons_search_square.xml b/android/app/src/main/res/layout/map_buttons_search_square.xml similarity index 100% rename from android/res/layout/map_buttons_search_square.xml rename to android/app/src/main/res/layout/map_buttons_search_square.xml diff --git a/android/res/layout/map_buttons_zoom.xml b/android/app/src/main/res/layout/map_buttons_zoom.xml similarity index 100% rename from android/res/layout/map_buttons_zoom.xml rename to android/app/src/main/res/layout/map_buttons_zoom.xml diff --git a/android/res/layout/menu.xml b/android/app/src/main/res/layout/menu.xml similarity index 100% rename from android/res/layout/menu.xml rename to android/app/src/main/res/layout/menu.xml diff --git a/android/res/layout/menu_route_plan_line.xml b/android/app/src/main/res/layout/menu_route_plan_line.xml similarity index 100% rename from android/res/layout/menu_route_plan_line.xml rename to android/app/src/main/res/layout/menu_route_plan_line.xml diff --git a/android/res/layout/nav_lanes.xml b/android/app/src/main/res/layout/nav_lanes.xml similarity index 100% rename from android/res/layout/nav_lanes.xml rename to android/app/src/main/res/layout/nav_lanes.xml diff --git a/android/res/layout/nav_single_lane.xml b/android/app/src/main/res/layout/nav_single_lane.xml similarity index 100% rename from android/res/layout/nav_single_lane.xml rename to android/app/src/main/res/layout/nav_single_lane.xml diff --git a/android/res/layout/navigation_notification.xml b/android/app/src/main/res/layout/navigation_notification.xml similarity index 100% rename from android/res/layout/navigation_notification.xml rename to android/app/src/main/res/layout/navigation_notification.xml diff --git a/android/res/layout/onmap_downloader.xml b/android/app/src/main/res/layout/onmap_downloader.xml similarity index 100% rename from android/res/layout/onmap_downloader.xml rename to android/app/src/main/res/layout/onmap_downloader.xml diff --git a/android/res/layout/place_page.xml b/android/app/src/main/res/layout/place_page.xml similarity index 100% rename from android/res/layout/place_page.xml rename to android/app/src/main/res/layout/place_page.xml diff --git a/android/res/layout/place_page_add.xml b/android/app/src/main/res/layout/place_page_add.xml similarity index 100% rename from android/res/layout/place_page_add.xml rename to android/app/src/main/res/layout/place_page_add.xml diff --git a/android/res/layout/place_page_add_business.xml b/android/app/src/main/res/layout/place_page_add_business.xml similarity index 100% rename from android/res/layout/place_page_add_business.xml rename to android/app/src/main/res/layout/place_page_add_business.xml diff --git a/android/res/layout/place_page_bookmark_fragment.xml b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml similarity index 100% rename from android/res/layout/place_page_bookmark_fragment.xml rename to android/app/src/main/res/layout/place_page_bookmark_fragment.xml diff --git a/android/res/layout/place_page_button.xml b/android/app/src/main/res/layout/place_page_button.xml similarity index 100% rename from android/res/layout/place_page_button.xml rename to android/app/src/main/res/layout/place_page_button.xml diff --git a/android/res/layout/place_page_container_fragment.xml b/android/app/src/main/res/layout/place_page_container_fragment.xml similarity index 100% rename from android/res/layout/place_page_container_fragment.xml rename to android/app/src/main/res/layout/place_page_container_fragment.xml diff --git a/android/res/layout/place_page_cuisine.xml b/android/app/src/main/res/layout/place_page_cuisine.xml similarity index 100% rename from android/res/layout/place_page_cuisine.xml rename to android/app/src/main/res/layout/place_page_cuisine.xml diff --git a/android/res/layout/place_page_description_layout.xml b/android/app/src/main/res/layout/place_page_description_layout.xml similarity index 100% rename from android/res/layout/place_page_description_layout.xml rename to android/app/src/main/res/layout/place_page_description_layout.xml diff --git a/android/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml similarity index 100% rename from android/res/layout/place_page_details.xml rename to android/app/src/main/res/layout/place_page_details.xml diff --git a/android/res/layout/place_page_editor.xml b/android/app/src/main/res/layout/place_page_editor.xml similarity index 100% rename from android/res/layout/place_page_editor.xml rename to android/app/src/main/res/layout/place_page_editor.xml diff --git a/android/res/layout/place_page_email.xml b/android/app/src/main/res/layout/place_page_email.xml similarity index 100% rename from android/res/layout/place_page_email.xml rename to android/app/src/main/res/layout/place_page_email.xml diff --git a/android/res/layout/place_page_entrance.xml b/android/app/src/main/res/layout/place_page_entrance.xml similarity index 100% rename from android/res/layout/place_page_entrance.xml rename to android/app/src/main/res/layout/place_page_entrance.xml diff --git a/android/res/layout/place_page_facebook.xml b/android/app/src/main/res/layout/place_page_facebook.xml similarity index 100% rename from android/res/layout/place_page_facebook.xml rename to android/app/src/main/res/layout/place_page_facebook.xml diff --git a/android/res/layout/place_page_fat_shadow.xml b/android/app/src/main/res/layout/place_page_fat_shadow.xml similarity index 100% rename from android/res/layout/place_page_fat_shadow.xml rename to android/app/src/main/res/layout/place_page_fat_shadow.xml diff --git a/android/res/layout/place_page_instagram.xml b/android/app/src/main/res/layout/place_page_instagram.xml similarity index 100% rename from android/res/layout/place_page_instagram.xml rename to android/app/src/main/res/layout/place_page_instagram.xml diff --git a/android/res/layout/place_page_latlon.xml b/android/app/src/main/res/layout/place_page_latlon.xml similarity index 100% rename from android/res/layout/place_page_latlon.xml rename to android/app/src/main/res/layout/place_page_latlon.xml diff --git a/android/res/layout/place_page_level.xml b/android/app/src/main/res/layout/place_page_level.xml similarity index 100% rename from android/res/layout/place_page_level.xml rename to android/app/src/main/res/layout/place_page_level.xml diff --git a/android/res/layout/place_page_line.xml b/android/app/src/main/res/layout/place_page_line.xml similarity index 100% rename from android/res/layout/place_page_line.xml rename to android/app/src/main/res/layout/place_page_line.xml diff --git a/android/res/layout/place_page_links_fragment.xml b/android/app/src/main/res/layout/place_page_links_fragment.xml similarity index 100% rename from android/res/layout/place_page_links_fragment.xml rename to android/app/src/main/res/layout/place_page_links_fragment.xml diff --git a/android/res/layout/place_page_opening_hours_fragment.xml b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml similarity index 100% rename from android/res/layout/place_page_opening_hours_fragment.xml rename to android/app/src/main/res/layout/place_page_opening_hours_fragment.xml diff --git a/android/res/layout/place_page_opening_hours_item.xml b/android/app/src/main/res/layout/place_page_opening_hours_item.xml similarity index 100% rename from android/res/layout/place_page_opening_hours_item.xml rename to android/app/src/main/res/layout/place_page_opening_hours_item.xml diff --git a/android/res/layout/place_page_operator.xml b/android/app/src/main/res/layout/place_page_operator.xml similarity index 100% rename from android/res/layout/place_page_operator.xml rename to android/app/src/main/res/layout/place_page_operator.xml diff --git a/android/res/layout/place_page_phone_fragment.xml b/android/app/src/main/res/layout/place_page_phone_fragment.xml similarity index 100% rename from android/res/layout/place_page_phone_fragment.xml rename to android/app/src/main/res/layout/place_page_phone_fragment.xml diff --git a/android/res/layout/place_page_phone_item.xml b/android/app/src/main/res/layout/place_page_phone_item.xml similarity index 100% rename from android/res/layout/place_page_phone_item.xml rename to android/app/src/main/res/layout/place_page_phone_item.xml diff --git a/android/res/layout/place_page_placename.xml b/android/app/src/main/res/layout/place_page_placename.xml similarity index 100% rename from android/res/layout/place_page_placename.xml rename to android/app/src/main/res/layout/place_page_placename.xml diff --git a/android/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml similarity index 100% rename from android/res/layout/place_page_preview.xml rename to android/app/src/main/res/layout/place_page_preview.xml diff --git a/android/res/layout/place_page_rating_records.xml b/android/app/src/main/res/layout/place_page_rating_records.xml similarity index 100% rename from android/res/layout/place_page_rating_records.xml rename to android/app/src/main/res/layout/place_page_rating_records.xml diff --git a/android/res/layout/place_page_twitter.xml b/android/app/src/main/res/layout/place_page_twitter.xml similarity index 100% rename from android/res/layout/place_page_twitter.xml rename to android/app/src/main/res/layout/place_page_twitter.xml diff --git a/android/res/layout/place_page_vk.xml b/android/app/src/main/res/layout/place_page_vk.xml similarity index 100% rename from android/res/layout/place_page_vk.xml rename to android/app/src/main/res/layout/place_page_vk.xml diff --git a/android/res/layout/place_page_website.xml b/android/app/src/main/res/layout/place_page_website.xml similarity index 100% rename from android/res/layout/place_page_website.xml rename to android/app/src/main/res/layout/place_page_website.xml diff --git a/android/res/layout/place_page_wifi.xml b/android/app/src/main/res/layout/place_page_wifi.xml similarity index 100% rename from android/res/layout/place_page_wifi.xml rename to android/app/src/main/res/layout/place_page_wifi.xml diff --git a/android/res/layout/place_page_wikimedia.xml b/android/app/src/main/res/layout/place_page_wikimedia.xml similarity index 100% rename from android/res/layout/place_page_wikimedia.xml rename to android/app/src/main/res/layout/place_page_wikimedia.xml diff --git a/android/res/layout/place_page_wikipedia_fragment.xml b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml similarity index 100% rename from android/res/layout/place_page_wikipedia_fragment.xml rename to android/app/src/main/res/layout/place_page_wikipedia_fragment.xml diff --git a/android/res/layout/placeholder_image.xml b/android/app/src/main/res/layout/placeholder_image.xml similarity index 100% rename from android/res/layout/placeholder_image.xml rename to android/app/src/main/res/layout/placeholder_image.xml diff --git a/android/res/layout/placeholder_subtitle.xml b/android/app/src/main/res/layout/placeholder_subtitle.xml similarity index 100% rename from android/res/layout/placeholder_subtitle.xml rename to android/app/src/main/res/layout/placeholder_subtitle.xml diff --git a/android/res/layout/placeholder_title.xml b/android/app/src/main/res/layout/placeholder_title.xml similarity index 100% rename from android/res/layout/placeholder_title.xml rename to android/app/src/main/res/layout/placeholder_title.xml diff --git a/android/res/layout/placeholder_with_progressbar_layout.xml b/android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml similarity index 100% rename from android/res/layout/placeholder_with_progressbar_layout.xml rename to android/app/src/main/res/layout/placeholder_with_progressbar_layout.xml diff --git a/android/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml similarity index 100% rename from android/res/layout/position_chooser.xml rename to android/app/src/main/res/layout/position_chooser.xml diff --git a/android/res/layout/pp_buttons_fragment.xml b/android/app/src/main/res/layout/pp_buttons_fragment.xml similarity index 100% rename from android/res/layout/pp_buttons_fragment.xml rename to android/app/src/main/res/layout/pp_buttons_fragment.xml diff --git a/android/res/layout/recycler_default.xml b/android/app/src/main/res/layout/recycler_default.xml similarity index 100% rename from android/res/layout/recycler_default.xml rename to android/app/src/main/res/layout/recycler_default.xml diff --git a/android/res/layout/recycler_with_fab.xml b/android/app/src/main/res/layout/recycler_with_fab.xml similarity index 100% rename from android/res/layout/recycler_with_fab.xml rename to android/app/src/main/res/layout/recycler_with_fab.xml diff --git a/android/res/layout/routing_action_panel.xml b/android/app/src/main/res/layout/routing_action_panel.xml similarity index 100% rename from android/res/layout/routing_action_panel.xml rename to android/app/src/main/res/layout/routing_action_panel.xml diff --git a/android/res/layout/routing_bottom_panel_transit.xml b/android/app/src/main/res/layout/routing_bottom_panel_transit.xml similarity index 100% rename from android/res/layout/routing_bottom_panel_transit.xml rename to android/app/src/main/res/layout/routing_bottom_panel_transit.xml diff --git a/android/res/layout/routing_details.xml b/android/app/src/main/res/layout/routing_details.xml similarity index 100% rename from android/res/layout/routing_details.xml rename to android/app/src/main/res/layout/routing_details.xml diff --git a/android/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml similarity index 100% rename from android/res/layout/routing_plan.xml rename to android/app/src/main/res/layout/routing_plan.xml diff --git a/android/res/layout/routing_transit_step_view.xml b/android/app/src/main/res/layout/routing_transit_step_view.xml similarity index 100% rename from android/res/layout/routing_transit_step_view.xml rename to android/app/src/main/res/layout/routing_transit_step_view.xml diff --git a/android/res/layout/shadow_bottom.xml b/android/app/src/main/res/layout/shadow_bottom.xml similarity index 100% rename from android/res/layout/shadow_bottom.xml rename to android/app/src/main/res/layout/shadow_bottom.xml diff --git a/android/res/layout/shadow_top.xml b/android/app/src/main/res/layout/shadow_top.xml similarity index 100% rename from android/res/layout/shadow_top.xml rename to android/app/src/main/res/layout/shadow_top.xml diff --git a/android/res/layout/show_on_map_fab.xml b/android/app/src/main/res/layout/show_on_map_fab.xml similarity index 100% rename from android/res/layout/show_on_map_fab.xml rename to android/app/src/main/res/layout/show_on_map_fab.xml diff --git a/android/res/layout/start_button.xml b/android/app/src/main/res/layout/start_button.xml similarity index 100% rename from android/res/layout/start_button.xml rename to android/app/src/main/res/layout/start_button.xml diff --git a/android/res/layout/tab_timepicker.xml b/android/app/src/main/res/layout/tab_timepicker.xml similarity index 100% rename from android/res/layout/tab_timepicker.xml rename to android/app/src/main/res/layout/tab_timepicker.xml diff --git a/android/res/layout/toolbar_default.xml b/android/app/src/main/res/layout/toolbar_default.xml similarity index 100% rename from android/res/layout/toolbar_default.xml rename to android/app/src/main/res/layout/toolbar_default.xml diff --git a/android/res/layout/toolbar_extended.xml b/android/app/src/main/res/layout/toolbar_extended.xml similarity index 100% rename from android/res/layout/toolbar_extended.xml rename to android/app/src/main/res/layout/toolbar_extended.xml diff --git a/android/res/layout/toolbar_menu_progressbar.xml b/android/app/src/main/res/layout/toolbar_menu_progressbar.xml similarity index 100% rename from android/res/layout/toolbar_menu_progressbar.xml rename to android/app/src/main/res/layout/toolbar_menu_progressbar.xml diff --git a/android/res/layout/toolbar_search_controls.xml b/android/app/src/main/res/layout/toolbar_search_controls.xml similarity index 100% rename from android/res/layout/toolbar_search_controls.xml rename to android/app/src/main/res/layout/toolbar_search_controls.xml diff --git a/android/res/layout/toolbar_transparent.xml b/android/app/src/main/res/layout/toolbar_transparent.xml similarity index 100% rename from android/res/layout/toolbar_transparent.xml rename to android/app/src/main/res/layout/toolbar_transparent.xml diff --git a/android/res/layout/toolbar_with_optional_search.xml b/android/app/src/main/res/layout/toolbar_with_optional_search.xml similarity index 100% rename from android/res/layout/toolbar_with_optional_search.xml rename to android/app/src/main/res/layout/toolbar_with_optional_search.xml diff --git a/android/res/layout/toolbar_with_search.xml b/android/app/src/main/res/layout/toolbar_with_search.xml similarity index 100% rename from android/res/layout/toolbar_with_search.xml rename to android/app/src/main/res/layout/toolbar_with_search.xml diff --git a/android/res/layout/toolbar_with_search_no_elevation.xml b/android/app/src/main/res/layout/toolbar_with_search_no_elevation.xml similarity index 100% rename from android/res/layout/toolbar_with_search_no_elevation.xml rename to android/app/src/main/res/layout/toolbar_with_search_no_elevation.xml diff --git a/android/res/menu/menu_done.xml b/android/app/src/main/res/menu/menu_done.xml similarity index 100% rename from android/res/menu/menu_done.xml rename to android/app/src/main/res/menu/menu_done.xml diff --git a/android/res/menu/option_menu_bookmarks.xml b/android/app/src/main/res/menu/option_menu_bookmarks.xml similarity index 100% rename from android/res/menu/option_menu_bookmarks.xml rename to android/app/src/main/res/menu/option_menu_bookmarks.xml diff --git a/android/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from android/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/android/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from android/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from android/res/mipmap-hdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from android/res/mipmap-hdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/android/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from android/res/mipmap-hdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from android/res/mipmap-mdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from android/res/mipmap-mdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/android/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from android/res/mipmap-mdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from android/res/mipmap-xhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from android/res/mipmap-xhdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/android/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from android/res/mipmap-xhdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from android/res/mipmap-xxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from android/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/android/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from android/res/mipmap-xxhdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/android/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from android/res/mipmap-xxxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from android/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/android/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from android/res/mipmap-xxxhdpi/ic_launcher_round.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/android/res/raw/speed_cams_beep.m4a b/android/app/src/main/res/raw/speed_cams_beep.m4a similarity index 100% rename from android/res/raw/speed_cams_beep.m4a rename to android/app/src/main/res/raw/speed_cams_beep.m4a diff --git a/android/res/values-ar-rSY/colors.xml b/android/app/src/main/res/values-ar-rSY/colors.xml similarity index 100% rename from android/res/values-ar-rSY/colors.xml rename to android/app/src/main/res/values-ar-rSY/colors.xml diff --git a/android/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml similarity index 100% rename from android/res/values-ar/strings.xml rename to android/app/src/main/res/values-ar/strings.xml diff --git a/android/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml similarity index 100% rename from android/res/values-be/strings.xml rename to android/app/src/main/res/values-be/strings.xml diff --git a/android/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml similarity index 100% rename from android/res/values-bg/strings.xml rename to android/app/src/main/res/values-bg/strings.xml diff --git a/android/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml similarity index 100% rename from android/res/values-ca/strings.xml rename to android/app/src/main/res/values-ca/strings.xml diff --git a/android/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml similarity index 100% rename from android/res/values-cs/strings.xml rename to android/app/src/main/res/values-cs/strings.xml diff --git a/android/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml similarity index 100% rename from android/res/values-da/strings.xml rename to android/app/src/main/res/values-da/strings.xml diff --git a/android/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml similarity index 100% rename from android/res/values-de/strings.xml rename to android/app/src/main/res/values-de/strings.xml diff --git a/android/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml similarity index 100% rename from android/res/values-el/strings.xml rename to android/app/src/main/res/values-el/strings.xml diff --git a/android/res/values-en-rGB/strings.xml b/android/app/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from android/res/values-en-rGB/strings.xml rename to android/app/src/main/res/values-en-rGB/strings.xml diff --git a/android/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml similarity index 100% rename from android/res/values-es-rMX/strings.xml rename to android/app/src/main/res/values-es-rMX/strings.xml diff --git a/android/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml similarity index 100% rename from android/res/values-es/strings.xml rename to android/app/src/main/res/values-es/strings.xml diff --git a/android/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml similarity index 100% rename from android/res/values-et/strings.xml rename to android/app/src/main/res/values-et/strings.xml diff --git a/android/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml similarity index 100% rename from android/res/values-eu/strings.xml rename to android/app/src/main/res/values-eu/strings.xml diff --git a/android/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml similarity index 100% rename from android/res/values-fa/strings.xml rename to android/app/src/main/res/values-fa/strings.xml diff --git a/android/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml similarity index 100% rename from android/res/values-fi/strings.xml rename to android/app/src/main/res/values-fi/strings.xml diff --git a/android/res/values-fr-rCA/strings.xml b/android/app/src/main/res/values-fr-rCA/strings.xml similarity index 100% rename from android/res/values-fr-rCA/strings.xml rename to android/app/src/main/res/values-fr-rCA/strings.xml diff --git a/android/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml similarity index 100% rename from android/res/values-fr/strings.xml rename to android/app/src/main/res/values-fr/strings.xml diff --git a/android/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml similarity index 100% rename from android/res/values-hu/strings.xml rename to android/app/src/main/res/values-hu/strings.xml diff --git a/android/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml similarity index 100% rename from android/res/values-in/strings.xml rename to android/app/src/main/res/values-in/strings.xml diff --git a/android/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml similarity index 100% rename from android/res/values-it/strings.xml rename to android/app/src/main/res/values-it/strings.xml diff --git a/android/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml similarity index 100% rename from android/res/values-iw/strings.xml rename to android/app/src/main/res/values-iw/strings.xml diff --git a/android/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml similarity index 100% rename from android/res/values-ja/strings.xml rename to android/app/src/main/res/values-ja/strings.xml diff --git a/android/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml similarity index 100% rename from android/res/values-ko/strings.xml rename to android/app/src/main/res/values-ko/strings.xml diff --git a/android/res/values-land/attrs.xml b/android/app/src/main/res/values-land/attrs.xml similarity index 100% rename from android/res/values-land/attrs.xml rename to android/app/src/main/res/values-land/attrs.xml diff --git a/android/res/values-land/dimens.xml b/android/app/src/main/res/values-land/dimens.xml similarity index 100% rename from android/res/values-land/dimens.xml rename to android/app/src/main/res/values-land/dimens.xml diff --git a/android/res/values-land/fractions.xml b/android/app/src/main/res/values-land/fractions.xml similarity index 100% rename from android/res/values-land/fractions.xml rename to android/app/src/main/res/values-land/fractions.xml diff --git a/android/res/values-land/integer.xml b/android/app/src/main/res/values-land/integer.xml similarity index 100% rename from android/res/values-land/integer.xml rename to android/app/src/main/res/values-land/integer.xml diff --git a/android/res/values-mcc286/colors.xml b/android/app/src/main/res/values-mcc286/colors.xml similarity index 100% rename from android/res/values-mcc286/colors.xml rename to android/app/src/main/res/values-mcc286/colors.xml diff --git a/android/res/values-mcc417/colors.xml b/android/app/src/main/res/values-mcc417/colors.xml similarity index 100% rename from android/res/values-mcc417/colors.xml rename to android/app/src/main/res/values-mcc417/colors.xml diff --git a/android/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml similarity index 100% rename from android/res/values-mr/strings.xml rename to android/app/src/main/res/values-mr/strings.xml diff --git a/android/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml similarity index 100% rename from android/res/values-nb/strings.xml rename to android/app/src/main/res/values-nb/strings.xml diff --git a/android/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml similarity index 100% rename from android/res/values-nl/strings.xml rename to android/app/src/main/res/values-nl/strings.xml diff --git a/android/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml similarity index 100% rename from android/res/values-pl/strings.xml rename to android/app/src/main/res/values-pl/strings.xml diff --git a/android/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from android/res/values-pt-rBR/strings.xml rename to android/app/src/main/res/values-pt-rBR/strings.xml diff --git a/android/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml similarity index 100% rename from android/res/values-pt/strings.xml rename to android/app/src/main/res/values-pt/strings.xml diff --git a/android/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml similarity index 100% rename from android/res/values-ro/strings.xml rename to android/app/src/main/res/values-ro/strings.xml diff --git a/android/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml similarity index 100% rename from android/res/values-ru/strings.xml rename to android/app/src/main/res/values-ru/strings.xml diff --git a/android/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml similarity index 100% rename from android/res/values-sk/strings.xml rename to android/app/src/main/res/values-sk/strings.xml diff --git a/android/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml similarity index 100% rename from android/res/values-sv/strings.xml rename to android/app/src/main/res/values-sv/strings.xml diff --git a/android/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml similarity index 100% rename from android/res/values-sw/strings.xml rename to android/app/src/main/res/values-sw/strings.xml diff --git a/android/res/values-sw360dp/values-preference.xml b/android/app/src/main/res/values-sw360dp/values-preference.xml similarity index 100% rename from android/res/values-sw360dp/values-preference.xml rename to android/app/src/main/res/values-sw360dp/values-preference.xml diff --git a/android/res/values-sw600dp-land/integer.xml b/android/app/src/main/res/values-sw600dp-land/integer.xml similarity index 100% rename from android/res/values-sw600dp-land/integer.xml rename to android/app/src/main/res/values-sw600dp-land/integer.xml diff --git a/android/res/values-sw600dp/attrs.xml b/android/app/src/main/res/values-sw600dp/attrs.xml similarity index 100% rename from android/res/values-sw600dp/attrs.xml rename to android/app/src/main/res/values-sw600dp/attrs.xml diff --git a/android/res/values-sw600dp/dimens.xml b/android/app/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from android/res/values-sw600dp/dimens.xml rename to android/app/src/main/res/values-sw600dp/dimens.xml diff --git a/android/res/values-sw720dp-land/dimens.xml b/android/app/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from android/res/values-sw720dp-land/dimens.xml rename to android/app/src/main/res/values-sw720dp-land/dimens.xml diff --git a/android/res/values-sw720dp/dimens.xml b/android/app/src/main/res/values-sw720dp/dimens.xml similarity index 100% rename from android/res/values-sw720dp/dimens.xml rename to android/app/src/main/res/values-sw720dp/dimens.xml diff --git a/android/res/values-sw720dp/font_sizes.xml b/android/app/src/main/res/values-sw720dp/font_sizes.xml similarity index 100% rename from android/res/values-sw720dp/font_sizes.xml rename to android/app/src/main/res/values-sw720dp/font_sizes.xml diff --git a/android/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml similarity index 100% rename from android/res/values-th/strings.xml rename to android/app/src/main/res/values-th/strings.xml diff --git a/android/res/values-tr/colors.xml b/android/app/src/main/res/values-tr/colors.xml similarity index 100% rename from android/res/values-tr/colors.xml rename to android/app/src/main/res/values-tr/colors.xml diff --git a/android/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml similarity index 100% rename from android/res/values-tr/strings.xml rename to android/app/src/main/res/values-tr/strings.xml diff --git a/android/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml similarity index 100% rename from android/res/values-uk/strings.xml rename to android/app/src/main/res/values-uk/strings.xml diff --git a/android/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml similarity index 100% rename from android/res/values-v27/themes.xml rename to android/app/src/main/res/values-v27/themes.xml diff --git a/android/res/values-v31/autoverify.xml b/android/app/src/main/res/values-v31/autoverify.xml similarity index 100% rename from android/res/values-v31/autoverify.xml rename to android/app/src/main/res/values-v31/autoverify.xml diff --git a/android/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml similarity index 100% rename from android/res/values-vi/strings.xml rename to android/app/src/main/res/values-vi/strings.xml diff --git a/android/res/values-w1020dp-land/dimens.xml b/android/app/src/main/res/values-w1020dp-land/dimens.xml similarity index 100% rename from android/res/values-w1020dp-land/dimens.xml rename to android/app/src/main/res/values-w1020dp-land/dimens.xml diff --git a/android/res/values-w1020dp/attrs.xml b/android/app/src/main/res/values-w1020dp/attrs.xml similarity index 100% rename from android/res/values-w1020dp/attrs.xml rename to android/app/src/main/res/values-w1020dp/attrs.xml diff --git a/android/res/values-w1020dp/dimens.xml b/android/app/src/main/res/values-w1020dp/dimens.xml similarity index 100% rename from android/res/values-w1020dp/dimens.xml rename to android/app/src/main/res/values-w1020dp/dimens.xml diff --git a/android/res/values-w400dp/dimens.xml b/android/app/src/main/res/values-w400dp/dimens.xml similarity index 100% rename from android/res/values-w400dp/dimens.xml rename to android/app/src/main/res/values-w400dp/dimens.xml diff --git a/android/res/values-w600dp/dimens.xml b/android/app/src/main/res/values-w600dp/dimens.xml similarity index 100% rename from android/res/values-w600dp/dimens.xml rename to android/app/src/main/res/values-w600dp/dimens.xml diff --git a/android/res/values-w840dp/dimens.xml b/android/app/src/main/res/values-w840dp/dimens.xml similarity index 100% rename from android/res/values-w840dp/dimens.xml rename to android/app/src/main/res/values-w840dp/dimens.xml diff --git a/android/res/values-zh-rHK/strings.xml b/android/app/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from android/res/values-zh-rHK/strings.xml rename to android/app/src/main/res/values-zh-rHK/strings.xml diff --git a/android/res/values-zh-rMO/strings.xml b/android/app/src/main/res/values-zh-rMO/strings.xml similarity index 100% rename from android/res/values-zh-rMO/strings.xml rename to android/app/src/main/res/values-zh-rMO/strings.xml diff --git a/android/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from android/res/values-zh-rTW/strings.xml rename to android/app/src/main/res/values-zh-rTW/strings.xml diff --git a/android/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml similarity index 100% rename from android/res/values-zh/strings.xml rename to android/app/src/main/res/values-zh/strings.xml diff --git a/android/res/values/anim.xml b/android/app/src/main/res/values/anim.xml similarity index 100% rename from android/res/values/anim.xml rename to android/app/src/main/res/values/anim.xml diff --git a/android/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml similarity index 100% rename from android/res/values/attrs.xml rename to android/app/src/main/res/values/attrs.xml diff --git a/android/res/values/autoverify.xml b/android/app/src/main/res/values/autoverify.xml similarity index 100% rename from android/res/values/autoverify.xml rename to android/app/src/main/res/values/autoverify.xml diff --git a/android/res/values/colors.xml b/android/app/src/main/res/values/colors.xml similarity index 100% rename from android/res/values/colors.xml rename to android/app/src/main/res/values/colors.xml diff --git a/android/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml similarity index 100% rename from android/res/values/dimens.xml rename to android/app/src/main/res/values/dimens.xml diff --git a/android/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml similarity index 100% rename from android/res/values/donottranslate.xml rename to android/app/src/main/res/values/donottranslate.xml diff --git a/android/res/values/font_sizes.xml b/android/app/src/main/res/values/font_sizes.xml similarity index 100% rename from android/res/values/font_sizes.xml rename to android/app/src/main/res/values/font_sizes.xml diff --git a/android/res/values/fractions.xml b/android/app/src/main/res/values/fractions.xml similarity index 100% rename from android/res/values/fractions.xml rename to android/app/src/main/res/values/fractions.xml diff --git a/android/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from android/res/values/ic_launcher_background.xml rename to android/app/src/main/res/values/ic_launcher_background.xml diff --git a/android/res/values/integer.xml b/android/app/src/main/res/values/integer.xml similarity index 100% rename from android/res/values/integer.xml rename to android/app/src/main/res/values/integer.xml diff --git a/android/res/values/string-arrays.xml b/android/app/src/main/res/values/string-arrays.xml similarity index 100% rename from android/res/values/string-arrays.xml rename to android/app/src/main/res/values/string-arrays.xml diff --git a/android/res/values/strings-tts.xml b/android/app/src/main/res/values/strings-tts.xml similarity index 100% rename from android/res/values/strings-tts.xml rename to android/app/src/main/res/values/strings-tts.xml diff --git a/android/res/values/strings.xml b/android/app/src/main/res/values/strings.xml similarity index 100% rename from android/res/values/strings.xml rename to android/app/src/main/res/values/strings.xml diff --git a/android/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml similarity index 100% rename from android/res/values/styles-editor.xml rename to android/app/src/main/res/values/styles-editor.xml diff --git a/android/res/values/styles-place_page.xml b/android/app/src/main/res/values/styles-place_page.xml similarity index 100% rename from android/res/values/styles-place_page.xml rename to android/app/src/main/res/values/styles-place_page.xml diff --git a/android/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml similarity index 100% rename from android/res/values/styles-text.xml rename to android/app/src/main/res/values/styles-text.xml diff --git a/android/res/values/styles.xml b/android/app/src/main/res/values/styles.xml similarity index 100% rename from android/res/values/styles.xml rename to android/app/src/main/res/values/styles.xml diff --git a/android/res/values/themes-attrs.xml b/android/app/src/main/res/values/themes-attrs.xml similarity index 100% rename from android/res/values/themes-attrs.xml rename to android/app/src/main/res/values/themes-attrs.xml diff --git a/android/res/values/themes-base.xml b/android/app/src/main/res/values/themes-base.xml similarity index 100% rename from android/res/values/themes-base.xml rename to android/app/src/main/res/values/themes-base.xml diff --git a/android/res/values/themes.xml b/android/app/src/main/res/values/themes.xml similarity index 100% rename from android/res/values/themes.xml rename to android/app/src/main/res/values/themes.xml diff --git a/android/res/xml/backup_content.xml b/android/app/src/main/res/xml/backup_content.xml similarity index 100% rename from android/res/xml/backup_content.xml rename to android/app/src/main/res/xml/backup_content.xml diff --git a/android/res/xml/backup_content_v31.xml b/android/app/src/main/res/xml/backup_content_v31.xml similarity index 100% rename from android/res/xml/backup_content_v31.xml rename to android/app/src/main/res/xml/backup_content_v31.xml diff --git a/android/res/xml/file_paths.xml b/android/app/src/main/res/xml/file_paths.xml similarity index 100% rename from android/res/xml/file_paths.xml rename to android/app/src/main/res/xml/file_paths.xml diff --git a/android/res/xml/locales_config.xml b/android/app/src/main/res/xml/locales_config.xml similarity index 100% rename from android/res/xml/locales_config.xml rename to android/app/src/main/res/xml/locales_config.xml diff --git a/android/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml similarity index 100% rename from android/res/xml/prefs_main.xml rename to android/app/src/main/res/xml/prefs_main.xml diff --git a/android/app/src/test/java/app/organicmaps/ExampleUnitTest.java b/android/app/src/test/java/app/organicmaps/ExampleUnitTest.java new file mode 100644 index 0000000000..b9e0751b0a --- /dev/null +++ b/android/app/src/test/java/app/organicmaps/ExampleUnitTest.java @@ -0,0 +1,19 @@ +package app.organicmaps; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest +{ + @Test + public void addition_isCorrect() + { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android/tests/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java b/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java similarity index 100% rename from android/tests/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java rename to android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java diff --git a/android/tests/resources/mockito-extensions/org.mockito.plugins.MockMaker b/android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from android/tests/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to android/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/android/assets/00_NotoNaskhArabic-Regular.ttf b/android/assets/00_NotoNaskhArabic-Regular.ttf deleted file mode 120000 index 05919eb765..0000000000 --- a/android/assets/00_NotoNaskhArabic-Regular.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/00_NotoNaskhArabic-Regular.ttf \ No newline at end of file diff --git a/android/assets/00_NotoSansThai-Regular.ttf b/android/assets/00_NotoSansThai-Regular.ttf deleted file mode 120000 index 2a75162e17..0000000000 --- a/android/assets/00_NotoSansThai-Regular.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/00_NotoSansThai-Regular.ttf \ No newline at end of file diff --git a/android/assets/00_NotoSerifDevanagari-Regular.ttf b/android/assets/00_NotoSerifDevanagari-Regular.ttf deleted file mode 120000 index fd3e05969b..0000000000 --- a/android/assets/00_NotoSerifDevanagari-Regular.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/00_NotoSerifDevanagari-Regular.ttf \ No newline at end of file diff --git a/android/assets/01_dejavusans.ttf b/android/assets/01_dejavusans.ttf deleted file mode 120000 index bb08ca0537..0000000000 --- a/android/assets/01_dejavusans.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/01_dejavusans.ttf \ No newline at end of file diff --git a/android/assets/02_droidsans-fallback.ttf b/android/assets/02_droidsans-fallback.ttf deleted file mode 120000 index 17fe7c691a..0000000000 --- a/android/assets/02_droidsans-fallback.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/02_droidsans-fallback.ttf \ No newline at end of file diff --git a/android/assets/03_jomolhari-id-a3d.ttf b/android/assets/03_jomolhari-id-a3d.ttf deleted file mode 120000 index 070a00adef..0000000000 --- a/android/assets/03_jomolhari-id-a3d.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/03_jomolhari-id-a3d.ttf \ No newline at end of file diff --git a/android/assets/04_padauk.ttf b/android/assets/04_padauk.ttf deleted file mode 120000 index 8d9d5826c9..0000000000 --- a/android/assets/04_padauk.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/04_padauk.ttf \ No newline at end of file diff --git a/android/assets/05_khmeros.ttf b/android/assets/05_khmeros.ttf deleted file mode 120000 index 0ae06c25a9..0000000000 --- a/android/assets/05_khmeros.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/05_khmeros.ttf \ No newline at end of file diff --git a/android/assets/06_code2000.ttf b/android/assets/06_code2000.ttf deleted file mode 120000 index 1eeb71ace9..0000000000 --- a/android/assets/06_code2000.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/06_code2000.ttf \ No newline at end of file diff --git a/android/assets/07_roboto_medium.ttf b/android/assets/07_roboto_medium.ttf deleted file mode 120000 index 2c316d51c9..0000000000 --- a/android/assets/07_roboto_medium.ttf +++ /dev/null @@ -1 +0,0 @@ -../../data/07_roboto_medium.ttf \ No newline at end of file diff --git a/android/assets/categories.txt b/android/assets/categories.txt deleted file mode 120000 index 8038010aa8..0000000000 --- a/android/assets/categories.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/categories.txt \ No newline at end of file diff --git a/android/assets/categories_brands.txt b/android/assets/categories_brands.txt deleted file mode 120000 index fc1848b1e0..0000000000 --- a/android/assets/categories_brands.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/categories_brands.txt \ No newline at end of file diff --git a/android/assets/categories_cuisines.txt b/android/assets/categories_cuisines.txt deleted file mode 120000 index a735b7d836..0000000000 --- a/android/assets/categories_cuisines.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/categories_cuisines.txt \ No newline at end of file diff --git a/android/assets/classificator.txt b/android/assets/classificator.txt deleted file mode 120000 index db372b15cb..0000000000 --- a/android/assets/classificator.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/classificator.txt \ No newline at end of file diff --git a/android/assets/colors.txt b/android/assets/colors.txt deleted file mode 120000 index ab5dad0420..0000000000 --- a/android/assets/colors.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/colors.txt \ No newline at end of file diff --git a/android/assets/copyright.html b/android/assets/copyright.html deleted file mode 120000 index c17fba3e25..0000000000 --- a/android/assets/copyright.html +++ /dev/null @@ -1 +0,0 @@ -../../data/copyright.html \ No newline at end of file diff --git a/android/assets/countries-strings b/android/assets/countries-strings deleted file mode 120000 index a3b668fff7..0000000000 --- a/android/assets/countries-strings +++ /dev/null @@ -1 +0,0 @@ -../../data/countries-strings/ \ No newline at end of file diff --git a/android/assets/countries.txt b/android/assets/countries.txt deleted file mode 120000 index 89e7165e30..0000000000 --- a/android/assets/countries.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/countries.txt \ No newline at end of file diff --git a/android/assets/drules_proto_clear.bin b/android/assets/drules_proto_clear.bin deleted file mode 120000 index 1266a15cba..0000000000 --- a/android/assets/drules_proto_clear.bin +++ /dev/null @@ -1 +0,0 @@ -../../data/drules_proto_clear.bin \ No newline at end of file diff --git a/android/assets/drules_proto_dark.bin b/android/assets/drules_proto_dark.bin deleted file mode 120000 index 30c2020b4d..0000000000 --- a/android/assets/drules_proto_dark.bin +++ /dev/null @@ -1 +0,0 @@ -../../data/drules_proto_dark.bin \ No newline at end of file diff --git a/android/assets/drules_proto_vehicle_clear.bin b/android/assets/drules_proto_vehicle_clear.bin deleted file mode 120000 index ebc6e8cfc8..0000000000 --- a/android/assets/drules_proto_vehicle_clear.bin +++ /dev/null @@ -1 +0,0 @@ -../../data/drules_proto_vehicle_clear.bin \ No newline at end of file diff --git a/android/assets/drules_proto_vehicle_dark.bin b/android/assets/drules_proto_vehicle_dark.bin deleted file mode 120000 index ab8f2484ae..0000000000 --- a/android/assets/drules_proto_vehicle_dark.bin +++ /dev/null @@ -1 +0,0 @@ -../../data/drules_proto_vehicle_dark.bin \ No newline at end of file diff --git a/android/assets/editor.config b/android/assets/editor.config deleted file mode 120000 index 5771771312..0000000000 --- a/android/assets/editor.config +++ /dev/null @@ -1 +0,0 @@ -../../data/editor.config \ No newline at end of file diff --git a/android/assets/faq.html b/android/assets/faq.html deleted file mode 120000 index 50811ba5b7..0000000000 --- a/android/assets/faq.html +++ /dev/null @@ -1 +0,0 @@ -../../data/faq.html \ No newline at end of file diff --git a/android/assets/fonts_blacklist.txt b/android/assets/fonts_blacklist.txt deleted file mode 120000 index 5803bdabdc..0000000000 --- a/android/assets/fonts_blacklist.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/fonts_blacklist.txt \ No newline at end of file diff --git a/android/assets/fonts_whitelist.txt b/android/assets/fonts_whitelist.txt deleted file mode 120000 index a33524b69d..0000000000 --- a/android/assets/fonts_whitelist.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/fonts_whitelist.txt \ No newline at end of file diff --git a/android/assets/icudt73l.dat b/android/assets/icudt73l.dat deleted file mode 120000 index fd146e695a..0000000000 --- a/android/assets/icudt73l.dat +++ /dev/null @@ -1 +0,0 @@ -../../data/icudt73l.dat \ No newline at end of file diff --git a/android/assets/languages.txt b/android/assets/languages.txt deleted file mode 120000 index 27e6a591ca..0000000000 --- a/android/assets/languages.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/languages.txt \ No newline at end of file diff --git a/android/assets/opening_hours_how_to_edit.html b/android/assets/opening_hours_how_to_edit.html deleted file mode 120000 index 67cdf700c8..0000000000 --- a/android/assets/opening_hours_how_to_edit.html +++ /dev/null @@ -1 +0,0 @@ -../../data/opening_hours_how_to_edit.html \ No newline at end of file diff --git a/android/assets/packed_polygons.bin b/android/assets/packed_polygons.bin deleted file mode 120000 index 668660390b..0000000000 --- a/android/assets/packed_polygons.bin +++ /dev/null @@ -1 +0,0 @@ -../../data/packed_polygons.bin \ No newline at end of file diff --git a/android/assets/patterns.txt b/android/assets/patterns.txt deleted file mode 120000 index ca0c3453a9..0000000000 --- a/android/assets/patterns.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/patterns.txt \ No newline at end of file diff --git a/android/assets/resources-6plus_clear b/android/assets/resources-6plus_clear deleted file mode 120000 index 9c423fec10..0000000000 --- a/android/assets/resources-6plus_clear +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-6plus_clear \ No newline at end of file diff --git a/android/assets/resources-6plus_dark b/android/assets/resources-6plus_dark deleted file mode 120000 index 49906c5257..0000000000 --- a/android/assets/resources-6plus_dark +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-6plus_dark \ No newline at end of file diff --git a/android/assets/resources-default b/android/assets/resources-default deleted file mode 120000 index 1b95aa04a1..0000000000 --- a/android/assets/resources-default +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-default \ No newline at end of file diff --git a/android/assets/resources-hdpi_clear b/android/assets/resources-hdpi_clear deleted file mode 120000 index 9892be7276..0000000000 --- a/android/assets/resources-hdpi_clear +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-hdpi_clear \ No newline at end of file diff --git a/android/assets/resources-hdpi_dark b/android/assets/resources-hdpi_dark deleted file mode 120000 index ad107b29a2..0000000000 --- a/android/assets/resources-hdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-hdpi_dark \ No newline at end of file diff --git a/android/assets/resources-mdpi_clear b/android/assets/resources-mdpi_clear deleted file mode 120000 index bf67411a55..0000000000 --- a/android/assets/resources-mdpi_clear +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-mdpi_clear \ No newline at end of file diff --git a/android/assets/resources-mdpi_dark b/android/assets/resources-mdpi_dark deleted file mode 120000 index 18aa171ccb..0000000000 --- a/android/assets/resources-mdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-mdpi_dark \ No newline at end of file diff --git a/android/assets/resources-xhdpi_clear b/android/assets/resources-xhdpi_clear deleted file mode 120000 index 0b7909d1bb..0000000000 --- a/android/assets/resources-xhdpi_clear +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-xhdpi_clear \ No newline at end of file diff --git a/android/assets/resources-xhdpi_dark b/android/assets/resources-xhdpi_dark deleted file mode 120000 index b43e769502..0000000000 --- a/android/assets/resources-xhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-xhdpi_dark \ No newline at end of file diff --git a/android/assets/resources-xxhdpi_clear b/android/assets/resources-xxhdpi_clear deleted file mode 120000 index d432da0c91..0000000000 --- a/android/assets/resources-xxhdpi_clear +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-xxhdpi_clear \ No newline at end of file diff --git a/android/assets/resources-xxhdpi_dark b/android/assets/resources-xxhdpi_dark deleted file mode 120000 index f4a41dd31b..0000000000 --- a/android/assets/resources-xxhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-xxhdpi_dark \ No newline at end of file diff --git a/android/assets/resources-xxxhdpi_clear b/android/assets/resources-xxxhdpi_clear deleted file mode 120000 index 2735a8dcf1..0000000000 --- a/android/assets/resources-xxxhdpi_clear +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-xxxhdpi_clear \ No newline at end of file diff --git a/android/assets/resources-xxxhdpi_dark b/android/assets/resources-xxxhdpi_dark deleted file mode 120000 index 259734a719..0000000000 --- a/android/assets/resources-xxxhdpi_dark +++ /dev/null @@ -1 +0,0 @@ -../../data/resources-xxxhdpi_dark \ No newline at end of file diff --git a/android/assets/sound-strings b/android/assets/sound-strings deleted file mode 120000 index 961476443f..0000000000 --- a/android/assets/sound-strings +++ /dev/null @@ -1 +0,0 @@ -../../data/sound-strings \ No newline at end of file diff --git a/android/assets/transit_colors.txt b/android/assets/transit_colors.txt deleted file mode 120000 index 6efd92d76a..0000000000 --- a/android/assets/transit_colors.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/transit_colors.txt \ No newline at end of file diff --git a/android/assets/types.txt b/android/assets/types.txt deleted file mode 120000 index 17099212ba..0000000000 --- a/android/assets/types.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/types.txt \ No newline at end of file diff --git a/android/assets/unicode_blocks.txt b/android/assets/unicode_blocks.txt deleted file mode 120000 index 49dff2d773..0000000000 --- a/android/assets/unicode_blocks.txt +++ /dev/null @@ -1 +0,0 @@ -../../data/unicode_blocks.txt \ No newline at end of file diff --git a/android/assets/vulkan_shaders b/android/assets/vulkan_shaders deleted file mode 120000 index 99474fc892..0000000000 --- a/android/assets/vulkan_shaders +++ /dev/null @@ -1 +0,0 @@ -../../data/vulkan_shaders \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 6cb3ae9771..de730d2d43 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,506 +1,7 @@ -buildscript { - repositories { - google() - mavenCentral() - } - - // - // The magic below is needed to disable Google Mobile Services (a.k.a GMS) and - // Google Firebase Services during the build time. Unfortunately, the only way - // to disable Gradle plugins is to add these hardcore switches to buildscript(). - // - - // Detect flavors from the task name. - def taskName = getGradle().getStartParameter().getTaskRequests().toString().toLowerCase() - def isFdroid = taskName.contains('fdroid') - def isBeta = taskName.contains('beta') - - // Enable Google Mobile Services for all flavors except fdroid. - def googleMobileServicesDefault = !isFdroid - // Add a parameter to force GMS. - ext.googleMobileServicesEnabled = project.hasProperty('gms') ?: googleMobileServicesDefault - - // Enable Firebase for all beta flavors except fdroid only if google-services.json exists. - def googleFirebaseServicesDefault = isBeta && !isFdroid && file('google-services.json').exists() - // Add a parameter to force Firebase. - ext.googleFirebaseServicesEnabled = project.hasProperty('firebase') ?: googleFirebaseServicesDefault - - dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' - - if (googleMobileServicesEnabled) { - println('Building with Google Mobile Services') - classpath 'com.google.gms:google-services:4.3.15' - } else { - println('Building without Google Services') - } - - if (googleFirebaseServicesEnabled) { - println('Building with Google Firebase Services') - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5' - classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0' - } else { - println('Building without Google Firebase Services') - } - - classpath('com.github.triplet.gradle:play-publisher:3.8.3') - classpath('ru.cian:huawei-publish-gradle-plugin:1.4.0') - } -} - -repositories { - google() - mavenCentral() - maven { url 'https://www.jitpack.io' } // MPAndroidChart -} - -apply plugin: 'com.android.application' -apply from: 'secure.properties' -if (googleMobileServicesEnabled) { - apply plugin: 'com.google.gms.google-services' -} -if (googleFirebaseServicesEnabled) { - apply plugin: 'com.google.firebase.crashlytics' - apply plugin: 'com.google.firebase.appdistribution' -} -apply plugin: 'com.github.triplet.play' -apply plugin: 'ru.cian.huawei-publish-gradle-plugin' - -dependencies { - // Google Mobile Services - if (googleMobileServicesEnabled) { - implementation 'com.google.android.gms:play-services-location:21.0.1' - } - - // Google Firebase Services - if (googleFirebaseServicesEnabled) { - // Import the BoM for the Firebase platform - implementation platform('com.google.firebase:firebase-bom:32.1.0') - // Add the dependencies for the Crashlytics and Analytics libraries - // When using the BoM, you don't specify versions in Firebase library dependencies - implementation 'com.google.firebase:firebase-crashlytics' - implementation 'com.google.firebase:firebase-crashlytics-ndk' - } - - // This line is added as a workaround for duplicate classes error caused by some outdated dependency: - // > A failure occurred while executing com.android.build.gradle.internal.tasks.CheckDuplicatesRunnable - // We don't use Kotlin, but some dependencies are actively using it. - implementation(platform('org.jetbrains.kotlin:kotlin-bom:1.8.21')) - implementation 'androidx.annotation:annotation:1.6.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.fragment:fragment:1.5.7' - implementation 'androidx.preference:preference:1.2.0' - implementation 'androidx.recyclerview:recyclerview:1.3.0' - implementation 'androidx.work:work-runtime:2.8.1' - implementation 'com.google.android.material:material:1.9.0' - implementation 'com.google.code.gson:gson:2.10.1' - implementation 'com.github.devnullorthrow:MPAndroidChart:3.2.0-alpha' - implementation 'net.jcip:jcip-annotations:1.0' - - // Test Dependencies - testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.3.1' - testImplementation 'org.mockito:mockito-inline:5.2.0' -} - -def run(cmd) { - def stdout = new ByteArrayOutputStream() - exec { - commandLine = cmd - standardOutput = stdout - } - return stdout.toString() -} - - -import com.github.triplet.gradle.androidpublisher.ReleaseStatus -import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - -def getVersion() { - def isWindows = DefaultNativePlatform.getCurrentOperatingSystem().isWindows() - def bash = isWindows ? 'C:\\Program Files\\Git\\bin\\bash.exe' : 'bash' - def versionCode = Integer.parseInt(run([bash, '../tools/unix/version.sh', 'android_code']).trim()) - def versionName = run([bash, '../tools/unix/version.sh', 'android_name']).trim() - return new Tuple2(versionCode, versionName) -} - -def getCommitMessage() { - return run(['git', '--no-pager', 'show', '-s', '--format=%s%n%n%b', 'HEAD']).trim() -} - -def osName = System.properties['os.name'].toLowerCase() - -project.ext.appId = 'app.organicmaps' -project.ext.appName = 'Organic Maps' - -android { - namespace 'app.organicmaps' - - buildFeatures { - dataBinding = true - } - // All properties are read from gradle.properties file - compileSdkVersion propCompileSdkVersion.toInteger() - buildToolsVersion propBuildToolsVersion - - ndkVersion '25.2.9519653' - - defaultConfig { - // Default package name is taken from the manifest and should be app.organicmaps - def ver = getVersion() - versionCode = ver.V1 - versionName = ver.V2 - println('Version: ' + versionName) - println('VersionCode: ' + versionCode) - minSdkVersion propMinSdkVersion.toInteger() - targetSdkVersion propTargetSdkVersion.toInteger() - applicationId project.ext.appId - buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"' - // Should be customized in flavors. - buildConfigField 'String', 'REVIEW_URL', '""' - resourceConfigurations += [project.ext.supportedLocalizations] - - multiDexEnabled true - multiDexKeepFile file('multidex-config.txt') - - externalNativeBuild { - def pchFlag = 'OFF' - if (project.hasProperty('pch')) pchFlag = 'ON' - - def njobs = '' - if (project.hasProperty('njobs')) njobs = project.getProperty('njobs') - - cmake { - cppFlags '-fexceptions', '-frtti' - // There is no sense to enable sections without gcc's --gc-sections flag. - cFlags '-fno-function-sections', '-fno-data-sections', - '-Wno-extern-c-compat' - arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', - "-DOS=$osName", '-DSKIP_TESTS=ON', "-DUSE_PCH=$pchFlag", - "-DNJOBS=$njobs" - targets 'organicmaps' - } - } - - // Use, for example, -Parm32 gradle parameter to build only for armeabi-v7a. - ndk { - abiFilters = new HashSet<>() - if (project.hasProperty('arm32') || project.hasProperty('armeabi-v7a')) { - abiFilters.add('armeabi-v7a') - } - if (project.hasProperty('arm64') || project.hasProperty('arm64-v8a')) { - abiFilters.add('arm64-v8a') - } - if (project.hasProperty('x86')) { - abiFilters.add('x86') - } - if (project.hasProperty('x86_64') || project.hasProperty('x64')) { - abiFilters.add('x86_64') - } - if (abiFilters.isEmpty()) { - abiFilters.add('armeabi-v7a') - abiFilters.add('arm64-v8a') - // For the emulator, chromebooks and some Intel Atom devices. - abiFilters.add('x86_64') - } - println("Building for " + abiFilters + " archs.") - } - - setProperty("archivesBaseName", appName.replaceAll("\\s","") + "-" + defaultConfig.versionCode) - } - - sourceSets.main { - manifest.srcFile 'AndroidManifest.xml' - res.srcDirs = ['res'] - java.srcDirs = ['src'] - if (googleMobileServicesEnabled) { - java.srcDirs += 'flavors/gms-enabled' - } else { - java.srcDirs += 'flavors/gms-disabled' - } - if (googleFirebaseServicesEnabled) { - java.srcDirs += 'flavors/firebase-enabled' - } else { - java.srcDirs += 'flavors/firebase-disabled' - } - assets.srcDirs = ['assets'] - } - - sourceSets.test { - java.srcDirs = ['tests/java'] - res.srcDirs = ['tests/resources'] - } - - flavorDimensions 'default' - - productFlavors { - // 01 is a historical artefact, sorry. - final int HUAWEI_VERSION_CODE_BASE = 01_00_00_00_00 - - google { - dimension "default" - versionName = android.defaultConfig.versionName + '-Google' - buildConfigField 'String', 'SUPPORT_MAIL', '"googleplay@organicmaps.app"' - buildConfigField 'String', 'REVIEW_URL', '"market://details?id=app.organicmaps"' - android.sourceSets.google.assets.srcDirs = ['flavors/world-enabled'] - } - - web { - dimension "default" - versionName = android.defaultConfig.versionName + '-Web' - buildConfigField 'String', 'SUPPORT_MAIL', '"apk@organicmaps.app"' - //android.sourceSets.web.assets.srcDirs = ['flavors/world-enabled'] - } - - fdroid { - dimension "default" - versionName = android.defaultConfig.versionName + '-FDroid' - buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@organicmaps.app"' - //android.sourceSets.fdroid.assets.srcDirs = ['flavors/world-enabled'] - } - - huawei { - dimension "default" - versionName = android.defaultConfig.versionName + '-Huawei' - versionCode = HUAWEI_VERSION_CODE_BASE + android.defaultConfig.versionCode - buildConfigField 'String', 'SUPPORT_MAIL', '"huawei@organicmaps.app"' - buildConfigField 'String', 'REVIEW_URL', '"appmarket://details?id=app.organicmaps"' - android.sourceSets.huawei.assets.srcDirs = ['flavors/world-enabled'] - } - } - - playConfigs { - googleRelease { - enabled.set(true) - } - } - - splits.abi { - boolean enabled = project.hasProperty('splitApk') - println ("Create separate apks: " + enabled) - enable enabled - reset() - include 'x86', 'armeabi-v7a', 'arm64-v8a', 'x86_64' - universalApk true - } - - lint { - disable 'MissingTranslation' - // https://github.com/organicmaps/organicmaps/issues/3551 - disable 'MissingQuantity', 'UnusedQuantity' - // https://github.com/organicmaps/organicmaps/issues/3550 - disable 'ByteOrderMark' - // https://github.com/organicmaps/organicmaps/issues/1077 - disable 'CustomSplashScreen' - // https://github.com/organicmaps/organicmaps/issues/3610 - disable 'InsecureBaseConfiguration' - // https://github.com/organicmaps/organicmaps/issues/3608 - disable 'UnusedResources' - abortOnError true - } - - gradle.projectsEvaluated { - android.applicationVariants.all { variant -> - def task = variant.name.capitalize() - project.task(type: Exec, "run${task}", dependsOn: "install${task}") { - commandLine android.getAdbExe(), 'shell', 'am', 'start', '-n', "${applicationId}/app.organicmaps.SplashActivity" - } - } - } - - signingConfigs { - debug { - storeFile file('debug.keystore') - storePassword '12345678' - keyAlias 'debug' - keyPassword '12345678' - } - - release { - storeFile file(spropStoreFile) - storePassword spropStorePassword - keyAlias spropKeyAlias - keyPassword spropKeyPassword - } - } - - buildTypes { - debug { - applicationIdSuffix '.debug' // Allows to install debug and release builds together - versionNameSuffix '-debug' - jniDebuggable true // Enable jni debug build - zipAlignEnabled true - signingConfig signingConfigs.debug - resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix - resValue 'string', 'app_name', project.ext.appName + ' ' + '(Debug)' - // Do not generate separate debug symbols for debug apps, because we don't distribute them. - ndk.debugSymbolLevel = 'none' - - if (googleFirebaseServicesEnabled) { - // Keep debug symbols for test lab. - ndk.debugSymbolLevel = 'symbol_table' - firebaseCrashlytics { - nativeSymbolUploadEnabled true - } - } - } - - release { - signingConfig signingConfigs.release - minifyEnabled true - shrinkResources true - // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin. - // To learn more, go to the documentation section about R8 configuration files. - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-mwm.txt' - resValue 'string', 'app_id', android.defaultConfig.applicationId - resValue 'string', 'app_name', project.ext.appName - // Full size symbols are too big for Google, 217mb aab vs 95mb. - ndk.debugSymbolLevel = 'symbol_table' - - if (googleFirebaseServicesEnabled) { - firebaseCrashlytics { - nativeSymbolUploadEnabled true - } - } - } - - beta { - applicationIdSuffix '.beta' - versionNameSuffix '-beta' - signingConfig signingConfigs.release - minifyEnabled true - shrinkResources true - // Includes the default ProGuard rules files that are packaged with the Android Gradle plugin. - // To learn more, go to the documentation section about R8 configuration files. - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-mwm.txt' - matchingFallbacks = ['debug', 'release'] - resValue 'string', 'app_id', android.defaultConfig.applicationId + applicationIdSuffix - resValue 'string', 'app_name', project.ext.appName + ' ' + '(Beta)' - // Full size symbols are too big for Google, 217mb aab vs 95mb. - ndk.debugSymbolLevel = 'symbol_table' - - if (googleFirebaseServicesEnabled) { - firebaseCrashlytics { - nativeSymbolUploadEnabled true - } - firebaseAppDistribution { - // A new beta release is created for each commit. - // Use the last commit message for the release notes. - releaseNotes = getCommitMessage() - groups = "qa" // Notify only selected people. - serviceCredentialsFile = "firebase-app-distribution.json" - } - } - } - } - - externalNativeBuild { - cmake { - version "3.22.1+" - buildStagingDirectory "./nativeOutputs" - path "../CMakeLists.txt" - } - } - - // We don't compress these extensions in assets/ because our random FileReader can't read zip-compressed files from apk. - // TODO: Load all minor files via separate call to ReadAsString which can correctly handle compressed files in zip containers. - androidResources { - ignoreAssetsPattern '!.svn:!.git:!.DS_Store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~' - noCompress 'txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj' - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - packagingOptions.jniLibs { - excludes += [ - 'lib/**/libVkLayer_khronos_validation.so', - 'lib/**/libVkLayer_core_validation.so', - 'lib/**/libVkLayer_threading.so', - 'lib/**/libVkLayer_image.so', - 'lib/**/libVkLayer_parameter_validation.so', - 'lib/**/libVkLayer_object_tracker.so', - 'lib/**/libVkLayer_swapchain.so', - 'lib/**/libVkLayer_unique_objects.so', - ] - } -} - -tasks.withType(JavaCompile) { - options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation' -} - -android.buildTypes.all { buildType -> - def suffix = applicationIdSuffix != null ? applicationIdSuffix : "" - def authorityValue = android.defaultConfig.applicationId + suffix + ".provider" - def authority = "\"" + authorityValue + "\"" - buildConfigField 'String', 'FILE_PROVIDER_AUTHORITY', authority - manifestPlaceholders += [FILE_PROVIDER_PLACEHOLDER : authorityValue] -} - -task prepareGoogleReleaseListing { - // Prepares Google Play metainfo from F-Droid metainfo. - final sourceFlavor = 'fdroid' - final targetFlavor = 'google' - doLast { - final sourceDir = new File("${projectDir}/src/$sourceFlavor/play/listings") - final targetDir = new File("${projectDir}/src/$targetFlavor/play/listings") - final sourceFiles = fileTree(dir: sourceDir, - include: "**/*.txt", exclude: "**/*-${targetFlavor}.txt") - sourceFiles.each { File sourceFile -> - final locale = sourceFile.parentFile.getName() - final targetLocaleDir = new File(targetDir, locale) - if (!targetLocaleDir.isDirectory()) - targetLocaleDir.mkdirs() - final targetFile = new File(targetLocaleDir, sourceFile.getName()) - // Override Google-specific values by using ${name}-google.txt files. - final overrideFile = new File(sourceFile.getPath().replace(".txt", "-${targetFlavor}.txt")) - targetFile.text = overrideFile.exists() ? overrideFile.text : sourceFile.text - } - copy { - from "${projectDir}/../screenshots/android" - into targetDir - } - } -} - -play { - enabled.set(false) - track.set("production") - userFraction.set(Double.valueOf(0.10)) // 10% - defaultToAppBundles.set(true) - releaseStatus.set(ReleaseStatus.IN_PROGRESS) - serviceAccountCredentials.set(file("google-play.json")) -} - -huaweiPublish { - instances { - huaweiRelease { - credentialsPath = "$rootDir/huawei-appgallery.json" - buildFormat = 'aab' - deployType = 'draft' // confirm manually - releaseNotes = [] - def localeOverride = [ - 'am' : 'am-ET', - 'gu': 'gu_IN', - 'iw-IL': 'he_IL', - 'kn-IN': 'kn_IN', - 'ml-IN': 'ml_IN', - 'mn-MN': 'mn_MN', - 'mr-IN': 'mr_IN', - 'ta-IN': 'ta_IN', - 'te-IN': 'te_IN', - ] - def files = fileTree(dir: "$projectDir/src/fdroid/play/listings", - include: '**/release-notes.txt') - files.each { File file -> - def path = file.getPath() - def locale = file.parentFile.getName() - locale = localeOverride.get(locale, locale) - releaseNotes.add(new ru.cian.huawei.publish.ReleaseNote(locale, path)) - } - } - } -} +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '8.1.0' apply false + id 'com.android.library' version '8.1.0' apply false + id 'com.android.test' version '8.1.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.0' apply false +} \ No newline at end of file diff --git a/android/gradle.properties b/android/gradle.properties index 36fd8e7034..4a522d8b1b 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -4,7 +4,7 @@ propCompileSdkVersion=33 propBuildToolsVersion=34.0.0 org.gradle.caching=true -org.gradle.jvmargs=-Xmx1024m -Xms256m +org.gradle.jvmargs=-Xmx2048m -Xms256m android.useAndroidX=true android.native.buildOutput=verbose android.defaults.buildfeatures.buildconfig=true diff --git a/android/macrobenchmark/.gitignore b/android/macrobenchmark/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/android/macrobenchmark/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android/macrobenchmark/build.gradle b/android/macrobenchmark/build.gradle new file mode 100644 index 0000000000..44e79e180b --- /dev/null +++ b/android/macrobenchmark/build.gradle @@ -0,0 +1,67 @@ +plugins { + id 'com.android.test' + id 'org.jetbrains.kotlin.android' +} + +repositories { + google() + mavenCentral() + maven { url 'https://www.jitpack.io' } // MPAndroidChart +} + +android { + namespace 'com.example.macrobenchmark' + compileSdk 33 + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" + } + + defaultConfig { + minSdk 23 + targetSdk 33 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + // This benchmark buildType is used for benchmarking, and should function like your + // release build (for example, with minification on). It's signed with a debug key + // for easy local/CI testing. + benchmark { + debuggable = true + signingConfig = debug.signingConfig + matchingFallbacks = ["release"] + } + } + + flavorDimensions += ["default"] + productFlavors { + google { dimension = "default" } + web { dimension = "default" } + fdroid { dimension = "default" } + huawei { dimension = "default" } + } + + targetProjectPath = ":app" + experimentalProperties["android.experimental.self-instrumenting"] = true +} + +dependencies { + implementation 'androidx.test.ext:junit:1.1.5' + implementation 'androidx.test.espresso:espresso-core:3.5.1' + implementation 'androidx.test.uiautomator:uiautomator:2.2.0' + implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.1' + implementation 'androidx.core:core-ktx:1.10.1' +} + +androidComponents { + beforeVariants(selector().all()) { + enable = buildType == "benchmark" + } +} \ No newline at end of file diff --git a/android/macrobenchmark/src/main/AndroidManifest.xml b/android/macrobenchmark/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..227314eeb7 --- /dev/null +++ b/android/macrobenchmark/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/android/macrobenchmark/src/main/java/com/example/macrobenchmark/ExampleStartupBenchmark.kt b/android/macrobenchmark/src/main/java/com/example/macrobenchmark/ExampleStartupBenchmark.kt new file mode 100644 index 0000000000..edf22834ef --- /dev/null +++ b/android/macrobenchmark/src/main/java/com/example/macrobenchmark/ExampleStartupBenchmark.kt @@ -0,0 +1,39 @@ +package com.example.macrobenchmark + +import androidx.benchmark.macro.CompilationMode +import androidx.benchmark.macro.StartupMode +import androidx.benchmark.macro.StartupTimingMetric +import androidx.benchmark.macro.junit4.MacrobenchmarkRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith + +/** + * This is an example startup benchmark. + * + * It navigates to the device's home screen, and launches the default activity. + * + * Before running this benchmark: + * 1) switch your app's active build variant in the Studio (affects Studio runs only) + * 2) add `` to your app's manifest, within the `` tag + * + * Run this benchmark from Studio to see startup measurements, and captured system traces + * for investigating your app's performance. + */ +@RunWith(AndroidJUnit4::class) +class ExampleStartupBenchmark { + @get:Rule + val benchmarkRule = MacrobenchmarkRule() + + @Test + fun startup() = benchmarkRule.measureRepeated( + packageName = "app.organicmaps", + metrics = listOf(StartupTimingMetric()), + iterations = 5, + startupMode = StartupMode.COLD + ) { + pressHome() + startActivityAndWait() + } +} \ No newline at end of file diff --git a/android/res/layout-land/about.xml b/android/res/layout-land/about.xml deleted file mode 100644 index 429757d69b..0000000000 --- a/android/res/layout-land/about.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml deleted file mode 100644 index 3aa15b3025..0000000000 --- a/android/res/layout/about.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -