Merge pull request #259 from criticalmaps/release_2.5.0

Release 2.5.0

Author: stephanlindauer

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @criticalmaps/android

.travis.yml

@@ -11,10 +11,10 @@ android:
     - platform-tools
 
     # The BuildTools version used by your project
-    - build-tools-27.0.3
+    # - build-tools-28.0.3
 
     # The SDK version used to compile your project
-    - android-27
+    - android-28
 
     # Additional components
 #    - extra-google-google_play_services
@@ -31,10 +31,7 @@ android:
 
 before_install:
  # The following line can be removed when https://github.com/travis-ci/travis-ci/issues/8874 is resolved
- - yes | sdkmanager "platforms;android-27"
+ - yes | sdkmanager "build-tools;28.0.3" "platforms;android-28"
  - chmod +x gradlew
 
 script: 'travis_retry ./gradlew clean build test'
-
-notifications:
-  slack: criticalmaps:mCh5Cy9Fl2bVMdnQ9ymeYv3H

app/build.gradle

@@ -21,17 +21,19 @@ android {
         }
     }
 
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "de.stephanlindauer.criticalmaps"
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 34
-        versionName "2.4.2"
+        targetSdkVersion 28
+        versionCode 35
+        versionName "2.5.0"
         vectorDrawables.useSupportLibrary = true
 
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [
@@ -44,6 +46,7 @@ android {
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
+            pseudoLocalesEnabled true
         }
         release {
             minifyEnabled false
@@ -55,6 +58,7 @@ android {
     lintOptions {
         warning 'MissingTranslation'
         warning 'StringFormatInvalid'
+        warning 'NewApi'
 
         // https://github.com/square/okio/issues/58
         // http://jakewharton.github.io/butterknife/
@@ -73,29 +77,40 @@ android {
 
 dependencies {
     implementation 'com.squareup:otto:1.3.8'
-    implementation 'org.osmdroid:osmdroid-android:6.0.2-SNAPSHOT'
+    implementation 'org.osmdroid:osmdroid-android:6.1.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
-    implementation "com.android.support:support-v4:$support_version"
-    implementation "com.android.support:appcompat-v7:$support_version"
-    implementation "com.android.support:support-annotations:$support_version"
-    implementation "com.android.support:design:$support_version"
-    implementation "com.android.support:exifinterface:$support_version"
-    implementation 'com.jakewharton.timber:timber:4.7.0'
-
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.annotation:annotation:1.0.2'
+    implementation 'com.google.android.material:material:1.1.0-alpha05'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
+
+    implementation 'com.squareup.okhttp3:okhttp:3.12.2'
     implementation "com.jakewharton:butterknife:$butterknife_version"
     annotationProcessor "com.jakewharton:butterknife-compiler:$butterknife_version"
 
     implementation 'org.ligi:AXT:0.37'
     implementation 'info.metadude.android:typed-preferences:2.1.0'
-    implementation "com.google.dagger:dagger:$dagger_version"
 
     compileOnly 'javax.annotation:jsr250-api:1.0'
+    implementation "com.google.dagger:dagger:$dagger_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
 
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-1'
+
+    errorprone("com.google.errorprone:error_prone_core:2.3.3")
+    errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
+
     testImplementation 'junit:junit:4.12'
-    testImplementation 'com.google.truth:truth:0.40'
-    testImplementation "com.android.support:support-annotations:$support_version"
-    testImplementation 'org.mockito:mockito-core:2.15.0'
+    testImplementation 'com.google.truth:truth:0.41'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
+
+    androidTestImplementation 'androidx.test:core:1.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }

app/src/androidTest/java/de/stephanlindauer/criticalmaps/ApplicationTest.java

@@ -1,13 +1,27 @@
 package de.stephanlindauer.criticalmaps;
 
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class ApplicationTest {
+
+    @Rule
+    public ActivityTestRule<Main> mActivityRule = new ActivityTestRule<>(Main.class);
+
+    @Test
+    public void verifyAppLaunches() {
+        onView(withId(R.id.drawer_layout)).check(matches(isDisplayed()));
     }
-}
+}

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="de.stephanlindauer.criticalmaps">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -9,6 +10,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-feature android:name="android.hardware.location.network" android:required="false"/>
     <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
@@ -18,9 +20,12 @@
     <application
         android:allowBackup="true"
         android:name=".App"
-        android:icon="@mipmap/ic_launcher_48dp"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:fullBackupContent="@xml/backup_descriptor">
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:supportsRtl="true"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name="de.stephanlindauer.criticalmaps.Main"
@@ -37,7 +42,7 @@
             android:name=".service.ServerSyncService"/>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="@string/fileprovider_authority"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/ic_launcher-web.png

@@ -1,7 +1,8 @@
 package de.stephanlindauer.criticalmaps;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
 
 import timber.log.Timber;
 
@@ -28,7 +29,7 @@ public static AppComponent components() {
 
     private static class NoOpTree extends Timber.Tree {
         @Override
-        protected void log(int priority, String tag, @NonNull String message, Throwable t) {
+        protected void log(int priority, String tag, @NotNull String message, Throwable t) {
         }
     }
 }

app/src/main/java/de/stephanlindauer/criticalmaps/App.java

@@ -9,8 +9,10 @@
 import de.stephanlindauer.criticalmaps.fragments.ChatFragment;
 import de.stephanlindauer.criticalmaps.fragments.MapFragment;
 import de.stephanlindauer.criticalmaps.handler.PrerequisitesChecker;
+import de.stephanlindauer.criticalmaps.fragments.SettingsFragment;
 import de.stephanlindauer.criticalmaps.model.OwnLocationModel;
 import de.stephanlindauer.criticalmaps.model.TwitterModel;
+import de.stephanlindauer.criticalmaps.provider.StorageLocationProvider;
 import de.stephanlindauer.criticalmaps.service.ServerSyncService;
 import javax.inject.Singleton;
 import okhttp3.OkHttpClient;
@@ -22,6 +24,7 @@ public interface AppComponent {
     void inject(ServerSyncService serverSyncService);
     void inject(MapFragment serverSyncService);
     void inject(ChatFragment chatFragment);
+	void inject(SettingsFragment settingsFragment);
     void inject(PrerequisitesChecker prerequisitesChecker);
 
     App app();
@@ -30,6 +33,7 @@ public interface AppComponent {
     TwitterModel twitterModel();
     OkHttpClient okHttpClient();
     SharedPreferences sharedPreferences();
+    StorageLocationProvider storageProvider();
 
     @Component.Builder
     interface Builder {