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

Tidied up default strings for main activity when server not running.

Browse Source
This commit is contained in:
Graham Jones
2023-02-06 20:33:40 +00:00
parent 200db5fba5
commit 3e9c04711f
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="uk.org.openseizuredetector" package="uk.org.openseizuredetector"
android:versionCode="115" android:versionCode="115"
android:versionName="4.1.3b"> android:versionName="4.1.3c">
<!-- android:allowBackup="false" --> <!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

42
app/src/main/res/layout/main.xml
View File

@@ -8,24 +8,16 @@
android:id="@+id/versionTv" android:id="@+id/versionTv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Android OpenSeizureDetector Version x.xx" /> android:text="@string/app_name" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:id="@+id/statusLayout" android:id="@+id/statusLayout"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<!--<TextView <LinearLayout
android:id="@+id/serverStatusTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:gravity="center"
android:text="textView1" />
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -36,13 +28,13 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="---" /> android:text="---" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="10dp"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -60,7 +52,7 @@
android:text="---" /> android:text="---" />
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -92,16 +84,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="0.5" android:layout_weight="0.5"
android:gravity="center" android:gravity="center"
android:text="textView2" /> android:text="---" />
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:id="@+id/watchStatusLl" android:id="@+id/watchStatusLl"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="0.5"
@@ -112,18 +104,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="pebTimeTv" /> android:text="---" />
<TextView <TextView
android:id="@+id/alarmTv" android:id="@+id/alarmTv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="alarmTv" android:text="---"
android:textSize="32sp" /> android:textSize="32sp" />
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.5" android:layout_weight="0.5"
@@ -133,19 +125,19 @@
android:id="@+id/pebbleTv" android:id="@+id/pebbleTv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="pebbleTv" /> android:text="---" />
<TextView <TextView
android:id="@+id/appTv" android:id="@+id/appTv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="appTv" /> android:text="---" />
<TextView <TextView
android:id="@+id/battTv" android:id="@+id/battTv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="battTv" /> android:text="---" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -159,7 +151,7 @@
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:text="Power" /> android:text="---" />
<ProgressBar <ProgressBar
android:id="@+id/powerProgressBar" android:id="@+id/powerProgressBar"
@@ -172,7 +164,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:text="Spectal Range" /> android:text="---" />
<ProgressBar <ProgressBar
android:id="@+id/spectrumProgressBar" android:id="@+id/spectrumProgressBar"