颜色优化

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         tools:ignore="GoogleAppIndexingWarning"
         android:allowBackup="false">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.TabActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -37,6 +37,10 @@
         <activity android:name=".ui.mine.login.forget.ForgetActivity"
             android:theme="@style/TextInputStyle"
             android:screenOrientation="portrait"/>
+
+        <activity android:name=".ui.mine.MineActivity"
+            android:theme="@style/TextInputStyle"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

app/src/main/java/com/itant/shibei/ui/TabActivity.java

@@ -0,0 +1,69 @@
+package com.itant.shibei.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+
+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.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.miekir.common.adapter.TabFragmentAdapter;
+import com.miekir.common.utils.ViewTool;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TabActivity extends BaseShiBeiActivity implements View.OnClickListener {
+
+    @Override
+    public int getLayoutID() {
+        return R.layout.activity_tab;
+    }
+
+    @Override
+    public void initViews(Bundle savedInstanceState) {
+        String[] titles = {"返利", "好券", "模板"};
+        List<Fragment> fragments = new ArrayList<>();
+        fragments.add(new GoodsFragment());
+        fragments.add(new TemplateFragment(FunctionFragment.TEMPLATE_TYPE_BONUS));
+        fragments.add(new TemplateFragment(FunctionFragment.TEMPLATE_TYPE_TEMPLATE));
+
+        ViewPager vp_main = findViewById(R.id.vp_main);
+        TabFragmentAdapter adapter = new TabFragmentAdapter(getSupportFragmentManager(), fragments);
+        vp_main.setAdapter(adapter);
+        vp_main.setOffscreenPageLimit(titles.length);
+        //vp_home.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+
+        SlidingTabLayout stl_home = findViewById(R.id.stl_home);
+        stl_home.setViewPager(vp_main, titles);
+
+        ViewTool.setOnClickListener(this, new int[]{R.id.rl_search_top, R.id.rl_more}, this);
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.rl_more:
+                startActivity(new Intent(this, MineActivity.class));
+                break;
+            default:
+                break;
+        }
+    }
+}

app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java

@@ -0,0 +1,56 @@
+package com.itant.shibei.ui.mine;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.itant.shibei.R;
+import com.itant.shibei.base.BaseShiBeiActivity;
+import com.itant.shibei.tool.SystemTool;
+import com.itant.shibei.ui.mine.login.LoginActivity;
+import com.itant.shibei.ui.mine.login.UserInfoManager;
+import com.miekir.common.utils.ViewTool;
+
+public class MineActivity extends BaseShiBeiActivity implements View.OnClickListener {
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.ll_about:
+                startActivity(new Intent(this, AboutActivity.class));
+                break;
+
+            case R.id.ll_user:
+                if (!UserInfoManager.getInstance().isLogin()) {
+                    // 未登录，跳转登录
+                    startActivity(new Intent(this, LoginActivity.class));
+                } else {
+                    // 退出登录对话框
+                }
+                break;
+
+            case R.id.ll_feedback:
+                SystemTool.sendEmail(this);
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public int getLayoutID() {
+        return R.layout.fragment_mine;
+    }
+
+    @Override
+    public void initViews(Bundle savedInstanceState) {
+        setTitle("我的");
+        ViewTool.setOnClickListener(this, new int[]{R.id.ll_about, R.id.ll_user, R.id.ll_feedback}, this);
+    }
+}

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>

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

@@ -16,7 +16,7 @@
     <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/margin_ss"/>
-            <solid android:color="@color/black_standard"/>
+            <solid android:color="@color/black_theme"/>
         </shape>
     </item>
 </selector>

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

@@ -0,0 +1,123 @@
+<?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">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <!--android:theme="@style/AppTheme.AppBarOverlay"-->
+
+        <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">
+            <ImageView
+                android:layout_width="@dimen/size_icon_big"
+                android:layout_height="@dimen/size_icon_big"
+                android:layout_gravity="center_vertical"
+                android:scaleType="fitXY"
+                android:src="@mipmap/logo_gray"
+                android:tint="@color/black_theme" />
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="拾贝"
+                android:textStyle="bold"
+                android:textColor="@color/black_theme"
+                android:textSize="@dimen/size_title"
+                android:layout_marginLeft="@dimen/margin_s"/>
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+            <RelativeLayout
+                android:id="@+id/rl_search_top"
+                android:layout_width="@dimen/height_edit_text"
+                android:layout_height="@dimen/height_sliding_tab"
+                android:background="?attr/selectableItemBackgroundBorderless">
+                <!--无边界波纹-->
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:src="@drawable/ic_search"
+                    android:tint="@color/black_theme" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/rl_more"
+                android:layout_width="@dimen/height_edit_text"
+                android:layout_height="@dimen/height_sliding_tab"
+                android:background="?attr/selectableItemBackgroundBorderless">
+                <!--无边界波纹-->
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_more_vert"
+                    android:tint="@color/black_theme"
+                    android:layout_centerInParent="true"/>
+            </RelativeLayout>
+        </LinearLayout>
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:background="@color/colorPrimary">
+
+            <com.flyco.tablayout.SlidingTabLayout
+                android:id="@+id/stl_home"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="@dimen/height_sliding_tab"
+                android:layout_gravity="center_horizontal"
+                app:tl_iconVisible="false"
+                app:tl_indicator_bounce_enable="false"
+                app:tl_indicator_color="@color/black"
+                app:tl_indicator_height="3dp"
+                app:tl_indicator_width="10dp"
+                app:tl_tab_width="44dp"
+                app:tl_textBold="NONE"
+                app:tl_textSelectColor="@color/black"
+                app:tl_textUnselectColor="@color/colorTextSecondary"
+                app:tl_textsize="@dimen/text_normal"
+                app:tl_indicator_margin_bottom="@dimen/margin_s"
+                android:layout_marginStart="@dimen/margin_s"
+                android:layout_marginEnd="@dimen/margin_default"/>
+
+            <RelativeLayout
+                android:id="@+id/rl_search"
+                android:layout_width="@dimen/height_edit_text"
+                android:layout_height="@dimen/height_sliding_tab"
+                android:background="?attr/selectableItemBackgroundBorderless">
+                <!--无边界波纹-->
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_search"
+                    android:tint="@color/black_theme"
+                    android:layout_centerInParent="true"/>
+            </RelativeLayout>
+
+        </LinearLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/vp_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -7,6 +7,7 @@
     android:orientation="vertical"
     android:background="@color/colorPrimary">
 
+    <include layout="@layout/view_toolbar"/>
 
     <LinearLayout
         android:id="@+id/ll_user"

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

@@ -93,7 +93,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black_standard"
+                        android:textColor="@color/black_theme"
                         android:textSize="@dimen/text_normal"
                         android:textStyle="bold"
                         android:text=" - "/>
@@ -119,7 +119,7 @@
                         android:layout_width="0dp"
                         android:layout_weight="1"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/black_standard"
+                        android:textColor="@color/black_theme"
                         android:textSize="@dimen/text_normal"
                         android:singleLine="true"
                         android:ellipsize="marquee"