From 7e29cad9f1d33211751c880bc87bbf3adbdf663b Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 30 Oct 2023 18:00:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0ic=5Flauncher=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-v24/ic_launcher_foreground.xml | 30 --- .../res/drawable/ic_launcher_background.xml | 236 ++++++------------ .../res/drawable/ic_launcher_foreground.xml | 15 ++ app/src/main/res/drawable/textview_border.xml | 5 + .../main/res/layout-land/activity_main.xml | 41 ++- app/src/main/res/layout/activity_main.xml | 63 ++--- .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- .../res/mipmap-anydpi-v33/ic_launcher.xml | 6 - app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 2182 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 3876 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 1932 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 2556 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 2770 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 5156 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 4276 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 8458 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 5640 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 11566 bytes 19 files changed, 128 insertions(+), 276 deletions(-) delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/textview_border.xml delete mode 100644 app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d11..00000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9c..ca3826a4 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..3c539fcd --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/textview_border.xml b/app/src/main/res/drawable/textview_border.xml new file mode 100644 index 00000000..6a677603 --- /dev/null +++ b/app/src/main/res/drawable/textview_border.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index a4c365e8..8432cd19 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -224,33 +224,24 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/takePhotoBtn4" /> - - - - - + android:padding="4dp" + android:scrollbars="vertical" + android:text="Logs" + android:textColor="@color/black" + android:inputType="textMultiLine" + android:textIsSelectable="true" + android:singleLine="false" + android:background="@drawable/textview_border" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/takePhotoBtn4" + app:layout_constraintTop_toTopOf="parent" />