[공통][Bug] merge 후 오류 수정

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

@@ -4,11 +4,14 @@
 package kr.co.zumo.app.lifeplus.activity;
 
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
+import kr.co.zumo.app.lifeplus.model.SignUpModel;
 import kr.co.zumo.app.lifeplus.view.ISignUpView;
+import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpStartFragment;
 import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
 
 /**;
@@ -28,21 +31,19 @@ public class SignUpActivity extends ActivityBase<SignUpPresenter> implements ISi
 
     setContentView(R.layout.activity_sign_up);
 
-/*<<<<<<< HEAD
-    watchNetwork();
     FragmentManager manager = getSupportFragmentManager();
     FragmentTransaction fragmentTransaction = manager.beginTransaction();
     SignUpStartFragment fragment = new SignUpStartFragment();
     fragmentTransaction.add(R.id.sign_up_container, fragment);
     fragmentTransaction.commit();
-=======*/
-    adapter = new SignUpAdapter(presenter);
 
-    recyclerView = findViewById(R.id.sign_up_list);
-    recyclerView.setHasFixedSize(true);
-    RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(App.getInstance().getContext());
-    recyclerView.setLayoutManager(layoutManager);
-    recyclerView.setAdapter(adapter);
+//    adapter = new SignUpAdapter(presenter);
+//
+//    recyclerView = findViewById(R.id.sign_up_list);
+//    recyclerView.setHasFixedSize(true);
+//    RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(App.getInstance().getContext());
+//    recyclerView.setLayoutManager(layoutManager);
+//    recyclerView.setAdapter(adapter);
 
 
     presenter.start();
@@ -70,7 +71,7 @@ public class SignUpActivity extends ActivityBase<SignUpPresenter> implements ISi
 
   @Override
   SignUpPresenter definePresenter() {
-    return null;
+    return new SignUpPresenter(new SignUpModel(), this);
   }
 
   /**
@@ -81,9 +82,5 @@ public class SignUpActivity extends ActivityBase<SignUpPresenter> implements ISi
     //adapter.notifyItemChanged(recyclerView, presenter.getSignUpList());
   }
 
-  @Override
-  public ActivityBase getActivityBase() {
-    return null;
-  }
 }
 

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

@@ -4,15 +4,11 @@
 package kr.co.zumo.app.lifeplus.activity;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.application.App;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.model.SignUpModel;
 import kr.co.zumo.app.lifeplus.view.ISignUpView;
-import kr.co.zumo.app.lifeplus.view.fragment.signup.SignUpAdapter;
 import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
 
 /**
@@ -27,23 +23,12 @@ import kr.co.zumo.app.lifeplus.view.presenter.SignUpPresenter;
  */
 public class SignUpZumoUserActivity extends ActivityBase<SignUpPresenter> implements ISignUpView {
 
-  private SignUpAdapter adapter;
-  private RecyclerView recyclerView;
-
   @Override
   void onAfterCreate(Bundle savedInstanceState) {
 
-    setContentView(R.layout.fragment_sign_up);
-
-    adapter = new SignUpAdapter(presenter);
+    setContentView(R.layout.activity_sign_up);
 
-    recyclerView = findViewById(R.id.sign_up_list);
-    recyclerView.setHasFixedSize(true);
-    RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(App.getInstance().getContext());
-    recyclerView.setLayoutManager(layoutManager);
-    recyclerView.setAdapter(adapter);
 
-    presenter.start();
   }
 
   @Override
@@ -71,7 +56,7 @@ public class SignUpZumoUserActivity extends ActivityBase<SignUpPresenter> implem
    */
   @Override
   public void notifyItemChanged() {
-    adapter.notifyItemChanged(recyclerView, presenter.getSignUpList());
+//    adapter.notifyItemChanged(recyclerView, presenter.getSignUpList());
   }
 }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpAdapter.java

@@ -125,11 +125,11 @@ public class SignUpAdapter extends RecyclerView.Adapter<BaseViewHolder> {
         view = getWrappedView(parent, view);
         holder = new SignUpDividerHolder(view);
         break;
-      case SignUpItem.SIGN_UP_AGREE:
-        view = inflater.inflate(R.layout.sign_up_agree, parent, false);
-        view = getWrappedView(parent, view);
-        holder = new SignUpAgreeHolder(view, presenter.getAgreeItems());
-        break;
+//      case SignUpItem.SIGN_UP_AGREE:
+//        view = inflater.inflate(R.layout.sign_up_agree, parent, false);
+//        view = getWrappedView(parent, view);
+//        holder = new SignUpAgreeHolder(view, presenter.getAgreeItems());
+//        break;
       default:
         break;
     }