Главная Обзор Помощь
Вход
APP_World
/
ShiBei
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

界面优化

詹子聪 5 лет назад
Родитель
edb732aede
Сommit
9017949727
23 измененных файлов с 354 добавлено и 390 удалено
Разделённый вид Показать статистику Diff
  1. 5 0
      app/src/main/AndroidManifest.xml
  2. 0 3
      app/src/main/assets/clock/clock_local.html
  3. 0 6
      app/src/main/assets/clock/clock_local_web.html
  4. 0 3
      app/src/main/assets/clock/clock_online.html
  5. 0 11
      app/src/main/assets/clock/code_snippet.txt
  6. 0 29
      app/src/main/assets/clock/honehone_clock_tr.js
  7. BIN
      app/src/main/assets/clock/honehone_clock_tr.swf
  8. 0 29
      app/src/main/assets/clock/honehone_clock_wh.js
  9. BIN
      app/src/main/assets/clock/honehone_clock_wh.swf
  10. 1 3
      app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java
  11. 5 7
      app/src/main/java/com/itant/shibei/ui/mine/login/LoginActivity.java
  12. 0 22
      app/src/main/java/com/itant/shibei/ui/mine/login/forget/ForgetActivity.java
  13. 42 0
      app/src/main/java/com/itant/shibei/ui/mine/login/register/FillDataActivity.java
  14. 6 25
      app/src/main/java/com/itant/shibei/ui/mine/login/register/RegisterActivity.java
  15. 5 5
      app/src/main/res/drawable/selector_btn.xml
  16. 109 0
      app/src/main/res/layout/activity_fill_data.xml
  17. 70 52
      app/src/main/res/layout/activity_forget.xml
  18. 23 24
      app/src/main/res/layout/activity_login.xml
  19. 14 45
      app/src/main/res/layout/activity_mine.xml
  20. 63 117
      app/src/main/res/layout/activity_register.xml
  21. 1 1
      app/src/main/res/layout/activity_tab.xml
  22. 9 8
      app/src/main/res/layout/view_toolbar.xml
  23. 1 0
      app/src/main/res/values/dimens.xml

+ 5 - 0
app/src/main/AndroidManifest.xml
Просмотреть файл 

@@ -37,6 +37,11 @@
 
             android:theme="@style/TextInputStyle"
 
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
 
+        <activity
 
+            android:name=".ui.mine.login.register.FillDataActivity"
 
+            android:screenOrientation="portrait"
 
+            android:theme="@style/TextInputStyle" />
 
+
 
         <activity
 
             android:name=".ui.mine.login.forget.ForgetActivity"
 
             android:screenOrientation="portrait"

+ 0 - 3
app/src/main/assets/clock/clock_local.html
Просмотреть файл 

@@ -1,3 +0,0 @@
 
-<html>
 
-<script charset="Shift_JIS" src="file:///android_asset/clock/honehone_clock_tr.js"></script>
 
-<html>

+ 0 - 6
app/src/main/assets/clock/clock_local_web.html
Просмотреть файл 

@@ -1,6 +0,0 @@
 
-<html>
 
-<script charset="Shift_JIS" src="./honehone_clock_tr.js"></script>
 
-</p>
 
-</p>
 
-<script charset="Shift_JIS" src="./honehone_clock_wh.js"></script>
 
-<html>

+ 0 - 3
app/src/main/assets/clock/clock_online.html
Просмотреть файл 

@@ -1,3 +0,0 @@
 
-<html>
 
-<script charset="Shift_JIS" src="http://chabudai.sakura.ne.jp/blogparts/honehoneclock/honehone_clock_tr.js"></script>
 
-<html>

+ 0 - 11
app/src/main/assets/clock/code_snippet.txt
Просмотреть файл 

@@ -1,11 +0,0 @@
 
-WebView  wv_clock = findViewById(R.id.wv_clock);
 
-WebSettings webSettings = wv_clock.getSettings();
 
-wv_clock.getSettings().setJavaScriptEnabled(true);
 
-// 设置可以访问文件
 
-webSettings.setAllowFileAccess(true);
 
-webSettings.setAllowFileAccessFromFileURLs(true);
 
-webSettings.setAllowContentAccess(true);
 
-webSettings.setDomStorageEnabled(true);
 
-wv_clock.getSettings().setAllowFileAccessFromFileURLs(true);
 
-//js与android调用
 
-wv_clock.loadUrl("file:///android_asset/clock/clock_local.html");

+ 0 - 29
app/src/main/assets/clock/honehone_clock_tr.js
Просмотреть файл 

@@ -1,29 +0,0 @@
 
-/******************************************************************************
 
-	初期設定
 
-******************************************************************************/
 
-var swfUrl = "file:///android_asset/clock/honehone_clock_tr.swf";
 
-
 
-var swfTitle = "honehoneclock";
 
-
 
-// 実行
 
-LoadBlogParts();
 
-
 
-/******************************************************************************
 
-	入力		なし
 
-	出力		document.writeによるHTML出力
 
-******************************************************************************/
 
-function LoadBlogParts(){
 
-	var sUrl = swfUrl;
 
-	
-	var sHtml = "";
 
-	sHtml += '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="160" height="70" id="' + swfTitle + '" align="middle">';
 
-	sHtml += '<param name="allowScriptAccess" value="always" />';
 
-	sHtml += '<param name="movie" value="' + sUrl + '" />';
 
-	sHtml += '<param name="quality" value="high" />';
 
-	sHtml += '<param name="bgcolor" value="#ffffffff" />';
 
-	sHtml += '<param name="wmode" value="transparent" />';
 
-	sHtml += '<embed wmode="transparent" src="' + sUrl + '" quality="high" bgcolor="#ffffffff" width="160" height="70" name="' + swfTitle + '" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />';
 
-	sHtml += '</object>';
 
-	
-	document.write(sHtml);
 
-}

BIN
app/src/main/assets/clock/honehone_clock_tr.swf
Просмотреть файл


