[메인][Bug] 메인화면 변경

app/src/androidTest/java/kr/co/zumo/app/lifeplus/activity/MainActivityTest.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.activity;
 
-import android.support.test.espresso.ViewInteraction;
 import android.support.test.rule.ActivityTestRule;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,17 +11,6 @@ import org.hamcrest.TypeSafeMatcher;
 import org.junit.Rule;
 import org.junit.Test;
 
-import kr.co.zumo.app.R;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.pressBack;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-
 public class MainActivityTest {
 
   @Rule
@@ -30,97 +18,7 @@ public class MainActivityTest {
 
   @Test
   public void startFragment() {
-    ViewInteraction appCompatButton = onView(
-      allOf(withId(R.id.button_login), withText("Login"),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          0),
-        isDisplayed()));
-    appCompatButton.perform(click());
-
-    ViewInteraction button = onView(
-      allOf(withId(R.id.button_sign_up),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          1),
-        isDisplayed()));
-    button.check(matches(isDisplayed()));
-
-    ViewInteraction button2 = onView(
-      allOf(withId(R.id.button_back),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          0),
-        isDisplayed()));
-    button2.check(matches(isDisplayed()));
-
-    ViewInteraction appCompatButton2 = onView(
-      allOf(withId(R.id.button_sign_up), withText("Sign Up"),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          1),
-        isDisplayed()));
-    appCompatButton2.perform(click());
-
-    ViewInteraction button3 = onView(
-      allOf(withId(R.id.button_back),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          0),
-        isDisplayed()));
-    button3.check(matches(isDisplayed()));
-
-    ViewInteraction appCompatButton3 = onView(
-      allOf(withId(R.id.button_back), withText("Back"),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          0),
-        isDisplayed()));
-    appCompatButton3.perform(click());
-
-    ViewInteraction button4 = onView(
-      allOf(withId(R.id.button_back),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          0),
-        isDisplayed()));
-    button4.check(matches(isDisplayed()));
-
-    ViewInteraction button5 = onView(
-      allOf(withId(R.id.button_sign_up),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          1),
-        isDisplayed()));
-    button5.check(matches(isDisplayed()));
-
-    pressBack();
 
-    ViewInteraction button6 = onView(
-      allOf(withId(R.id.button_login),
-        childAtPosition(
-          childAtPosition(
-            withId(R.id.container),
-            0),
-          0),
-        isDisplayed()));
-    button6.check(matches(isDisplayed()));
 
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/activity/MainActivity.java

@@ -10,9 +10,9 @@ import android.widget.Button;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.model.MainModel;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IMainView;
-import kr.co.zumo.app.lifeplus.view.PinDialogAgent;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBase;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -31,29 +31,26 @@ import kr.co.zumo.app.lifeplus.view.presenter.MainPresenter;
  */
 public class MainActivity extends ActivityBase<MainPresenter> implements IMainView {
 
-  PinDialogAgent pinDialogAgent;
-
   @Override
   void onAfterCreate(Bundle savedInstanceState) {
 
     setContentView(R.layout.activity_main);
 
-    pinDialogAgent = new PinDialogAgent(this);
-
-    Button button = findViewById(R.id.button_login);
+    Button button = findViewById(R.id.button_clear);
     button.setOnClickListener(v -> {
-      presenter.onEvent(new Event.Builder(Event.LOGIN).build());
+      SuperModel.getInstance().getPreferences().setPermissionInfoDone(false);
+      SuperModel.getInstance().getPreferences().setTutorialDone(false);
     });
 
     button = findViewById(R.id.button_sign_up);
     button.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.SIGN_UP).build());
     });
-
-    button = findViewById(R.id.button_test);
-    button.setOnClickListener(v -> {
-      showAddRegistrationDialog();
-    });
+//
+//    button = findViewById(R.id.button_test);
+//    button.setOnClickListener(v -> {
+//      showAddRegistrationDialog();
+//    });
 
   }
 
@@ -100,9 +97,5 @@ public class MainActivity extends ActivityBase<MainPresenter> implements IMainVi
       .show();
   }
 
-  @Override
-  public void showPinDialog() {
-    pinDialogAgent.showPinDialog();
-  }
 }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/IMainView.java

