smiuser/hpos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

changes Ui and attributes of panel, auto DAC, Calibration and device Diagnostics screens.

Browse Source
This commit is contained in:
tanx
2024-03-28 16:29:55 +05:30
parent f1b03c93a2
commit 304f413364
10 changed files with 92 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/drawable/baground_auto_dac.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/card_blue_app" />
<corners android:radius="20dp" />
</shape>
</item>
</selector>

3
app/src/main/res/drawable/border.xml
View File

@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="ExtraText">
<solid android:color="@android:color/transparent" />
<corners android:radius="10dp" />
<stroke
android:color="#000000"
android:width="2dp" />
android:width="1dp" />
</shape>

14
app/src/main/res/drawable/pannel_button.xml
View File

@@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Drop Shadow -->
<item>
<shape android:shape="rectangle">
<solid android:color="#4D000000" /> <!-- Semi-transparent black color -->
<corners android:radius="20dp" />
</shape>
</item>
<!-- Original Shape with Blue Color -->
<item android:top="5dp" android:right="5dp" android:left="5dp" android:bottom="5dp">
<shape android:shape="rectangle">
<solid android:color="@color/card_blue_app" />
<corners android:radius="20dp" />
<stroke android:color="@color/red" android:width="1dp" />
</shape>
</item>
</selector>
</layer-list>

3
app/src/main/res/layout/fragment_auto_dac.xml
View File

@@ -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" />

3
app/src/main/res/layout/fragment_blank.xml
View File

@@ -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" />

21
app/src/main/res/layout/fragment_calibration.xml
View File

@@ -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"

1
app/src/main/res/layout/fragment_device.xml
View File

@@ -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"

1
app/src/main/res/layout/fragment_diagnostics.xml
View File

@@ -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"

79
app/src/main/res/layout/fragment_gallery.xml
View File

@@ -28,44 +28,51 @@
<GridLayout
android:layout_width="match_parent"
android:layout_height="600dp"
android:layout_margin="10sp"
android:layout_height="wrap_content"
android:columnCount="2"
android:rowCount="4"
android:layout_margin="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_subtitle4"
app:layout_constraintVertical_bias="0.471">
>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_submit"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:textSize="14dp"
android:layout_margin="8sp"
android:layout_gravity="center"
android:clickable="false"
android:background="@drawable/pannel_button"
android:text="@string/check_buffer"
android:textColor="@color/blue_text_color" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_diagnostics"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_margin="8sp"
android:textSize="14dp"
android:layout_gravity="center"
android:text="diagnostics"
android:clickable="false"
android:text="@string/diagnostics"
android:background="@drawable/pannel_button"
android:textColor="@color/blue_text_color"
app:cornerRadius="16dp" />
android:textColor="@color/blue_text_color" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_auto_dac"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:textSize="14dp"
android:layout_gravity="center"
android:layout_margin="8sp"
android:clickable="false"
android:text="@string/auto_dac"
android:background="@drawable/pannel_button"
@@ -74,9 +81,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_calibration"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:textSize="14dp"
android:layout_gravity="center"
android:layout_margin="8sp"
android:clickable="false"
android:text="@string/calibration"
android:background="@drawable/pannel_button"
@@ -86,9 +95,11 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_deviceInfo"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_gravity="center"
android:textSize="14dp"
android:layout_height="120dp"
android:layout_margin="8sp"
android:clickable="false"
android:text="@string/deviceinfo"
android:background="@drawable/pannel_button"
@@ -97,9 +108,11 @@
<Button
android:id="@+id/btn_deviceProvision"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_margin="8sp"
android:textSize="14dp"
android:layout_gravity="center"
android:text="@string/deviceProvision"
android:background="@drawable/pannel_button"
android:textColor="@color/blue_text_color"
@@ -108,10 +121,12 @@
<Button
android:id="@+id/btn_firefox"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:textSize="14dp"
android:layout_margin="8sp"
android:clickable="false"
android:layout_gravity="center"
android:text="@string/Firefox"
android:background="@drawable/pannel_button"
android:textColor="@color/blue_text_color"
@@ -119,9 +134,11 @@
<Button
android:id="@+id/btn_files"
android:layout_width="150dp"
android:layout_height="130dp"
android:layout_margin="15sp"
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_margin="8sp"
android:textSize="14dp"
android:layout_gravity="center"
android:clickable="false"
android:text="@string/Files"
android:background="@drawable/pannel_button"

2
app/src/main/res/values/colors.xml
View File

@@ -16,7 +16,7 @@
<color name="red">#FF0000</color>
<color name="red_light">#88FF0000</color>
<color name="blue_app">#4daaff</color>
<color name="card_blue_app">#6600A3E0</color>
<color name="card_blue_app">#43BFE8F7</color>
<color name="blue_app_dark">#005db3</color>
<color name="blue_app_light">#e5f3ff</color>
<color name="new_blue">#A2C3FA</color>