From ed20815e60ed78029873f58e59c1dac526971fe5 Mon Sep 17 00:00:00 2001 From: Lixin <2563946749@qq.com> Date: Sun, 15 Dec 2024 15:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A44?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 1 + app/src/main/AndroidManifest.xml | 3 + .../example/myapplication/FindFragment.java | 47 +-- .../example/myapplication/MainActivity.java | 2 +- .../example/myapplication/MineFragment.java | 47 --- .../ShoppingTrolleyFragment.java | 47 +-- .../example/myapplication/VipFragment.java | 46 --- .../example/myapplication/yindaoActivity.java | 85 ++++- app/src/main/res/drawable/chakandingdan.png | Bin 0 -> 2687 bytes app/src/main/res/drawable/daifukuan.png | Bin 0 -> 2220 bytes app/src/main/res/drawable/daipeisong.png | Bin 0 -> 2400 bytes app/src/main/res/drawable/daitihuo.png | Bin 0 -> 2413 bytes app/src/main/res/drawable/faxiantupian.xml | 6 + app/src/main/res/drawable/gouwuchetupian.xml | 6 + app/src/main/res/drawable/huiyuantupian.xml | 6 + app/src/main/res/drawable/shouyetupian.xml | 6 + app/src/main/res/drawable/tihuoerweima.png | Bin 0 -> 4102 bytes app/src/main/res/drawable/wodetupian.xml | 6 + app/src/main/res/layout/activity_yindao.xml | 11 +- app/src/main/res/layout/fragment_find.xml | 39 +-- app/src/main/res/layout/fragment_mine.xml | 311 +++++++++++++++++- app/src/main/res/layout/fragment_vip.xml | 142 ++++---- 22 files changed, 513 insertions(+), 298 deletions(-) create mode 100644 app/src/main/res/drawable/chakandingdan.png create mode 100644 app/src/main/res/drawable/daifukuan.png create mode 100644 app/src/main/res/drawable/daipeisong.png create mode 100644 app/src/main/res/drawable/daitihuo.png create mode 100644 app/src/main/res/drawable/faxiantupian.xml create mode 100644 app/src/main/res/drawable/gouwuchetupian.xml create mode 100644 app/src/main/res/drawable/huiyuantupian.xml create mode 100644 app/src/main/res/drawable/shouyetupian.xml create mode 100644 app/src/main/res/drawable/tihuoerweima.png create mode 100644 app/src/main/res/drawable/wodetupian.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 440c300..36d689d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,6 +33,7 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.9.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.legacy:legacy-support-v4:1.0.0") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 75a512d..92b1ee5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,8 @@ android:theme="@style/Theme.MyApplication" android:usesCleartextTraffic="true" tools:targetApi="31"> + + @@ -31,6 +33,7 @@ + diff --git a/app/src/main/java/com/example/myapplication/FindFragment.java b/app/src/main/java/com/example/myapplication/FindFragment.java index e49ec91..6f22a8d 100644 --- a/app/src/main/java/com/example/myapplication/FindFragment.java +++ b/app/src/main/java/com/example/myapplication/FindFragment.java @@ -8,53 +8,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -/** - * A simple {@link Fragment} subclass. - * Use the {@link FindFragment#newInstance} factory method to - * create an instance of this fragment. - */ + public class FindFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public FindFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment FindFragment. - */ - // TODO: Rename and change types and number of parameters - public static FindFragment newInstance(String param1, String param2) { - FindFragment fragment = new FindFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/com/example/myapplication/MainActivity.java b/app/src/main/java/com/example/myapplication/MainActivity.java index 0109c01..5ed0f83 100644 --- a/app/src/main/java/com/example/myapplication/MainActivity.java +++ b/app/src/main/java/com/example/myapplication/MainActivity.java @@ -56,7 +56,7 @@ public class MainActivity extends AppCompatActivity { SharedPreferences.Editor editor = getSharedPreferences("data", MODE_PRIVATE).edit(); editor.putString("token", loginResult.token); editor.apply(); - Intent intent = new Intent(MainActivity.this, MineFragment.class); + Intent intent = new Intent(MainActivity.this, yindaoActivity.class); startActivity(intent); }else { Toast.makeText(MainActivity.this,loginResult.msg, Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/example/myapplication/MineFragment.java b/app/src/main/java/com/example/myapplication/MineFragment.java index 7abdbb1..207297f 100644 --- a/app/src/main/java/com/example/myapplication/MineFragment.java +++ b/app/src/main/java/com/example/myapplication/MineFragment.java @@ -7,54 +7,7 @@ import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; - -/** - * A simple {@link Fragment} subclass. - * Use the {@link MineFragment#newInstance} factory method to - * create an instance of this fragment. - */ public class MineFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public MineFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment MineFragment. - */ - // TODO: Rename and change types and number of parameters - public static MineFragment newInstance(String param1, String param2) { - MineFragment fragment = new MineFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/com/example/myapplication/ShoppingTrolleyFragment.java b/app/src/main/java/com/example/myapplication/ShoppingTrolleyFragment.java index 945b963..960c275 100644 --- a/app/src/main/java/com/example/myapplication/ShoppingTrolleyFragment.java +++ b/app/src/main/java/com/example/myapplication/ShoppingTrolleyFragment.java @@ -8,53 +8,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -/** - * A simple {@link Fragment} subclass. - * Use the {@link ShoppingTrolleyFragment#newInstance} factory method to - * create an instance of this fragment. - */ + public class ShoppingTrolleyFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public ShoppingTrolleyFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment ShoppingTrolleyFragment. - */ - // TODO: Rename and change types and number of parameters - public static ShoppingTrolleyFragment newInstance(String param1, String param2) { - ShoppingTrolleyFragment fragment = new ShoppingTrolleyFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/com/example/myapplication/VipFragment.java b/app/src/main/java/com/example/myapplication/VipFragment.java index 13aabc5..bce6d99 100644 --- a/app/src/main/java/com/example/myapplication/VipFragment.java +++ b/app/src/main/java/com/example/myapplication/VipFragment.java @@ -8,53 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -/** - * A simple {@link Fragment} subclass. - * Use the {@link VipFragment#newInstance} factory method to - * create an instance of this fragment. - */ public class VipFragment extends Fragment { - - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; - - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - - public VipFragment() { - // Required empty public constructor - } - - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment VipFragment. - */ - // TODO: Rename and change types and number of parameters - public static VipFragment newInstance(String param1, String param2) { - VipFragment fragment = new VipFragment(); - Bundle args = new Bundle(); - args.putString(ARG_PARAM1, param1); - args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); - return fragment; - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); - } - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/app/src/main/java/com/example/myapplication/yindaoActivity.java b/app/src/main/java/com/example/myapplication/yindaoActivity.java index aa2b8bb..9fecee9 100644 --- a/app/src/main/java/com/example/myapplication/yindaoActivity.java +++ b/app/src/main/java/com/example/myapplication/yindaoActivity.java @@ -3,6 +3,8 @@ package com.example.myapplication; import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageButton; public class yindaoActivity extends AppCompatActivity { @@ -17,15 +19,86 @@ public class yindaoActivity extends AppCompatActivity { ShoppingTrolleyFragment shoppingTrolleyFragment = new ShoppingTrolleyFragment(); MineFragment mineFragment = new MineFragment(); - getSupportFragmentManager().beginTransaction().replace(R.id.constraintLayout9,homeFragment).commit(); - getSupportFragmentManager().beginTransaction().replace(R.id.constraintLayout9,findFragment).commit(); - getSupportFragmentManager().beginTransaction().replace(R.id.constraintLayout9,vipFragment).commit(); - getSupportFragmentManager().beginTransaction().replace(R.id.constraintLayout9,shoppingTrolleyFragment).commit(); - getSupportFragmentManager().beginTransaction().replace(R.id.constraintLayout9,mineFragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.constraintLayout100,homeFragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.constraintLayout100,findFragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.constraintLayout100,vipFragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.constraintLayout100,shoppingTrolleyFragment).commit(); + getSupportFragmentManager().beginTransaction().add(R.id.constraintLayout100,mineFragment).commit(); //默认第一个，显示第一个 getSupportFragmentManager().beginTransaction() - .hide(findFragment).hide(vipFragment).hide(shoppingTrolleyFragment).hide(mineFragment).show(shoppingTrolleyFragment).commit(); + .hide(findFragment).hide(vipFragment).hide(shoppingTrolleyFragment).hide(mineFragment).show(homeFragment).commit(); + + ImageButton imageButton1 = findViewById(R.id.imageButton4); + ImageButton imageButton2 = findViewById(R.id.imageButton5); + ImageButton imageButton3 = findViewById(R.id.imageButton6); + ImageButton imageButton4 = findViewById(R.id.imageButton7); + ImageButton imageButton5 = findViewById(R.id.imageButton8); + + imageButton1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getSupportFragmentManager().beginTransaction() + .hide(findFragment).hide(vipFragment).hide(shoppingTrolleyFragment).hide(mineFragment).show(homeFragment).commit(); + imageButton1.setSelected(true); + imageButton2.setSelected(false); + imageButton3.setSelected(false); + imageButton4.setSelected(false); + imageButton5.setSelected(false); + } + }); + + imageButton2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getSupportFragmentManager().beginTransaction() + .hide(homeFragment).hide(vipFragment).hide(shoppingTrolleyFragment).hide(mineFragment).show(findFragment).commit(); + imageButton1.setSelected(false); + imageButton2.setSelected(true); + imageButton3.setSelected(false); + imageButton4.setSelected(false); + imageButton5.setSelected(false); + } + }); + + imageButton3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getSupportFragmentManager().beginTransaction() + .hide(homeFragment).hide(findFragment).hide(shoppingTrolleyFragment).hide(mineFragment).show(vipFragment).commit(); + imageButton1.setSelected(false); + imageButton2.setSelected(false); + imageButton3.setSelected(true); + imageButton4.setSelected(false); + imageButton5.setSelected(false); + } + }); + + imageButton4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getSupportFragmentManager().beginTransaction() + .hide(homeFragment).hide(findFragment).hide(vipFragment).hide(mineFragment).show(shoppingTrolleyFragment).commit(); + imageButton1.setSelected(false); + imageButton2.setSelected(false); + imageButton3.setSelected(false); + imageButton4.setSelected(true); + imageButton5.setSelected(false); + } + }); + + imageButton5.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + getSupportFragmentManager().beginTransaction() + .hide(homeFragment).hide(findFragment).hide(vipFragment).hide(shoppingTrolleyFragment).show(mineFragment).commit(); + imageButton1.setSelected(false); + imageButton2.setSelected(false); + imageButton3.setSelected(false); + imageButton4.setSelected(false); + imageButton5.setSelected(true); + } + }); } } \ No newline at end of file diff --git a/app/src/main/res/drawable/chakandingdan.png b/app/src/main/res/drawable/chakandingdan.png new file mode 100644 index 0000000000000000000000000000000000000000..7bcb95d78cbd023320481e5f22a6cf08e9793fec GIT binary patch literal 2687 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/daifukuan.png b/app/src/main/res/drawable/daifukuan.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2674b7269d2ebb12d1bf2abc8f7e372f6bfa6d GIT binary patch literal 2220 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 Wn?1~2 zrQrded*E%V`lj{HojWvV&Kw?}o^Rj2xu2g*XjHCRwTkxa*+XBxe37M|+`W63Ukkl| z|6Z2(=KJ^Wv}@NcI(FOuyr%rKuZ$RN=#*Co@2M%z50FyL+ z{CFOp3ZB1z|9)!LtQn0RJC?6KgvOhrojZ5ZrcIluM~@!-&mbB>b9e`)9?WXQlXnkiEzS>hr~mMrqj6IjZQ9Xn{!q)Bw^)-7IQ zwQJXwwSQT?dNoa)IFUYm`b1s3cBQ3Dmr|iZg=DP&F9tQ9V#T=c*w|PlK0aP~^X82*aNt0%Ul?eQ zlP6Eg-V{ZctkS7dCoXT;u%S|>Oc@@ButY^zBKKRpdUdXE(xi#9e*Jpo_3PL2ZbkX^ z>lcq#_!!rh2yk4zdi7$hO`krUa_7!XvuDqyo;`aSa#r5RmoFdHty`D-#Cd@N1^B=0 zvSrJEq3+$g^RGJVxQ4an%9V?+!N-puY1F7u zY$a^o7!dv{K|`1p*2;zr8>msEMs)DtL3;M=8Q-XK{rYu!`SK+tB_)y2tSog=u3R}1 zGeOm=RpUd9|UXA0_DP~;eR)euZw>E{HX}D=5>Mf5(xML5w?`KZ{I4yYs*qk zu&!FSZp~|0n3y7F*?k}C{2f@Y-oQBVOyOi@i8*$S{^Dpjf^YXbu-)Q62P7!Za0!EqWf z5FsT^8n62g&c>E3SwbU6jx-#%k)745Rf}g+k8o0Kc3K4jC|)={_koy-G}s8p5V6#- zeDonuk9R3`lqgYx5)u+vU^qHoyDy_4W+EwpGPSw7$fQVkdH2!0d2>paj*T%O==0va zd#vn07!n%5wBe+#T)E=m=*)sV0FeQ}d5Tn%&jFOHerbS1q^@4`cvuijxn#+be2vLK z;)3Obqy(84A`!}AO=uez7sqXZVW9yAf=x-&rcGsuc_8HW?b~VAtXb5hOBbF|ktegW zGYU)?V?n}k;lc&#-@iX+iP%jcQGw%vBNh2Mb?)4mJw2j{O0q8zu!lve<||Gk)jM(G z1b2A*_HA0ccrknK88c>3wrtsCD`NA-)(%b!LSc>e>C=ao2hvZ3EqGY`q7Qi8$jC?z zSr{~C9VUx3cigyfT#m2?OTm5_DdpkAhuJ$fXwZPaHmX{+DraZ_k>%XEbF^~hO5QHR zw_vuR1k*xe4~=b`3bc*R^lJ&R8F3#oi0Ck2zyKBi`(Hd*`ynj^fq;kvP^1>@3lKt~ zsD%p`vgwN56qPDfip?A*U9ez5pH3LS$ssirStcvlR^OZ;5@5z{CA5kuNA`cg5!x;| fLfZu!3QhD6K~D69qgQ;Q00000NkvXXu0mjfBhQVi literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/faxiantupian.xml b/app/src/main/res/drawable/faxiantupian.xml new file mode 100644 index 0000000..ea1239d --- /dev/null +++ b/app/src/main/res/drawable/faxiantupian.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/gouwuchetupian.xml b/app/src/main/res/drawable/gouwuchetupian.xml new file mode 100644 index 0000000..e70cb34 --- /dev/null +++ b/app/src/main/res/drawable/gouwuchetupian.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/huiyuantupian.xml b/app/src/main/res/drawable/huiyuantupian.xml new file mode 100644 index 0000000..a27c90a --- /dev/null +++ b/app/src/main/res/drawable/huiyuantupian.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shouyetupian.xml b/app/src/main/res/drawable/shouyetupian.xml new file mode 100644 index 0000000..7deb6d7 --- /dev/null +++ b/app/src/main/res/drawable/shouyetupian.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/tihuoerweima.png b/app/src/main/res/drawable/tihuoerweima.png new file mode 100644 index 0000000000000000000000000000000000000000..a8608fa525b7da8b6be4b2052646a331ec71d157 GIT binary patch literal 4102 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/wodetupian.xml b/app/src/main/res/drawable/wodetupian.xml new file mode 100644 index 0000000..1172b37 --- /dev/null +++ b/app/src/main/res/drawable/wodetupian.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_yindao.xml b/app/src/main/res/layout/activity_yindao.xml index 2bb2fec..7dfccaf 100644 --- a/app/src/main/res/layout/activity_yindao.xml +++ b/app/src/main/res/layout/activity_yindao.xml @@ -38,7 +38,7 @@ android:id="@+id/imageButton4" android:layout_width="81dp" android:layout_height="98dp" - android:src="@drawable/shouye1" + android:src="@drawable/shouyetupian" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -57,7 +57,7 @@ android:id="@+id/imageButton5" android:layout_width="72dp" android:layout_height="96dp" - android:src="@drawable/faxian1" + android:src="@drawable/faxiantupian" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -77,7 +77,7 @@ android:id="@+id/imageButton6" android:layout_width="72dp" android:layout_height="96dp" - android:src="@drawable/huiyuan1" + android:src="@drawable/huiyuantupian" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -97,7 +97,7 @@ android:id="@+id/imageButton7" android:layout_width="84dp" android:layout_height="96dp" - android:src="@drawable/gouwuche1" + android:src="@drawable/gouwuchetupian" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -117,7 +117,7 @@ android:id="@+id/imageButton8" android:layout_width="74dp" android:layout_height="96dp" - android:src="@drawable/wode1" + android:src="@drawable/wodetupian" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -127,6 +127,7 @@ + app:layout_constraintStart_toStartOf="parent"> @@ -56,12 +55,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="180dp" - android:text="关注" - android:gravity="center" - android:textStyle="bold" - android:textSize="18dp" - android:textColor="#000000" android:backgroundTint="@color/white" + android:gravity="center" + android:text="关注" + android:textColor="#000000" + android:textSize="18dp" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -71,21 +70,17 @@ + app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 37736ab..15de764 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -6,14 +6,13 @@ android:layout_height="match_parent" tools:context=".MineFragment"> - - - + + + +