Преглед на файлове

[주모] 로그인 관련 밸리데이션 및 기타 레이아웃 수정사항 반영

yeongyun преди 6 години
родител
ревизия
b3117fec24

+ 4 - 2
app/src/main/AndroidManifest.xml

@@ -288,8 +288,10 @@
     <!-- ZUMO -->
 
     <!-- Naver Setting -->
-    <activity android:name="com.nhn.android.naverlogin.ui.OAuthLoginActivity" />
-    <activity android:name="com.nhn.android.naverlogin.ui.OAuthLoginInAppBrowserActivity" />
+    <activity android:name="com.nhn.android.naverlogin.ui.OAuthLoginActivity"
+        android:theme="@style/AppThemeZumo"/>
+    <activity android:name="com.nhn.android.naverlogin.ui.OAuthLoginInAppBrowserActivity"
+        android:theme="@style/AppThemeZumo"/>
     <!-- Naver Setting -->
 
     <!-- Install referrer Setting -->

+ 8 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/zumo/activity/SignInEmailActivity.java

@@ -23,6 +23,8 @@ import kr.co.zumo.app.lifeplus.zumo.screen.SignInEmailFragment;
  */
 public class SignInEmailActivity extends AppCompatActivity implements ISignUpProcessListener {
 
+    private TextView tvTitle;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -33,7 +35,9 @@ public class SignInEmailActivity extends AppCompatActivity implements ISignUpPro
 
         setSupportActionBar(findViewById(R.id.toolbar));
 
-        ((TextView) findViewById(R.id.action_bar_title)).setText(getString(R.string.title_sign_in_email));
+        tvTitle = findViewById(R.id.action_bar_title);
+
+        tvTitle.setText(getString(R.string.title_sign_in_email));
         findViewById(R.id.image_view_back).setOnClickListener(view -> onBackPressed());
         getSupportActionBar().setDisplayOptions(android.support.v7.app.ActionBar.DISPLAY_SHOW_CUSTOM);
     }
@@ -42,13 +46,13 @@ public class SignInEmailActivity extends AppCompatActivity implements ISignUpPro
     public void onProcessChange(int step) {
         if (step == ISignUpProcessListener.SIGN_IN_EMAIL) { // 이메일 로그인 화면 재호출
             getSupportFragmentManager().popBackStack();
-            getSupportActionBar().setTitle(getString(R.string.title_sign_in_email));
+            tvTitle.setText(getString(R.string.title_sign_in_email));
         } else if (step == ISignUpProcessListener.FIND_ID) { // 아이디 찾기 화면 호출
-            getSupportActionBar().setTitle(getString(R.string.title_find_id));
+            tvTitle.setText(getString(R.string.title_find_id));
             getSupportFragmentManager().beginTransaction().setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.back_enter, R.anim.back_exit)
                     .add(R.id.container, FindIDFragment.newInstance()).addToBackStack(null).commit();
         } else if (step == ISignUpProcessListener.FIND_PW) { // 비밀번호 찾기 화면 호출
-            getSupportActionBar().setTitle(getString(R.string.title_find_pw));
+            tvTitle.setText(getString(R.string.title_find_pw));
             getSupportFragmentManager().beginTransaction().setCustomAnimations(R.anim.enter, R.anim.exit, R.anim.back_enter, R.anim.back_exit)
                     .add(R.id.container, FindPWFragment.newInstance()).addToBackStack(null).commit();
         }

+ 1 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/zumo/screen/SignInEmailPresenter.java

@@ -90,13 +90,11 @@ public class SignInEmailPresenter extends BasePresenter<SignUpModel, SignInEmail
      */
     public boolean possibleToNext() {
 
-        //TODO: 비밀번호 오류 메시지 출력
         String resultEmail = getValidationEmail();
 
         boolean possible = !StringUtil.isEmpty(tempUserInfo.getEmail())
                 && !StringUtil.isEmpty(tempUserInfo.getPassword())
-                && StringUtil.isEmpty(resultEmail)
-                && (getStringLength(tempUserInfo.getPassword()) >= 8);
+                && StringUtil.isEmpty(resultEmail);
         view.possibleToNext(possible);
         return possible;
     }