+ 0 - 29
app/src/main/assets/clock/honehone_clock_wh.js
Просмотреть файл 

@@ -1,29 +0,0 @@
 
-/******************************************************************************
 
-	初期設定
 
-******************************************************************************/
 
-var swfUrl = "./honehone_clock_wh.swf";
 
-
 
-var swfTitle = "honehoneclock";
 
-
 
-// 実行
 
-LoadBlogParts();
 
-
 
-/******************************************************************************
 
-	入力		なし
 
-	出力		document.writeによるHTML出力
 
-******************************************************************************/
 
-function LoadBlogParts(){
 
-	var sUrl = swfUrl;
 
-	
-	var sHtml = "";
 
-	sHtml += '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="160" height="70" id="' + swfTitle + '" align="middle">';
 
-	sHtml += '<param name="allowScriptAccess" value="always" />';
 
-	sHtml += '<param name="movie" value="' + sUrl + '" />';
 
-	sHtml += '<param name="quality" value="high" />';
 
-	sHtml += '<param name="bgcolor" value="#ffffff" />';
 
-	sHtml += '<param name="wmode" value="transparent" />';
 
-	sHtml += '<embed wmode="transparent" src="' + sUrl + '" quality="high" bgcolor="#ffffff" width="160" height="70" name="' + swfTitle + '" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />';
 
-	sHtml += '</object>';
 
-	
-	document.write(sHtml);
 
-}

BIN
app/src/main/assets/clock/honehone_clock_wh.swf
Просмотреть файл


+ 1 - 3
app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java
Просмотреть файл 

@@ -3,7 +3,6 @@ package com.itant.shibei.ui.mine;
 
 import android.content.Intent;
 
 import android.os.Bundle;
 
 import android.view.View;
 
-import android.widget.TextView;
 
 
 import com.itant.shibei.R;
 
 import com.itant.shibei.base.BaseShiBeiActivity;
 
@@ -45,9 +44,8 @@ public class MineActivity extends BaseShiBeiActivity implements View.OnClickList
 
 
     @Override
 
     public void initViews(Bundle savedInstanceState) {
 
+        // todo 主人换为昵称
 
         setTitle(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), "主人"));
 
-        TextView tv_hello = findViewById(R.id.tv_hello);
 
-        //tv_hello.setText(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), "主人"));
 
 
 
         ViewTool.setOnClickListener(this, new int[]{R.id.ll_user, R.id.ll_feedback}, this);

+ 5 - 7
app/src/main/java/com/itant/shibei/ui/mine/login/LoginActivity.java
Просмотреть файл 

@@ -14,7 +14,6 @@ import com.itant.shibei.base.BaseShiBeiActivity;
 
 import com.itant.shibei.ui.mine.login.forget.ForgetActivity;
 
 import com.itant.shibei.ui.mine.login.register.RegisterActivity;
 
 import com.miekir.common.utils.ViewTool;
 
-import com.miekir.mvp.view.BaseMVPActivity;
 
 
 /**
 
  * @author 詹子聪
 
@@ -35,14 +34,16 @@ public class LoginActivity extends BaseShiBeiActivity implements View.OnClickLis
 
 
     @Override
 
     public void initViews(Bundle savedInstanceState) {
 
-        setTitle("登录");
 
+        setTitle("使用电子邮箱登录");
 
         //setOnDoneListener(this);
 
-        ViewTool.setOnClickListener(this, new int[]{R.id.tv_register, R.id.tv_forget}, this);
 
+        ViewTool.setOnClickListener(this, new int[]{R.id.tv_forget}, this);
 
     }
 
 
     @Override
 
     public boolean onCreateOptionsMenu(Menu menu) {
 
         getMenuInflater().inflate(R.menu.menu_done, menu);
 
+        MenuItem item = menu.findItem(R.id.action_done);
 
+        item.setTitle("  注册账号  ");
 
         return super.onCreateOptionsMenu(menu);
 
     }
 
 
@@ -50,7 +51,7 @@ public class LoginActivity extends BaseShiBeiActivity implements View.OnClickLis
 
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
         switch (item.getItemId()) {
 
             case R.id.action_done:
 
-                finish();
 
+                startActivity(new Intent(this, RegisterActivity.class));
 
                 break;
 
             default:
 
                 break;
 
@@ -61,9 +62,6 @@ public class LoginActivity extends BaseShiBeiActivity implements View.OnClickLis
 
     @Override
 
     public void onClick(View v) {
 
         switch (v.getId()) {
 
-            case R.id.tv_register:
 
-                startActivity(new Intent(this, RegisterActivity.class));
 
-                break;
 
             case R.id.tv_forget:
 
                 startActivity(new Intent(this, ForgetActivity.class));
 
                 break;

+ 0 - 22
app/src/main/java/com/itant/shibei/ui/mine/login/forget/ForgetActivity.java
Просмотреть файл 

@@ -1,11 +1,8 @@
 
 package com.itant.shibei.ui.mine.login.forget;
 
 
 import android.os.Bundle;
 
-import android.view.Menu;
 
-import android.view.MenuItem;
 
 import android.view.View;
 
 
-import androidx.annotation.NonNull;
 
 import androidx.annotation.Nullable;
 
 
 import com.itant.shibei.R;
 
@@ -33,25 +30,6 @@ public class ForgetActivity extends BaseShiBeiActivity implements View.OnClickLi
 
         setTitle("重置密码");
 
     }
 
 
-    @Override
 
-    public boolean onCreateOptionsMenu(Menu menu) {
 
-        getMenuInflater().inflate(R.menu.menu_done, menu);
 
-        //MenuItem item = menu.findItem(R.id.action_done);
 
-        //item.setTitle("重置完成");
 
-        return super.onCreateOptionsMenu(menu);
 
-    }
 
-
 
-    @Override
 
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
-        switch (item.getItemId()) {
 
-            case R.id.action_done:
 
-                finish();
 
-                break;
 
-            default:
 
-                break;
 
-        }
 
-        return super.onOptionsItemSelected(item);
 
-    }
 
 
     @Override
 
     public void onClick(View v) {

+ 42 - 0
app/src/main/java/com/itant/shibei/ui/mine/login/register/FillDataActivity.java
Просмотреть файл 

@@ -0,0 +1,42 @@
 
+package com.itant.shibei.ui.mine.login.register;
 
+
 
+import android.os.Bundle;
 
+import android.view.View;
 
+
 
+import androidx.annotation.Nullable;
 
+
 
+import com.itant.shibei.R;
 
+import com.itant.shibei.base.BaseShiBeiActivity;
 
+
 
+/**
 
+ * @author 詹子聪
 
+ * @date 2020/6/18 16:48
 
+ * Description: 完善资料界面
 
+ */
 
