Pārlūkot izejas kodu

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

hyodong.min 7 gadi atpakaļ
vecāks
revīzija
32934c2a77

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/manager/ActionBarManager.java

@@ -360,7 +360,7 @@ public class ActionBarManager {
 
   private void setViewVisible(View view, boolean isVisible) {
     if (null != view) {
-      setViewVisible(view, isVisible, View.INVISIBLE);
+      setViewVisible(view, isVisible, View.GONE);
     }
   }
 
@@ -399,6 +399,7 @@ public class ActionBarManager {
       setSettingVisible(false);
       setNotificationVisible(false);
       setCloseVisible(false);
+      setTextButtonVisible(false);
     }
 
     if (builder.isScrollable != newBuilder.isScrollable) {

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/manager/NavigationBar.java

@@ -178,7 +178,7 @@ public class NavigationBar {
 
   private void setViewVisible(View view, boolean isVisible) {
     if (null != view) {
-      setViewVisible(view, isVisible, View.INVISIBLE);
+      setViewVisible(view, isVisible, View.GONE);
     }
   }
 

+ 18 - 18
app/src/main/res/layout/action_bar.xml

@@ -120,19 +120,6 @@
       app:srcCompat="@drawable/icon_h_down"
       tools:visibility="visible"/>
 
-    <ImageView
-      android:id="@+id/button_search"
-      android:layout_width="36dp"
-      android:layout_height="36dp"
-      android:paddingStart="9dp"
-      android:paddingTop="9dp"
-      android:paddingEnd="9dp"
-      android:paddingBottom="9dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toStartOf="@+id/button_menu"
-      app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_icon_header_search"/>
-
     <TextView
       android:id="@+id/text_sub"
       android:layout_width="wrap_content"
@@ -145,7 +132,7 @@
       android:textColor="#666666"
       android:textSize="12sp"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toStartOf="@+id/guide_end2"
+      app:layout_constraintEnd_toStartOf="@+id/button_search"
       app:layout_constraintTop_toTopOf="parent"
       tools:text="회원확인"
       />
@@ -158,7 +145,7 @@
       app:layout_constraintGuide_end="36.5dp"/>
 
     <ImageView
-      android:id="@+id/button_menu"
+      android:id="@+id/button_search"
       android:layout_width="36dp"
       android:layout_height="36dp"
       android:paddingStart="9dp"
@@ -166,9 +153,9 @@
       android:paddingEnd="9dp"
       android:paddingBottom="9dp"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="@+id/guide_end"
+      app:layout_constraintEnd_toStartOf="@+id/button_close"
       app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_icon_header_menu"/>
+      app:srcCompat="@drawable/ic_icon_header_search"/>
 
     <ImageView
       android:id="@+id/button_close"
@@ -179,10 +166,23 @@
       android:paddingEnd="9dp"
       android:paddingBottom="9dp"
       app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="@+id/guide_end"
+      app:layout_constraintEnd_toStartOf="@+id/button_menu"
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_icon_header_close"/>
 
+    <ImageView
+      android:id="@+id/button_menu"
+      android:layout_width="36dp"
+      android:layout_height="36dp"
+      android:paddingStart="9dp"
+      android:paddingTop="9dp"
+      android:paddingEnd="9dp"
+      android:paddingBottom="9dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="@+id/guide_end"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/ic_icon_header_menu"/>
+
     <android.support.constraint.Guideline
       android:id="@+id/guide_end"
       android:layout_width="wrap_content"