浏览代码

[공통][Bug] 핀 뷰 레이아웃 수정
- 화면에 트랜지션 없이 바로 표시되는 경우 레이아웃이 틀어지는 경우가 있어서 수정

hyodong.min 7 年之前
父节点
当前提交
2bc7180442

+ 3 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/manager/ActionBarManager.java

@@ -144,9 +144,7 @@ public class ActionBarManager implements IActionBarListener {
   public void hide() {
     Log.i("APP# ActionBarManager | hide", "|" + "~~~~~~~~~~~~~~~~~~~~~~`");
     actionBar.hide();
-    if (toolbar.getParent() instanceof AppBarLayout) {
-      ((AppBarLayout) toolbar.getParent()).setExpanded(false, false);
-    }
+//      appBarLayout.setExpanded(false, false);
   }
 
   /**
@@ -155,9 +153,8 @@ public class ActionBarManager implements IActionBarListener {
   public void show() {
     Log.i("APP# ActionBarManager | show", "|" + "~~~~~~~~~~~~~~~~~~~~~~`");
     actionBar.show();
-    if (toolbar.getParent() instanceof AppBarLayout) {
-      ((AppBarLayout) toolbar.getParent()).setExpanded(true, false);
-    }
+
+    appBarLayout.setExpanded(true, true);
   }
 
   /**

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

@@ -60,7 +60,7 @@ public class FragmentChanger extends ScreenChanger{
   public void changeTo(@ScreenID.FragmentID int id) {
 
     FragmentTransaction fragmentTransaction = activity.getSupportFragmentManager().beginTransaction();
-    fragmentTransaction.setCustomAnimations(R.anim.none, R.anim.none);
+//    fragmentTransaction.setCustomAnimations(R.anim.none, R.anim.none);
 
     changeFragment(id, fragmentTransaction);
   }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/pin/CustomPinView.java

@@ -76,7 +76,7 @@ public class CustomPinView extends ConstraintLayout implements IPinContract.View
   private void init(Context context) {
 
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    inflater.inflate(R.layout.fragment_pin, this);
+    inflater.inflate(R.layout.pin_view, this);
 
     password = "";
 

+ 8 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/FragmentBase.java

@@ -39,6 +39,14 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
    * Fragment
    ***********************************/
 
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    presenter = definePresenter();
+    defineActionBar();
+  }
+
   @Nullable
   @Override
   public abstract View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState);
@@ -47,8 +55,6 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
   public final void onActivityCreated(@Nullable Bundle savedInstanceState) {
     super.onActivityCreated(savedInstanceState);
 
-    presenter = definePresenter();
-    defineActionBar();
     onAfterActivityCreated(savedInstanceState);
 
   }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/pin/PinConfirmFragment.java

@@ -83,7 +83,7 @@ public class PinConfirmFragment extends FragmentBase<PinConfirmPresenter> implem
 
   @Override
   protected void defineActionBar() {
-    ActionBarManager.getInstance().hide();
+    ActionBarManager.getInstance().begin().back().hide();
   }
 
   @Override

app/src/main/res/layout/fragment_pin.xml → app/src/main/res/layout/pin_view.xml