+public class FillDataActivity extends BaseShiBeiActivity implements View.OnClickListener {
 
+    @Override
 
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
 
+        super.onCreate(savedInstanceState);
 
+        findViewById(R.id.btn_finish).setOnClickListener(v -> {
 
+            finish();
 
+        });
 
+    }
 
+
 
+    @Override
 
+    public int getLayoutID() {
 
+        return R.layout.activity_fill_data;
 
+    }
 
+
 
+    @Override
 
+    public void initViews(Bundle savedInstanceState) {
 
+        setTitle("完善提现资料");
 
+    }
 
+
 
+    @Override
 
+    public void onClick(View v) {
 
+        switch (v.getId()) {
 
+            default:
 
+                break;
 
+        }
 
+    }
 
+}

+ 6 - 25
app/src/main/java/com/itant/shibei/ui/mine/login/register/RegisterActivity.java
Просмотреть файл 

@@ -1,11 +1,9 @@
 
 package com.itant.shibei.ui.mine.login.register;
 
 
+import android.content.Intent;
 
 import android.os.Bundle;
 
-import android.view.Menu;
 
-import android.view.MenuItem;
 
 import android.view.View;
 
 
-import androidx.annotation.NonNull;
 
 import androidx.annotation.Nullable;
 
 
 import com.itant.shibei.R;
 
@@ -20,7 +18,10 @@ public class RegisterActivity extends BaseShiBeiActivity implements View.OnClick
 
     @Override
 
     protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
 
-
 
+        findViewById(R.id.btn_next).setOnClickListener(v -> {
 
+            startActivity(new Intent(RegisterActivity.this, FillDataActivity.class));
 
+            finish();
 
+        });
 
     }
 
 
     @Override
 
@@ -30,27 +31,7 @@ public class RegisterActivity extends BaseShiBeiActivity implements View.OnClick
 
 
     @Override
 
     public void initViews(Bundle savedInstanceState) {
 
-        setTitle("注册");
 
-    }
 
-
 
-    @Override
 
-    public boolean onCreateOptionsMenu(Menu menu) {
 
-        getMenuInflater().inflate(R.menu.menu_done, menu);
 
-        //MenuItem item = menu.findItem(R.id.action_done);
 
-        //item.setTitle("完成注册");
 
-        return super.onCreateOptionsMenu(menu);
 
-    }
 
-
 
-    @Override
 
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
-        switch (item.getItemId()) {
 
-            case R.id.action_done:
 
-                finish();
 
-                break;
 
-            default:
 
-                break;
 
-        }
 
-        return super.onOptionsItemSelected(item);
 
+        setTitle("使用电子邮箱注册");
 
     }
 
 
     @Override

+ 5 - 5
app/src/main/res/drawable/selector_btn.xml
Просмотреть файл 

@@ -3,20 +3,20 @@
 
     <item android:state_pressed="true">
 
         <shape android:shape="rectangle">
 
             <corners android:radius="@dimen/margin_ss"/>
 
-            <solid android:color="@color/black_title"/>
 
+            <solid android:color="@color/green_pressed"/>
 
         </shape>
 
     </item>
 
 
-    <item android:state_enabled="false">
 
+    <!--<item android:state_enabled="false">
 
         <shape android:shape="rectangle">
 
             <corners android:radius="@dimen/margin_ss"/>
 
-            <solid android:color="@color/black_title"/>
 
+            <solid android:color="@color/green_logo"/>
 
         </shape>
 
-    </item>
 
+    </item>-->
 
     <item>
 
         <shape android:shape="rectangle">
 
             <corners android:radius="@dimen/margin_ss"/>
 
-            <solid android:color="@color/black_theme"/>
 
+            <solid android:color="@color/green_logo"/>
 
         </shape>
 
     </item>
 
 </selector>

+ 109 - 0
app/src/main/res/layout/activity_fill_data.xml
Просмотреть файл 

@@ -0,0 +1,109 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="match_parent"
 
+    android:background="@color/colorPrimary"
 
+    android:fitsSystemWindows="true"
 
+    android:focusable="true"
 
+    android:focusableInTouchMode="true"
 
+    android:orientation="vertical">
 
+    <!--启用深色模式之后，需要使用fitsSystemWindows来不让布局上滑-->
 
+
 
+    <include layout="@layout/view_toolbar" />
 
+    <!--阴影效果android:background="?android:attr/listDivider"-->
 
+
 
+
 
+    <com.google.android.material.textfield.TextInputLayout
 
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:layout_marginStart="@dimen/margin_default"
 
+        android:layout_marginTop="@dimen/margin_default"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:hint="请设置密码"
 
+        app:boxBackgroundMode="outline"
 
+        app:boxCornerRadiusBottomEnd="4dp"
 
+        app:boxCornerRadiusBottomStart="4dp"
 
+        app:boxCornerRadiusTopEnd="4dp"
 
+        app:boxCornerRadiusTopStart="4dp"
 
+        app:boxStrokeWidth="@dimen/width_stroke"
 
+        app:boxStrokeWidthFocused="@dimen/width_stroke">
 
+
 
