gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI work in progress

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -66,7 +66,7 @@
android:exported="true" android:exported="true"
android:icon="@drawable/star_of_life_48x48" android:icon="@drawable/star_of_life_48x48"
android:label="@string/app_name" /> android:label="@string/app_name" />
g <activity <activity
android:name=".PrefActivity" android:name=".PrefActivity"
android:label="OpenSeizureDetector Preferences" /> android:label="OpenSeizureDetector Preferences" />
<activity <activity

65
app/src/main/res/layout/fragment_hr_alg.xml
View File

@@ -5,23 +5,74 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".FragmentOsdBaseClass"> tools:context=".FragmentOsdBaseClass">
<!-- TODO: Update blank fragment layout -->
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="253dp" android:layout_height="253dp"
android:background="@color/okBackgroundColor"
android:orientation="vertical"> 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 <TextView
android:id="@+id/fragment_hr_alg_tv1" android:id="@+id/fragment_hr_alg_tv1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Fragment_HrAlg" /> android:text="Fragment_HrAlg" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="HR Algorithm Status" />
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

22
app/src/main/res/layout/fragment_osdalg.xml
View File

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

2
build.gradle
View File

@@ -10,7 +10,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.0.2' classpath 'com.android.tools.build:gradle:8.1.1'
classpath 'com.google.gms:google-services:4.3.15' classpath 'com.google.gms:google-services:4.3.15'
} }
} }