UI work in progress

This commit is contained in:
Graham Jones
2023-09-30 20:32:04 +01:00
parent 26cc18a17d
commit b339daa826
4 changed files with 74 additions and 17 deletions

View File

@@ -5,23 +5,74 @@
android:layout_height="match_parent"
tools:context=".FragmentOsdBaseClass">
<!-- TODO: Update blank fragment layout -->
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="253dp"
android:background="@color/okBackgroundColor"
android:orientation="vertical">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="HR Algorithm Status"
android:textColor="@color/okTextColor" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Current HR: "
android:textColor="@color/okTextColor" />
<TextView
android:id="@+id/current_hr_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="---"
android:textColor="@color/okTextColor" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" bpm"
android:textColor="@color/okTextColor" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Adaptive Threshold Average HR: "
android:textColor="@color/okTextColor" />
<TextView
android:id="@+id/adaptive_avg_hr_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="---"
android:textColor="@color/okTextColor" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" bpm"
android:textColor="@color/okTextColor" />
</androidx.appcompat.widget.LinearLayoutCompat>
<TextView
android:id="@+id/fragment_hr_alg_tv1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Fragment_HrAlg" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="HR Algorithm Status" />
</androidx.appcompat.widget.LinearLayoutCompat>

View File

@@ -8,25 +8,21 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="253dp"
android:orientation="vertical">
<!-- TODO: Update blank fragment layout -->
<TextView
android:id="@+id/fragment_osdalg_tv1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Fragment_OsdAlg" />
android:orientation="vertical"
android:background="@color/okBackgroundColor">
<TextView
android:id="@+id/fragment_osdalg_tv2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/okTextColor"
android:text="OSD Algorithm Status" />
<TextView
android:id="@+id/powerTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/okTextColor"
android:text="---" />
<ProgressBar
@@ -40,6 +36,7 @@
android:id="@+id/spectrumTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/okTextColor"
android:text="---" />
<ProgressBar
@@ -55,5 +52,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!--This is not displayed because of match_parent height above -->
<TextView
android:id="@+id/fragment_osdalg_tv1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/okTextColor"
android:text="Fragment_OsdAlg" />
</androidx.appcompat.widget.LinearLayoutCompat>
</FrameLayout>