diff --git a/app/build.gradle b/app/build.gradle index f175b22..7a6984e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 23 targetSdkVersion 29 - versionCode 12 - versionName "1.1.1" + versionCode 14 + versionName "1.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e1d601..a94044a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,7 +57,8 @@ + android:screenOrientation="portrait" + android:theme="@style/AppThemeWhite" /> @@ -57,8 +57,8 @@ android:layout_marginStart="8dp" android:layout_marginEnd="16dp" android:text="@{title}" - android:textColor="@color/white" - android:textSize="18sp" + android:textColor="@color/black" + android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/tv_total" @@ -72,8 +72,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:text="视频:0个" - android:textColor="@color/white" - android:textSize="16sp" + android:textColor="@color/black" + android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_decryption_player.xml b/app/src/main/res/layout/activity_decryption_player.xml index 4304f59..ee413e0 100644 --- a/app/src/main/res/layout/activity_decryption_player.xml +++ b/app/src/main/res/layout/activity_decryption_player.xml @@ -1,5 +1,6 @@ @@ -14,10 +15,35 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + + + + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/constraintLayout3" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml index ce6e32a..35255d5 100644 --- a/app/src/main/res/layout/item_category.xml +++ b/app/src/main/res/layout/item_category.xml @@ -16,14 +16,13 @@ - + app:layout_constraintTop_toTopOf="parent"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_category_video.xml b/app/src/main/res/layout/item_category_video.xml index ce5133c..09bc532 100644 --- a/app/src/main/res/layout/item_category_video.xml +++ b/app/src/main/res/layout/item_category_video.xml @@ -17,11 +17,12 @@ + android:textColor="@color/text_content" + android:textSize="10sp" + tools:text="00:00" /> + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ccacbc9..aca4758 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -15,6 +15,7 @@ #1E63FF #d0d0d0 #9F9F9F + #bfbfbf #efefef #3D54D9 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ce1da40..96581c0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,6 +10,16 @@ true + +