[android] Use module project structure
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
parent
e09dcefb1c
commit
480fa6c2fc
2347 changed files with 134 additions and 73 deletions
CMakeLists.txt
android
.gitignore
app
.gitignore
assets
00_NotoNaskhArabic-Regular.ttf00_NotoSansThai-Regular.ttf00_NotoSerifDevanagari-Regular.ttf01_dejavusans.ttf02_droidsans-fallback.ttf03_jomolhari-id-a3d.ttf04_padauk.ttf05_khmeros.ttf06_code2000.ttf07_roboto_medium.ttfcategories.txtcategories_brands.txtcategories_cuisines.txtclassificator.txtcolors.txtcopyright.htmlcountries-stringscountries.txtdrules_proto_clear.bindrules_proto_dark.bindrules_proto_vehicle_clear.bindrules_proto_vehicle_dark.bineditor.configfaq.htmlfonts_blacklist.txtfonts_whitelist.txticudt73l.datlanguages.txtopening_hours_how_to_edit.htmlpacked_polygons.binpatterns.txtresources-6plus_clearresources-6plus_darkresources-defaultresources-hdpi_clearresources-hdpi_darkresources-mdpi_clearresources-mdpi_darkresources-xhdpi_clearresources-xhdpi_darkresources-xxhdpi_clearresources-xxhdpi_darkresources-xxxhdpi_clearresources-xxxhdpi_darksound-stringstransit_colors.txttypes.txtunicode_blocks.txtvulkan_shaders
build.gradledebug.keystoreic_launcher-playstore.pngmultidex-config.txtproguard-mwm.txtsrc
androidTest/java/app/organicmaps
flavors
firebase-disabled/app/organicmaps/util
firebase-enabled/com/mapswithme/util
gms-disabled/com/mapswithme/maps/location
gms-enabled
AndroidManifest.xml
app/organicmaps/location
world-enabled
main
AndroidManifest.xml
cpp
CMakeLists.txt
app/organicmaps
DisplayedCategories.cppDownloadResourcesLegacyActivity.cppFramework.cppFramework.hppLocationState.cppMap.cppMapManager.cppMwmApplication.cppSearchEngine.cppSearchRecents.cppTrackRecorder.cppTrafficState.cppUserMarkHelper.cppUserMarkHelper.hppVideoTimer.cppVideoTimer.hpp
bookmarks/data
core
ScopedEnv.hppScopedLocalRef.hppjni_helper.cppjni_helper.hppjni_java_methods.cppjni_java_methods.hpplogging.cpplogging.hpprender_context.cpprender_context.hpp
editor
isolines
opengl
|
@ -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()
|
||||
|
|
47
android/.gitignore
vendored
47
android/.gitignore
vendored
|
@ -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
|
||||
|
|
20
android/app/.gitignore
vendored
Normal file
20
android/app/.gitignore
vendored
Normal file
|
@ -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
|
|
@ -3,7 +3,6 @@ buildscript {
|
|||
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
|
||||
|
@ -122,8 +121,8 @@ 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()
|
||||
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)
|
||||
}
|
||||
|
||||
|
@ -212,27 +211,22 @@ android {
|
|||
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']
|
||||
}
|
||||
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'
|
||||
|
||||
|
@ -401,7 +395,7 @@ android {
|
|||
cmake {
|
||||
version "3.22.1+"
|
||||
buildStagingDirectory "./nativeOutputs"
|
||||
path "../CMakeLists.txt"
|
||||
path "../../CMakeLists.txt"
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -447,8 +441,8 @@ task prepareGoogleReleaseListing {
|
|||
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 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 ->
|
||||
|
@ -462,7 +456,7 @@ task prepareGoogleReleaseListing {
|
|||
targetFile.text = overrideFile.exists() ? overrideFile.text : sourceFile.text
|
||||
}
|
||||
copy {
|
||||
from "${projectDir}/../screenshots/android"
|
||||
from "${projectDir}/../../screenshots/android"
|
||||
into targetDir
|
||||
}
|
||||
}
|
||||
|
@ -495,7 +489,7 @@ huaweiPublish {
|
|||
'ta-IN': 'ta_IN',
|
||||
'te-IN': 'te_IN',
|
||||
]
|
||||
def files = fileTree(dir: "$projectDir/src/fdroid/play/listings",
|
||||
def files = fileTree(dir: "$projectDir/src/main/fdroid/play/listings",
|
||||
include: '**/release-notes.txt')
|
||||
files.each { File file ->
|
||||
def path = file.getPath()
|
Before ![]() (image error) Size: 34 KiB After ![]() (image error) Size: 34 KiB ![]() ![]() |
|
@ -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 <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||
*/
|
||||
@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());
|
||||
}
|
||||
}
|
|
@ -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
|
Some files were not shown because too many files have changed in this diff Show more
Reference in a new issue