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

[공통][Bug] 액션 바 코드 정리
- 리팩토링 예정

hyodong.min преди 7 години
родител
ревизия
69276c8a97

+ 50 - 13
app/src/main/java/kr/co/zumo/app/lifeplus/manager/ActionBarManager.java

@@ -97,10 +97,10 @@ public class ActionBarManager implements IActionBarListener {
     View view = inflater.inflate(R.layout.action_bar, null);
 
     actionBarTitle = view.findViewById(R.id.action_bar_title);
-    progressBar = view.findViewById(R.id.progress_bar);
     imageBi = view.findViewById(R.id.image_bi);
     buttonSearch = view.findViewById(R.id.button_search);
     buttonMenu = view.findViewById(R.id.button_menu);
+    progressBar = view.findViewById(R.id.progress_bar);
 
     buttonBack = view.findViewById(R.id.button_back);
     buttonBack.setOnClickListener(v -> {
@@ -116,6 +116,11 @@ public class ActionBarManager implements IActionBarListener {
     setCustomView(view);
   }
 
+  /**
+   * 액션바 영역이 스크롤 설정
+   *
+   * @param isEnabled
+   */
   public void setScrollable(boolean isEnabled) {
     AppBarLayout.LayoutParams params = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
     CoordinatorLayout.LayoutParams appBarLayoutParams = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
@@ -131,29 +136,70 @@ public class ActionBarManager implements IActionBarListener {
     }
   }
 
+  /**
+   * 타이틀 보이기
+   * - setTitle() 해서 설정도 해줘야함.
+   *
+   * @param isVisible
+   */
   public void setTitleVisible(boolean isVisible) {
     setViewVisible(actionBarTitle, isVisible);
   }
 
+  /**
+   * 백 버튼 보이기
+   *
+   * @param isVisible
+   */
   public void setBackVisible(boolean isVisible) {
     setViewVisible(buttonBack, isVisible);
   }
 
+  /**
+   * BI(Lifeplus) 보이기
+   *
+   * @param isVisible
+   */
   public void setBiVisible(boolean isVisible) {
     setViewVisible(imageBi, isVisible);
   }
 
+  /**
+   * 검색 버튼 보이기
+   *
+   * @param isVisible
+   */
   public void setSearchVisible(boolean isVisible) {
     setViewVisible(buttonSearch, isVisible);
   }
 
+  /**
+   * 메뉴 버튼 보이기
+   *
+   * @param isVisible
+   */
   public void setMenuVisible(boolean isVisible) {
     setViewVisible(buttonMenu, isVisible);
   }
 
+  /**
+   * progress bar 보이기/안보이기
+   *
+   * @param isVisible
+   */
+  public void setProgressVisible(boolean isVisible) {
+    setViewVisible(progressBar, isVisible);
+  }
+
   private void setViewVisible(View view, boolean isVisible) {
     if (null != view) {
-      view.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
+      setViewVisible(view, isVisible, View.INVISIBLE);
+    }
+  }
+
+  private void setViewVisible(View view, boolean isVisible, int visibility) {
+    if (null != view) {
+      view.setVisibility(isVisible ? View.VISIBLE : visibility);
     }
   }
 
@@ -205,7 +251,7 @@ public class ActionBarManager implements IActionBarListener {
     toolbar = (Toolbar) view.getParent();
     toolbar.setPadding(0, 0, 0, 0);//for tab otherwise give space in tab
     toolbar.setContentInsetsAbsolute(0, 0);
-//    toolbar.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
+//    toolbar.setLayoutParams(new AppBarLayout.LayoutParams(AppBarLayout.LayoutParams.MATCH_PARENT, AppBarLayout.LayoutParams.MATCH_PARENT));
 
     setDisplayOptions(android.app.ActionBar.DISPLAY_SHOW_CUSTOM);
     setElevation(0);
@@ -246,15 +292,6 @@ public class ActionBarManager implements IActionBarListener {
 //    }
 //  }
 
-  /**
-   * progress bar 보이기/안보이기
-   *
-   * @param isVisible
-   */
-  public void setProgressVisible(boolean isVisible) {
-    setViewVisible(progressBar, isVisible);
-  }
-
   private void setDisplayOptions(int displayOptions) {
     actionBar.setDisplayOptions(displayOptions);
   }
@@ -323,7 +360,7 @@ public class ActionBarManager implements IActionBarListener {
         appBarLayout.addOnOffsetChangedListener(onOffsetChangedListener);
       }
     }
-    
+
     scrollListener = null;
 
     listener = null;

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

@@ -5,10 +5,10 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  tools:layout_height="100dp"
-  android:gravity="top"
   android:background="@color/CFFFFFF"
-  android:orientation="vertical">
+  android:gravity="top"
+  android:orientation="vertical"
+  tools:layout_height="100dp">
 
   <LinearLayout
     android:layout_width="match_parent"

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

@@ -26,7 +26,7 @@
     <android.support.v7.widget.Toolbar
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/action_bar_height"
+      android:layout_height="wrap_content"
       android:background="@color/CFFFFFF"
       android:minHeight="0dp"
       >

+ 50 - 50
app/src/main/res/layout/fragment_bucket_list.xml

@@ -9,59 +9,59 @@
 
   <RelativeLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginBottom="@dimen/action_bar_height">
-  <android.support.v4.view.ViewPager
-    android:id="@+id/view_pager_bucket_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_alignParentTop="true"
-    android:layout_marginBottom="35dp"
-    android:layout_marginTop="30dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"/>
+    android:layout_height="match_parent">
 
-  <android.support.design.widget.TabLayout
-    android:id="@+id/tab_layout_bucket_list"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentStart="true"
-    android:layout_alignParentBottom="true"
-    android:layout_marginBottom="35dp"
-    app:tabBackground="@drawable/tab_selector"
-    app:tabGravity="center"
-    app:tabIndicatorHeight="0dp"/>
+    <android.support.v4.view.ViewPager
+      android:id="@+id/view_pager_bucket_list"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_alignParentTop="true"
+      android:layout_marginTop="30dp"
+      android:layout_marginBottom="35dp"
+      android:paddingLeft="25dp"
+      android:paddingRight="25dp"/>
+
+    <android.support.design.widget.TabLayout
+      android:id="@+id/tab_layout_bucket_list"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentStart="true"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="35dp"
+      app:tabBackground="@drawable/tab_selector"
+      app:tabGravity="center"
+      app:tabIndicatorHeight="0dp"/>
 
-  <ImageView
-    android:id="@+id/image_view_text_balloon"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentEnd="true"
-    android:layout_alignParentBottom="true"
-    android:layout_marginEnd="73dp"
-    android:layout_marginBottom="22dp"
-    app:srcCompat="@drawable/ic_textballoon_shape"/>
+    <ImageView
+      android:id="@+id/image_view_text_balloon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentBottom="true"
+      android:layout_marginEnd="73dp"
+      android:layout_marginBottom="22dp"
+      app:srcCompat="@drawable/ic_textballoon_shape"/>
 
-  <ImageView
-    android:id="@+id/image_view_floating_plus"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentEnd="true"
-    android:layout_alignParentBottom="true"
-    android:layout_marginEnd="22dp"
-    android:layout_marginBottom="22dp"
-    app:srcCompat="@drawable/icon_floating_plus"/>
+    <ImageView
+      android:id="@+id/image_view_floating_plus"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentBottom="true"
+      android:layout_marginEnd="22dp"
+      android:layout_marginBottom="22dp"
+      app:srcCompat="@drawable/icon_floating_plus"/>
 
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentEnd="true"
-    android:layout_alignParentBottom="true"
-    android:layout_marginEnd="87dp"
-    android:layout_marginBottom="27dp"
-    android:lineSpacingExtra="4sp"
-    android:text="@string/bucket_list_write"
-    android:textColor="@color/CD0D0D0"
-    android:textSize="12sp"/>
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_alignParentBottom="true"
+      android:layout_marginEnd="87dp"
+      android:layout_marginBottom="27dp"
+      android:lineSpacingExtra="4sp"
+      android:text="@string/bucket_list_write"
+      android:textColor="@color/CD0D0D0"
+      android:textSize="12sp"/>
   </RelativeLayout>
 </LinearLayout>