+        <com.google.android.material.textfield.TextInputEditText
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            android:inputType="textPassword"
 
+            android:maxLength="20"
 
+            android:textSize="@dimen/text_normal_s" />
 
+
 
+    </com.google.android.material.textfield.TextInputLayout>
 
+
 
+
 
+    <com.google.android.material.textfield.TextInputLayout
 
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:layout_marginStart="@dimen/margin_default"
 
+        android:layout_marginTop="@dimen/margin_default"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:hint="请输入昵称"
 
+        app:boxBackgroundMode="outline"
 
+        app:boxCornerRadiusBottomEnd="4dp"
 
+        app:boxCornerRadiusBottomStart="4dp"
 
+        app:boxCornerRadiusTopEnd="4dp"
 
+        app:boxCornerRadiusTopStart="4dp"
 
+        app:boxStrokeWidth="@dimen/width_stroke"
 
+        app:boxStrokeWidthFocused="@dimen/width_stroke">
 
+
 
+        <com.google.android.material.textfield.TextInputEditText
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            android:inputType="textEmailAddress"
 
+            android:maxLength="50"
 
+            android:textSize="@dimen/text_normal_s" />
 
+    </com.google.android.material.textfield.TextInputLayout>
 
+
 
+    <com.google.android.material.textfield.TextInputLayout
 
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:layout_marginStart="@dimen/margin_default"
 
+        android:layout_marginTop="@dimen/margin_default"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:hint="请输入提现账号(目前仅支持支付宝)"
 
+        app:boxBackgroundMode="outline"
 
+        app:boxCornerRadiusBottomEnd="4dp"
 
+        app:boxCornerRadiusBottomStart="4dp"
 
+        app:boxCornerRadiusTopEnd="4dp"
 
+        app:boxCornerRadiusTopStart="4dp"
 
+        app:boxStrokeWidth="@dimen/width_stroke"
 
+        app:boxStrokeWidthFocused="@dimen/width_stroke">
 
+
 
+        <com.google.android.material.textfield.TextInputEditText
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            android:inputType="textEmailAddress"
 
+            android:maxLength="50"
 
+            android:textSize="@dimen/text_normal_s" />
 
+    </com.google.android.material.textfield.TextInputLayout>
 
+
 
+    <android.widget.Button
 
+        android:id="@+id/btn_finish"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:minHeight="0dp"
 
+        android:layout_marginTop="@dimen/margin_default"
 
+        android:layout_marginStart="@dimen/margin_default"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:paddingTop="@dimen/padding_full_width"
 
+        android:paddingBottom="@dimen/padding_full_width"
 
+        android:text="完成注册  购物返利"
 
+        android:textColor="@color/white"
 
+        android:textStyle="bold"
 
+        android:background="@drawable/selector_btn"
 
+        style="?android:attr/borderlessButtonStyle"/>
 
+
 
+
 
+
 
+</LinearLayout>

+ 70 - 52
app/src/main/res/layout/activity_forget.xml
Просмотреть файл 

@@ -5,117 +5,135 @@
 
     android:layout_height="match_parent"
 
     android:background="@color/colorPrimary"
 
     android:fitsSystemWindows="true"
 
-    android:orientation="vertical"
 
     android:focusable="true"
 
-    android:focusableInTouchMode="true">
 
+    android:focusableInTouchMode="true"
 
+    android:orientation="vertical">
 
     <!--启用深色模式之后，需要使用fitsSystemWindows来不让布局上滑-->
 
 
     <include layout="@layout/view_toolbar" />
 
     <!--阴影效果android:background="?android:attr/listDivider"-->
 
 
-    <FrameLayout
 
+
 
+    <com.google.android.material.textfield.TextInputLayout
 
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
+        android:layout_marginStart="@dimen/margin_default"
 
         android:layout_marginTop="@dimen/margin_default"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:hint="请输入邮箱"
 
+        app:boxBackgroundMode="outline"
 
+        app:boxCornerRadiusBottomEnd="4dp"
 
+        app:boxCornerRadiusBottomStart="4dp"
 
+        app:boxCornerRadiusTopEnd="4dp"
 
+        app:boxCornerRadiusTopStart="4dp"
 
+        app:boxStrokeWidth="@dimen/width_stroke"
 
+        app:boxStrokeWidthFocused="@dimen/width_stroke">
 
+
 
+        <com.google.android.material.textfield.TextInputEditText
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            android:inputType="textEmailAddress"
 
+            android:maxLength="50"
 
+            android:paddingEnd="90dp"
 
+            android:textSize="@dimen/text_normal_s" />
 
+    </com.google.android.material.textfield.TextInputLayout>
 
+
 
+
 
+    <FrameLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
         android:layout_marginStart="@dimen/margin_default"
 
+        android:layout_marginTop="@dimen/margin_default"
 
         android:layout_marginEnd="@dimen/margin_default">
 
+
 
         <com.google.android.material.textfield.TextInputLayout
 
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
             android:layout_width="match_parent"
 
             android:layout_height="wrap_content"
 
-            android:hint="请输入邮箱"
 
+            android:hint="邮箱验证码"
 
+            android:orientation="horizontal"
 
             app:boxBackgroundMode="outline"
 
             app:boxCornerRadiusBottomEnd="4dp"
 
             app:boxCornerRadiusBottomStart="4dp"
 
             app:boxCornerRadiusTopEnd="4dp"
 
             app:boxCornerRadiusTopStart="4dp"
 
             app:boxStrokeWidth="@dimen/width_stroke"
 
-            app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
+            app:boxStrokeWidthFocused="@dimen/width_stroke">
 
 
             <com.google.android.material.textfield.TextInputEditText
 
                 android:layout_width="match_parent"
 
                 android:layout_height="wrap_content"
 
-                android:paddingEnd="90dp"
 
-                android:textSize="@dimen/text_normal_s"
 
-                android:inputType="textEmailAddress"
 
-                android:maxLength="50"/>
 
+                android:digits="0123456789"
 
