Browse Source

[공통][Bug] Coding Rule 에 맞게 수정

hyodong.min 7 years ago
parent
commit
9697c80b4c

+ 9 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/activity/factory/ActivityFactory.java

@@ -28,12 +28,18 @@ public class ActivityFactory {
    * @return MainActivity.class
    */
   public Class<? extends ActivityBase> getActivityClass(int id) {
+    Class<? extends ActivityBase> activity;
     switch (id) {
       case ScreenID.ACTIVITY_MAIN:
-        return MainActivity.class;
+        activity = MainActivity.class;
+        break;
       case ScreenID.ACTIVITY_LOGIN:
-        return LoginActivity.class;
+        activity = LoginActivity.class;
+        break;
+      default:
+        activity = null;
+        break;
     }
-    return null;
+    return activity;
   }
 }

+ 20 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/manager/AccountManager.java

@@ -27,4 +27,24 @@ public class AccountManager {
   public boolean isLogin() {
     return true;
   }
+
+  /***********************************
+   * life-cycle
+   ***********************************/
+
+//  public void init() {
+//
+//  }
+//
+//  public void start() {
+//
+//  }
+//
+//  public void stop() {
+//
+//  }
+//
+//  public void dispose() {
+//
+//  }
 }

+ 20 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/manager/ScreenManager.java

@@ -23,4 +23,24 @@ public class ScreenManager {
 
   private ScreenManager() {
   }
+
+  /***********************************
+   * life-cycle
+   ***********************************/
+
+//  public void init() {
+//
+//  }
+//
+//  public void start() {
+//
+//  }
+//
+//  public void stop() {
+//
+//  }
+//
+//  public void dispose() {
+//
+//  }
 }

+ 11 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/BasicFragmentFactory.java

@@ -22,15 +22,22 @@ import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 public class BasicFragmentFactory extends FragmentFactory {
   @Override
   public FragmentBase getFragmentById(int id) {
+    FragmentBase fragment;
     switch (id) {
       case ScreenID.MAIN:
-        return new MainFragment();
+        fragment = new MainFragment();
+        break;
       case ScreenID.LOGIN:
-        return new LoginFragment();
+        fragment = new LoginFragment();
+        break;
       case ScreenID.SIGN_UP:
-        return new SignUpFragment();
+        fragment = new SignUpFragment();
+        break;
+      default:
+        fragment = null;
+        break;
     }
 
-    return null;
+    return fragment;
   }
 }

+ 3 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/factory/FragmentFactory.java

@@ -28,12 +28,11 @@ public abstract class FragmentFactory {
   public FragmentBase getFragment(int id) throws RuntimeException {
     FragmentBase fragmentBase = getFragmentById(id);
 
-    if (null != fragmentBase) {
-      return fragmentBase;
-    }
-    else {
+    if (null == fragmentBase) {
       throw new RuntimeException("Fragment no matched.");
     }
+
+    return fragmentBase;
   }
 
   abstract FragmentBase getFragmentById(int id);

+ 8 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/LoginViewModel.java

@@ -31,17 +31,21 @@ public class LoginViewModel extends ViewModel {
       case Event.BACK:
         exitTo(ScreenID.MAIN);
         break;
+      default:
+        break;
     }
   }
 
   @Override
-  public void exitTo(int id) {
-    switch (id) {
+  public void exitTo(int screenId) {
+    switch (screenId) {
       case ScreenID.SIGN_UP:
-        screenChanger.changeToNext(id);
+        screenChanger.changeToNext(screenId);
         break;
       case ScreenID.MAIN:
-        screenChanger.changeToBack(id);
+        screenChanger.changeToBack(screenId);
+        break;
+      default:
         break;
     }
   }

+ 8 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/MainViewModel.java

@@ -29,21 +29,25 @@ public class MainViewModel extends ViewModel {
       case Event.LOGIN:
         exitTo(ScreenID.LOGIN);
         break;
+      default:
+        break;
     }
   }
 
   @Override
-  public void exitTo(int id) {
-    switch (id) {
+  public void exitTo(int screenId) {
+    switch (screenId) {
       case ScreenID.LOGIN:
-        screenChanger.changeToNext(id);
+        screenChanger.changeToNext(screenId);
+        break;
+      default:
         break;
     }
   }
 
   @Override
   public void exitByBackKey() {
-    /**
+    /*
      * 첫 화면이므로 백 키는 앱 종료 됨
      */
     ScreenChangerHelper.getInstance().getFragmentActivity().finish();

+ 5 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/SignUpViewModel.java

@@ -28,15 +28,19 @@ public class SignUpViewModel extends ViewModel {
       case Event.BACK:
         exitTo(ScreenID.LOGIN);
         break;
+      default:
+        break;
     }
   }
 
   @Override
-  public void exitTo(int id)  {
+  public void exitTo(int id) {
     switch (id) {
       case ScreenID.LOGIN:
         screenChanger.changeToBack(id);
         break;
+      default:
+        break;
     }
   }
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/ViewModel.java

@@ -39,7 +39,7 @@ public abstract class ViewModel implements IExit {
    * @param screenId
    */
   @Override
-  public abstract void exitTo(int id);
+  public abstract void exitTo(int screenId);
 
   /**
    * Device back key 입력 시 처리