Browse Source

[회원가입][Bug] 회원가입 진입 버튼 위치 변경

hyodong.min 7 years ago
parent
commit
f81e839bec

+ 0 - 6
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/LoginViewModel.java

@@ -27,9 +27,6 @@ public class LoginViewModel extends ViewModel {
   @Override
   void onEvent(int eventId, int intValue, @Nullable String stringValue) {
     switch (eventId) {
-      case Event.SIGN_UP:
-        exitTo(ScreenID.SIGN_UP);
-        break;
       case Event.BACK:
         exitTo(ScreenID.MAIN);
         break;
@@ -41,9 +38,6 @@ public class LoginViewModel extends ViewModel {
   @Override
   public void exitTo(int screenId) {
     switch (screenId) {
-      case ScreenID.SIGN_UP:
-        screenChanger.changeToNext(screenId);
-        break;
       case ScreenID.MAIN:
         screenChanger.changeToBack(screenId);
         break;

+ 6 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/model/MainViewModel.java

@@ -31,6 +31,9 @@ public class MainViewModel extends ViewModel {
       case Event.LOGIN:
         exitTo(ScreenID.LOGIN);
         break;
+      case Event.SIGN_UP:
+        exitTo(ScreenID.SIGN_UP);
+        break;
       default:
         break;
     }
@@ -42,6 +45,9 @@ public class MainViewModel extends ViewModel {
       case ScreenID.LOGIN:
         screenChanger.changeToNext(screenId);
         break;
+      case ScreenID.SIGN_UP:
+        screenChanger.changeToNext(screenId);
+        break;
       default:
         break;
     }

+ 0 - 7
app/src/main/res/layout/fragment_login.xml

@@ -25,12 +25,5 @@
       android:onClick="@{() -> model.onEvent(Event.BACK)}"
       android:text="Back"/>
 
-    <Button
-      android:id="@+id/button_sign_up"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:onClick="@{() -> model.onEvent(Event.SIGN_UP)}"
-      android:text="Sign Up"/>
-
   </LinearLayout>
 </layout>

+ 6 - 1
app/src/main/res/layout/fragment_main.xml

@@ -18,13 +18,18 @@
     tools:fragmentActivity=".view.MainFragment"
     android:orientation="vertical">
 
-    <!-- TODO: Update blank fragment layout -->
     <Button
       android:id="@+id/button_login"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:onClick="@{() -> model.onEvent(Event.LOGIN, 1)}"
       android:text="Login"/>
+    <Button
+      android:id="@+id/button_sign_up"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:onClick="@{() -> model.onEvent(Event.SIGN_UP)}"
+      android:text="Sign Up"/>
 
   </LinearLayout>
 </layout>