Parcourir la source

[공통][Bug] 화면전환 애니메이션 수정

hyodong.min il y a 7 ans
Parent
commit
0b2fcbde4f

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/ActivityChanger.java

@@ -74,11 +74,11 @@ public class ActivityChanger extends ScreenChanger {
   @Override
   public void changeToBack(int id) {
     startActivity(id);
-    activity.overridePendingTransition(R.anim.pop_enter, R.anim.pop_exit);
+    activity.overridePendingTransition(R.anim.back_enter, R.anim.back_exit);
     finishAfterTransition();
 
 //    activity.finish();
-//    activity.overridePendingTransition(R.anim.pop_enter, R.anim.pop_exit);
+//    activity.overridePendingTransition(R.anim.back_enter, R.anim.back_exit);
   }
 
   private void startActivity(int id) {

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/supervisor/FragmentChanger.java

@@ -73,7 +73,7 @@ public class FragmentChanger extends ScreenChanger{
   public void changeToNext(@ScreenID.FragmentID int id) {
 
     FragmentTransaction fragmentTransaction = activity.getSupportFragmentManager().beginTransaction();
-    fragmentTransaction.setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.pop_enter, R.anim.pop_exit);
+    fragmentTransaction.setCustomAnimations(R.anim.enter, R.anim.exit);
 
     changeFragment(id, fragmentTransaction);
 
@@ -87,7 +87,7 @@ public class FragmentChanger extends ScreenChanger{
   public void changeToBack(@ScreenID.FragmentID int id) {
 
     FragmentTransaction fragmentTransaction = activity.getSupportFragmentManager().beginTransaction();
-    fragmentTransaction.setCustomAnimations(R.anim.pop_enter, R.anim.pop_exit, R.anim.enter, R.anim.exit);
+    fragmentTransaction.setCustomAnimations(R.anim.back_enter, R.anim.back_exit);
 
     changeFragment(id, fragmentTransaction);
 

+ 1 - 1
app/src/main/res/anim/pop_enter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set>
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
-             android:duration="300"
+             android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="-100%"
              android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="0"/>

+ 1 - 1
app/src/main/res/anim/pop_exit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set>
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
-             android:duration="300"
+             android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="0"
              android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="100%"/>

+ 1 - 1
app/src/main/res/anim/enter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set>
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
-             android:duration="@android:integer/config_shortAnimTime"
+             android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="100%"
              android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="0"/>

+ 1 - 1
app/src/main/res/anim/exit.xml

@@ -3,6 +3,6 @@
   <translate xmlns:android="http://schemas.android.com/apk/res/android"
              android:duration="@android:integer/config_mediumAnimTime"
              android:fromXDelta="0"
-             android:interpolator="@android:anim/accelerate_interpolator"
+             android:interpolator="@android:anim/decelerate_interpolator"
              android:toXDelta="-100%"/>
 </set>

+ 1 - 1
app/src/main/res/layout/fragment_sign_up_start1.xml

@@ -4,6 +4,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="@color/CFFFFFF"
   android:orientation="vertical"
   >
 
@@ -25,7 +26,6 @@
       tools:text="@string/sign_up_hello_from_on_boarding"
       />
 
-
     <TextView
       android:id="@+id/text_description"
       android:layout_width="match_parent"

+ 3 - 3
app/src/main/res/layout/fragment_sign_up_start2.xml

@@ -4,6 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
+  android:background="@color/CFFFFFF"
   android:orientation="vertical"
   >
 
@@ -19,18 +20,17 @@
       android:layout_height="wrap_content"
       android:lineSpacingExtra="8sp"
       android:text="@string/sign_up_hello_text"
-      android:textColor="#000000"
+      android:textColor="@color/C000000"
       android:textSize="21sp"
       />
 
-
     <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="17dp"
       android:lineSpacingExtra="5sp"
       android:text="@string/sign_up_need_id"
-      android:textColor="#999999"
+      android:textColor="@color/C999999"
       android:textSize="14sp"
       />
 

+ 1 - 1
app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -153,7 +153,7 @@ public class LifeplusAPIService implements LifeplusAPI {
         "  \"data\": [{\"user_no\": \"12345678900\",\n" +
         "            \"user_name\": \"나나나\",\n" +
         "            \"mail_id\": \"naananan@gmail.com\",\n" +
-        "            \"memr_stat_cd\": \"000\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
+        "            \"memr_stat_cd\": \"200\",\n" +                // 000: 정상, 200:휴면, 탈퇴:900
         "            \"lock_stat_cd\": \"000\", \n" +               // 정상: 000, 잠김 회원: 999
         "            \"ci_value\":\"5555555555\"}],\n" +
         "    \"sp_rtn\": 0\n" +