Przeglądaj źródła

Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

hyodong.min 7 lat temu
rodzic
commit
3c60e71eb0

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListFragment.java

@@ -102,7 +102,7 @@ public class AddMyBucketListFragment extends FragmentBase<AddMyBucketListPresent
     actionBarHelper.begin()
       .back(navigationBar -> presenter.onNavigationClickBack(navigationBar))
       .transparent()
-//      .white()
+      .white()
       .show();
   }
 

+ 4 - 0
app/src/main/res/layout/fragment_add_my_bucket_list.xml

@@ -13,6 +13,10 @@
     android:layout_height="match_parent"
     android:scaleType="centerCrop"
     tools:src="@drawable/img_bestbucket_1"/>
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/rectangle_dim_c80cccccc"/>
 
   <EditText
     android:id="@+id/edit_text_my_bucket"

+ 3 - 2
app/src/main/res/layout/fragment_book_mark_list.xml

@@ -44,19 +44,19 @@
         android:layout_width="match_parent"
         android:layout_height="22dp"
         android:background="@null"
-        app:elevation="0dp"
         android:visibility="invisible"
+        app:elevation="0dp"
         app:layout_collapseMode="pin"
         />
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/category_layout"
-        android:background="@color/CFFFFFF"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_marginTop="15dp"
         android:layout_marginEnd="25dp"
+        android:background="@color/CFFFFFF"
         app:layout_collapseMode="pin"
         >
 
@@ -182,6 +182,7 @@
     android:layout_height="wrap_content"
     android:paddingStart="25dp"
     android:layout_marginTop="10dp"
+    android:layout_marginEnd="25dp"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"

+ 5 - 0
app/src/main/res/layout/main_first_category_banner_view.xml

@@ -4,6 +4,11 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="122dp"
+    android:background="@drawable/rectangle_dim_c80cccccc"
+    />
 <kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
   android:id="@+id/main_banner_view_first_category"
   android:layout_width="match_parent"

+ 4 - 0
app/src/main/res/layout/main_fourth_category_banner_view.xml

@@ -4,6 +4,10 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="150dp"
+    android:background="@drawable/rectangle_dim_c80cccccc"/>
   <kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
     android:id="@+id/main_banner_view_first_category"
     android:layout_width="match_parent"

+ 4 - 0
app/src/main/res/layout/main_third_category_banner_view.xml

@@ -4,6 +4,10 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="150dp"
+    android:background="@drawable/rectangle_dim_c80cccccc"/>
   <kr.co.zumo.app.lifeplus.view.custom.main.banner.MainBannerView
     android:id="@+id/main_banner_view_first_category"
     android:layout_width="match_parent"