From 997cb7cb30d7bf8956075b4c29bcb41f51faa2c7 Mon Sep 17 00:00:00 2001 From: Cole Deck Date: Wed, 2 Nov 2022 11:34:23 -0500 Subject: [PATCH] Make app mostly usable in dark mode --- software/android/.idea/codeStyles/Project.xml | 123 ++++++++++++++++++ .../.idea/codeStyles/codeStyleConfig.xml | 5 + .../app/src/main/res/layout/activity_main.xml | 29 +++-- .../src/main/res/layout/selected_device.xml | 8 +- 4 files changed, 153 insertions(+), 12 deletions(-) create mode 100644 software/android/.idea/codeStyles/Project.xml create mode 100644 software/android/.idea/codeStyles/codeStyleConfig.xml diff --git a/software/android/.idea/codeStyles/Project.xml b/software/android/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/software/android/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/software/android/.idea/codeStyles/codeStyleConfig.xml b/software/android/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/software/android/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/software/android/app/src/main/res/layout/activity_main.xml b/software/android/app/src/main/res/layout/activity_main.xml index 3f98626..6bbf2ea 100644 --- a/software/android/app/src/main/res/layout/activity_main.xml +++ b/software/android/app/src/main/res/layout/activity_main.xml @@ -18,11 +18,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/white" + android:elevation="8dp" + android:forceDarkAllowed="false" android:gravity="center_horizontal" android:orientation="vertical" android:paddingStart="16dp" - android:paddingEnd="16dp" - android:elevation="8dp"> + android:paddingEnd="16dp"> @@ -78,6 +83,8 @@ + android:text="192.168.1.127" + android:textColor="@android:color/primary_text_light" /> + android:text="1234" + android:textColor="@android:color/primary_text_light" /> diff --git a/software/android/app/src/main/res/layout/selected_device.xml b/software/android/app/src/main/res/layout/selected_device.xml index f1e79dc..0c6d658 100644 --- a/software/android/app/src/main/res/layout/selected_device.xml +++ b/software/android/app/src/main/res/layout/selected_device.xml @@ -4,9 +4,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@color/grey_500" android:clickable="true" android:focusable="true" - android:background="?android:attr/selectableItemBackground" android:paddingTop="16dp" android:paddingBottom="16dp"> @@ -16,17 +16,17 @@ android:layout_height="64dp" android:padding="16dp" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/textView_device_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintEnd_toStartOf="@+id/textView_device_name" app:srcCompat="@drawable/ic_baseline_bluetooth_24" />