- update v1.0.5

kollerlukas · Mar 23, 2018 · 74fe2ed · 74fe2ed
1 parent 55d693f
commit 74fe2ed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.koller.cameraroll"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 34
-        versionName "v1.0.4"
+        versionCode 35
+        versionName "v1.0.5"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java b/app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java
@@ -432,7 +432,7 @@ private void setupMenu() {
     @Override
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public void onActivityReenter(int requestCode, Intent data) {
-        /*super.onActivityReenter(requestCode, data);*/
+        super.onActivityReenter(requestCode, data);
         Log.d("AlbumActivity", "onActivityReenter: " + this);
         if (data != null) {
             sharedElementReturnPosition = data.getIntExtra(EXTRA_CURRENT_ALBUM_POSITION, -1);
@@ -452,7 +452,7 @@ public void onLayoutChange(View v, int l, int t, int r, int b,
                 recyclerView.scrollToPosition(sharedElementReturnPosition);
             }
         }
-        super.onActivityReenter(requestCode, data);
+        /*super.onActivityReenter(requestCode, data);*/
     }
 
     @Override

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -26,6 +26,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:padding="32dp"
+                    android:elevation="4dp"
                     tools:ignore="UseCompoundDrawables">
 
                     <TextView

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -34,6 +34,8 @@
 
         <item name="android:windowSharedElementEnterTransition">@transition/album_item_transition
         </item>
+        <item name="android:windowSharedElementExitTransition">@transition/album_item_transition
+        </item>
 
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -46,6 +48,8 @@
 
         <item name="android:windowSharedElementEnterTransition">@transition/album_item_transition
         </item>
+        <item name="android:windowSharedElementExitTransition">@transition/album_item_transition
+        </item>
 
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>