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

Revert "Started to add a simplified default main screen."

Browse Source 
This reverts commit 83df18d77b.
This commit is contained in:
Graham Jones
2024-10-10 19:57:44 +01:00
parent 83df18d77b
commit 279534fc16
5 changed files with 12 additions and 1316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,6 +1,6 @@
OpenSeizureDetector Android App - Change Log OpenSeizureDetector Android App - Change Log
============================================ ============================================
V4.3.0 - added a crude 'flap' detector into OSD Algorithm, added simplified default UI, Improved data sharing data entry. V4.2.11 - added a crude 'flap' detector into OSD Algorithm
V4.2.10 - fixed (infrequent) crash when opening data sharing page (#195), and crash if log manager fails to start (#196) V4.2.10 - fixed (infrequent) crash when opening data sharing page (#195), and crash if log manager fails to start (#196)
V4.2.9 - fixed crash when using Polish translation. V4.2.9 - fixed crash when using Polish translation.
V4.2.8 - V4.2.8 -

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

@@ -50,9 +50,6 @@
<activity <activity
android:name=".MainActivity2" android:name=".MainActivity2"
android:exported="false" /> android:exported="false" />
<activity
android:name=".ActivityMainSimple"
android:exported="false" />
<!--<activity <!--<activity
android:name=".MlModelManager" android:name=".MlModelManager"
android:exported="false" android:exported="false"

1186
app/src/main/java/uk/org/openseizuredetector/ActivityMainSimple.java
View File

File diff suppressed because it is too large Load Diff

2
app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
View File

@@ -512,7 +512,7 @@ public class StartupActivity extends AppCompatActivity {
} else { } else {
intent = new Intent( intent = new Intent(
getApplicationContext(), getApplicationContext(),
ActivityMainSimple.class); MainActivity.class);
} }
intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent); startActivity(intent);

131
app/src/main/res/layout/activity_main_simple.xml
View File

@@ -6,136 +6,21 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:id="@+id/statusLayoutSimple"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<TextView <TextView
android:id="@+id/versionTvSimple" android:id="@+id/versionTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/app_name" />
<TextView
android:id="@+id/serverStatusTvSimple"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/app_name" /> android:text="@string/app_name" />
</LinearLayout>
<LinearLayout <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_common_container_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:orientation="horizontal"
android:weightSum="100">
<TextView
android:id="@+id/alg1NameTv"
android:layout_weight="70"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="OSD" />
<TextView
android:id="@+id/alg1StatusTv"
android:layout_weight="70"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="alg1StatusTv" />
</LinearLayout>
<LinearLayout
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/fragment_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" />
android:orientation="horizontal"
android:weightSum="100">
<TextView
android:id="@+id/alg2NameTv"
android:layout_weight="70"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="Flap" />
<TextView
android:id="@+id/alg2StatusTv"
android:layout_width="0dp"
android:layout_weight="70"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="alg2StatusTv" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="100">
<TextView
android:id="@+id/alg3NameTv"
android:layout_weight="70"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="CNN" />
<TextView
android:id="@+id/alg3StatusTv"
android:layout_width="0dp"
android:layout_weight="70"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="alg3StatusTv longer text" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="100">
<TextView
android:id="@+id/alg4NameTv"
android:layout_weight="70"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="HR" />
<TextView
android:id="@+id/alg4StatusTv"
android:layout_width="0dp"
android:layout_weight="70"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="alg3StatusTv longer text" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false">
<Button
android:id="@+id/acceptAlarmButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/AcceptAlarmBtnTxt" />
<Button
android:id="@+id/cancelAudibleButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/CancelAudibleButtonTxt" />
<Button
android:id="@+id/manualAlarmButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:backgroundTint="#ff0000"
android:text="@string/ManualAlarmBtnTxt" />
</LinearLayout>
</LinearLayout> </LinearLayout>