diff options
author | jandegr <jandegr@users.noreply.github.com> | 2018-05-12 21:24:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-12 21:24:52 +0200 |
commit | 8306ba289299bfcd073e96f0cedd8b2a8ef605dd (patch) | |
tree | 8eb38a6dc31e89afa9e44e19606b6cea4a5ca611 | |
parent | 03f3aa8637fff3e8e09d3bde21b28654454011fd (diff) | |
download | navit-8306ba289299bfcd073e96f0cedd8b2a8ef605dd.tar.gz |
Android lint check (#586)
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
* Add files via upload
-rw-r--r-- | .circleci/config.yml | 13 | ||||
-rw-r--r-- | navit/android/build.gradle | 22 | ||||
-rw-r--r-- | navit/android/res/values-v19/styles.xml | 11 | ||||
-rw-r--r-- | navit/android/res/values/styles.xml | 29 |
4 files changed, 22 insertions, 53 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 991ebefdc..e01f0bbaa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,6 @@ version: 2 defaults: &defaults docker: - image: ubuntu:14.04 - jobs: build_linux: <<: *defaults @@ -105,15 +104,21 @@ jobs: command: ./gradlew assembleDebug - run: name: Run Tests - command: ./gradlew tasks --all + command: | + ln -s navit/navit.dtd navit.dtd + ls -la + ./gradlew tasks --all + ./gradlew lint test - store_artifacts: path: navit/android/build/outputs/apk destination: apk - store_artifacts: path: navit/android/build/outputs/logs destination: logs - - store_test_results: - path: navit/android/build/test-results + - store_artifacts: + name: Store reports + path: navit/android/build/reports + destination: reports build_win32: <<: *defaults steps: diff --git a/navit/android/build.gradle b/navit/android/build.gradle index 60b6516e9..4ae19a148 100644 --- a/navit/android/build.gradle +++ b/navit/android/build.gradle @@ -10,8 +10,7 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - ndk { // because mips was a problem with ndk 14 - // and no need for, 'x86_64' and , 'armeabi' and , 'arm64-v8a' + ndk { // need for now for 'x86_64' and , 'armeabi' and , 'arm64-v8a' abiFilters 'x86', 'armeabi-v7a' } externalNativeBuild { @@ -19,7 +18,6 @@ android { arguments '-DUSE_PLUGINS=n', '-DBUILD_MAPTOOL=n', '-DXSL_PROCESSING=n', '-DSAMPLE_MAP=n' } } - // https://github.com/googlesamples/android-ndk/blob/master/native-media/app/build.gradle } buildTypes { release { @@ -27,15 +25,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { + disable 'UnusedResources' + abortOnError true + } sourceSets { - main { - manifest.srcFile "AndroidManifest.xml" - java.srcDirs = ["src"] - resources.srcDirs = ["src"] - renderscript.srcDirs = ["src"] - res.srcDirs = ["res"] + main { + manifest.srcFile "AndroidManifest.xml" + java.srcDirs = ["src"] + resources.srcDirs = ["src"] + renderscript.srcDirs = ["src"] + res.srcDirs = ["res"] } - } + } externalNativeBuild { cmake { path '../../CMakeLists.txt' diff --git a/navit/android/res/values-v19/styles.xml b/navit/android/res/values-v19/styles.xml index b3ea5c14f..69acd3a4e 100644 --- a/navit/android/res/values-v19/styles.xml +++ b/navit/android/res/values-v19/styles.xml @@ -5,16 +5,7 @@ NavitBaseTheme from BOTH res/values/styles.xml and res/values-v19/styles.xml on API 19+ devices. --> - <style name="NavitBaseTheme" parent="android:Theme.Holo"> - - <!-- Main theme colors --> - <!-- your app branding color for the app bar --> - <item name="android:colorPrimary">@color/navitYellow500</item> - <!-- darker variant for the status bar and contextual app bars --> - <item name="android:colorPrimaryDark">@color/navitYellow700</item> - <!-- theme UI controls like checkboxes and text fields --> - <item name="android:colorAccent">@color/navitBlue500</item> - </style> + <style name="NavitBaseTheme" parent="android:Theme.Holo"/> <!-- Main Activity theme for API 19+. This theme completely replaces diff --git a/navit/android/res/values/styles.xml b/navit/android/res/values/styles.xml index 91094e222..78dadf1ce 100644 --- a/navit/android/res/values/styles.xml +++ b/navit/android/res/values/styles.xml @@ -1,32 +1,4 @@ <resources> - - <!-- - Base application theme, dependent on API level. This theme is replaced - by NavitBaseTheme from res/values-vXX/styles.xml on newer devices. - --> - <style name="NavitBaseTheme" parent="android:Theme.Holo"> - <!-- - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - --> - </style> - - <!-- Theme for Navit's main Activity. --> - <style name="NavitTheme" parent="NavitBaseTheme"> - <!-- All customizations that are NOT specific to a particular API-level can go here. --> - </style> - - <!-- TODO complete list of shades for both colors --> - <!-- - Primary color is derived average of icon colors (500 in Android parlance): - 213 164 19 #d5a411 hsl 45 92 84 - - Dark color is normally the 600 color (i.e. slightly darker than 500) - 209 155 19 #d19b13 hsl 43 91 82 - --> - - <!-- Yellow from Navit icon background (300 and 700 are the extremes of the gradient, 500 is the average, 900 is the line color) --> <color name="navitYellow300">#e9cb14</color> <color name="navitYellow500">#d5a411</color> @@ -38,5 +10,4 @@ <color name="navitBlue300">#329eff</color> <color name="navitBlue500">#1a6cb6</color> <color name="navitBlue900">#1f3157</color> - </resources>
\ No newline at end of file |