Changeset 35756a5 in orbit

Timestamp:

10/10/13 15:56:27 (9 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

pyramid

Parents:

0d2b1fc

Message:

FragmentTabPyramid?:

• initial checkin

Location:

android

Files:

• res/layout/fragment_pyramid.xml (added)
• res/values/strings.xml (modified) (1 diff)
• src/info/puzzlebox/orbit/FragmentTabPyramid.java (added)
• src/info/puzzlebox/orbit/OrbitTabActivity.java (modified) (16 diffs)

android/res/values/strings.xml

@@ -12 +12 @@
     <string name="tab_advanced_small">Options</string>
     <string name="tab_advanced_large">Advanced</string>
+    <string name="tab_pyramid">Pyramid</string>
+    <string name="tab_pyramid_small">Pyramid</string>
+    <string name="tab_pyramid_large">Pyramid</string>
     <string name="tab_support">Support</string>
     <string name="tab_support_small">Help</string>

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

@@ -67 +67 @@
          * Configuration
          */
-        int minAPIVersion = 11;
+        int minAPIVersion = 14;
         String versionName;
         int eegAttention = 0;
@@ -78 +78 @@
         boolean generateAudio = true;
         boolean invertControlSignal = false;
+//      boolean pluginPyramid = false;
+        boolean pluginPyramid = true;
 
 
@@ -89 +91 @@
         String idTabFragmentFlight;
         String idTabFragmentAdvanced;
+        String idTabFragmentPyramid;
         String idTabFragmentSupport;
 
@@ -111 +114 @@
          */
         /** set to "false" for production releases */
-        //      boolean DEBUG = true;
-        boolean DEBUG = false;
+        boolean DEBUG = true;
+        //      boolean DEBUG = false;
         String TAG = "OrbitTabActivity";
 
@@ -205 +208 @@
                 String tabFlightLabel = getResources().getString(R.string.tab_flight);
                 String tabAdvancedLabel = getResources().getString(R.string.tab_advanced);
+                String tabPyramidLabel = getResources().getString(R.string.tab_pyramid);
                 String tabSupportLabel = getResources().getString(R.string.tab_support);
 
@@ -216 +220 @@
                         tabFlightLabel = getResources().getString(R.string.tab_flight_small);
                         tabAdvancedLabel = getResources().getString(R.string.tab_advanced_small);
+                        tabPyramidLabel = getResources().getString(R.string.tab_pyramid_small);
                         tabSupportLabel = getResources().getString(R.string.tab_support_small);
                         break;
@@ -225 +230 @@
                         tabFlightLabel = getResources().getString(R.string.tab_flight_large);
                         tabAdvancedLabel = getResources().getString(R.string.tab_advanced_large);
+                        tabPyramidLabel = getResources().getString(R.string.tab_pyramid_large);                 
                         tabSupportLabel = getResources().getString(R.string.tab_support_large);
                         break;
@@ -231 +237 @@
                         tabFlightLabel = getResources().getString(R.string.tab_flight_large);
                         tabAdvancedLabel = getResources().getString(R.string.tab_advanced_large);
+                        tabPyramidLabel = getResources().getString(R.string.tab_pyramid_large);
                         tabSupportLabel = getResources().getString(R.string.tab_support_large);
                         break;
@@ -261 +268 @@
                 mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabAdvancedLabel),
                                 FragmentTabAdvanced.class, null);
+
+                mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabPyramidLabel),
+                                FragmentTabPyramid.class, null);
 
                 mTabsAdapter.addTab(mTabHost.newTabSpec("Orbit").setIndicator(tabSupportLabel),
@@ -364 +374 @@
         // ################################################################
 
-                public boolean onCreateOptionsMenu(Menu menu) {
-        
-                        SubMenu sub = menu.addSubMenu("About");
-                        sub.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-        
-                        return true;
-        
-                } // onCreateOptionsMenu
-
-
-        // ################################################################
-
-                public boolean onOptionsItemSelected(MenuItem item) {
-                        if (item.getItemId() == android.R.id.home || item.getItemId() == 0) {
-                                //                      Toast.makeText(this, "About menu: \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show();
-                                Toast.makeText(this, "Puzzlebox Orbit\n Version: " + versionName, Toast.LENGTH_SHORT).show();
-                                return false;
-                        }
-                        ////      THEME = item.getItemId();
-                        //      Toast.makeText(this, "Theme changed to \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show();
-                        Toast.makeText(this, "About menu: \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show();
-                        return true;
-        
-                } // onOptionsItemSelected
+        public boolean onCreateOptionsMenu(Menu menu) {
+
+                SubMenu sub = menu.addSubMenu("About");
+                sub.getItem().setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+                return true;
+
+        } // onCreateOptionsMenu
+
+
+        // ################################################################
+
+        public boolean onOptionsItemSelected(MenuItem item) {
+                if (item.getItemId() == android.R.id.home || item.getItemId() == 0) {
+                        //                      Toast.makeText(this, "About menu: \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show();
+                        Toast.makeText(this, "Puzzlebox Orbit\n Version: " + versionName, Toast.LENGTH_SHORT).show();
+                        return false;
+                }
+                ////      THEME = item.getItemId();
+                //      Toast.makeText(this, "Theme changed to \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, "About menu: \"" + item.getTitle() + "\"", Toast.LENGTH_SHORT).show();
+                return true;
+
+        } // onOptionsItemSelected
 
 
@@ -618 +628 @@
                 idTabFragmentAdvanced = t;
         }
+        public void setTabFragmentPyramid(String t) {
+                idTabFragmentPyramid = t;
+        }
         public void setTabFragmentSupport(String t) {
                 idTabFragmentSupport = t;
@@ -630 +643 @@
         public String getTabFragmentAdvanced() {
                 return idTabFragmentAdvanced;
+        }
+        public String getTabFragmentPyramid() {
+                return idTabFragmentPyramid;
         }
         public String getTabFragmentSupport() {
@@ -857 +873 @@
                                 fragmentFlight.parseEEG(msg);
                         }
+                        
+                        
+                        FragmentTabPyramid fragmentPyramid = 
+                                        (FragmentTabPyramid) getSupportFragmentManager().findFragmentByTag( getTabFragmentPyramid() );
+
+                        if (fragmentPyramid != null){
+                                fragmentPyramid.parseEEG(msg);
+                        }
+                        
 
                         switch (msg.what) {
@@ -1007 +1032 @@
                         tgDevice.close();
                 }
-                
+
                 stopControl();
 
@@ -1063 +1088 @@
                 if (fragmentFlight != null)
                         eegPower = fragmentFlight.updatePower();
+                
+                
+                FragmentTabPyramid fragmentPyramid = 
+                                (FragmentTabPyramid) getSupportFragmentManager().findFragmentByTag( getTabFragmentPyramid() );
+
+                if (fragmentPyramid != null)
+                        fragmentPyramid.updatePower(eegPower);
+                
 
                 String command = "";
@@ -1136 +1169 @@
                                 else
                                         updateAudioHandlerLoopNumberWhileMindControl(4500);
-                                
+
                                 updateAudioHandlerChannel(channel);
-                                
+
                                 audioHandler.mutexNotify();
                         }