Animation fixes
- Icon transition is no longer jumping in first frame (caused by different padding) - Icon is no longer cropped at start of transition (caused by missing changeImageTransform) - Toolbar icons are no longer animated. Introduced in !561 by changing the icons programmatically
This commit is contained in:
parent
a71eb243fa
commit
8bfecc89fb
@ -39,7 +39,6 @@ import android.support.annotation.NonNull;
|
|||||||
import android.support.annotation.Nullable;
|
import android.support.annotation.Nullable;
|
||||||
import android.support.design.widget.AppBarLayout;
|
import android.support.design.widget.AppBarLayout;
|
||||||
import android.support.design.widget.CoordinatorLayout;
|
import android.support.design.widget.CoordinatorLayout;
|
||||||
import android.support.v4.content.ContextCompat;
|
|
||||||
import android.support.v4.content.LocalBroadcastManager;
|
import android.support.v4.content.LocalBroadcastManager;
|
||||||
import android.support.v7.app.AlertDialog;
|
import android.support.v7.app.AlertDialog;
|
||||||
import android.support.v7.app.AppCompatActivity;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
@ -112,7 +111,6 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
|
|||||||
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
||||||
toolbar.setTitle(""); // Nice and clean toolbar
|
toolbar.setTitle(""); // Nice and clean toolbar
|
||||||
toolbar.setNavigationIcon(R.drawable.ic_back);
|
toolbar.setNavigationIcon(R.drawable.ic_back);
|
||||||
toolbar.setOverflowIcon(ContextCompat.getDrawable(this, R.drawable.ic_more));
|
|
||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
supportPostponeEnterTransition();
|
supportPostponeEnterTransition();
|
||||||
|
@ -40,8 +40,9 @@
|
|||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:paddingRight="8dp"
|
android:layout_marginRight="8dp"
|
||||||
android:paddingEnd="8dp"
|
android:layout_marginEnd="8dp"
|
||||||
|
android:scaleType="fitCenter"
|
||||||
android:transitionName="@string/transition_app_item_icon"
|
android:transitionName="@string/transition_app_item_icon"
|
||||||
android:src="@drawable/ic_repo_app_default" />
|
android:src="@drawable/ic_repo_app_default" />
|
||||||
|
|
||||||
|
7
app/src/main/res/transition/shared_elements.xml
Normal file
7
app/src/main/res/transition/shared_elements.xml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<transitionSet>
|
||||||
|
<changeImageTransform />
|
||||||
|
<changeBounds />
|
||||||
|
<changeTransform />
|
||||||
|
<changeClipBounds />
|
||||||
|
</transitionSet>
|
@ -10,11 +10,13 @@
|
|||||||
<style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert">
|
<style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert">
|
||||||
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
|
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
|
||||||
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
|
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
|
||||||
|
<item name="android:actionOverflowButtonStyle">@style/ActionButtonOverflow</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert">
|
<style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert">
|
||||||
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
|
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
|
||||||
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
|
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
|
||||||
|
<item name="android:actionOverflowButtonStyle">@style/ActionButtonOverflow</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AppDetailsLink" parent="AppDetailsLinkBase">
|
<style name="AppDetailsLink" parent="AppDetailsLinkBase">
|
||||||
|
@ -6,12 +6,18 @@
|
|||||||
<item name="android:alertDialogTheme">@style/AlertDialogThemeDark</item>
|
<item name="android:alertDialogTheme">@style/AlertDialogThemeDark</item>
|
||||||
<item name="android:colorControlActivated">@color/fdroid_green</item>
|
<item name="android:colorControlActivated">@color/fdroid_green</item>
|
||||||
<item name="android:colorControlHighlight">@color/fdroid_green</item>
|
<item name="android:colorControlHighlight">@color/fdroid_green</item>
|
||||||
|
<item name="android:actionOverflowButtonStyle">@style/ActionButtonOverflow</item>
|
||||||
|
<item name="android:windowSharedElementEnterTransition">@transition/shared_elements</item>
|
||||||
|
<item name="android:windowSharedElementExitTransition">@transition/shared_elements</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AppThemeLight" parent="AppBaseThemeLight">
|
<style name="AppThemeLight" parent="AppBaseThemeLight">
|
||||||
<!-- customizations that are not API-level specific go here. -->
|
<!-- customizations that are not API-level specific go here. -->
|
||||||
<item name="android:alertDialogTheme">@style/AlertDialogThemeLight</item>
|
<item name="android:alertDialogTheme">@style/AlertDialogThemeLight</item>
|
||||||
<item name="android:colorEdgeEffect">@color/fdroid_blue</item>
|
<item name="android:colorEdgeEffect">@color/fdroid_blue</item>
|
||||||
|
<item name="android:actionOverflowButtonStyle">@style/ActionButtonOverflow</item>
|
||||||
|
<item name="android:windowSharedElementEnterTransition">@transition/shared_elements</item>
|
||||||
|
<item name="android:windowSharedElementExitTransition">@transition/shared_elements</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">
|
<style name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">
|
||||||
|
@ -284,6 +284,10 @@
|
|||||||
<item name="colorControlNormal">@android:color/white</item>
|
<item name="colorControlNormal">@android:color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="ActionButtonOverflow" parent="Widget.AppCompat.ActionButton.Overflow">
|
||||||
|
<item name="android:src">@drawable/ic_more</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
|
<style name="AppThemeLight.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
|
||||||
|
|
||||||
<style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
|
<style name="AppThemeLight.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user