diff --git a/software/android/app/src/main/ic_launcher-playstore.png b/software/android/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..7c13c3a Binary files /dev/null and b/software/android/app/src/main/ic_launcher-playstore.png differ diff --git a/software/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/software/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/software/android/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/software/android/app/src/main/res/drawable/ic_control_circle_backward.xml b/software/android/app/src/main/res/drawable/ic_control_circle_backward.xml new file mode 100644 index 0000000..68984ba --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_backward.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_fastbackward.xml b/software/android/app/src/main/res/drawable/ic_control_circle_fastbackward.xml new file mode 100644 index 0000000..beacf75 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_fastbackward.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_fastforward.xml b/software/android/app/src/main/res/drawable/ic_control_circle_fastforward.xml new file mode 100644 index 0000000..e907a22 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_fastforward.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_forward.xml b/software/android/app/src/main/res/drawable/ic_control_circle_forward.xml new file mode 100644 index 0000000..0949956 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_forward.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_left.xml b/software/android/app/src/main/res/drawable/ic_control_circle_left.xml new file mode 100644 index 0000000..fc812dd --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_left.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_right.xml b/software/android/app/src/main/res/drawable/ic_control_circle_right.xml new file mode 100644 index 0000000..f003c7b --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_right.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_standby.xml b/software/android/app/src/main/res/drawable/ic_control_circle_standby.xml new file mode 100644 index 0000000..69e0da1 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_standby.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_turnleft.xml b/software/android/app/src/main/res/drawable/ic_control_circle_turnleft.xml new file mode 100644 index 0000000..5d82411 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_turnleft.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_control_circle_turnright.xml b/software/android/app/src/main/res/drawable/ic_control_circle_turnright.xml new file mode 100644 index 0000000..6242204 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_control_circle_turnright.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/drawable/ic_launcher_background.xml b/software/android/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/software/android/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/software/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/software/android/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..6882c28 --- /dev/null +++ b/software/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + diff --git a/software/android/app/src/main/res/layout/activity_control.xml b/software/android/app/src/main/res/layout/activity_control.xml index 952f347..98720c0 100644 --- a/software/android/app/src/main/res/layout/activity_control.xml +++ b/software/android/app/src/main/res/layout/activity_control.xml @@ -38,6 +38,7 @@ android:paddingTop="24dp" android:paddingBottom="24dp" android:layout_margin="16dp" + android:theme="@style/Theme.Hexapod.ButtonInactive" android:text="Rotate X" app:layout_constraintBottom_toTopOf="@+id/button_rotatey" app:layout_constraintEnd_toStartOf="@+id/button_climb" @@ -54,6 +55,7 @@ android:paddingTop="24dp" android:paddingBottom="24dp" android:layout_margin="16dp" + android:theme="@style/Theme.Hexapod.ButtonInactive" android:text="Climb" app:layout_constraintBottom_toTopOf="@+id/button_twist" app:layout_constraintStart_toEndOf="@+id/button_rotatex" @@ -74,6 +76,7 @@ android:paddingTop="24dp" android:paddingBottom="24dp" android:layout_margin="16dp" + android:theme="@style/Theme.Hexapod.ButtonInactive" android:text="Rotate Y" app:layout_constraintBottom_toTopOf="@+id/button_rotatez" app:layout_constraintEnd_toStartOf="@+id/button_twist" @@ -88,6 +91,7 @@ android:paddingTop="24dp" android:paddingBottom="24dp" android:layout_margin="16dp" + android:theme="@style/Theme.Hexapod.ButtonInactive" android:text="Twist" app:layout_constraintBottom_toTopOf="@+id/button6" app:layout_constraintStart_toEndOf="@+id/button_rotatey" @@ -107,6 +111,7 @@ android:paddingTop="24dp" android:paddingBottom="24dp" android:layout_margin="16dp" + android:theme="@style/Theme.Hexapod.ButtonInactive" android:text="Rotate Z" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/button6" @@ -121,6 +126,7 @@ android:paddingTop="24dp" android:paddingBottom="24dp" android:layout_margin="16dp" + android:theme="@style/Theme.Hexapod.ButtonInactive" android:text="Button" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" @@ -149,7 +155,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_control_circle" /> + app:srcCompat="@drawable/ic_control_circle_standby" /> @@ -159,7 +165,7 @@ android:id="@+id/progressBar" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/blackTransparent" tools:visibility="gone"> + android:paddingEnd="16dp"> + android:text="192.168.1.127" /> - - + + \ No newline at end of file diff --git a/software/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/software/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cf..7353dbd 100644 --- a/software/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/software/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/software/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/software/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..43bad68 Binary files /dev/null and b/software/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/software/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/software/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/software/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/software/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..593dcbe Binary files /dev/null and b/software/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/software/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/software/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/software/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/software/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..cd401dc Binary files /dev/null and b/software/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/software/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/software/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/software/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/software/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..b6de742 Binary files /dev/null and b/software/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/software/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/software/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/software/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..fa17674 Binary files /dev/null and b/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..ae1bc5f Binary files /dev/null and b/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/software/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..18ddca5 Binary files /dev/null and b/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..15308a2 Binary files /dev/null and b/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/software/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..d0059bc Binary files /dev/null and b/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..07f383a Binary files /dev/null and b/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/software/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/software/android/app/src/main/res/values/colors.xml b/software/android/app/src/main/res/values/colors.xml index f8c6127..c09eeab 100644 --- a/software/android/app/src/main/res/values/colors.xml +++ b/software/android/app/src/main/res/values/colors.xml @@ -3,8 +3,12 @@ #FFBB86FC #FF6200EE #FF3700B3 + #FFEEEEEE + #FF9E9E9E + #FF616161 #FF03DAC5 #FF018786 #FF000000 #FFFFFFFF + #8F000000 \ No newline at end of file diff --git a/software/android/app/src/main/res/values/ic_launcher_background.xml b/software/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/software/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/software/android/app/src/main/res/values/themes.xml b/software/android/app/src/main/res/values/themes.xml index eb64fe1..50f1507 100644 --- a/software/android/app/src/main/res/values/themes.xml +++ b/software/android/app/src/main/res/values/themes.xml @@ -27,4 +27,18 @@ ?attr/colorPrimaryVariant + + \ No newline at end of file