[공통][New] 액션바 아이콘 추가

.idea/assetWizardSettings.xml

@@ -14,11 +14,11 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="height" value="57" />
-                            <entry key="outputName" value="icon_cancel_stop" />
+                            <entry key="height" value="55" />
+                            <entry key="outputName" value="ic_icon_header_search" />
                             <entry key="overrideSize" value="true" />
-                            <entry key="sourceFile" value="C:\Users\Hasemi\Downloads\icon_cancel_stop.svg" />
-                            <entry key="width" value="57" />
+                            <entry key="sourceFile" value="$USER_HOME$/Downloads/icon_header_search.svg" />
+                            <entry key="width" value="55" />
                           </map>
                         </option>
                       </PersistentState>

app/src/main/java/kr/co/zumo/app/lifeplus/activity/MainActivity.java

@@ -101,7 +101,7 @@ public class MainActivity extends ActivityBase<MainPresenter> implements IMainVi
       textView.setText("Member status: " + memberStatus);
     }
 
-    ((TextView) findViewById(R.id.text_version)).setText(AppUtil.getVersionName());
+    ((TextView) findViewById(R.id.text_version)).setText("앱 버젼: " + AppUtil.getVersionName());
   }
 
   private void clearData() {
@@ -130,7 +130,13 @@ public class MainActivity extends ActivityBase<MainPresenter> implements IMainVi
   @Override
   void defineActionBar() {
     ActionBarManager actionBarManager = ActionBarManager.getInstance();
-    actionBarManager.hide();
+    actionBarManager.setProgressVisible(false);
+    actionBarManager.setTitleVisible(false);
+    actionBarManager.setBiVisible(true);
+    actionBarManager.setMenuVisible(true);
+    actionBarManager.setSearchVisible(true);
+    actionBarManager.setBackVisible(false);
+    actionBarManager.show();
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/manager/ActionBarManager.java

@@ -6,6 +6,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -31,6 +32,10 @@ public class ActionBarManager {
 
   private ActionBar actionBar;
   private TextView actionBarTitle;
+  private View imageBi;
+  private View buttonBack;
+  private View buttonSearch;
+  private View buttonMenu;
   private ProgressBar progressBar;
 
 
@@ -50,14 +55,42 @@ public class ActionBarManager {
 
     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);
 
-    view.findViewById(R.id.button_back).setOnClickListener(v -> {
+    buttonBack = view.findViewById(R.id.button_back);
+    buttonBack.setOnClickListener(v -> {
       activity.onBackPressed();
     });
 
     setCustomView(view);
   }
 
+  public void setTitleVisible(boolean isVisible) {
+    setViewVisible(actionBarTitle, isVisible);
+  }
+
+  public void setBackVisible(boolean isVisible) {
+    setViewVisible(buttonBack, isVisible);
+  }
+
+  public void setBiVisible(boolean isVisible) {
+    setViewVisible(imageBi, isVisible);
+  }
+
+  public void setSearchVisible(boolean isVisible) {
+    setViewVisible(buttonSearch, isVisible);
+  }
+
+  public void setMenuVisible(boolean isVisible) {
+    setViewVisible(buttonMenu, isVisible);
+  }
+
+  private void setViewVisible(View view, boolean isVisible) {
+    view.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
+  }
+
 
   /**
    * actionbar 제목 설정
@@ -99,6 +132,7 @@ public class ActionBarManager {
     Toolbar parent = (Toolbar) view.getParent();
     parent.setPadding(0, 0, 0, 0);//for tab otherwise give space in tab
     parent.setContentInsetsAbsolute(0, 0);
+    parent.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
 
     setDisplayOptions(android.app.ActionBar.DISPLAY_SHOW_CUSTOM);
     setElevation(0);
@@ -122,7 +156,7 @@ public class ActionBarManager {
    * @param isVisible
    */
   public void setProgressVisible(boolean isVisible) {
-    progressBar.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
+    setViewVisible(progressBar, isVisible);
   }
 
   private void setDisplayOptions(int displayOptions) {

app/src/main/res/drawable/ic_icon_header_menu.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="60dp"
+    android:height="60dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M5,6h50a3,3 0,0 1,0 6L5,12a3,3 0,0 1,0 -6zM5,27h50a3,3 0,0 1,0 6L5,33a3,3 0,0 1,0 -6zM5,48h50a3,3 0,0 1,0 6L5,54a3,3 0,0 1,0 -6z"
+      android:fillColor="#222"
+      android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable/ic_icon_header_search.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="55dp"
+    android:height="55dp"
+    android:viewportWidth="55"
+    android:viewportHeight="55">
+  <path
+      android:pathData="M24,24m-21.5,0a21.5,21.5 0,1 1,43 0a21.5,21.5 0,1 1,-43 0"
+      android:strokeWidth="5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M37.3683,37.3683L37.3683,37.3683A2.5,2.5 0,0 1,40.9038 37.3683L53.6317,50.0962A2.5,2.5 0,0 1,53.6317 53.6317L53.6317,53.6317A2.5,2.5 0,0 1,50.0962 53.6317L37.3683,40.9038A2.5,2.5 0,0 1,37.3683 37.3683z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+</vector>

app/src/main/res/layout/action_bar.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-  android:layout_height="100dp"
+  android:layout_height="@dimen/action_bar_height"
   android:background="@color/CFFFFFF"
   android:gravity="center_vertical"
   android:orientation="vertical">
@@ -13,37 +13,79 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
-    android:paddingEnd="24dp"
     android:paddingStart="14dp"
-     >
+    android:paddingEnd="8dp"
+    >
 
-    <ImageView
-      android:id="@+id/button_back"
-      android:layout_width="35dp"
-      android:layout_height="35dp"
-      android:paddingTop="10dp"
-      android:paddingRight="10dp"
-      android:paddingBottom="10dp"
-      android:paddingLeft="10dp"
-      android:contentDescription="@string/previous_page"
-      app:srcCompat="@drawable/icon_header_back"/>
+    <android.support.constraint.ConstraintLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+      <ImageView
+        android:id="@+id/button_back"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:paddingStart="10dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="10dp"
+        android:paddingBottom="10dp"
+        app:srcCompat="@drawable/icon_header_back"/>
+
+      <ImageView
+        android:id="@+id/image_bi"
+        android:layout_width="62dp"
+        android:layout_height="15dp"
+        android:layout_marginStart="19dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/button_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_bi_header_black"/>
+
+    </android.support.constraint.ConstraintLayout>
 
     <TextView
       android:id="@+id/action_bar_title"
       android:layout_width="0dp"
       android:layout_height="56dp"
+      android:layout_marginStart="8dp"
       android:layout_marginEnd="18dp"
-      android:layout_marginStart="28dp"
       android:layout_weight="1"
       android:gravity="center"
       android:textColor="@color/C000000"
       android:textSize="18sp"
-      tools:text="action bar title"/>
+      tools:text="action bar title"
+      />
 
-    <View
-      android:layout_width="35dp"
-      android:layout_height="match_parent"/>
 
+    <ImageView
+      android:id="@+id/button_search"
+      android:layout_width="34dp"
+      android:layout_height="34dp"
+      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"/>
+
+    <ImageView
+      android:id="@+id/button_menu"
+      android:layout_width="38dp"
+      android:layout_height="38dp"
+      android:paddingStart="9dp"
+      android:paddingTop="9dp"
+      android:paddingEnd="9dp"
+      android:paddingBottom="9dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
+      app:srcCompat="@drawable/ic_icon_header_menu"/>
   </LinearLayout>
 
   <RelativeLayout

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <android.support.constraint.ConstraintLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -9,7 +8,6 @@
   android:background="@android:color/white"
   tools:fragmentActivity=".MainActivity">
 
-
   <TextView
     android:id="@+id/text_version"
     android:layout_width="wrap_content"
@@ -164,10 +162,10 @@
   <ImageView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:srcCompat="@drawable/bi_splash_bk"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:srcCompat="@drawable/bi_splash_bk"/>
 
 </android.support.constraint.ConstraintLayout>

app/src/main/res/values/dimens.xml

@@ -4,4 +4,5 @@
   <dimen name="activity_vertical_margin">16dp</dimen>
   <dimen name="fab_margin">16dp</dimen>
   <dimen name="appbar_padding_top">8dp</dimen>
+  <dimen name="action_bar_height">58dp</dimen>
 </resources>

app/src/main/res/values/styles.xml

@@ -11,7 +11,7 @@
 
   <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
     <!-- Customize your theme here. -->
-    <item name="actionBarSize">57dp</item>
+    <item name="actionBarSize">@dimen/action_bar_height</item>
     <item name="colorPrimary">@color/CFFFFFF</item>
     <item name="colorPrimaryDark">@color/C000000</item>
     <item name="colorAccent">@color/C000000</item>