Changeset 005b954 in orbit for android/src

Timestamp:

12/25/13 17:02:37 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

b7a3163

Parents:

de61e47

Message:

• added minature Attention, Meditation, Signal, and Power progressBars to Advanced tab

Location:

android/src/info/puzzlebox/orbit

Files:

• FragmentTabAdvanced.java (modified) (6 diffs)
• FragmentTabFlightThinkGear.java (modified) (2 diffs)
• OrbitTabActivity.java (modified) (1 diff)

android/src/info/puzzlebox/orbit/FragmentTabAdvanced.java

@@ -18 +18 @@
 import android.content.Context;
 import android.content.res.Configuration;
+import android.graphics.Color;
+import android.graphics.drawable.ClipDrawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.RoundRectShape;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
@@ -23 +27 @@
 import android.hardware.SensorManager;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -29 +34 @@
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -80 +86 @@
         Configuration config;
 
+        ProgressBar progressBarAttention;
+        ProgressBar progressBarMeditation;
+        ProgressBar progressBarSignal;
+        ProgressBar progressBarPower;
+
+        
         SeekBar seekBarThrottle;
         SeekBar seekBarYaw;
@@ -164 +176 @@
         // ################################################################
 
+        @SuppressWarnings("deprecation")
         public View onCreateView (LayoutInflater inflater, ViewGroup container,
                         Bundle savedInstanceState) {
@@ -173 +186 @@
                 config = getResources().getConfiguration();
 
-                checkBoxAdvancedOptions = (CheckBox) v.findViewById(R.id.checkBoxAdvancedOptions);
+//              checkBoxAdvancedOptions = (CheckBox) v.findViewById(R.id.checkBoxAdvancedOptions);
+                
+                progressBarAttention = (ProgressBar) v.findViewById(R.id.progressBarAttention);
+                final float[] roundedCorners = new float[] { 5, 5, 5, 5, 5, 5, 5, 5 };
+                ShapeDrawable progressBarAttentionDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null));
+                String progressBarAttentionColor = "#FF0000";
+                progressBarAttentionDrawable.getPaint().setColor(Color.parseColor(progressBarAttentionColor));
+                ClipDrawable progressAttention = new ClipDrawable(progressBarAttentionDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
+                progressBarAttention.setProgressDrawable(progressAttention);   
+                progressBarAttention.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
+
+                progressBarMeditation = (ProgressBar) v.findViewById(R.id.progressBarMeditation);
+                ShapeDrawable progressBarMeditationDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null));
+                String progressBarMeditationColor = "#0000FF";
+                progressBarMeditationDrawable.getPaint().setColor(Color.parseColor(progressBarMeditationColor));
+                ClipDrawable progressMeditation = new ClipDrawable(progressBarMeditationDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
+                progressBarMeditation.setProgressDrawable(progressMeditation);   
+                progressBarMeditation.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
+
+                progressBarSignal = (ProgressBar) v.findViewById(R.id.progressBarSignal);
+                ShapeDrawable progressBarSignalDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null));
+                String progressBarSignalColor = "#00FF00";
+                progressBarSignalDrawable.getPaint().setColor(Color.parseColor(progressBarSignalColor));
+                ClipDrawable progressSignal = new ClipDrawable(progressBarSignalDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
+                progressBarSignal.setProgressDrawable(progressSignal);
+                progressBarSignal.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
+
+                progressBarPower = (ProgressBar) v.findViewById(R.id.progressBarPower);
+                ShapeDrawable progressBarPowerDrawable = new ShapeDrawable(new RoundRectShape(roundedCorners, null,null));
+                String progressBarPowerColor = "#FFFF00";
+                progressBarPowerDrawable.getPaint().setColor(Color.parseColor(progressBarPowerColor));
+                ClipDrawable progressPower = new ClipDrawable(progressBarPowerDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL);
+                progressBarPower.setProgressDrawable(progressPower);   
+                progressBarPower.setBackgroundDrawable(getResources().getDrawable(android.R.drawable.progress_horizontal));
+
 
                 seekBarThrottle = (SeekBar) v.findViewById(R.id.seekBarThrottle);

android/src/info/puzzlebox/orbit/FragmentTabFlightThinkGear.java

@@ -660 +660 @@
                                 Log.v(TAG, "Meditation: " + eegMeditation);
                         progressBarMeditation.setProgress(eegMeditation);
-                        updatePower();
+                        //                      updatePower();
 
                         break;
@@ -936 +936 @@
                 progressBarPower.setProgress(eegPower);
 
-                //              return eegPower;
-
                 ((OrbitTabActivity)getActivity()).eegPower = eegPower;
                 ((OrbitTabActivity)getActivity()).updatePower();
+
+
+                String id = ((OrbitTabActivity)getActivity()).getTabFragmentAdvanced();
+
+                FragmentTabAdvanced fragmentAdvanced = 
+                                (FragmentTabAdvanced) getFragmentManager().findFragmentByTag(id);
+
+                if (fragmentAdvanced != null) {
+                        fragmentAdvanced.progressBarAttention.setProgress(eegAttention);
+                        fragmentAdvanced.progressBarMeditation.setProgress(eegMeditation);
+                        fragmentAdvanced.progressBarSignal.setProgress(eegSignal);
+                        fragmentAdvanced.progressBarPower.setProgress(eegPower);
+                }
 
 

android/src/info/puzzlebox/orbit/OrbitTabActivity.java

@@ -818 +818 @@
                         // Handle controlled descent thread if activated
                         if ((fragmentAdvanced.orbitControlledDescentTask != null) && 
-                                        (fragmentAdvanced.orbitControlledDescentTask.keepDescending)) {
+                                        (! fragmentAdvanced.orbitControlledDescentTask.keepDescending)) {
                                 fragmentAdvanced.orbitControlledDescentTask.callStopAudio = false;
                                 fragmentAdvanced.orbitControlledDescentTask.keepDescending = false;