Commit 87f90eeb by 刘鹏

feat: UI还原

parent b928654e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
android:orientation="horizontal" android:gravity="center_vertical"
android:gravity="center_vertical"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/iv_back" android:id="@+id/iv_back"
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
android:layout_marginStart="9dp" android:layout_marginStart="9dp"
android:padding="9dp" android:padding="9dp"
android:src="@drawable/article_home_back_icon" android:src="@drawable/article_home_back_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"/>
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="文章·阅读" android:text="文章·阅读"
android:textSize="18sp"
android:textColor="#000000" android:textColor="#000000"
android:textSize="18sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
...@@ -43,18 +43,21 @@ ...@@ -43,18 +43,21 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="#F8F8F8"/> android:background="#F8F8F8" />
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
style="@style/ArticleTabLayoutStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="38dp"
android:paddingTop="14dp" android:paddingTop="10dp"
app:tabBackground="@color/transparent" app:tabBackground="@color/transparent"
app:tabRippleColor="@color/transparent"
app:tabMode="scrollable"
app:tabIndicatorFullWidth="false" app:tabIndicatorFullWidth="false"
style="@style/ArticleTabLayoutStyle" /> app:tabMaxWidth="88dp"
app:tabMinWidth="64dp"
app:tabMode="scrollable"
app:tabRippleColor="@color/transparent"
app:tabTextAppearance="@style/TabLayoutTextStyle" />
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager" android:id="@+id/view_pager"
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/card_view_article_image" android:id="@+id/card_view_article_image"
android:layout_width="84dp" android:layout_width="88dp"
android:layout_height="70dp" android:layout_height="70dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:cardCornerRadius="6dp" app:cardCornerRadius="8dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="@drawable/platform_ydl_common_dialog_bg"/> tools:src="@drawable/picture_album_bg"/>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="#1C1F28" android:textColor="#1C1F28"
android:layout_marginEnd="18dp"
android:lineSpacingExtra="1dp" android:lineSpacingExtra="1dp"
tools:text="最伟大的作品,是魔术啊,最伟大的作品,是魔术啊。" tools:text="最伟大的作品,是魔术啊,最伟大的作品,是魔术啊。"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -53,9 +54,9 @@ ...@@ -53,9 +54,9 @@
android:maxLines="1" android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:textSize="13sp" android:textSize="13sp"
android:textStyle="bold"
android:singleLine="true" android:singleLine="true"
android:textColor="#9D9EA7" android:textColor="#9D9EA7"
android:layout_marginEnd="18dp"
tools:text="最伟大的作品,是魔术啊,最伟大的作品,是魔术啊。fdasfa" tools:text="最伟大的作品,是魔术啊,最伟大的作品,是魔术啊。fdasfa"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_article_title"/> app:layout_constraintTop_toBottomOf="@id/tv_article_title"/>
...@@ -67,6 +68,7 @@ ...@@ -67,6 +68,7 @@
android:layout_marginTop="17dp" android:layout_marginTop="17dp"
app:layout_constraintStart_toStartOf="@id/tv_article_title" app:layout_constraintStart_toStartOf="@id/tv_article_title"
app:layout_constraintTop_toBottomOf="@id/card_view_article_image" app:layout_constraintTop_toBottomOf="@id/card_view_article_image"
app:cardElevation="0dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
...@@ -83,9 +85,9 @@ ...@@ -83,9 +85,9 @@
android:id="@+id/tv_author_name" android:id="@+id/tv_author_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="3dp" android:layout_marginStart="5dp"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#666666" android:textColor="#62636F"
tools:text="黄秀章" tools:text="黄秀章"
app:layout_constraintStart_toEndOf="@id/card_view_avatar" app:layout_constraintStart_toEndOf="@id/card_view_avatar"
app:layout_constraintTop_toTopOf="@id/card_view_avatar" app:layout_constraintTop_toTopOf="@id/card_view_avatar"
...@@ -95,10 +97,9 @@ ...@@ -95,10 +97,9 @@
android:id="@+id/tv_article_view_num" android:id="@+id/tv_article_view_num"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="@id/tv_article_like_num"
tools:text="2656浏览" tools:text="2656浏览"
android:textSize="13sp" android:textSize="13sp"
android:layout_marginEnd="35dp" android:layout_marginEnd="70dp"
android:textColor="#62636F" android:textColor="#62636F"
app:layout_constraintBaseline_toBaselineOf="@id/tv_author_name" app:layout_constraintBaseline_toBaselineOf="@id/tv_author_name"
app:layout_constraintEnd_toEndOf="parent"/> app:layout_constraintEnd_toEndOf="parent"/>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="ArticleTabLayoutStyle" parent="Widget.Design.TabLayout"> <style name="ArticleTabLayoutStyle" parent="TextAppearance.Design.Tab">
<item name="tabIndicatorColor">@color/color_1DA1F2</item> <item name="tabIndicatorColor">@color/color_1DA1F2</item>
<item name="tabIndicatorHeight">4dp</item> <item name="tabIndicatorHeight">4dp</item>
<item name="tabIndicatorFullWidth">false</item> <item name="tabIndicatorFullWidth">false</item>
<item name="tabSelectedTextColor">@color/color_000000</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="tabSelectedTextColor">@color/color_000000</item>
<item name="android:textColor">@color/color_999999</item> <item name="android:textColor">@color/color_999999</item>
<item name="android:textStyle">normal</item>
</style>
<style name="TabLayoutTextStyle" parent="TextAppearance.Design.Tab">
<item name="android:textSize">16sp</item>
</style> </style>
</resources> </resources>
\ No newline at end of file
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/homeModuleArticleItemViewCardImg" android:id="@+id/homeModuleArticleItemViewCardImg"
android:layout_width="84dp" android:layout_width="88dp"
android:layout_height="70dp" android:layout_height="70dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
app:cardCornerRadius="@dimen/platform_dp_6" app:cardCornerRadius="8dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:cardElevation="0dp"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp">
<ImageView <ImageView
...@@ -85,8 +86,8 @@ ...@@ -85,8 +86,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#666666" android:textColor="#62636F"
android:layout_marginLeft="@dimen/platform_dp_3" android:layout_marginLeft="5dp"
app:layout_constraintStart_toEndOf="@id/card_view_avatar" app:layout_constraintStart_toEndOf="@id/card_view_avatar"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -96,19 +97,18 @@ ...@@ -96,19 +97,18 @@
android:id="@+id/homeModuleArticleItemViewLookNum" android:id="@+id/homeModuleArticleItemViewLookNum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="35dp" android:layout_marginEnd="70dp"
tools:text="2656浏览" tools:text="2656浏览"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#62636F" android:textColor="#62636F"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/homeModuleArticleItemViewGreatNum"/> app:layout_constraintEnd_toEndOf="parent"/>
<TextView <TextView
android:id="@+id/homeModuleArticleItemViewGreatNum" android:id="@+id/homeModuleArticleItemViewGreatNum"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp"
tools:text="3327点赞" tools:text="3327点赞"
android:textSize="13sp" android:textSize="13sp"
android:textColor="#62636F" android:textColor="#62636F"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment