see 09/20 log

Blankj · Blankj · commit 70df3fb11a76 · 2017-09-20T18:37:28.000+08:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -66,6 +66,7 @@
         <!--core-->
         <activity android:name=".core.main.CoreUtilActivity" />
         <activity android:name=".core.activity.ActivityActivity" />
+        <activity android:name=".core.activity.SharedElementActivityActivity" />
         <activity android:name=".core.app.AppActivity" />
         <activity android:name=".core.bar.BarActivity" />
         <activity android:name=".core.bar.BarNavActivity" />
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/activity/ActivityActivity.java b/app/src/main/java/com/blankj/androidutilcode/core/activity/ActivityActivity.java
@@ -22,6 +22,8 @@
  */
 public class ActivityActivity extends BaseBackActivity {
 
+    View viewSharedElement;
+
     public static void start(Context context) {
         Intent starter = new Intent(context, ActivityActivity.class);
         context.startActivity(starter);
@@ -41,8 +43,9 @@ public int bindLayout() {
     @Override
     public void initView(Bundle savedInstanceState, View view) {
         getToolBar().setTitle(getString(R.string.demo_activity));
-
-        findViewById(R.id.btn_launch_image_activity).setOnClickListener(this);
+        viewSharedElement = findViewById(R.id.view_shared_element);
+        findViewById(R.id.btn_start_image_activity).setOnClickListener(this);
+        findViewById(R.id.btn_shared_element).setOnClickListener(this);
         findViewById(R.id.btn_finish_all_activity).setOnClickListener(this);
         TextView tvAboutActivity = (TextView) findViewById(R.id.tv_about_activity);
         tvAboutActivity.setText("Is ImageActivity Exists: " + ActivityUtils.isActivityExists(Config.PKG, ImageActivity.class.getName())
@@ -59,9 +62,12 @@ public void doBusiness() {
     @Override
     public void onWidgetClick(View view) {
         switch (view.getId()) {
-            case R.id.btn_launch_image_activity:
+            case R.id.btn_start_image_activity:
                 ActivityUtils.startActivity(Config.PKG, ImageActivity.class.getName());
                 break;
+            case R.id.btn_shared_element:
+                ActivityUtils.startActivity(this, SharedElementActivityActivity.class, viewSharedElement);
+                break;
             case R.id.btn_finish_all_activity:
                 ActivityUtils.finishAllActivities();
                 break;
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/activity/SharedElementActivityActivity.java b/app/src/main/java/com/blankj/androidutilcode/core/activity/SharedElementActivityActivity.java
@@ -0,0 +1,52 @@
+package com.blankj.androidutilcode.core.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.blankj.androidutilcode.R;
+import com.blankj.androidutilcode.base.BaseBackActivity;
+
+/**
+ * <pre>
+ *     author: Blankj
+ *     blog  : http://blankj.com
+ *     time  : 2016/10/13
+ *     desc  : Activity工具类Demo
+ * </pre>
+ */
+public class SharedElementActivityActivity extends BaseBackActivity {
+
+    public static void start(Context context) {
+        Intent starter = new Intent(context, SharedElementActivityActivity.class);
+        context.startActivity(starter);
+    }
+
+    @Override
+    public void initData(Bundle bundle) {
+
+    }
+
+    @Override
+    public int bindLayout() {
+        return R.layout.activity_activity_shared_element;
+    }
+
+
+    @Override
+    public void initView(Bundle savedInstanceState, View view) {
+        getToolBar().setTitle(getString(R.string.demo_activity));
+
+    }
+
+    @Override
+    public void doBusiness() {
+
+    }
+
+    @Override
+    public void onWidgetClick(View view) {
+
+    }
+}
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusAlphaFragment.java b/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusAlphaFragment.java
@@ -1,4 +1,4 @@
-package com.blankj.androidutilcode.core.fragment;
+package com.blankj.androidutilcode.core.bar;
 
 import android.os.Bundle;
 import android.view.View;
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusColorFragment.java b/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusColorFragment.java
@@ -1,4 +1,4 @@
-package com.blankj.androidutilcode.core.fragment;
+package com.blankj.androidutilcode.core.bar;
 
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusFragmentActivity.java b/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusFragmentActivity.java
@@ -13,9 +13,6 @@
 
 import com.blankj.androidutilcode.R;
 import com.blankj.androidutilcode.base.BaseActivity;
-import com.blankj.androidutilcode.core.fragment.BarStatusAlphaFragment;
-import com.blankj.androidutilcode.core.fragment.BarStatusColorFragment;
-import com.blankj.androidutilcode.core.fragment.BarStatusImageViewFragment;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusImageViewFragment.java b/app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusImageViewFragment.java
@@ -1,4 +1,4 @@
-package com.blankj.androidutilcode.core.fragment;
+package com.blankj.androidutilcode.core.bar;
 
 import android.os.Bundle;
 import android.view.View;
diff --git a/app/src/main/java/com/blankj/androidutilcode/core/fragment/FragmentActivity.java b/app/src/main/java/com/blankj/androidutilcode/core/fragment/FragmentActivity.java
@@ -42,15 +42,17 @@ public int bindLayout() {
     @Override
     public void initView(Bundle savedInstanceState, View view) {
         getToolBar().setTitle(getString(R.string.demo_fragment));
-    }
 
-    @Override
-    public void doBusiness() {
         ArrayList<Fragment> fragments = new ArrayList<>();
         fragments.add(Demo0Fragment.newInstance());
         rootFragment = FragmentUtils.addFragments(getSupportFragmentManager(), fragments, R.id.fragment_container, 0);
     }
 
+    @Override
+    public void doBusiness() {
+
+    }
+
     @Override
     public void onWidgetClick(View view) {
 
diff --git a/app/src/main/res/core/layout/activity_activity.xml b/app/src/main/res/core/layout/activity_activity.xml
@@ -7,19 +7,33 @@
     android:orientation="vertical"
     android:padding="@dimen/spacing_16">
 
+    <View
+        android:id="@+id/view_shared_element"
+        android:layout_width="@dimen/size_40"
+        android:layout_height="@dimen/size_40"
+        android:background="@color/colorPrimary"
+        android:transitionName="@string/activity_shared_element"/>
+
     <TextView
         android:id="@+id/tv_about_activity"
         style="@style/TextStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <Button
-        android:id="@+id/btn_launch_image_activity"
+        android:id="@+id/btn_start_image_activity"
         style="@style/WideBtnStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/activity_start_imageActivity" />
 
+    <Button
+        android:id="@+id/btn_shared_element"
+        style="@style/WideBtnStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/activity_start_shared_element_activity" />
+
     <Button
         android:id="@+id/btn_finish_all_activity"
         style="@style/WideBtnStyle"
diff --git a/app/src/main/res/core/layout/activity_activity_shared_element.xml b/app/src/main/res/core/layout/activity_activity_shared_element.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:padding="@dimen/spacing_16">
+
+    <View
+        android:layout_width="@dimen/size_160"
+        android:layout_height="@dimen/size_160"
+        android:background="@color/colorPrimary"
+        android:transitionName="@string/activity_shared_element"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/core/values/strings.xml b/app/src/main/res/core/values/strings.xml
@@ -21,7 +21,9 @@
     <string name="demo_toast">ToastUtils Demo</string>
 
     <!--Activity相关-->
+    <string name="activity_shared_element">Shared Element</string>
     <string name="activity_start_imageActivity">Start ImageActivity</string>
+    <string name="activity_start_shared_element_activity">Start Shared Element Activity</string>
     <string name="activity_finish_all_activity">Finish All Activity</string>
 
     <!--App相关-->
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowAnimationStyle">@style/AnimationActivity</item>
+        <item name="android:windowActionBar">false</item>
+        <!--slider-->
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+
+        <item name="android:windowContentTransitions">true</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -5,6 +5,9 @@
     <dimen name="spacing_16">16dp</dimen>
     <dimen name="spacing_24">24dp</dimen>
     <dimen name="spacing_128">128dp</dimen>
+    
+    <dimen name="size_40">40dp</dimen>
+    <dimen name="size_160">160dp</dimen>
 
     <dimen name="font_16">16sp</dimen>
     <dimen name="font_20">20sp</dimen>
diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,5 @@
+* 17/09/20 完善FragmentUtils
+* 17/09/19 修复CrashUtils自定义路径错误
 * 17/09/18 完善ImageUtils的Demo
 * 17/09/17 完善ImageUtils的compress
 * 17/09/13 完善ImageUtils的addBorder
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
@@ -10,6 +10,9 @@
 import android.os.Bundle;
 import android.support.annotation.AnimRes;
 import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.util.Pair;
+import android.view.View;
 
 import java.util.List;
 
@@ -89,6 +92,21 @@ public static void startActivity(@NonNull final Activity activity,
         startActivity(activity, null, activity.getPackageName(), cls.getName(), options);
     }
 
+    /**
+     * 启动Activity
+     *
+     * @param activity      activity
+     * @param cls           activity类
+     * @param sharedElement 共享元素View
+     */
+    public static void startActivity(@NonNull final Activity activity,
+                                     @NonNull final Class<?> cls,
+                                     @NonNull final View... sharedElement) {
+        ActivityOptionsCompat options = getOptions(activity, sharedElement);
+        startActivity(activity, null, activity.getPackageName(), cls.getName(),
+                options == null ? null : options.toBundle());
+    }
+
     /**
      * 启动Activity
      *
@@ -159,6 +177,23 @@ public static void startActivity(@NonNull final Bundle extras,
         startActivity(activity, extras, activity.getPackageName(), cls.getName(), options);
     }
 
+    /**
+     * 启动Activity
+     *
+     * @param extras        extras
+     * @param activity      activity
+     * @param cls           activity类
+     * @param sharedElement 共享元素View
+     */
+    public static void startActivity(@NonNull final Bundle extras,
+                                     @NonNull final Activity activity,
+                                     @NonNull final Class<?> cls,
+                                     @NonNull final View... sharedElement) {
+        ActivityOptionsCompat options = getOptions(activity, sharedElement);
+        startActivity(activity, extras, activity.getPackageName(), cls.getName(),
+                options == null ? null : options.toBundle());
+    }
+
     /**
      * 启动Activity
      *
@@ -390,4 +425,19 @@ public static void finishAllActivities() {
             activityList.remove(i);
         }
     }
+
+    private static ActivityOptionsCompat getOptions(@NonNull Activity activity, @NonNull View[] sharedElement) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            int len = sharedElement.length;
+            Pair<View, String>[] pairs = new Pair[len];
+            for (int i = 0; i < len; i++) {
+
+                pairs[i] = new Pair<>(sharedElement[i], sharedElement[i].getTransitionName());
+            }
+            return ActivityOptionsCompat.makeSceneTransitionAnimation(
+                    activity, pairs
+            );
+        }
+        return null;
+    }
 }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.blankj.androidutilcode.core.fragment;`
	`1`	`+package com.blankj.androidutilcode.core.bar;`
`2`	`2`
`3`	`3`	`import android.os.Bundle;`
`4`	`4`	`import android.view.View;`