Quellcode durchsuchen

[공통][Bug] Custom Button 적용

hyodong.min vor 7 Jahren
Ursprung
Commit
f3617f90c5

+ 3 - 1
app/src/main/AndroidManifest.xml

@@ -26,7 +26,9 @@
     </activity>
     <activity android:name=".lifeplus.activity.MainActivity"/>
     <activity android:name=".lifeplus.activity.TutorialActivity"/>
-    <activity android:name=".lifeplus.activity.SignUpActivity"/>
+    <activity
+      android:name=".lifeplus.activity.SignUpActivity"
+      android:windowSoftInputMode="adjustResize"/>
     <activity android:name=".lifeplus.activity.NetworkErrorActivity"/>
     <activity android:name=".lifeplus.activity.SignUpZumoUserActivity"/>
     <activity android:name=".lifeplus.activity.PermissionInfoActivity"/>

+ 3 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/activity/NetworkErrorActivity.java

@@ -4,7 +4,7 @@
 package kr.co.zumo.app.lifeplus.activity;
 
 import android.os.Bundle;
-import android.widget.Button;
+import android.view.View;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
@@ -29,7 +29,7 @@ public class NetworkErrorActivity extends ActivityBase<NetworkErrorPresenter> im
   void onAfterCreate(Bundle savedInstanceState) {
     setContentView(R.layout.fragment_network_disconnected);
 
-    Button buttonRetry = findViewById(R.id.button_retry);
+    View buttonRetry = findViewById(R.id.button_retry);
     buttonRetry.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.RETRY).build());
     });
@@ -41,6 +41,7 @@ public class NetworkErrorActivity extends ActivityBase<NetworkErrorPresenter> im
     ActionBarManager actionBarManager = ActionBarManager.getInstance();
     actionBarManager.setTitle(R.string.network_disconnected);
     actionBarManager.setDisplayHomeAsUpEnabled(false);
+    actionBarManager.hide();
   }
 
   @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpAlreadyMemberFragment.java

@@ -41,7 +41,7 @@ public class SignUpAlreadyMemberFragment extends FragmentBase<SignUpAlreadyMembe
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    Button buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
+    View buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
 
     buttonAuthorization.setOnClickListener(new View.OnClickListener() {
       @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpNeedFor30daysFragment.java

@@ -41,7 +41,7 @@ public class SignUpNeedFor30daysFragment extends FragmentBase<SignUpNeedFor30day
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    Button buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
+    View buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
 
     buttonAuthorization.setOnClickListener(new View.OnClickListener() {
       @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpStartFromOnBoardingFragment.java

@@ -41,7 +41,7 @@ public class SignUpStartFromOnBoardingFragment extends FragmentBase<SignUpStartF
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    Button buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
+    View buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
 
     buttonAuthorization.setOnClickListener(new View.OnClickListener() {
       @Override

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/signup/SignUpStartFromZumoFragment.java

@@ -41,7 +41,7 @@ public class SignUpStartFromZumoFragment extends FragmentBase<SignUpStartFromZum
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    Button buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
+    View buttonAuthorization = (Button) getView().findViewById(R.id.sign_up_mobile_authorization_button);
 
     buttonAuthorization.setOnClickListener(new View.OnClickListener() {
       @Override

+ 1 - 0
app/src/main/res/layout/activity_main.xml

@@ -13,6 +13,7 @@
     android:layout_width="match_parent"
     android:gravity="bottom"
     android:layout_height="match_parent"
+    android:padding="20dp"
     android:orientation="horizontal">
 
     <kr.co.zumo.app.lifeplus.view.custom.SignUpButtonView

+ 0 - 1
app/src/main/res/layout/alert_dialog.xml

@@ -22,7 +22,6 @@
 
   <kr.co.zumo.app.lifeplus.view.custom.SignUpButtonView
     android:id="@+id/button_confirm"
-    android:minWidth="80dp"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:text="@string/confirm"

+ 1 - 0
app/src/main/res/layout/sign_up_button_view.xml

@@ -7,6 +7,7 @@
 
   <LinearLayout
     android:id="@+id/layout_background"
+    android:layout_gravity="center"
     android:layout_width="wrap_content"
     android:layout_height="38dp"
     android:background="@drawable/button_background"