+                android:inputType="number"
 
+                android:maxLength="6"
 
+                android:textSize="@dimen/text_normal_s" />
 
+
 
         </com.google.android.material.textfield.TextInputLayout>
 
 
         <!--去除按钮阴影style="?android:attr/borderlessButtonStyle"-->
 
         <!--用android.widget.Button代替Button就不会有Material风格了，当前style下Button的background无效-->
 
         <android.widget.Button
 
+            style="?android:attr/borderlessButtonStyle"
 
             android:layout_width="@dimen/size_image_big"
 
-            android:minWidth="0dp"
 
             android:layout_height="match_parent"
 
-            android:textColor="@color/white"
 
-            android:minHeight="0dp"
 
-            android:paddingTop="@dimen/margin_ss"
 
-            android:layout_marginTop="9dp"
 
-            android:layout_marginBottom="@dimen/margin_ss"
 
-            android:paddingBottom="@dimen/margin_ss"
 
+            android:layout_gravity="end"
 
             android:layout_marginStart="@dimen/margin_ss"
 
+            android:layout_marginTop="9dp"
 
             android:layout_marginEnd="@dimen/margin_ss"
 
+            android:layout_marginBottom="@dimen/margin_ss"
 
+            android:elevation="0dp"
 
+            android:minWidth="0dp"
 
+            android:minHeight="0dp"
 
             android:paddingStart="@dimen/margin_ss"
 
+            android:paddingTop="@dimen/margin_ss"
 
             android:paddingEnd="@dimen/margin_ss"
 
+            android:paddingBottom="@dimen/margin_ss"
 
+            android:text="获取验证码"
 
+            android:textColor="@color/green_logo"
 
             android:textSize="@dimen/text_s"
 
-            android:text="验证码"
 
-            android:elevation="0dp"
 
-            style="?android:attr/borderlessButtonStyle"
 
-            android:background="@drawable/selector_btn"
 
-            android:layout_gravity="end"/>
 
+            android:textStyle="bold" />
 
     </FrameLayout>
 
 
 
     <com.google.android.material.textfield.TextInputLayout
 
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
         android:layout_marginStart="@dimen/margin_default"
 
-        android:layout_marginEnd="@dimen/margin_default"
 
         android:layout_marginTop="@dimen/margin_default"
 
-        android:hint="邮箱验证码"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:hint="请设置密码"
 
         app:boxBackgroundMode="outline"
 
         app:boxCornerRadiusBottomEnd="4dp"
 
         app:boxCornerRadiusBottomStart="4dp"
 
         app:boxCornerRadiusTopEnd="4dp"
 
         app:boxCornerRadiusTopStart="4dp"
 
         app:boxStrokeWidth="@dimen/width_stroke"
 
-        app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
-        android:orientation="horizontal">
 
+        app:boxStrokeWidthFocused="@dimen/width_stroke">
 
 
         <com.google.android.material.textfield.TextInputEditText
 
             android:layout_width="match_parent"
 
             android:layout_height="wrap_content"
 
-            android:inputType="number"
 
-            android:digits="0123456789"
 
-            android:textSize="@dimen/text_normal_s"
 
-            android:maxLength="6"/>
 
+            android:inputType="textPassword"
 
+            android:maxLength="20"
 
+            android:textSize="@dimen/text_normal_s" />
 
 
     </com.google.android.material.textfield.TextInputLayout>
 
 
-    <com.google.android.material.textfield.TextInputLayout
 
+
 
+    <android.widget.Button
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
+        android:minHeight="0dp"
 
+        android:layout_marginTop="@dimen/margin_default"
 
         android:layout_marginStart="@dimen/margin_default"
 
         android:layout_marginEnd="@dimen/margin_default"
 
-        android:layout_marginTop="@dimen/margin_default"
 
-        android:hint="请设置密码"
 
-        app:boxBackgroundMode="outline"
 
-        app:boxCornerRadiusBottomEnd="4dp"
 
-        app:boxCornerRadiusBottomStart="4dp"
 
-        app:boxCornerRadiusTopEnd="4dp"
 
-        app:boxCornerRadiusTopStart="4dp"
 
-        app:boxStrokeWidth="@dimen/width_stroke"
 
-        app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
-
 
-        <com.google.android.material.textfield.TextInputEditText
 
-            android:layout_width="match_parent"
 
-            android:layout_height="wrap_content"
 
-            android:inputType="textPassword"
 
-            android:textSize="@dimen/text_normal_s"
 
-            android:maxLength="20"/>
 
-
 
-    </com.google.android.material.textfield.TextInputLayout>
 
-
 
+        android:paddingTop="@dimen/padding_full_width"
 
+        android:paddingBottom="@dimen/padding_full_width"
 
+        android:text="立即重设密码"
 
+        android:textColor="@color/white"
 
+        android:textStyle="bold"
 
+        android:background="@drawable/selector_btn"
 
+        style="?android:attr/borderlessButtonStyle"/>
 
 </LinearLayout>

+ 23 - 24
app/src/main/res/layout/activity_login.xml
Просмотреть файл 

@@ -63,33 +63,32 @@
 
 
     </com.google.android.material.textfield.TextInputLayout>
 
 
-    <RelativeLayout
 
+    <TextView
 
+        android:id="@+id/tv_forget"
 
+        android:layout_width="wrap_content"
 
+        android:layout_height="wrap_content"
 
+        android:layout_marginTop="@dimen/margin_message"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:text="忘记密码"
 
+        android:textColor="@color/gray_hint"
 
+        android:textStyle="bold"
 
+        android:textSize="@dimen/text_s"
 
+        android:background="?attr/selectableItemBackground"
 
+        android:layout_gravity="end"/>
 
+
 
+    <android.widget.Button
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
-        android:layout_marginTop="@dimen/margin_s"
 
+        android:minHeight="0dp"
 
