Updates Android Gradle Plugin to 7.0.1.

Updates dependency versions.

Android/.gitignore

@@ -8,6 +8,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/dictionaries
+.DS_Store
 /build
 /captures
 .externalNativeBuild

Android/.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="16" />
   </component>
 </project>

Android/.idea/gradle.xml

@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="Android Studio java home" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -15,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

Android/.idea/misc.xml

@@ -25,7 +25,7 @@
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="13">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="2" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
@@ -39,11 +39,12 @@
           <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
           <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

Android/.idea/runConfigurations.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

Android/README.md

@@ -0,0 +1,4 @@
+[![Build status](https://build.appcenter.ms/v0.1/apps/44e4ee45-fe39-4d2d-950f-943e9948ca35/branches/master/badge)](https://appcenter.ms)
+
+# MonsterCards for Android
+

Android/app/build.gradle

@@ -11,22 +11,15 @@ if (propertiesFile.exists()) {
 def appCenterLocalSecret = properties.getProperty('appCenter.localSecret')
 def appCenterEnvSecret = System.getenv('APPCENTER_SECRET')
 def appCenterSecret = appCenterLocalSecret != null ? appCenterLocalSecret : appCenterEnvSecret != null ? appCenterEnvSecret : ""
-def appCenterSdkVersion = '3.3.0'
-def nav_version = '2.3.5'
-def room_version = '2.3.0'
-def rxjava_version = '3.0.0'
-def flipper_version = '0.87.0'
-def soloader_version = '0.10.1'
-def gson_version = '2.8.6'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "com.majinnaibu.monstercards"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         buildConfigField "String", "APPCENTER_SECRET", "\"${appCenterSecret}\""
@@ -63,6 +56,9 @@ android {
     buildFeatures {
         viewBinding true
     }
+    lintOptions {
+        checkDependencies true
+    }
 }
 
 dependencies {
@@ -73,8 +69,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
-    implementation "androidx.navigation:navigation-fragment:$nav_version"
+    implementation "androidx.navigation:navigation-fragment:2.3.5"
-    implementation "androidx.navigation:navigation-ui:$nav_version"
+    implementation "androidx.navigation:navigation-ui:2.3.5"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
@@ -87,23 +83,23 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Room DB
-    implementation "io.reactivex.rxjava3:rxjava:$rxjava_version"
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.0'
-    implementation "io.reactivex.rxjava3:rxandroid:$rxjava_version"
+    implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
-    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-runtime:2.3.0"
-    annotationProcessor "androidx.room:room-compiler:$room_version"
+    annotationProcessor "androidx.room:room-compiler:2.3.0"
-    implementation "androidx.room:room-rxjava3:$room_version"
+    implementation "androidx.room:room-rxjava3:2.3.0"
-    //testImplementation "androidx.room:room-testing:$room_version"
+    //testImplementation "androidx.room:room-testing:2.3.0"
 
     // AppCenter
-    debugImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
+    debugImplementation 'com.microsoft.appcenter:appcenter-analytics:4.2.0'
-    debugImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
+    debugImplementation 'com.microsoft.appcenter:appcenter-crashes:4.2.0'
 
     // Flipper
-    debugImplementation "com.facebook.flipper:flipper:$flipper_version"
+    debugImplementation 'com.facebook.flipper:flipper:0.102.0'
-    debugImplementation "com.facebook.soloader:soloader:$soloader_version"
+    debugImplementation "com.facebook.soloader:soloader:0.10.1"
-    releaseImplementation "com.facebook.flipper:flipper-noop:$flipper_version"
+    releaseImplementation 'com.facebook.flipper:flipper-noop:0.102.0'
 
     // Other 3rd Party
-    implementation 'com.atlassian.commonmark:commonmark:0.15.2'
+    implementation 'com.atlassian.commonmark:commonmark:0.17.0'
-    implementation "com.google.code.gson:gson:$gson_version"
+    implementation 'com.google.code.gson:gson:2.8.7'
 }

Android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <application
         android:name=".MonsterCardsApplication"
         android:allowBackup="true"
+        android:fullBackupOnly="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -14,6 +15,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <intent-filter>

Android/app/src/main/java/com/majinnaibu/monstercards/MainActivity.java

@@ -1,8 +1,11 @@
 package com.majinnaibu.monstercards;
 
+import android.content.ContentResolver;
 import android.content.Intent;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.DocumentsContract;
 import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
@@ -21,6 +24,7 @@ import com.majinnaibu.monstercards.init.FlipperInitializer;
 import com.majinnaibu.monstercards.utils.Logger;
 
 import java.io.BufferedReader;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -81,7 +85,9 @@ public class MainActivity extends AppCompatActivity {
         String type = intent.getType();
         String json;
         Uri uri = null;
-        if ("android.intent.action.SEND".equals(action) && "text/plain".equals(type)) {
+        if ("android.intent.action.MAIN".equals(action)) {
+            return null;
+        } else if ("android.intent.action.SEND".equals(action) && "text/plain".equals(type)) {
             uri = extras.getParcelable("android.intent.extra.STREAM");
         } else if ("android.intent.action.VIEW".equals(action) && ("text/plain".equals(type) || "application/octet-stream".equals(type))) {
             uri = intent.getData();
@@ -101,10 +107,10 @@ public class MainActivity extends AppCompatActivity {
     @Nullable
     private String readContentsOfUri(Uri uri) {
         StringBuilder builder = new StringBuilder();
-        try (InputStream inputStream =
+        try (
-                     getContentResolver().openInputStream(uri);
+                InputStream inputStream = openInputStream(uri);
-             BufferedReader reader = new BufferedReader(
+                BufferedReader reader = new BufferedReader(new InputStreamReader(Objects.requireNonNull(inputStream)))
-                     new InputStreamReader(Objects.requireNonNull(inputStream)))) {
+        ) {
             String line;
             while ((line = reader.readLine()) != null) {
                 builder.append(line);
@@ -115,4 +121,36 @@ public class MainActivity extends AppCompatActivity {
         }
         return builder.toString();
     }
+
+    private boolean isVirtualFile(Uri uri) {
+        if (!DocumentsContract.isDocumentUri(this, uri)) {
+            return false;
+        }
+
+        Cursor cursor = getContentResolver().query(
+                uri,
+                new String[]{DocumentsContract.Document.COLUMN_FLAGS},
+                null, null, null);
+
+        int flags = 0;
+        if (cursor.moveToFirst()) {
+            flags = cursor.getInt(0);
+        }
+        cursor.close();
+
+        return (flags & DocumentsContract.Document.FLAG_VIRTUAL_DOCUMENT) != 0;
+    }
+
+    private InputStream openInputStream(Uri uri) throws IOException {
+        ContentResolver resolver = getContentResolver();
+        if (isVirtualFile(uri)) {
+            String[] openableMimeTypes = resolver.getStreamTypes(uri, "*/*");
+            if (openableMimeTypes == null || openableMimeTypes.length <= 0) {
+                throw new FileNotFoundException();
+            }
+            return resolver.openTypedAssetFileDescriptor(uri, openableMimeTypes[0], null).createInputStream();
+        } else {
+            return resolver.openInputStream(uri);
+        }
+    }
 }

Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java

@@ -20,7 +20,6 @@ import com.majinnaibu.monstercards.ui.shared.MCFragment;
 import com.majinnaibu.monstercards.utils.Logger;
 
 import java.util.List;
-import java.util.Locale;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -38,6 +37,7 @@ public class DashboardFragment extends MCFragment {
 
         setupRecyclerView(mHolder.list);
 
+        // TODO: subscribe better
         getMonsterRepository()
                 .getMonsters()
                 .subscribeOn(Schedulers.io())
@@ -49,7 +49,6 @@ public class DashboardFragment extends MCFragment {
 
     private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
         int columnCount = Math.max(1, getResources().getConfiguration().screenWidthDp / 396);
-        Logger.logWTF(String.format(Locale.US, "Setting column count to %d", columnCount));
         Context context = requireContext();
         GridLayoutManager layoutManager = new GridLayoutManager(context, columnCount);
         recyclerView.setLayoutManager(layoutManager);

Android/build.gradle

@@ -5,10 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath "com.android.tools.build:gradle:7.0.1"
-
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
-        def nav_version = "2.3.0"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,6 +20,12 @@ allprojects {
         // maven { url "https://oss.jfrog.org/libs-snapshot" }
         // maven { url 'http://repo1.maven.org/maven2' }
     }
+    // Temporary workaround until room 2.4.0 is released https://issuetracker.google.com/issues/174695268?pli=1#comment10
+    configurations.configureEach {
+        resolutionStrategy {
+            force 'org.xerial:sqlite-jdbc:3.34.0'
+        }
+    }
 }
 
 task clean(type: Delete) {

Android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip