Merge remote-tracking branch 'origin/develop'

firelotus · Aug 11, 2018 · 8a09d6f · 8a09d6f
2 parents 6497da8 + 26175e4
commit 8a09d6f
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/firelotus/meteorite/ui/content/SubFragment.java b/app/src/main/java/com/firelotus/meteorite/ui/content/SubFragment.java
@@ -179,6 +179,10 @@ public void onDestroyView() {
         if(presenter != null){
             presenter.detach();
         }
+        if(xRecyclerView != null){
+            xRecyclerView.destroy();
+            xRecyclerView = null;
+        }
     }
 
     @Override

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -15,7 +15,7 @@
             android:layout_width="230px"
             android:layout_height="230px"
             android:layout_gravity="center"
-            android:src="@drawable/head"
+            android:src="@mipmap/ic_launcher_transparent"
             />
         <LinearLayout
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_transparent.png b/app/src/main/res/mipmap-hdpi/ic_launcher_transparent.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_transparent.png b/app/src/main/res/mipmap-mdpi/ic_launcher_transparent.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_transparent.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_transparent.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_transparent.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_transparent.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_transparent.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_transparent.png
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -14,7 +14,7 @@ ext.versions = [
         debugDb           : '1.0.1',
         logger            : '2.1.1',
         novate            : '1.5.2.3',
-        xrecyclerview     : '1.3.2',
+        xrecyclerview     : '1.5.9',
         baseRvadapter     : '3.0.3',
         viewPagerIndicator: '1.1.6',
         banner            : '1.4.10',