+        android:layout_marginTop="@dimen/margin_message"
 
         android:layout_marginStart="@dimen/margin_default"
 
         android:layout_marginEnd="@dimen/margin_default"
 
-        android:gravity="center_vertical">
 
-
 
-        <TextView
 
-            android:id="@+id/tv_forget"
 
-            android:layout_width="wrap_content"
 
-            android:layout_height="wrap_content"
 
-            android:text="忘记密码"
 
-            android:textColor="@color/gray_hint"
 
-            android:textStyle="bold"
 
-            android:textSize="@dimen/text_s"/>
 
-
 
-        <TextView
 
-            android:id="@+id/tv_register"
 
-            android:layout_width="wrap_content"
 
-            android:layout_height="wrap_content"
 
-            android:text="立即注册"
 
-            android:textColor="@color/black_theme"
 
-            android:textSize="@dimen/text_s"
 
-            android:textStyle="bold"
 
-            android:layout_alignParentEnd="true" />
 
-
 
-    </RelativeLayout>
 
+        android:paddingTop="@dimen/padding_full_width"
 
+        android:paddingBottom="@dimen/padding_full_width"
 
+        android:text="立即登录  购物返利"
 
+        android:textColor="@color/white"
 
+        android:textStyle="bold"
 
+        android:background="@drawable/selector_btn"
 
+        style="?android:attr/borderlessButtonStyle"/>
 
 
 </LinearLayout>

+ 14 - 45
app/src/main/res/layout/activity_mine.xml
Просмотреть файл 

@@ -9,20 +9,6 @@
 
 
     <include layout="@layout/view_toolbar"/>
 
 
-    <TextView
 
-        android:id="@+id/tv_hello"
 
-        android:layout_width="match_parent"
 
-        android:layout_height="wrap_content"
 
-        android:textStyle="bold"
 
-        android:textSize="@dimen/size_hello"
 
-        android:textColor="@color/black_standard"
 
-        android:paddingStart="@dimen/activity_horizontal_margin"
 
-        android:paddingEnd="@dimen/activity_horizontal_margin"
 
-        android:layout_marginTop="@dimen/width_indicator"
 
-        android:layout_marginBottom="@dimen/width_indicator"
 
-        android:visibility="gone"/>
 
-
 
-    <include layout="@layout/view_divider_common" />
 
     <LinearLayout
 
         android:id="@+id/ll_user"
 
         android:layout_width="match_parent"
 
@@ -96,9 +82,9 @@
 
             android:textColor="@color/black_text" />
 
 
     </LinearLayout>
 
-    <include layout="@layout/view_divider_common" />
 
 
 
+    <include layout="@layout/view_divider_common" />
 
 
 
 
@@ -110,49 +96,32 @@
 
 
 
         <!--处理提现-->
 
-        <LinearLayout
 
-            android:layout_width="match_parent"
 
+        <TextView
 
+            android:layout_width="wrap_content"
 
             android:layout_height="@dimen/height_tab_bar"
 
             android:background="?attr/selectableItemBackground"
 
             android:gravity="center_vertical"
 
             android:orientation="horizontal"
 
             android:paddingStart="@dimen/activity_horizontal_margin"
 
-            android:paddingEnd="@dimen/activity_horizontal_margin">
 
-
 
-            <ImageView
 
-                android:layout_width="@dimen/size_icon_big"
 
-                android:layout_height="@dimen/size_icon"
 
-                android:src="@drawable/ic_mine_cash" />
 
+            android:paddingEnd="@dimen/activity_horizontal_margin"
 
+            android:text="处理提现工单"
 
+            android:textColor="@color/black_text" />
 
 
-            <TextView
 
-                android:layout_width="wrap_content"
 
-                android:layout_height="wrap_content"
 
-                android:layout_marginStart="@dimen/activity_horizontal_margin_s"
 
-                android:text="提现"
 
-                android:textColor="@color/black_text" />
 
-        </LinearLayout>
 
+        <include layout="@layout/view_divider_common"/>
 
 
-        <!--上架商品-->
 
-        <LinearLayout
 
-            android:layout_width="match_parent"
 
+        <!--处理提现-->
 
+        <TextView
 
+            android:layout_width="wrap_content"
 
             android:layout_height="@dimen/height_tab_bar"
 
             android:background="?attr/selectableItemBackground"
 
             android:gravity="center_vertical"
 
             android:orientation="horizontal"
 
             android:paddingStart="@dimen/activity_horizontal_margin"
 
-            android:paddingEnd="@dimen/activity_horizontal_margin">
 
+            android:paddingEnd="@dimen/activity_horizontal_margin"
 
+            android:text="上架新的商品"
 
+            android:textColor="@color/black_text" />
 
 
-            <ImageView
 
-                android:layout_width="@dimen/size_icon_big"
 
-                android:layout_height="@dimen/size_icon"
 
-                android:src="@drawable/ic_mine_upload" />
 
+        <include layout="@layout/view_divider_common" />
 
 
-            <TextView
 
-                android:layout_width="wrap_content"
 
-                android:layout_height="wrap_content"
 
-                android:layout_marginStart="@dimen/activity_horizontal_margin_s"
 
-                android:text="上架"
 
-                android:textColor="@color/black_text" />
 
-        </LinearLayout>
 
     </LinearLayout>
 
 </LinearLayout>

+ 63 - 117
app/src/main/res/layout/activity_register.xml
Просмотреть файл 

@@ -5,167 +5,113 @@
 
     android:layout_height="match_parent"
 
     android:background="@color/colorPrimary"
 
     android:fitsSystemWindows="true"
 
-    android:orientation="vertical"
 
     android:focusable="true"
 
-    android:focusableInTouchMode="true">
 
+    android:focusableInTouchMode="true"
 
+    android:orientation="vertical">
 
     <!--启用深色模式之后，需要使用fitsSystemWindows来不让布局上滑-->
 
 
     <include layout="@layout/view_toolbar" />
 
     <!--阴影效果android:background="?android:attr/listDivider"-->
 
 
