瀏覽代碼

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

Hasemi 7 年之前
父節點
當前提交
8b671b2ffa

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/helper/ActionBarHelper.java

@@ -218,7 +218,7 @@ public class ActionBarHelper extends Helper {
   }
 
   public void animate() {
-    toolbar.setTranslationY(-ResourceUtil.getDimension(R.dimen.action_bar_height_with_status_bar_height));
+    toolbar.setTranslationY(-ResourceUtil.getDimension(R.dimen.action_bar_height_with_extra_space));
 
     ObjectAnimator textViewAnimator = ObjectAnimator.ofFloat(toolbar, "translationY", 0f);
     textViewAnimator.setDuration(900);
@@ -247,7 +247,7 @@ public class ActionBarHelper extends Helper {
       // 스크롤 플래그 설정
       toolbarLayoutParams.setScrollFlags(APP_BAR_LAYOUT_SCROLL_PARAM);
       // 스테이터스 바 위로 스크롤 시키기위해서 높이 조절
-      toolbarLayoutParams.height = ResourceUtil.getDimension(R.dimen.action_bar_height_with_status_bar_height);
+      toolbarLayoutParams.height = ResourceUtil.getDimension(R.dimen.action_bar_height_with_extra_space);
 
       appBarLayoutParams.setBehavior(new CustomHeaderBehavior());
       containerLayoutParams.setBehavior(null);

+ 2 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkFragment.java

@@ -43,6 +43,8 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     recyclerViewDefaultBookMark = findViewById(R.id.recycler_view_default_book_mark);
 
+//    int paddingTop = ResourceUtil.getStatusBarHeightManual() + ResourceUtil.getDimension(R.dimen.action_bar_height) + recyclerViewDefaultBookMark.getPaddingTop();
+//    recyclerViewDefaultBookMark.setPadding(recyclerViewDefaultBookMark.getPaddingLeft(), paddingTop, recyclerViewDefaultBookMark.getPaddingRight(), recyclerViewDefaultBookMark.getPaddingBottom());
   }
 
   @Override
@@ -51,7 +53,6 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
       .menu(actionBar -> presenter.onNavigationClickMenu(actionBar))
       .search(actionBar -> presenter.onNavigationClickSearch(actionBar))
       .back(actionBar -> presenter.onNavigationClickBack(actionBar))
-      .scroll()
       .show();
   }
 

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

@@ -30,7 +30,7 @@
     <android.support.v7.widget.Toolbar
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
-      android:layout_height="@dimen/action_bar_height_with_status_bar_height"
+      android:layout_height="@dimen/action_bar_height_with_extra_space"
       android:minHeight="0dp"/>
 
     <RelativeLayout

+ 7 - 7
app/src/main/res/layout/fragment_default_book_mark.xml

@@ -6,11 +6,11 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
-      android:id="@+id/recycler_view_default_book_mark"
-      android:layout_marginTop="45dp"
-      app:layout_constraintTop_toTopOf="parent"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
-  
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view_default_book_mark"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    app:layout_constraintTop_toTopOf="parent"/>
+
 </android.support.constraint.ConstraintLayout>

+ 1 - 1
app/src/main/res/values/dimens.xml

@@ -5,7 +5,7 @@
   <dimen name="fab_margin">22dp</dimen>
 
   <dimen name="action_bar_height">52dp</dimen>
-  <dimen name="action_bar_height_with_status_bar_height">90dp</dimen> <!--38dp + 52dp 스테이스바 높이를 알 수 없어서 넉넉히 넣어준다.-->
+  <dimen name="action_bar_height_with_extra_space">90dp</dimen> <!--38dp + 52dp 스테이스바 높이를 알 수 없어서 넉넉히 넣어준다.-->
 
   <dimen name="main_contents_weather_margin_top">90dp</dimen>  <!--38dp + 52dp-->