Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'transitions' into 'master'

Browse Source 
Fixed shared element transitions

See merge request !524
This commit is contained in:
Hans-Christoph Steiner 2017-05-29 18:55:48 +00:00
commit c5f5eb6a05
7 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/fdroid/fdroid/AppDetails2.java
View File

@ -47,6 +47,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.ViewTreeObserver;
import android.widget.Toast;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
@ -108,6 +109,7 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
toolbar.setTitle(""); // Nice and clean toolbar
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
supportPostponeEnterTransition();
if (!reset(getPackageNameFromIntent(getIntent()))) {
finish();
@ -155,6 +157,16 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
recyclerView.setLayoutManager(lm);
recyclerView.setAdapter(adapter);
recyclerView.getViewTreeObserver().addOnPreDrawListener(
new ViewTreeObserver.OnPreDrawListener() {
@Override
public boolean onPreDraw() {
supportStartPostponedEnterTransition();
return true;
}
}
);
// Load the feature graphic, if present
final FeatureImage featureImage = (FeatureImage) findViewById(R.id.feature_graphic);
DisplayImageOptions displayImageOptions = Utils.getImageLoadingOptions().build();

1
app/src/main/res/layout/app_card_featured.xml
View File

@ -51,6 +51,7 @@
android:layout_height="48dp"
tools:src="@drawable/ic_launcher"
android:scaleType="fitCenter"
android:transitionName="@string/transition_app_item_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />

1
app/src/main/res/layout/app_card_horizontal.xml
View File

@ -20,6 +20,7 @@
android:layout_height="48dp"
tools:src="@drawable/ic_launcher"
android:scaleType="fitCenter"
android:transitionName="@string/transition_app_item_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />

1
app/src/main/res/layout/app_card_large.xml
View File

@ -20,6 +20,7 @@
android:layout_height="96dip"
tools:src="@drawable/ic_launcher"
android:scaleType="fitCenter"
android:transitionName="@string/transition_app_item_icon"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"

1
app/src/main/res/layout/app_card_list_item.xml
View File

@ -20,6 +20,7 @@
android:layout_height="48dp"
tools:src="@drawable/ic_launcher"
android:scaleType="fitCenter"
android:transitionName="@string/transition_app_item_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />

1
app/src/main/res/layout/app_card_normal.xml
View File

@ -15,6 +15,7 @@
android:layout_height="48dip"
tools:src="@drawable/ic_launcher"
android:scaleType="fitCenter"
android:transitionName="@string/transition_app_item_icon"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"

1
app/src/main/res/layout/app_details2_header.xml
View File

@ -42,6 +42,7 @@
android:layout_alignParentTop="true"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:transitionName="@string/transition_app_item_icon"
android:src="@drawable/ic_repo_app_default" />
<!-- Name, Author (optional), Updated date -->