diff --git a/app/src/main/res/drawable/baground_auto_dac.xml b/app/src/main/res/drawable/baground_auto_dac.xml new file mode 100644 index 0000000..34d6bfb --- /dev/null +++ b/app/src/main/res/drawable/baground_auto_dac.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml index 176c850..44f79a9 100644 --- a/app/src/main/res/drawable/border.xml +++ b/app/src/main/res/drawable/border.xml @@ -3,7 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="ExtraText"> + + android:width="1dp" /> diff --git a/app/src/main/res/drawable/pannel_button.xml b/app/src/main/res/drawable/pannel_button.xml index 3506a1c..c2541e1 100644 --- a/app/src/main/res/drawable/pannel_button.xml +++ b/app/src/main/res/drawable/pannel_button.xml @@ -1,10 +1,18 @@ - + + + + + + + + + + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_auto_dac.xml b/app/src/main/res/layout/fragment_auto_dac.xml index 09e6330..7691267 100644 --- a/app/src/main/res/layout/fragment_auto_dac.xml +++ b/app/src/main/res/layout/fragment_auto_dac.xml @@ -47,12 +47,13 @@ style="@style/title1_1" android:layout_width="0dp" android:layout_height="380dp" + android:background="@drawable/baground_auto_dac" android:layout_marginHorizontal="24dp" android:layout_marginTop="16dp" android:gravity="center" android:text="Start" android:textColor="@color/black" - android:textSize="11sp" + android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" /> diff --git a/app/src/main/res/layout/fragment_blank.xml b/app/src/main/res/layout/fragment_blank.xml index 9a8a4b4..2703615 100644 --- a/app/src/main/res/layout/fragment_blank.xml +++ b/app/src/main/res/layout/fragment_blank.xml @@ -50,9 +50,10 @@ android:layout_marginHorizontal="24dp" android:layout_marginTop="16dp" android:gravity="center" + android:background="@drawable/baground_auto_dac" android:text="Start" android:textColor="@color/black" - android:textSize="11sp" + android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_subtitle3" /> diff --git a/app/src/main/res/layout/fragment_calibration.xml b/app/src/main/res/layout/fragment_calibration.xml index 4f3bccd..ec059ad 100644 --- a/app/src/main/res/layout/fragment_calibration.xml +++ b/app/src/main/res/layout/fragment_calibration.xml @@ -37,6 +37,8 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" android:layout_marginTop="16dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:orientation="horizontal" android:background="@drawable/border" app:layout_constraintEnd_toEndOf="parent" @@ -70,8 +72,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginTop="16dp" + android:layout_marginTop="36dp" android:orientation="horizontal" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:background="@drawable/border" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -104,8 +108,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginTop="16dp" + android:layout_marginTop="36dp" android:orientation="horizontal" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:background="@drawable/border" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -138,8 +144,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginTop="16dp" + android:layout_marginTop="36dp" android:orientation="horizontal" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:background="@drawable/border" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -174,7 +182,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" - android:layout_marginTop="16dp" + android:layout_marginTop="36dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/llLed4Fields" /> @@ -185,9 +193,10 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_marginHorizontal="24dp" - android:layout_marginTop="8dp" + android:layout_marginTop="60dp" android:gravity="center" android:text="Start" + android:background="@drawable/baground_auto_dac" android:textColor="@color/black" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" @@ -199,7 +208,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" - android:layout_marginTop="10dp" + android:layout_marginTop="60dp" android:clickable="false" android:paddingLeft="5dp" android:paddingRight="5dp" diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml index 84d4928..2151270 100644 --- a/app/src/main/res/layout/fragment_device.xml +++ b/app/src/main/res/layout/fragment_device.xml @@ -13,6 +13,7 @@ android:layout_marginHorizontal="24dp" android:layout_marginTop="50dp" android:gravity="center" + android:background="@drawable/baground_auto_dac" android:text="Start" android:textColor="@color/black" android:textSize="16sp" diff --git a/app/src/main/res/layout/fragment_diagnostics.xml b/app/src/main/res/layout/fragment_diagnostics.xml index 49a5ab1..19779ac 100644 --- a/app/src/main/res/layout/fragment_diagnostics.xml +++ b/app/src/main/res/layout/fragment_diagnostics.xml @@ -51,6 +51,7 @@ android:layout_marginTop="16dp" android:gravity="center" android:text="Start" + android:background="@drawable/baground_auto_dac" android:textColor="@color/red" android:textSize="22sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml index f57637e..cc2565e 100644 --- a/app/src/main/res/layout/fragment_gallery.xml +++ b/app/src/main/res/layout/fragment_gallery.xml @@ -28,44 +28,51 @@ + > - + android:textColor="@color/blue_text_color" /> + + + #FF0000 #88FF0000 #4daaff - #6600A3E0 + #43BFE8F7 #005db3 #e5f3ff #A2C3FA