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

Tidied up UI - colours and background fill.

Browse Source
This commit is contained in:
Graham Jones
2015-12-15 22:13:18 +00:00
parent e7cf47f08a
commit db2d40879d
9 changed files with 223 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/drawable/progress_bar_red.xml
View File

@@ -20,10 +20,10 @@
<shape>
<corners android:radius="5dp"/>
<gradient
android:startColor="#ff0000"
android:centerColor="#ffa0a0"
android:startColor="#f00000"
android:centerColor="#f0a0a0"
android:centerY="0.5"
android:endColor="#ff0000"
android:endColor="#f00000"
android:angle="270"
/>
</shape>

6
app/src/main/res/drawable/progress_bar_yellow.xml
View File

@@ -20,10 +20,10 @@
<shape>
<corners android:radius="5dp"/>
<gradient
android:startColor="#f0f000"
android:centerColor="#f0f0a0"
android:startColor="#d0d000"
android:centerColor="#d0d0a0"
android:centerY="0.5"
android:endColor="#f0f000"
android:endColor="#d0d000"
android:angle="270"
/>
</shape>

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

@@ -1,139 +1,139 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
<TextView
android:id="@+id/versionTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Android OpenSeizureDetector Version x.xx"
/>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<TextView
android:id="@+id/textView1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:text="textView1"
/>
<TextView
android:id="@+id/textView2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:text="textView2"
/>
</LinearLayout>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
<TextView
android:id="@+id/versionTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Android OpenSeizureDetector Version x.xx" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
>
<TextView
android:id="@+id/alarmTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="alarmTv"
android:textSize="32sp"
/>
<TextView
android:id="@+id/pebTimeTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="pebTimeTv"
/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/serverStatusTv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:layout_weight="0.5"
android:text="textView1" />
<TextView
android:id="@+id/serverIpTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_weight="0.5"
android:text="textView2" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/pebbleTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="pebbleTv"
/>
<TextView
android:id="@+id/appTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="appTv"
/>
<TextView
android:id="@+id/battTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="battTv"
/>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical">
<TextView
android:id="@+id/pebTimeTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="pebTimeTv" />
<TextView
android:id="@+id/alarmTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="alarmTv"
android:textSize="32sp" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical">
<TextView
android:id="@+id/pebbleTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="pebbleTv" />
<TextView
android:id="@+id/appTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="appTv" />
<TextView
android:id="@+id/battTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="battTv" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/powerTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Power" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Power"
android:id="@+id/powerTv" />
<ProgressBar
android:id="@+id/powerProgressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="20dp" />
<ProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/powerProgressBar"
android:minHeight="20dp" />
<TextView
android:id="@+id/spectrumTv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Spectal Range" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Spectal Range"
android:id="@+id/spectrumTv" />
<ProgressBar
android:id="@+id/spectrumProgressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:indeterminate="false"
android:minHeight="20dp" />
<ProgressBar
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/spectrumProgressBar"
android:indeterminate="false"
android:minHeight="20dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Accept Alarm"
android:id="@+id/acceptAlarmButton" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cancel Audible (temporarily)"
android:id="@+id/cancelAudibleButton" />
</LinearLayout>
<Button
android:id="@+id/acceptAlarmButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Accept Alarm" />
<com.github.mikephil.charting.charts.LineChart
<Button
android:id="@+id/cancelAudibleButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cancel Audible (temporarily)" />
</LinearLayout>
<com.github.mikephil.charting.charts.LineChart
android:id="@+id/chart1"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</LinearLayout>

12
app/src/main/res/layout/startup_activity.xml
View File

@@ -47,7 +47,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="New Text"
android:id="@+id/textItem1" />
@@ -65,7 +65,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="New Text"
android:id="@+id/textItem2" />
@@ -83,7 +83,7 @@
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="New Text"
android:id="@+id/textItem3" />
@@ -99,7 +99,7 @@
android:id="@+id/progressBar4" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="New Text"
android:id="@+id/textItem4" />
@@ -115,7 +115,7 @@
android:id="@+id/progressBar5" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:text="New Text"
android:gravity="center_vertical"
android:id="@+id/textItem5" />
@@ -131,7 +131,7 @@
android:id="@+id/progressBar6" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:text="New Text"
android:id="@+id/textItem6" />