[공통][New] ScreenManager 이용에 불필요한 Model 데이터 삭제

app/src/main/java/kr/co/zumo/app/lifeplus/model/Model.java

@@ -15,7 +15,6 @@ import kr.co.zumo.app.lifeplus.network.INetworkReceiverListener;
 import kr.co.zumo.app.lifeplus.network.NetworkWatcher;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
 
 /**
  * Model
@@ -154,25 +153,6 @@ public abstract class Model extends ViewModel implements ILifeCycle {
     return SuperModel.getInstance().getUserEmail();
   }
 
-
-  /**
-   * 네비게이션에 사용할 FragmentFactory 를 리턴한다.
-   *
-   * @return
-   */
-  public FragmentFactory getFragmentFactory() {
-    return SuperModel.getInstance().getFragmentFactory();
-  }
-
-  /**
-   * 네비게이션 FragmentFactory 지정
-   *
-   * @param factory
-   */
-  public void setFragmentFactory(FragmentFactory factory) {
-    SuperModel.getInstance().setFragmentFactory(factory);
-  }
-
   /**
    * 네트워크 상태를 체크할 리스너 등록
    *

app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModel.java

@@ -6,8 +6,6 @@ package kr.co.zumo.app.lifeplus.model;
 import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.util.StringUtil;
-import kr.co.zumo.app.lifeplus.view.screen.factory.BasicFragmentFactory;
-import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
 
 /**
  * 앱에 필요한 전반적인 데이터 저장
@@ -282,32 +280,6 @@ public final class SuperModel {
     }
   }
 
-
-  // fixme 팩토리를 유지하기 위해서 임시로 슈퍼모델에 저장
-
-  private FragmentFactory fragmentFactory;
-
-  /**
-   * 네비게이션에 사용할 FragmentFactory 를 리턴한다.
-   *
-   * @return
-   */
-  public FragmentFactory getFragmentFactory() {
-    if (null == fragmentFactory) {
-      fragmentFactory = new BasicFragmentFactory();
-    }
-    return fragmentFactory;
-  }
-
-  /**
-   * 네비게이션 FragmentFactory 지정
-   *
-   * @param factory
-   */
-  public void setFragmentFactory(FragmentFactory factory) {
-    this.fragmentFactory = factory;
-  }
-
   /**
    * Screen Width
    *

app/src/main/java/kr/co/zumo/app/lifeplus/view/command/FragmentChangeCommand.java

@@ -5,14 +5,15 @@ package kr.co.zumo.app.lifeplus.view.command;
 
 import android.util.Log;
 
+import kr.co.zumo.app.lifeplus.helper.ScreenChangerHelper;
 import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.supervisor.FragmentChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenChanger;
-import kr.co.zumo.app.lifeplus.helper.ScreenChangerHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.IView;
-import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
+import kr.co.zumo.app.lifeplus.view.screen.factory.BasicFragmentFactory;
+import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
 
 /**
  * FragmentChangeCommand
@@ -40,7 +41,7 @@ public class FragmentChangeCommand extends Command<Model, IView, Presenter> {
 
   @Override
   public void execute(Model model, IView view, Presenter presenter) {
-    FragmentFactory factory = model.getFragmentFactory();
+    FragmentFactory factory = new BasicFragmentFactory();
     ScreenChanger screenChanger = getScreenChanger(factory, view.getHelper(ScreenChangerHelper.class));
     Log.i("APP# FragmentChangeCommand | execute", "| fragment factory: " + factory.getClass().getSimpleName());