Merge pull request #50 from 2729StormRobotics/multidex

Multidex
2729StormRobotics · Feb 28, 2020 · 73f8794 · 73f8794
2 parents 4c0d240 + ef9cc81
commit 73f8794
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 10 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,9 +6,10 @@ android {
         applicationId "org.stormroboticsnj"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 5
-        versionName "1.4"
+        versionCode 6
+        versionName "1.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -24,10 +25,22 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            multiDexKeepFile file('multidex-config.txt')
+        }
+    }
+    testOptions {
+        animationsDisabled true
+
+        unitTests {
+            includeAndroidResources = true
         }
     }
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs << "-Xlint:all"
+}
+
 configurations {
     all {
         exclude module: 'commons-logging'
@@ -43,6 +56,7 @@ dependencies {
     def fragment_version = "1.2.2"
     def room_version = "2.2.4"
     def permissions_version = "4.6.0"
+    def multidex_version = "2.0.1"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
@@ -53,6 +67,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.1.0'
 
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     implementation "androidx.navigation:navigation-fragment:$nav_version"
     implementation "androidx.navigation:navigation-ui:$nav_version"
@@ -63,6 +78,9 @@ dependencies {
     // Java language implementation
     implementation "androidx.activity:activity:$activity_version"
 
+    // Multidex support for splitting app
+    implementation "androidx.multidex:multidex:$multidex_version"
+
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
     // LiveData

diff --git a/app/multidex-config.txt b/app/multidex-config.txt
@@ -0,0 +1 @@
+org/stormroboticsnj/ui/display/whoosh/WhooshListFragment.class
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
 
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="Storm Scouting Radar 2020: Master"

diff --git a/app/src/main/java/org/stormroboticsnj/ui/MapFragment.java b/app/src/main/java/org/stormroboticsnj/ui/MapFragment.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.Fragment;
 
 import org.stormroboticsnj.R;
@@ -73,10 +74,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         view.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (Objects.equals(view.getBackground().getConstantState(), getResources().getDrawable(R.drawable.field_map_blue).getConstantState())) {
-                    view.setBackground(getResources().getDrawable(R.drawable.field_map_red));
+                if (Objects.equals(view.getBackground().getConstantState(), ResourcesCompat.getDrawable(getResources(), R.drawable.field_map_blue, null).getConstantState())) {
+                    view.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.field_map_red, null));
                 } else {
-                    view.setBackground(getResources().getDrawable(R.drawable.field_map_blue));
+                    view.setBackground(ResourcesCompat.getDrawable(getResources(), R.drawable.field_map_blue, null));
                 }
             }
         });

diff --git a/app/src/main/java/org/stormroboticsnj/ui/display/DisplayFragment.java b/app/src/main/java/org/stormroboticsnj/ui/display/DisplayFragment.java
@@ -12,6 +12,8 @@
 import android.widget.Toast;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
 import org.stormroboticsnj.MainActivity;
@@ -83,6 +85,10 @@ public void onClick(View view) {
                 onButtonPressed(colSpinner.getSelectedItemPosition() == 0, filterVal);
             }
         });
+
+        FragmentManager fm = getChildFragmentManager();
+        FragmentTransaction fragmentTransaction = fm.beginTransaction();
+        fragmentTransaction.replace(R.id.frag1, DisplayFragment.newInstance());
         return v;
     }
 

diff --git a/app/src/main/res/layout/fragment_display.xml b/app/src/main/res/layout/fragment_display.xml
@@ -10,7 +10,6 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/frag1"
-        android:name="org.stormroboticsnj.ui.display.whoosh.WhooshListFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		org/stormroboticsnj/ui/display/whoosh/WhooshListFragment.class