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 7dd0d7eb..87ff5bd0 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); - 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); + 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 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 new file mode 100644 index 00000000..a4eaf750 --- /dev/null +++ b/android-app/app/src/main/res/drawable/bg_cover_selected_border.xml @@ -0,0 +1,8 @@ + + + + + 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 cf04f65e..6b598547 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,22 +3,23 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#FFFFFF"> + android:background="#F8F8F8"> + app:elevation="2dp"> + app:titleTextColor="#FFFFFF" + app:navigationIcon="@drawable/ic_arrow_back_24" + app:navigationIconTint="#FFFFFF" /> @@ -39,14 +40,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - app:cardCornerRadius="16dp" - app:cardElevation="2dp" - app:cardUseCompatPadding="false"> + app:cardCornerRadius="12dp" + app:cardElevation="4dp" + app:strokeWidth="0dp" + app:cardUseCompatPadding="true"> + android:minHeight="280dp" + android:background="#FFFFFF"> + android:padding="40dp" + android:minHeight="280dp"> + android:layout_marginTop="20dp" + android:text="添加图片或视频" + android:textColor="#333333" + android:textSize="17sp" + android:textStyle="bold" /> + android:textSize="13sp" /> @@ -151,14 +155,18 @@ @@ -168,9 +176,10 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:visibility="gone" - app:cardCornerRadius="16dp" - app:cardElevation="2dp" - app:cardUseCompatPadding="false"> + app:cardCornerRadius="12dp" + app:cardElevation="4dp" + app:strokeWidth="0dp" + app:cardUseCompatPadding="true"> @@ -217,14 +226,18 @@ @@ -232,72 +245,90 @@ - + android:layout_marginBottom="12dp" + app:cardCornerRadius="12dp" + app:cardElevation="2dp" + app:strokeWidth="0dp" + app:cardUseCompatPadding="true"> - + android:hint="✏️ 作品标题(必填)" + app:boxBackgroundMode="none" + app:hintTextColor="#999999"> - + + + + + - + app:cardCornerRadius="12dp" + app:cardElevation="2dp" + app:strokeWidth="0dp" + app:cardUseCompatPadding="true"> - + android:hint="💬 添加描述(可选)" + app:boxBackgroundMode="none" + app:hintTextColor="#999999"> - + + + + + + app:iconPadding="8dp" + app:iconTint="#FFFFFF" + android:elevation="4dp" /> 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 d7fb5aaf..7a93adc1 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,83 +1,161 @@ + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:background="@drawable/bottom_sheet_background"> + + + + + + + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:background="?attr/selectableItemBackground"> - + - + + + + + + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:background="?attr/selectableItemBackground"> - + - + + + + + + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:background="?attr/selectableItemBackground"> - + - + + + + + + android:paddingStart="24dp" + android:paddingEnd="24dp" + android:background="?attr/selectableItemBackground"> + + + + + + - + + android:textSize="16sp" + app:cornerRadius="24dp" + app:strokeColor="#E0E0E0" + app:strokeWidth="1dp" + style="@style/Widget.MaterialComponents.Button.OutlinedButton" /> 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 931462cb..fd31462d 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,50 +1,42 @@ - + android:layout_width="100dp" + android:layout_height="100dp" + android:layout_marginEnd="8dp" + app:cardCornerRadius="8dp" + app:cardElevation="2dp" + app:strokeWidth="0dp"> - + - - + - - + + - + + + + + 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 94a1eb77..0350c7a3 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,33 +1,44 @@ - + android:layout_width="110dp" + android:layout_height="140dp" + android:layout_marginEnd="8dp" + app:cardCornerRadius="12dp" + app:cardElevation="4dp" + app:strokeWidth="0dp"> - + - + - + + + + + +