diff --git a/android-app/app/src/main/java/com/example/livestreaming/PublishWorkActivity.java b/android-app/app/src/main/java/com/example/livestreaming/PublishWorkActivity.java
index 87ff5bd0..7dd0d7eb 100644
--- a/android-app/app/src/main/java/com/example/livestreaming/PublishWorkActivity.java
+++ b/android-app/app/src/main/java/com/example/livestreaming/PublishWorkActivity.java
@@ -284,10 +284,10 @@ public class PublishWorkActivity extends AppCompatActivity {
View view = getLayoutInflater().inflate(R.layout.bottom_sheet_media_picker, null);
dialog.setContentView(view);
- LinearLayout pickImage = view.findViewById(R.id.actionPickImage);
- LinearLayout pickVideo = view.findViewById(R.id.actionPickVideo);
- LinearLayout takePhoto = view.findViewById(R.id.actionTakePhoto);
- LinearLayout takeVideo = view.findViewById(R.id.actionTakeVideo);
+ View pickImage = view.findViewById(R.id.actionPickImage);
+ View pickVideo = view.findViewById(R.id.actionPickVideo);
+ View takePhoto = view.findViewById(R.id.actionTakePhoto);
+ View takeVideo = view.findViewById(R.id.actionTakeVideo);
View cancel = view.findViewById(R.id.actionCancel);
pickImage.setOnClickListener(v -> {
diff --git a/android-app/app/src/main/res/drawable/bg_cover_selected_border.xml b/android-app/app/src/main/res/drawable/bg_cover_selected_border.xml
deleted file mode 100644
index a4eaf750..00000000
--- a/android-app/app/src/main/res/drawable/bg_cover_selected_border.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/android-app/app/src/main/res/layout/activity_publish_work.xml b/android-app/app/src/main/res/layout/activity_publish_work.xml
index 6b598547..cf04f65e 100644
--- a/android-app/app/src/main/res/layout/activity_publish_work.xml
+++ b/android-app/app/src/main/res/layout/activity_publish_work.xml
@@ -3,23 +3,22 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#F8F8F8">
+ android:background="#FFFFFF">
+ app:elevation="0dp">
+ app:titleTextColor="#111111"
+ app:navigationIcon="@drawable/ic_arrow_back_24" />
@@ -40,16 +39,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
- app:cardCornerRadius="12dp"
- app:cardElevation="4dp"
- app:strokeWidth="0dp"
- app:cardUseCompatPadding="true">
+ app:cardCornerRadius="16dp"
+ app:cardElevation="2dp"
+ app:cardUseCompatPadding="false">
+ android:minHeight="300dp">
+ android:padding="32dp"
+ android:minHeight="300dp">
+ android:layout_marginTop="16dp"
+ android:text="选择图片或视频"
+ android:textColor="#666666"
+ android:textSize="16sp" />
+ android:textSize="14sp" />
@@ -155,18 +151,14 @@
@@ -176,10 +168,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:visibility="gone"
- app:cardCornerRadius="12dp"
- app:cardElevation="4dp"
- app:strokeWidth="0dp"
- app:cardUseCompatPadding="true">
+ app:cardCornerRadius="16dp"
+ app:cardElevation="2dp"
+ app:cardUseCompatPadding="false">
@@ -226,18 +217,14 @@
@@ -245,90 +232,72 @@
-
+ android:layout_marginBottom="16dp"
+ android:hint="作品标题"
+ app:boxCornerRadiusTopStart="12dp"
+ app:boxCornerRadiusTopEnd="12dp"
+ app:boxCornerRadiusBottomStart="12dp"
+ app:boxCornerRadiusBottomEnd="12dp"
+ app:boxStrokeWidth="1dp"
+ app:boxStrokeWidthFocused="2dp"
+ app:hintTextColor="#999999"
+ app:boxStrokeColor="#E0E0E0">
-
+ android:inputType="textCapSentences"
+ android:maxLines="1"
+ android:maxLength="50"
+ android:textSize="16sp" />
-
-
-
-
-
+
-
+ android:hint="作品描述(可选)"
+ app:boxCornerRadiusTopStart="12dp"
+ app:boxCornerRadiusTopEnd="12dp"
+ app:boxCornerRadiusBottomStart="12dp"
+ app:boxCornerRadiusBottomEnd="12dp"
+ app:boxStrokeWidth="1dp"
+ app:boxStrokeWidthFocused="2dp"
+ app:hintTextColor="#999999"
+ app:boxStrokeColor="#E0E0E0">
-
+ android:inputType="textMultiLine|textCapSentences"
+ android:maxLines="5"
+ android:maxLength="500"
+ android:gravity="top|start"
+ android:minHeight="120dp"
+ android:textSize="16sp" />
-
-
-
-
-
+
+ app:iconPadding="8dp" />
diff --git a/android-app/app/src/main/res/layout/bottom_sheet_media_picker.xml b/android-app/app/src/main/res/layout/bottom_sheet_media_picker.xml
index 7a93adc1..d7fb5aaf 100644
--- a/android-app/app/src/main/res/layout/bottom_sheet_media_picker.xml
+++ b/android-app/app/src/main/res/layout/bottom_sheet_media_picker.xml
@@ -1,161 +1,83 @@
+ android:paddingTop="8dp"
+ android:paddingBottom="12dp">
-
+ android:layout_height="56dp"
+ android:gravity="center_vertical"
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:text="从相册选择图片"
+ android:textColor="#111111"
+ android:textSize="16sp" />
+ android:background="#11000000" />
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:text="从相册选择视频"
+ android:textColor="#111111"
+ android:textSize="16sp" />
-
+
-
-
-
-
-
-
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:text="拍照"
+ android:textColor="#111111"
+ android:textSize="16sp" />
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+ android:paddingStart="20dp"
+ android:paddingEnd="20dp"
+ android:text="录像"
+ android:textColor="#111111"
+ android:textSize="16sp" />
-
-
+ android:textSize="16sp" />
diff --git a/android-app/app/src/main/res/layout/item_cover_picker.xml b/android-app/app/src/main/res/layout/item_cover_picker.xml
index fd31462d..931462cb 100644
--- a/android-app/app/src/main/res/layout/item_cover_picker.xml
+++ b/android-app/app/src/main/res/layout/item_cover_picker.xml
@@ -1,42 +1,50 @@
-
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_margin="4dp"
+ android:background="?attr/selectableItemBackground"
+ android:clickable="true"
+ android:focusable="true">
-
+
-
+
+
-
-
+
+
-
-
+
-
-
-
diff --git a/android-app/app/src/main/res/layout/item_media_preview.xml b/android-app/app/src/main/res/layout/item_media_preview.xml
index 0350c7a3..94a1eb77 100644
--- a/android-app/app/src/main/res/layout/item_media_preview.xml
+++ b/android-app/app/src/main/res/layout/item_media_preview.xml
@@ -1,44 +1,33 @@
-
+ android:layout_width="120dp"
+ android:layout_height="160dp"
+ android:layout_marginEnd="8dp">
-
+
-
+
-
-
-
-
-
-
+