소스 검색

高度增加

詹子聪 6 년 전
부모
커밋
eefbfb6463

+ 1 - 1
app/src/main/java/com/itant/shibei/ui/TabActivity.java

@@ -51,7 +51,7 @@ public class TabActivity extends BaseShiBeiActivity implements View.OnClickListe
         ViewTool.setOnClickListener(this, new int[]{R.id.rl_search,
                 R.id.rl_search_top, R.id.rl_search_top_shadow, R.id.rl_more}, this);
 
-        double defaultHeight = getResources().getDimension(R.dimen.height_sliding_tab);
+        double defaultHeight = getResources().getDimension(R.dimen.margin_default);
         double defaultWidth = getResources().getDimension(R.dimen.height_edit_text);
 
         View rl_search_top = findViewById(R.id.rl_search_top);

+ 7 - 6
app/src/main/java/com/itant/shibei/widget/AppbarTranslateListener.java

@@ -1,5 +1,6 @@
 package com.itant.shibei.widget;
 
+import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.view.View;
@@ -116,14 +117,14 @@ public class AppbarTranslateListener implements AppBarLayout.OnOffsetChangedList
         ObjectAnimator tranXAnim = ObjectAnimator.ofFloat(rl_search_top, "translationX", (float) (mDefaultWidth*fraction));
         tranXAnim.setDuration(0);
         // 纵向移动
-        //ObjectAnimator tranYAnim = ObjectAnimator.ofFloat(rl_search_top, "translationY", (float) (mDefaultHeight*fraction));
-        //tranYAnim.setDuration(0);
+        ObjectAnimator tranYAnim = ObjectAnimator.ofFloat(rl_search_top, "translationY", (float) (-mDefaultHeight*fraction));
+        tranYAnim.setDuration(0);
 
-        tranXAnim.start();
+        //tranXAnim.start();
 
         // 一起做运动
-        //AnimatorSet set = new AnimatorSet();
-        //set.playTogether(tranXAnim, tranYAnim);
-        //set.start();
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(tranXAnim, tranYAnim);
+        set.start();
     }
 }

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

@@ -15,11 +15,12 @@
         <!--android:minHeight="?actionBarSize"水波纹居中和gravity属性有关-->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/height_sliding_tab"
+            android:layout_height="64dp"
             android:paddingStart="@dimen/margin_default"
             android:orientation="horizontal"
             app:layout_scrollFlags="scroll|enterAlways|snap"
-            android:gravity="center_vertical">
+            android:gravity="center_vertical"
+            android:paddingTop="@dimen/margin_default">
             <ImageView
                 android:layout_width="@dimen/size_icon_big"
                 android:layout_height="@dimen/size_icon_big"