@@ -14,5 +14,4 @@ package kr.co.zumo.app.lifeplus.view;
  * @since 2018. 9. 21.
  */
 public interface IMainView extends IView {
-  void showPinDialog();
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/MobileAuthorizationView.java

@@ -21,7 +21,6 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -51,7 +50,6 @@ public class MobileAuthorizationView extends ConstraintLayout implements View.On
 
   private LinearLayout scrollViewLinearLayout;
   private LinearLayout phoneIdentifyLayout;
-  private ScrollView scrollView;
 
   private EditText editTextName;
   private RadioButton radioSelectLocal;
@@ -111,7 +109,6 @@ public class MobileAuthorizationView extends ConstraintLayout implements View.On
 
     scrollViewLinearLayout = view.findViewById(R.id.linear_layout_identify);
     phoneIdentifyLayout = view.findViewById(R.id.phone_identify_layout);
-    scrollView = view.findViewById(R.id.scroll_view_identify);
     buttonConfirm = view.findViewById(R.id.button_phone_identify_confirm);
     buttonTimeExpansion = view.findViewById(R.id.button_phone_identify_time_expansion);
     buttonIdentifyNumberSend = view.findViewById(R.id.button_identify_number_send);

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MobileAuthorizationDialog.java

@@ -24,7 +24,6 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
-import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -52,7 +51,6 @@ public class MobileAuthorizationDialog extends DialogBase implements View.OnClic
 
   private LinearLayout scrollViewLinearLayout;
   private LinearLayout phoneIdentifyLayout;
-  private ScrollView scrollView;
 
   private EditText editTextName;
   private RadioButton radioSelectLocal;
@@ -175,7 +173,6 @@ public class MobileAuthorizationDialog extends DialogBase implements View.OnClic
   private void initView(View view) {
     scrollViewLinearLayout = view.findViewById(R.id.linear_layout_identify);
     phoneIdentifyLayout = view.findViewById(R.id.phone_identify_layout);
-    scrollView = view.findViewById(R.id.scroll_view_identify);
     buttonConfirm = view.findViewById(R.id.button_phone_identify_confirm);
     buttonTimeExpansion = view.findViewById(R.id.button_phone_identify_time_expansion);
     buttonIdentifyNumberSend = view.findViewById(R.id.button_identify_number_send);

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/MainPresenter.java

@@ -46,9 +46,6 @@ public class MainPresenter extends Presenter<MainModel, IMainView> {
   @Override
   protected void performOnEvent(Event event) {
     switch (event.getEventId()) {
-      case Event.LOGIN:
-        view.showPinDialog();
-        break;
       case Event.SIGN_UP:
         onCommand(new ActivityChangeCommand(ScreenID.ACTIVITY_SIGN_UP, ScreenID.DIRECTION_NEXT));
         break;

app/src/main/res/layout/activity_main.xml

@@ -2,22 +2,18 @@
 
 <android.support.constraint.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@android:color/darker_gray"
+  android:background="@android:color/white"
   tools:fragmentActivity=".MainActivity">
 
   <LinearLayout
     android:layout_width="match_parent"
+    android:gravity="bottom"
     android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <Button
-      android:id="@+id/button_login"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="Pin"/>
+    android:orientation="horizontal">
 
     <Button
       android:id="@+id/button_sign_up"
@@ -25,12 +21,21 @@
       android:layout_height="wrap_content"
       android:text="Sign Up"/>
 
+    <!--<Button-->
+      <!--android:id="@+id/button_test"-->
+      <!--android:layout_width="wrap_content"-->
+      <!--android:layout_height="wrap_content"-->
+      <!--android:text="Test"/>-->
+
+    <Space
+      android:layout_width="0dp"
+      android:layout_weight="1"
+      android:layout_height="wrap_content"/>
     <Button
-      android:id="@+id/button_test"
+      android:id="@+id/button_clear"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="50dp"
-      android:text="Test"/>
+      android:text="Clear Data"/>
   </LinearLayout>
 
   <LinearLayout
@@ -41,4 +46,13 @@
 
   </LinearLayout>
 
+  <ImageView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:src="@drawable/splash_logo"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"/>
+
 </android.support.constraint.ConstraintLayout>