Explorar el Código

Task #1296 [Android] Splash, 로그인 관련 소스 정리

http://www.junstarok.com/redmine/issues/1296
sanghoonkwon hace 7 años
padre
commit
538ddb2d9f

+ 36 - 23
app/src/main/java/kr/co/hanwha/hifive/screen/intro/IntroActivity.java

@@ -90,11 +90,21 @@ public class IntroActivity extends BaseActivity implements IntroContract.View {
         if (BuildConfig.DEBUG == false)
             mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
 
-        mPasswordEdit = (HFPasswordEditTextView) findViewById(R.id.passwordEditText);
-        mPasswordEdit.setOnInputPasswordListener(onInputPasswordListener);
+        initLayout();
+
+        initPresenter();
+
+        initCallback();
+
+        initLifeAndSncMode();
+
+        initDdevHintText();
+    }
 
+    @Override
+    public void initLayout() {
+        mPasswordEdit = (HFPasswordEditTextView) findViewById(R.id.passwordEditText);
         mNumberKeypadView = (HFNumberKeypadView) findViewById(R.id.numberKeypadView);
-        mNumberKeypadView.setOnNumberKeypadListener(onNumberKeypadListener);
 
         mTextViewAlertSimple = (TextView) findViewById(R.id.alertSimple_textView);
         mTextViewAlertAccount = (TextView) findViewById(R.id.alertAccount_textView);
@@ -110,19 +120,11 @@ public class IntroActivity extends BaseActivity implements IntroContract.View {
 
         mLayoutSimpleLogin = (LinearLayout) findViewById(R.id.simpleLogin_linearLayout);
 
-        mGestureDetector = new GestureDetector(this, new MyGestureListener());
         mImageViewIcon = (ImageView) findViewById(R.id.icon_imageView);
 
         mLayoutAccountLogin.setVisibility(View.GONE);
         mLayoutSimpleLogin.setVisibility(View.GONE);
 
-        findViewById(R.id.hidden_view).setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                return mGestureDetector.onTouchEvent(event);
-            }
-        });
-
         mTextViewRevision = (TextView) findViewById(R.id.revision_textView);
         mTextViewRevision.setText(BuildConfig.REVISION);
 
@@ -132,28 +134,40 @@ public class IntroActivity extends BaseActivity implements IntroContract.View {
 
         mImageViewIcon.setTranslationY(targetY);
 
-        findViewById(R.id.department_linearLayout).setOnClickListener(onClickListener);
-        findViewById(R.id.admin_view).setOnClickListener(onClickListener);
-        findViewById(R.id.login_textView).setOnClickListener(onClickListener);
-        findViewById(R.id.signup_textView).setOnClickListener(onClickListener);
-        findViewById(R.id.resetPassword_textView).setOnClickListener(onClickListener);
-
         findViewById(R.id.login_textView).setEnabled(false);
 
         mTextViewDepartment = (TextView) findViewById(R.id.department_textView);
         mDepartmentPickerView = (HFDepartmentPickerView) findViewById(R.id.departmentPickerView);
-        mDepartmentPickerView.setOnItemSelectedListener(onItemSelectedListener);
-
-        initLifeAndSncMode();
+    }
 
+    @Override
+    public void initPresenter() {
         mPresenter = new IntroPresenter(this);
         mPresenter.checkUpdate();
         mPresenter.checkLanding(getIntent());
+    }
 
-        initDdevHintText();
+    @Override
+    public void initCallback() {
+        mPasswordEdit.setOnInputPasswordListener(onInputPasswordListener);
+        mNumberKeypadView.setOnNumberKeypadListener(onNumberKeypadListener);
 
-    }
+        mGestureDetector = new GestureDetector(this, new MyGestureListener());
+        findViewById(R.id.hidden_view).setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return mGestureDetector.onTouchEvent(event);
+            }
+        });
 
+        findViewById(R.id.department_linearLayout).setOnClickListener(onClickListener);
+        findViewById(R.id.admin_view).setOnClickListener(onClickListener);
+        findViewById(R.id.login_textView).setOnClickListener(onClickListener);
+        findViewById(R.id.signup_textView).setOnClickListener(onClickListener);
+        findViewById(R.id.resetPassword_textView).setOnClickListener(onClickListener);
+
+        mDepartmentPickerView.setOnItemSelectedListener(onItemSelectedListener);
+    }
 
     @Override
     public void onBackPressed() {
@@ -510,7 +524,6 @@ public class IntroActivity extends BaseActivity implements IntroContract.View {
      * GestureDetector.SimpleOnGestureListener
      **************************************************/
     class MyGestureListener extends GestureDetector.SimpleOnGestureListener {
-
         @Override
         public boolean onDown(MotionEvent event) {
             return true;

+ 6 - 0
app/src/main/java/kr/co/hanwha/hifive/screen/intro/contract/IntroContract.java

@@ -15,6 +15,12 @@ import kr.co.hanwha.hifive.data.model.UpdateInfo;
 
 public interface IntroContract {
     interface View extends BaseView<Presenter> {
+        void initLayout();
+
+        void initPresenter();
+
+        void initCallback();
+
         /**
          * 에러 메세지 표시 - 간편 로그인
          *