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

Merge branch 'animation-fixes' into 'master'

Browse Source 
Animation fixes

See merge request !566
This commit is contained in:
Peter Serwylo 2017-09-05 02:18:30 +00:00
commit fc2093a9a6
6 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CoordinatorLayout;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.AlertDialog;
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.setTitle(""); // Nice and clean toolbar
toolbar.setNavigationIcon(R.drawable.ic_back);
toolbar.setOverflowIcon(ContextCompat.getDrawable(this, R.drawable.ic_more));
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
supportPostponeEnterTransition();

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

@ -40,8 +40,9 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:scaleType="fitCenter"
android:transitionName="@string/transition_app_item_icon"
android:src="@drawable/ic_repo_app_default" />

7
app/src/main/res/transition/shared_elements.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<transitionSet>
<changeImageTransform />
<changeBounds />
<changeTransform />
<changeClipBounds />
</transitionSet>

2
app/src/main/res/values-v11/styles.xml
View File

@ -10,11 +10,13 @@
<style name="AlertDialogBaseThemeDark" parent="Theme.AppCompat.Dialog.Alert">
<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:actionOverflowButtonStyle">@style/ActionButtonOverflow</item>
</style>
<style name="AlertDialogBaseThemeLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<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:actionOverflowButtonStyle">@style/ActionButtonOverflow</item>
</style>
<style name="AppDetailsLink" parent="AppDetailsLinkBase">

6
app/src/main/res/values-v21/styles.xml
View File

@ -6,12 +6,18 @@
<item name="android:alertDialogTheme">@style/AlertDialogThemeDark</item>
<item name="android:colorControlActivated">@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 name="AppThemeLight" parent="AppBaseThemeLight">
<!-- customizations that are not API-level specific go here. -->
<item name="android:alertDialogTheme">@style/AlertDialogThemeLight</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 name="SwapTheme.Wizard" parent="Theme.AppCompat.Light.NoActionBar">

4
app/src/main/res/values/styles.xml
View File

@ -286,6 +286,10 @@
<item name="colorControlNormal">@android:color/white</item>
</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.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />