diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index f2f09df..976b426 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -38,6 +38,7 @@ import android.content.ServiceConnection;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -390,21 +391,26 @@ public class MainActivity extends Activity {
" (threshold = " + mConnection.mSdServer.mSdData.alarmRatioThresh + ")");
ProgressBar pb;
+ Drawable pbDrawable;
pb = ((ProgressBar) findViewById(R.id.powerProgressBar));
pb.setMax(100);
pb.setProgress((int) powerPc);
- int colour = Color.BLUE;
- if (powerPc > 75) colour = Color.YELLOW;
- if (powerPc > 100) colour = Color.RED;
- pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
+ pbDrawable = getResources().getDrawable(R.drawable.progress_bar_blue);
+ if (powerPc > 75) pbDrawable = getResources().getDrawable(R.drawable.progress_bar_yellow);
+ if (powerPc > 100) pbDrawable = getResources().getDrawable(R.drawable.progress_bar_red);
+
+ //pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
+
+ pb.setProgressDrawable(pbDrawable);
pb = ((ProgressBar) findViewById(R.id.spectrumProgressBar));
pb.setMax(100);
pb.setProgress((int) specPc);
- colour = Color.BLUE;
- if (specPc > 75) colour = Color.YELLOW;
- if (specPc > 100) colour = Color.RED;
- pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
+ pbDrawable = getResources().getDrawable(R.drawable.progress_bar_blue);
+ if (specPc > 75) pbDrawable = getResources().getDrawable(R.drawable.progress_bar_yellow);
+ if (specPc > 100) pbDrawable = getResources().getDrawable(R.drawable.progress_bar_red);
+ //pb.getProgressDrawable().setColorFilter(colour, PorterDuff.Mode.SRC_IN);
+ pb.setProgressDrawable(pbDrawable);
} else {
tv = (TextView) findViewById(R.id.alarmTv);
tv.setText("Not Connected to Server");
diff --git a/app/src/main/res/drawable/progress_bar_blue.xml b/app/src/main/res/drawable/progress_bar_blue.xml
new file mode 100644
index 0000000..bfe2f13
--- /dev/null
+++ b/app/src/main/res/drawable/progress_bar_blue.xml
@@ -0,0 +1,30 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_bar_red.xml b/app/src/main/res/drawable/progress_bar_red.xml
new file mode 100644
index 0000000..eb3847f
--- /dev/null
+++ b/app/src/main/res/drawable/progress_bar_red.xml
@@ -0,0 +1,30 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/progress_bar_yellow.xml b/app/src/main/res/drawable/progress_bar_yellow.xml
new file mode 100644
index 0000000..b5d27d8
--- /dev/null
+++ b/app/src/main/res/drawable/progress_bar_yellow.xml
@@ -0,0 +1,30 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 32367c9..0fb75eb 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -98,7 +98,8 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:id="@+id/powerProgressBar" />
+ android:id="@+id/powerProgressBar"
+ android:minHeight="20dp" />
+ android:indeterminate="false"
+ android:minHeight="20dp" />
- OpenSeizureDetector Server
+ OpenSeizureDetector