詹子聪 6 лет назад
Родитель
Сommit
665c3c5853

+ 24 - 17
app/src/main/AndroidManifest.xml

@@ -3,15 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.itant.shibei">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning"
-        android:allowBackup="false">
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".ui.TabActivity"
             android:label="@string/app_name"
@@ -23,24 +23,31 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.mine.AboutActivity"
-            android:theme="@style/BackTheme"
-            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.mine.AboutActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/BackTheme" />
 
-        <activity android:name=".ui.mine.login.LoginActivity"
-            android:theme="@style/TextInputStyle"
-            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.mine.login.LoginActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/TextInputStyle" />
 
-        <activity android:name=".ui.mine.login.register.RegisterActivity"
-            android:theme="@style/TextInputStyle"
-            android:screenOrientation="portrait"/>
-        <activity android:name=".ui.mine.login.forget.ForgetActivity"
+        <activity
+            android:name=".ui.mine.login.register.RegisterActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/TextInputStyle"
-            android:screenOrientation="portrait"/>
+            android:windowSoftInputMode="stateVisible|adjustResize" />
 
-        <activity android:name=".ui.mine.MineActivity"
-            android:theme="@style/TextInputStyle"
-            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.mine.login.forget.ForgetActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/TextInputStyle" />
+
+        <activity
+            android:name=".ui.mine.MineActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/TextInputStyle" />
     </application>
 
 </manifest>

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

@@ -2,35 +2,22 @@ package com.itant.shibei.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.navigation.NavController;
 import androidx.viewpager.widget.ViewPager;
 
 import com.flyco.tablayout.SlidingTabLayout;
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.bottomnavigation.BottomNavigationView;
-import com.google.android.material.bottomnavigation.LabelVisibilityMode;
 import com.itant.shibei.R;
-import com.itant.shibei.adapter.FragmentPagerItemAdapter;
 import com.itant.shibei.base.BaseShiBeiActivity;
 import com.itant.shibei.ui.function.FunctionFragment;
 import com.itant.shibei.ui.function.template.TemplateFragment;
 import com.itant.shibei.ui.home.GoodsFragment;
-import com.itant.shibei.ui.home.HomeFragment;
 import com.itant.shibei.ui.mine.MineActivity;
-import com.itant.shibei.ui.mine.MineFragment;
 import com.itant.shibei.widget.AppbarTranslateListener;
 import com.miekir.common.adapter.TabFragmentAdapter;
 import com.miekir.common.utils.ViewTool;
-import com.socks.library.KLog;
-import com.socks.library.KLogUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,14 +49,15 @@ public class TabActivity extends BaseShiBeiActivity implements View.OnClickListe
 
         ViewTool.setOnClickListener(this, new int[]{R.id.rl_search_top, R.id.rl_more}, this);
 
-        double mDefaultImageSize = getResources().getDimension(R.dimen.size_image_s);
+        double defaultImageSize = getResources().getDimension(R.dimen.size_image_s);
+        double defaultWidth = getResources().getDimension(R.dimen.height_edit_text);
         View rl_search = findViewById(R.id.rl_search);
         View iv_search = findViewById(R.id.iv_search);
         View rl_search_top = findViewById(R.id.rl_search_top);
         View iv_search_top = findViewById(R.id.iv_search_top);
-
+        // 搜索图标动画
         AppBarLayout abl_main = findViewById(R.id.abl_main);
-        AppbarTranslateListener listener = new AppbarTranslateListener(mDefaultImageSize,
+        AppbarTranslateListener listener = new AppbarTranslateListener(defaultWidth, defaultImageSize,
                 rl_search_top, iv_search_top, rl_search, iv_search);
         abl_main.addOnOffsetChangedListener(listener);
     }

+ 4 - 1
app/src/main/java/com/itant/shibei/widget/AppbarTranslateListener.java

@@ -18,6 +18,7 @@ public class AppbarTranslateListener implements AppBarLayout.OnOffsetChangedList
     private static final int STATUS_MOVE = 3;
 
     private double mDefaultImageSize;
+    private double mDefaultWidth;
     /**
      * 1. 完全关闭 2. 完全打开 3.运动中
      */
@@ -30,7 +31,9 @@ public class AppbarTranslateListener implements AppBarLayout.OnOffsetChangedList
 
     private long mLastAnimateMillis;
 
-    public AppbarTranslateListener(double defaultImageSize, View rl_search_top, View iv_search_top, View rl_search, View iv_search) {
+    public AppbarTranslateListener(double defaultWidth, double defaultImageSize, View rl_search_top,
+                                   View iv_search_top, View rl_search, View iv_search) {
+        mDefaultWidth = defaultWidth;
         mDefaultImageSize = defaultImageSize;
         this.rl_search = rl_search;
         this.rl_search_top = rl_search_top;

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,13 +10,15 @@
         android:id="@+id/abl_main">
         <!--android:theme="@style/AppTheme.AppBarOverlay"-->
 
+        <!--android:minHeight="?actionBarSize"水波纹居中和gravity属性有关-->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?actionBarSize"
             android:paddingStart="@dimen/margin_default"
             android:orientation="horizontal"
-            app:layout_scrollFlags="scroll|enterAlways|snap">
+            app:layout_scrollFlags="scroll|enterAlways|snap"
+            android:gravity="center_vertical">
             <ImageView
                 android:layout_width="@dimen/size_icon_big"
                 android:layout_height="@dimen/size_icon_big"
@@ -28,10 +29,11 @@
             <TextView
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
                 android:text="拾贝"
                 android:textStyle="bold"
+                android:layout_gravity="center_vertical"
                 android:textColor="@color/black_theme"
                 android:textSize="@dimen/size_title"
                 android:layout_marginLeft="@dimen/margin_s"/>