-    <FrameLayout
 
+
 
+    <com.google.android.material.textfield.TextInputLayout
 
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
+        android:layout_marginStart="@dimen/margin_default"
 
         android:layout_marginTop="@dimen/margin_default"
 
+        android:layout_marginEnd="@dimen/margin_default"
 
+        android:hint="请输入邮箱"
 
+        app:boxBackgroundMode="outline"
 
+        app:boxCornerRadiusBottomEnd="4dp"
 
+        app:boxCornerRadiusBottomStart="4dp"
 
+        app:boxCornerRadiusTopEnd="4dp"
 
+        app:boxCornerRadiusTopStart="4dp"
 
+        app:boxStrokeWidth="@dimen/width_stroke"
 
+        app:boxStrokeWidthFocused="@dimen/width_stroke">
 
+
 
+        <com.google.android.material.textfield.TextInputEditText
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            android:inputType="textEmailAddress"
 
+            android:maxLength="50"
 
+            android:paddingEnd="90dp"
 
+            android:textSize="@dimen/text_normal_s" />
 
+    </com.google.android.material.textfield.TextInputLayout>
 
+
 
+
 
+    <FrameLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
         android:layout_marginStart="@dimen/margin_default"
 
+        android:layout_marginTop="@dimen/margin_default"
 
         android:layout_marginEnd="@dimen/margin_default">
 
+
 
         <com.google.android.material.textfield.TextInputLayout
 
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
             android:layout_width="match_parent"
 
+
 
             android:layout_height="wrap_content"
 
-            android:hint="请输入邮箱"
 
+            android:hint="请输入邮箱验证码"
 
+            android:orientation="horizontal"
 
             app:boxBackgroundMode="outline"
 
             app:boxCornerRadiusBottomEnd="4dp"
 
             app:boxCornerRadiusBottomStart="4dp"
 
             app:boxCornerRadiusTopEnd="4dp"
 
             app:boxCornerRadiusTopStart="4dp"
 
             app:boxStrokeWidth="@dimen/width_stroke"
 
-            app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
+            app:boxStrokeWidthFocused="@dimen/width_stroke">
 
 
             <com.google.android.material.textfield.TextInputEditText
 
                 android:layout_width="match_parent"
 
                 android:layout_height="wrap_content"
 
-                android:paddingEnd="90dp"
 
-                android:textSize="@dimen/text_normal_s"
 
-                android:inputType="textEmailAddress"
 
-                android:maxLength="50"/>
 
+                android:digits="0123456789"
 
+                android:inputType="number"
 
+                android:maxLength="6"
 
+                android:textSize="@dimen/text_normal_s" />
 
+
 
         </com.google.android.material.textfield.TextInputLayout>
 
 
         <!--去除按钮阴影style="?android:attr/borderlessButtonStyle"-->
 
         <!--用android.widget.Button代替Button就不会有Material风格了，当前style下Button的background无效-->
 
         <android.widget.Button
 
+            style="?android:attr/borderlessButtonStyle"
 
             android:layout_width="@dimen/size_image_big"
 
-            android:minWidth="0dp"
 
             android:layout_height="match_parent"
 
-            android:textColor="@color/white"
 
-            android:minHeight="0dp"
 
-            android:paddingTop="@dimen/margin_ss"
 
-            android:layout_marginTop="9dp"
 
-            android:layout_marginBottom="@dimen/margin_ss"
 
-            android:paddingBottom="@dimen/margin_ss"
 
+            android:layout_gravity="end"
 
             android:layout_marginStart="@dimen/margin_ss"
 
+            android:layout_marginTop="9dp"
 
             android:layout_marginEnd="@dimen/margin_ss"
 
+            android:layout_marginBottom="@dimen/margin_ss"
 
+            android:elevation="0dp"
 
+            android:minWidth="0dp"
 
+            android:minHeight="0dp"
 
             android:paddingStart="@dimen/margin_ss"
 
+            android:paddingTop="@dimen/margin_ss"
 
             android:paddingEnd="@dimen/margin_ss"
 
+            android:paddingBottom="@dimen/margin_ss"
 
+            android:text="获取验证码"
 
+            android:textColor="@color/green_logo"
 
             android:textSize="@dimen/text_s"
 
-            android:text="验证码"
 
-            android:elevation="0dp"
 
-            style="?android:attr/borderlessButtonStyle"
 
-            android:background="@drawable/selector_btn"
 
-            android:layout_gravity="end"/>
 
+            android:textStyle="bold" />
 
     </FrameLayout>
 
 
-
 
-    <com.google.android.material.textfield.TextInputLayout
 
+    <android.widget.Button
 
+        android:id="@+id/btn_next"
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
-        android:layout_marginStart="@dimen/margin_default"
 
-        android:layout_marginEnd="@dimen/margin_default"
 
+        android:minHeight="0dp"
 
         android:layout_marginTop="@dimen/margin_default"
 
-        android:hint="请输入邮箱验证码"
 
-        app:boxBackgroundMode="outline"
 
-        app:boxCornerRadiusBottomEnd="4dp"
 
-        app:boxCornerRadiusBottomStart="4dp"
 
-        app:boxCornerRadiusTopEnd="4dp"
 
-        app:boxCornerRadiusTopStart="4dp"
 
-        app:boxStrokeWidth="@dimen/width_stroke"
 
-        app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
 
-        android:orientation="horizontal">
 
-
 
-        <com.google.android.material.textfield.TextInputEditText
 
-            android:layout_width="match_parent"
 
-            android:layout_height="wrap_content"
 
-            android:inputType="number"
 
-            android:digits="0123456789"
 
-            android:textSize="@dimen/text_normal_s"
 
-            android:maxLength="6"/>
 
-
 
-    </com.google.android.material.textfield.TextInputLayout>
 
-
 
-    <com.google.android.material.textfield.TextInputLayout
 
-        android:layout_width="match_parent"
 
