awin/vc-kirby-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: layout and theme issues

Browse Source
This commit is contained in:
Stefan Zollinger
2023-12-14 11:18:26 +01:00
parent ae0d1ff921
commit 6fe6d13dea
9 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/res/layout/row_device_list.xml
View File

@@ -38,6 +38,7 @@
android:id="@+id/device_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#000000"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -84,6 +85,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/black"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="MAC: XX:XX:XX:XX:XX" />
@@ -94,6 +96,7 @@
android:layout_height="wrap_content"
android:drawablePadding="2dp"
android:textSize="14sp"
android:textColor="@color/black"
app:drawableEndCompat="@drawable/signal_strength_medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -113,6 +116,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="@color/black"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="Device Status" />
@@ -120,12 +124,17 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<ListView
android:layout_marginTop="20dp"
<com.example.sensortestingapp.NonScrollListView
android:id="@+id/measurement_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/device_meta" />
android:layout_marginTop="20dp"
android:divider="@color/greyDarker"
android:dividerHeight="1px"
android:footerDividersEnabled="true"
android:headerDividersEnabled="true"
app:layout_constraintTop_toBottomOf="@id/device_meta"
tools:layout_editor_absoluteX="10dp" />
</androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/layout/row_measurements_list.xml
View File

@@ -11,6 +11,7 @@
android:layout_height="wrap_content"
android:drawablePadding="2dp"
android:textSize="16sp"
android:textColor="@color/black"
app:drawableStartCompat="@drawable/baseline_device_thermostat_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -20,16 +21,18 @@
<TextView
android:id="@+id/measurement_value"
android:textColor="@color/black"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="android:layout_margin=&quot;18dp&quot; android:maxWidth=&quot;250dp&quot; android:text=&quot;@string/year&quot; android:maxLines=&quot;24&quot; android:textSize=&quot;18sp&quot; app:layout_constraintBottom_toBottomOf=&quot;parent&quot;" />
tools:text="600°" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/values-night/themes.xml
View File

@@ -1,7 +1,8 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Base.Theme.SensorTestingApp" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Base.Theme.SensorTestingApp" parent="Theme.Material3.Light.NoActionBar">
<!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
<item name="android:forceDarkAllowed">false</item>
</style>
</resources>

4
app/src/main/res/values/themes.xml
View File

@@ -1,8 +1,10 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Base.Theme.SensorTestingApp" parent="Theme.Material3.DayNight.NoActionBar">
<style name="Base.Theme.SensorTestingApp" parent="Theme.Material3.Light.NoActionBar">
<!-- Customize your light theme here. -->
<!-- <item name="colorPrimary">@color/my_light_primary</item> -->
<item name="textAppearanceBody1">@color/black</item>
<item name="android:forceDarkAllowed">false</item>
</style>
<style name="Theme.SensorTestingApp" parent="Base.Theme.SensorTestingApp" />