浏览代码

[공통][New] 액션바 레이아웃 수정

hyodong.min 7 年之前
父节点
当前提交
6f53eab6b0

+ 5 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/activity/FAQActivity.java

@@ -42,6 +42,11 @@ public class FAQActivity extends ActivityBase<FAQPresenter> implements IFAQView
   @Override
   void defineActionBar() {
     ActionBarManager actionBarManager = ActionBarManager.getInstance();
+    actionBarManager.setTitleVisible(true);
+    actionBarManager.setBiVisible(false);
+    actionBarManager.setMenuVisible(true);
+    actionBarManager.setSearchVisible(true);
+    actionBarManager.setBackVisible(true);
     actionBarManager.setTitle(R.string.faq);
     actionBarManager.setProgressVisible(false);
     actionBarManager.show();

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/activity/MainActivity.java

@@ -118,6 +118,7 @@ public class MainActivity extends ActivityBase<MainPresenter> implements IMainVi
 
   private void render() {
     findViewById(R.id.button_sign_up).setEnabled(StringUtil.isEmpty(SuperModel.getInstance().getUserId()));
+    findViewById(R.id.button_delete_account).setEnabled(StringUtil.isFull(SuperModel.getInstance().getUserId()));
     findViewById(R.id.button_pin).setEnabled(StringUtil.isFull(SuperModel.getInstance().getPreferences().getEncryptedPin()));
     findViewById(R.id.button_pin_reset).setEnabled(StringUtil.isEmpty(SuperModel.getInstance().getPreferences().getEncryptedPin()));
   }

+ 5 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/activity/SignUpActivity.java

@@ -54,7 +54,11 @@ public class SignUpActivity extends ActivityBase<SignUpPresenter> implements ISi
   void defineActionBar() {
     ActionBarManager actionBarManager = ActionBarManager.getInstance();
     actionBarManager.setProgressVisible(true);
-    actionBarManager.setTitle(R.string.empty_string);
+    actionBarManager.setTitleVisible(false);
+    actionBarManager.setBiVisible(false);
+    actionBarManager.setMenuVisible(false);
+    actionBarManager.setSearchVisible(false);
+    actionBarManager.setBackVisible(true);
     actionBarManager.show();
   }
 

+ 20 - 12
app/src/main/res/layout/action_bar.xml

@@ -47,18 +47,26 @@
 
     </android.support.constraint.ConstraintLayout>
 
-    <TextView
-      android:id="@+id/action_bar_title"
+    <android.support.constraint.ConstraintLayout
       android:layout_width="0dp"
-      android:layout_height="56dp"
-      android:layout_marginStart="8dp"
-      android:layout_marginEnd="18dp"
-      android:layout_weight="1"
-      android:gravity="center"
-      android:textColor="@color/C000000"
-      android:textSize="18sp"
-      tools:text="action bar title"
-      />
+      android:layout_height="wrap_content"
+      android:layout_weight="1">
+
+      <TextView
+        android:id="@+id/action_bar_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="25dp"
+        android:gravity="center"
+        android:textColor="@color/C000000"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="VVV"/>
+      <!-- 타이틀 옆에 아이콘 자리 -->
+    </android.support.constraint.ConstraintLayout>
 
 
     <ImageView
@@ -107,7 +115,7 @@
       android:layout_height="match_parent"
       android:layout_centerInParent="false"
       android:progressDrawable="@drawable/sign_up_progress"
-      tools:progress="40"
+      tools:progress="50"
       />
   </RelativeLayout>
 

+ 6 - 6
app/src/main/res/layout/activity_main.xml

@@ -8,12 +8,6 @@
   android:background="@android:color/white"
   tools:fragmentActivity=".MainActivity">
 
-  <TextView
-    android:id="@+id/text_version"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:text="Version: v4.0.0"/>
-
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -42,6 +36,12 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"/>
 
+      <TextView
+        android:id="@+id/text_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="Version: v4.0.0"/>
+
     </LinearLayout>
 
     <LinearLayout