-        android:layout_height="wrap_content"
 
         android:layout_marginStart="@dimen/margin_default"
 
         android:layout_marginEnd="@dimen/margin_default"
 
-        android:layout_marginTop="@dimen/margin_default"
 
-        android:hint="请设置密码"
 
-        app:boxBackgroundMode="outline"
 
-        app:boxCornerRadiusBottomEnd="4dp"
 
-        app:boxCornerRadiusBottomStart="4dp"
 
-        app:boxCornerRadiusTopEnd="4dp"
 
-        app:boxCornerRadiusTopStart="4dp"
 
-        app:boxStrokeWidth="@dimen/width_stroke"
 
-        app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
-
 
-        <com.google.android.material.textfield.TextInputEditText
 
-            android:layout_width="match_parent"
 
-            android:layout_height="wrap_content"
 
-            android:inputType="textPassword"
 
-            android:textSize="@dimen/text_normal_s"
 
-            android:maxLength="20"/>
 
-
 
-    </com.google.android.material.textfield.TextInputLayout>
 
+        android:paddingTop="@dimen/padding_full_width"
 
+        android:paddingBottom="@dimen/padding_full_width"
 
+        android:text="下一步  完善提现信息"
 
+        android:textColor="@color/white"
 
+        android:textStyle="bold"
 
+        android:background="@drawable/selector_btn"
 
+        style="?android:attr/borderlessButtonStyle"/>
 
 
 
 
-
 
-    <com.google.android.material.textfield.TextInputLayout
 
-        android:layout_width="match_parent"
 
-        android:layout_height="wrap_content"
 
-        android:layout_marginStart="@dimen/margin_default"
 
-        android:layout_marginEnd="@dimen/margin_default"
 
-        android:layout_marginTop="@dimen/margin_default"
 
-        android:hint="请输入昵称"
 
-        app:boxBackgroundMode="outline"
 
-        app:boxCornerRadiusBottomEnd="4dp"
 
-        app:boxCornerRadiusBottomStart="4dp"
 
-        app:boxCornerRadiusTopEnd="4dp"
 
-        app:boxCornerRadiusTopStart="4dp"
 
-        app:boxStrokeWidth="@dimen/width_stroke"
 
-        app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
-
 
-        <com.google.android.material.textfield.TextInputEditText
 
-            android:layout_width="match_parent"
 
-            android:layout_height="wrap_content"
 
-            android:textSize="@dimen/text_normal_s"
 
-            android:inputType="textEmailAddress"
 
-            android:maxLength="50"/>
 
-    </com.google.android.material.textfield.TextInputLayout>
 
-
 
-    <com.google.android.material.textfield.TextInputLayout
 
-        android:layout_width="match_parent"
 
-        android:layout_height="wrap_content"
 
-        android:layout_marginStart="@dimen/margin_default"
 
-        android:layout_marginEnd="@dimen/margin_default"
 
-        android:layout_marginTop="@dimen/margin_default"
 
-        android:hint="请输入提现账号(目前仅支持支付宝)"
 
-        app:boxBackgroundMode="outline"
 
-        app:boxCornerRadiusBottomEnd="4dp"
 
-        app:boxCornerRadiusBottomStart="4dp"
 
-        app:boxCornerRadiusTopEnd="4dp"
 
-        app:boxCornerRadiusTopStart="4dp"
 
-        app:boxStrokeWidth="@dimen/width_stroke"
 
-        app:boxStrokeWidthFocused="@dimen/width_stroke"
 
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
-
 
-        <com.google.android.material.textfield.TextInputEditText
 
-            android:layout_width="match_parent"
 
-            android:layout_height="wrap_content"
 
-            android:textSize="@dimen/text_normal_s"
 
-            android:inputType="textEmailAddress"
 
-            android:maxLength="50"/>
 
-    </com.google.android.material.textfield.TextInputLayout>
 
 </LinearLayout>

+ 1 - 1
app/src/main/res/layout/activity_tab.xml
Просмотреть файл 

@@ -33,7 +33,7 @@
 
                 android:id="@+id/title"
 
                 android:layout_width="wrap_content"
 
                 android:layout_height="wrap_content"
 
-                android:text="拾贝 · 安心购物少花费"
 
+                android:text="拾贝 · 放心购物少花费"
 
                 android:textStyle="bold"
 
                 android:textColor="@color/black_theme"
 
                 android:textSize="@dimen/size_hello" />

+ 9 - 8
app/src/main/res/layout/view_toolbar.xml
Просмотреть файл 

@@ -2,20 +2,21 @@
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
 
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
-    <androidx.appcompat.widget.Toolbar
 
-        android:id="@+id/toolbar"
 
-        android:layout_width="match_parent"
 
-        android:layout_height="@dimen/height_tool_bar"
 
-        android:background="@color/colorPrimary"
 
-        app:titleTextAppearance="@style/Toolbar.TitleText"/>
 
-    <!--<LinearLayout
 
+
 
+    <LinearLayout
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content"
 
         android:orientation="vertical">
 
 
+        <androidx.appcompat.widget.Toolbar
 
+            android:id="@+id/toolbar"
 
+            android:layout_width="match_parent"
 
+            android:layout_height="@dimen/height_tool_bar"
 
+            android:background="@color/colorPrimary"
 
+            app:titleTextAppearance="@style/Toolbar.TitleText" />
 
 
         <include layout="@layout/view_divider_common" />
 
 
 
-    </LinearLayout>-->
 
+    </LinearLayout>
 
 </merge>

+ 1 - 0
app/src/main/res/values/dimens.xml
Просмотреть файл 

@@ -21,6 +21,7 @@
 
 
     <dimen name="margin_default">16dp</dimen>
 
     <dimen name="margin_message">12dp</dimen>
 
+    <dimen name="padding_full_width">12.8dp</dimen>
 
     <dimen name="margin_s">8dp</dimen>
 
     <dimen name="margin_ss">4dp</dimen>
 
     <dimen name="margin_tag">3.2dp</dimen>