Przeglądaj źródła

[카테고리][New] 액티비티 재사용, 트랜지션 z 위치 설정

hyodong.min 6 lat temu
rodzic
commit
e1f5f34861

+ 2 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityBase.java

@@ -58,7 +58,7 @@ import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
  */
 public abstract class ActivityBase extends AppCompatActivity implements IHelperProvider {
 
-  private static final String SLIDE_TYPE = "slide_type";
+  protected static final String SLIDE_TYPE = "slide_type";
 
   public static final int SLIDE_TYPE_ACTIVITY = 0;
   public static final int SLIDE_TYPE_HOME = 1;
@@ -196,9 +196,6 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
     super.onNewIntent(intent);
     Log.w("APP# ActivityBase | onNewIntent", "| >>>> " + this.getClass().getSimpleName() + " HC: " + this.hashCode());
 
-    if (null != intent.getExtras()) {
-      overrideTransition(intent.getExtras().getInt(SLIDE_TYPE));
-    }
     onAfterNewIntent(intent);
   }
 
@@ -292,7 +289,7 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
     overrideTransition(type);
   }
 
-  private void overrideTransition(@SlideType int type) {
+  protected void overrideTransition(@SlideType int type) {
     switch (type) {
       case SLIDE_TYPE_NONE:
         overridePendingTransition(R.anim.none, R.anim.none);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/activity/Category1Activity.java

@@ -18,7 +18,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class Category1Activity extends ActivityBaseScreen {
+public class Category1Activity extends CategoryBaseActivity {
 
   @Override
   protected void render() {
@@ -33,7 +33,7 @@ public class Category1Activity extends ActivityBaseScreen {
 
   @Override
   protected void onAfterNewIntent(Intent intent) {
-
+    super.onAfterNewIntent(intent);
   }
 
   @Override

+ 1 - 32
app/src/main/java/kr/co/zumo/app/lifeplus/activity/Category2Activity.java

@@ -3,11 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.activity;
 
-import android.content.Intent;
-
-import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
-import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
-
 /**
  * Category2Activity
  * <pre>
@@ -18,33 +13,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class Category2Activity extends ActivityBaseScreen {
-
-  @Override
-  protected void render() {
-
-    CategoryDeliveryBean categoryDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(CategoryDeliveryBean.class);
-
-    if (null != categoryDeliveryBean) {
-      // 첫 화면 표시
-      launchScreen(categoryDeliveryBean.getCategoryId());
-    }
-  }
-
-  @Override
-  protected void onAfterNewIntent(Intent intent) {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected void onBeforeDestroy() {
-
-  }
+public class Category2Activity extends Category1Activity {
 
 }
 

+ 1 - 32
app/src/main/java/kr/co/zumo/app/lifeplus/activity/Category3Activity.java

@@ -3,11 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.activity;
 
-import android.content.Intent;
-
-import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
-import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
-
 /**
  * Category3Activity
  * <pre>
@@ -18,33 +13,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class Category3Activity extends ActivityBaseScreen {
-
-  @Override
-  protected void render() {
-
-    CategoryDeliveryBean categoryDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(CategoryDeliveryBean.class);
-
-    if (null != categoryDeliveryBean) {
-      // 첫 화면 표시
-      launchScreen(categoryDeliveryBean.getCategoryId());
-    }
-  }
-
-  @Override
-  protected void onAfterNewIntent(Intent intent) {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected void onBeforeDestroy() {
-
-  }
+public class Category3Activity extends Category1Activity {
 
 }
 

+ 1 - 32
app/src/main/java/kr/co/zumo/app/lifeplus/activity/Category4Activity.java

@@ -3,11 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.activity;
 
-import android.content.Intent;
-
-import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
-import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
-
 /**
  * Category4Activity
  * <pre>
@@ -18,33 +13,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class Category4Activity extends ActivityBaseScreen {
-
-  @Override
-  protected void render() {
-
-    CategoryDeliveryBean categoryDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(CategoryDeliveryBean.class);
-
-    if (null != categoryDeliveryBean) {
-      // 첫 화면 표시
-      launchScreen(categoryDeliveryBean.getCategoryId());
-    }
-  }
-
-  @Override
-  protected void onAfterNewIntent(Intent intent) {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected void onBeforeDestroy() {
-
-  }
+public class Category4Activity extends Category1Activity {
 
 }
 

+ 1 - 32
app/src/main/java/kr/co/zumo/app/lifeplus/activity/Category5Activity.java

@@ -3,11 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.activity;
 
-import android.content.Intent;
-
-import kr.co.zumo.app.lifeplus.bean.CategoryDeliveryBean;
-import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
-
 /**
  * Category5Activity
  * <pre>
@@ -18,33 +13,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryHelper;
  * @history 민효동   [2018. 9. 5.]   [최초 작성]
  * @since 2018. 9. 5.
  */
-public class Category5Activity extends ActivityBaseScreen {
-
-  @Override
-  protected void render() {
-
-    CategoryDeliveryBean categoryDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(CategoryDeliveryBean.class);
-
-    if (null != categoryDeliveryBean) {
-      // 첫 화면 표시
-      launchScreen(categoryDeliveryBean.getCategoryId());
-    }
-  }
-
-  @Override
-  protected void onAfterNewIntent(Intent intent) {
-
-  }
-
-  @Override
-  protected void onAfterDestroy() {
-
-  }
-
-  @Override
-  protected void onBeforeDestroy() {
-
-  }
+public class Category5Activity extends Category1Activity {
 
 }
 

+ 28 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/activity/CategoryBaseActivity.java

@@ -0,0 +1,28 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.activity;
+
+import android.content.Intent;
+import android.support.annotation.CallSuper;
+
+/**
+ * CategoryBaseActivity
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2019. 3. 13.]   [최초 작성]
+ * @since 2019. 3. 13.
+ */
+public abstract class CategoryBaseActivity extends ActivityBaseScreen {
+
+  @CallSuper
+  @Override
+  protected void onAfterNewIntent(Intent intent) {
+    if (null != intent.getExtras()) {
+      overrideTransition(intent.getExtras().getInt(SLIDE_TYPE));
+    }
+  }
+}

+ 6 - 5
app/src/main/res/anim/activity_slide_in_back_enter.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:zAdjustment="bottom">
   <translate
     android:duration="300"
     android:fromXDelta="-20%"
     android:interpolator="@android:anim/anticipate_overshoot_interpolator"
     android:toXDelta="0.0"/>
-  <alpha
-    android:duration="300"
-    android:fromAlpha="0.8"
-    android:toAlpha="1.0"/>
+  <!--<alpha-->
+    <!--android:duration="300"-->
+    <!--android:fromAlpha="0.8"-->
+    <!--android:toAlpha="1.0"/>-->
 </set>

+ 2 - 1
app/src/main/res/anim/activity_slide_in_enter.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:zAdjustment="top">
   <translate
     android:duration="250"
     android:fromXDelta="100.0%"

+ 2 - 1
app/src/main/res/anim/activity_slide_out_back_exit.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:zAdjustment="top">
   <translate
     android:duration="250"
     android:fromXDelta="0.0"

+ 6 - 5
app/src/main/res/anim/activity_slide_out_exit.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:zAdjustment="bottom">
   <translate
     android:duration="300"
     android:fromXDelta="0.0"
     android:interpolator="@android:anim/anticipate_overshoot_interpolator"
     android:toXDelta="-20%"/>
-  <alpha
-    android:duration="300"
-    android:fromAlpha="1.0"
-    android:toAlpha="0.8"/>
+  <!--<alpha-->
+    <!--android:duration="300"-->
+    <!--android:fromAlpha="1.0"-->
+    <!--android:toAlpha="0.8"/>-->
 </set>

+ 0 - 7
app/src/main/res/anim/category_tab_close.xml

@@ -1,7 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">
-  <scale
-    android:duration="500"
-    android:fromYScale="1.0"
-    android:toYScale="0.0"/>
-</set>

+ 0 - 7
app/src/main/res/anim/category_tab_open.xml

@@ -1,7 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-     android:interpolator="@android:anim/linear_interpolator">
-  <scale
-    android:duration="500"
-    android:fromYScale="0.0"
-    android:toYScale="1.0"/>
-</set>