Skip to content
This repository was archived by the owner on Sep 8, 2019. It is now read-only.

Commit 74fe2ed

Browse files
committed
- update v1.0.5
1 parent 55d693f commit 74fe2ed

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "us.koller.cameraroll"
88
minSdkVersion 19
99
targetSdkVersion 27
10-
versionCode 34
11-
versionName "v1.0.4"
10+
versionCode 35
11+
versionName "v1.0.5"
1212
vectorDrawables.useSupportLibrary = true
1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1414
}

app/src/main/java/us/koller/cameraroll/ui/AlbumActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ private void setupMenu() {
432432
@Override
433433
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
434434
public void onActivityReenter(int requestCode, Intent data) {
435-
/*super.onActivityReenter(requestCode, data);*/
435+
super.onActivityReenter(requestCode, data);
436436
Log.d("AlbumActivity", "onActivityReenter: " + this);
437437
if (data != null) {
438438
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,
452452
recyclerView.scrollToPosition(sharedElementReturnPosition);
453453
}
454454
}
455-
super.onActivityReenter(requestCode, data);
455+
/*super.onActivityReenter(requestCode, data);*/
456456
}
457457

458458
@Override

app/src/main/res/layout/activity_about.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
android:layout_height="wrap_content"
2727
android:orientation="vertical"
2828
android:padding="32dp"
29+
android:elevation="4dp"
2930
tools:ignore="UseCompoundDrawables">
3031

3132
<TextView

app/src/main/res/values-v21/styles.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
<item name="android:windowSharedElementEnterTransition">@transition/album_item_transition
3636
</item>
37+
<item name="android:windowSharedElementExitTransition">@transition/album_item_transition
38+
</item>
3739

3840
<item name="android:windowTranslucentNavigation">false</item>
3941
<item name="android:navigationBarColor">@android:color/transparent</item>
@@ -46,6 +48,8 @@
4648

4749
<item name="android:windowSharedElementEnterTransition">@transition/album_item_transition
4850
</item>
51+
<item name="android:windowSharedElementExitTransition">@transition/album_item_transition
52+
</item>
4953

5054
<item name="android:windowTranslucentNavigation">false</item>
5155
<item name="android:navigationBarColor">@android:color/transparent</item>

0 commit comments

Comments
 (0)