theme background color in gl view

src/de/tudarmstadt/informatik/hostage/ui2/activity/MainActivity.java

@@ -9,6 +9,7 @@ import android.app.FragmentManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
+import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.widget.DrawerLayout;
@@ -18,7 +19,6 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.ui.LogFilter;
-import de.tudarmstadt.informatik.hostage.ui.ViewLogTable;
 import de.tudarmstadt.informatik.hostage.ui2.adapter.DrawerListAdapter;
 import de.tudarmstadt.informatik.hostage.ui2.fragment.HomeFragment;
 import de.tudarmstadt.informatik.hostage.ui2.fragment.ProfileManagerFragment;
@@ -27,163 +27,179 @@ import de.tudarmstadt.informatik.hostage.ui2.fragment.opengl.ThreatIndicatorGLRe
 import de.tudarmstadt.informatik.hostage.ui2.model.DrawerListItem;
 
 /**
- * @author  Alexander Brakowski
+ * @author Alexander Brakowski
  * @created 12.01.14 23:24
  */
 public class MainActivity extends Activity {
-    private DrawerLayout mDrawerLayout;
-    private ListView mDrawerList;
-    private ActionBarDrawerToggle mDrawerToggle;
-
-    private CharSequence mDrawerTitle;
-    private CharSequence mTitle;
-    
-    public Fragment displayedFragment;
-
-    private ArrayList<DrawerListItem> drawerItems;
-
-    public static volatile Context context;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        MainActivity.context = getApplicationContext();
-        
-        ThreatIndicatorGLRenderer.assets = getAssets();
-        ThreatIndicatorGLRenderer.setThreatLevel(0);
-
-        setContentView(R.layout.activity_drawer_main);
-
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE
-                | ActionBar.DISPLAY_SHOW_HOME
-                | ActionBar.DISPLAY_HOME_AS_UP);
-
-        mTitle = mDrawerTitle = getTitle();
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
-        mDrawerList = (ListView) findViewById(R.id.left_drawer);
-
-        drawerItems = new ArrayList<DrawerListItem>();
-        drawerItems.add(new DrawerListItem(R.string.drawer_overview, R.drawable.ic_menu_home));
-        drawerItems.add(new DrawerListItem(R.string.drawer_threat_map, R.drawable.ic_menu_mapmode));
-        drawerItems.add(new DrawerListItem(R.string.drawer_records, R.drawable.ic_menu_gallery));
-        drawerItems.add(new DrawerListItem(R.string.drawer_services, R.drawable.ic_menu_set_as));
-        drawerItems.add(new DrawerListItem(R.string.drawer_profile_manager, R.drawable.ic_menu_set_as));
-        drawerItems.add(new DrawerListItem(R.string.drawer_settings, R.drawable.ic_menu_preferences));
-        drawerItems.add(new DrawerListItem(R.string.drawer_app_info, R.drawable.ic_menu_info_details));
-
-
-        DrawerListAdapter listAdapter = new DrawerListAdapter(this, drawerItems);
-
-        mDrawerList.setAdapter(listAdapter);
-        mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
-
-        getActionBar().setDisplayHomeAsUpEnabled(true);
-        getActionBar().setHomeButtonEnabled(true);
-
-        mDrawerToggle = new ActionBarDrawerToggle(
-                this,                  /* host Activity */
-                mDrawerLayout,         /* DrawerLayout object */
-                R.drawable.ic_navigation_drawer,  /* nav drawer image to replace 'Up' caret */
-                R.string.drawer_open,  /* "open drawer" description for accessibility */
-                R.string.drawer_close  /* "close drawer" description for accessibility */
-        ) {
-            public void onDrawerClosed(View view) {
-                getActionBar().setTitle(mTitle);
-                invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
-            }
-
-            public void onDrawerOpened(View drawerView) {
-                getActionBar().setTitle(mDrawerTitle);
-                invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
-            }
-        };
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-
-        if (savedInstanceState == null) {
-            // on first time display view for first nav item
-            displayView(0);
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // toggle nav drawer on selecting action bar app icon/title
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-
-    @Override
-    public void setTitle(CharSequence title) {
-        mTitle = title;
-        getActionBar().setTitle(mTitle);
-    }
-
-    /**
-     * When using the ActionBarDrawerToggle, you must call it during
-     * onPostCreate() and onConfigurationChanged()...
-     */
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
-        mDrawerToggle.syncState();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        // Pass any configuration change to the drawer toggls
-        mDrawerToggle.onConfigurationChanged(newConfig);
-    }
-
-    private void displayView(int position) {
-        // update the main content by replacing fragments
-        Fragment fragment = null;
-        switch (position) {
-            case 0:
-                fragment = new HomeFragment();
-                break;
-            case 2:
-            	//LogFilter filter = new LogFilter();
-        		Intent intent = this.getIntent(); //new Intent(this, ViewLogTable.class);
-        		intent.removeExtra(LogFilter.LOG_FILTER_INTENT_KEY);
-        		//intent.putExtra(LogFilter.LOG_FILTER_INTENT_KEY, null);
-                fragment = new RecordOverviewFragment();
-                break;
-            case 4:
-                fragment = new ProfileManagerFragment();
-                break;
-            default:
-                break;
-        }
-
-        if (fragment != null) {
-        	this.displayedFragment = fragment;
-            FragmentManager fragmentManager = getFragmentManager();
-            fragmentManager.beginTransaction()
-                    .replace(R.id.content_frame, fragment).commit();
-
-            // update selected item and title, then close the drawer
-            mDrawerList.setItemChecked(position, true);
-            mDrawerList.setSelection(position);
-            setTitle(drawerItems.get(position).text);
-            mDrawerLayout.closeDrawer(mDrawerList);
-        }
-    }
-
-    private class DrawerItemClickListener implements ListView.OnItemClickListener {
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            displayView(position);
-        }
-    }
-    
-    public Fragment getDisplayedFragment(){
-    	return this.displayedFragment;
-    }
+	private DrawerLayout mDrawerLayout;
+	private ListView mDrawerList;
+	private ActionBarDrawerToggle mDrawerToggle;
+
+	private CharSequence mDrawerTitle;
+	private CharSequence mTitle;
+
+	public Fragment displayedFragment;
+
+	private ArrayList<DrawerListItem> drawerItems;
+
+	public static volatile Context context;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		MainActivity.context = getApplicationContext();
+
+		setContentView(R.layout.activity_drawer_main);
+
+		ThreatIndicatorGLRenderer.assets = getAssets();
+		ThreatIndicatorGLRenderer.setThreatLevel(0);
+		// set background color
+		TypedArray arr = getTheme().obtainStyledAttributes(
+				new int[] { android.R.attr.colorBackground });
+		ThreatIndicatorGLRenderer.setBackgroundColor(arr.getColor(0, 0xFFFFFF));
+		arr.recycle();
+
+		ActionBar actionBar = getActionBar();
+		actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE
+				| ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_HOME_AS_UP);
+
+		mTitle = mDrawerTitle = getTitle();
+		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+		mDrawerList = (ListView) findViewById(R.id.left_drawer);
+
+		drawerItems = new ArrayList<DrawerListItem>();
+		drawerItems.add(new DrawerListItem(R.string.drawer_overview,
+				R.drawable.ic_menu_home));
+		drawerItems.add(new DrawerListItem(R.string.drawer_threat_map,
+				R.drawable.ic_menu_mapmode));
+		drawerItems.add(new DrawerListItem(R.string.drawer_records,
+				R.drawable.ic_menu_gallery));
+		drawerItems.add(new DrawerListItem(R.string.drawer_services,
+				R.drawable.ic_menu_set_as));
+		drawerItems.add(new DrawerListItem(R.string.drawer_profile_manager,
+				R.drawable.ic_menu_set_as));
+		drawerItems.add(new DrawerListItem(R.string.drawer_settings,
+				R.drawable.ic_menu_preferences));
+		drawerItems.add(new DrawerListItem(R.string.drawer_app_info,
+				R.drawable.ic_menu_info_details));
+
+		DrawerListAdapter listAdapter = new DrawerListAdapter(this, drawerItems);
+
+		mDrawerList.setAdapter(listAdapter);
+		mDrawerList.setOnItemClickListener(new DrawerItemClickListener());
+
+		getActionBar().setDisplayHomeAsUpEnabled(true);
+		getActionBar().setHomeButtonEnabled(true);
+
+		mDrawerToggle = new ActionBarDrawerToggle(this, /* host Activity */
+		mDrawerLayout, /* DrawerLayout object */
+		R.drawable.ic_navigation_drawer, /*
+										 * nav drawer image to replace 'Up'
+										 * caret
+										 */
+		R.string.drawer_open, /* "open drawer" description for accessibility */
+		R.string.drawer_close /* "close drawer" description for accessibility */
+		) {
+			public void onDrawerClosed(View view) {
+				getActionBar().setTitle(mTitle);
+				invalidateOptionsMenu(); // creates call to
+											// onPrepareOptionsMenu()
+			}
+
+			public void onDrawerOpened(View drawerView) {
+				getActionBar().setTitle(mDrawerTitle);
+				invalidateOptionsMenu(); // creates call to
+											// onPrepareOptionsMenu()
+			}
+		};
+		mDrawerLayout.setDrawerListener(mDrawerToggle);
+
+		if (savedInstanceState == null) {
+			// on first time display view for first nav item
+			displayView(0);
+		}
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// toggle nav drawer on selecting action bar app icon/title
+		if (mDrawerToggle.onOptionsItemSelected(item)) {
+			return true;
+		}
+
+		return super.onOptionsItemSelected(item);
+	}
+
+	@Override
+	public void setTitle(CharSequence title) {
+		mTitle = title;
+		getActionBar().setTitle(mTitle);
+	}
+
+	/**
+	 * When using the ActionBarDrawerToggle, you must call it during
+	 * onPostCreate() and onConfigurationChanged()...
+	 */
+
+	@Override
+	protected void onPostCreate(Bundle savedInstanceState) {
+		super.onPostCreate(savedInstanceState);
+		// Sync the toggle state after onRestoreInstanceState has occurred.
+		mDrawerToggle.syncState();
+	}
+
+	@Override
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		// Pass any configuration change to the drawer toggls
+		mDrawerToggle.onConfigurationChanged(newConfig);
+	}
+
+	private void displayView(int position) {
+		// update the main content by replacing fragments
+		Fragment fragment = null;
+		switch (position) {
+		case 0:
+			fragment = new HomeFragment();
+			break;
+		case 2:
+			// LogFilter filter = new LogFilter();
+			Intent intent = this.getIntent(); // new Intent(this,
+												// ViewLogTable.class);
+			intent.removeExtra(LogFilter.LOG_FILTER_INTENT_KEY);
+			// intent.putExtra(LogFilter.LOG_FILTER_INTENT_KEY, null);
+			fragment = new RecordOverviewFragment();
+			break;
+		case 4:
+			fragment = new ProfileManagerFragment();
+			break;
+		default:
+			break;
+		}
+
+		if (fragment != null) {
+			this.displayedFragment = fragment;
+			FragmentManager fragmentManager = getFragmentManager();
+			fragmentManager.beginTransaction()
+					.replace(R.id.content_frame, fragment).commit();
+
+			// update selected item and title, then close the drawer
+			mDrawerList.setItemChecked(position, true);
+			mDrawerList.setSelection(position);
+			setTitle(drawerItems.get(position).text);
+			mDrawerLayout.closeDrawer(mDrawerList);
+		}
+	}
+
+	private class DrawerItemClickListener implements
+			ListView.OnItemClickListener {
+		public void onItemClick(AdapterView<?> parent, View view, int position,
+				long id) {
+			displayView(position);
+		}
+	}
+
+	public Fragment getDisplayedFragment() {
+		return this.displayedFragment;
+	}
 }

src/de/tudarmstadt/informatik/hostage/ui2/fragment/opengl/ThreatIndicatorGLRenderer.java

@@ -10,6 +10,7 @@ import javax.microedition.khronos.opengles.GL10;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
 
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView.Renderer;
@@ -23,6 +24,13 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 	public static void setThreatLevel(int level) {
 		threatLevel = level;
 	}
+
+	public static void setBackgroundColor(int color) {
+		backgroundColor[0] = (float)Color.red(color) / 255.0f;
+		backgroundColor[1] = (float)Color.green(color) / 255.0f;
+		backgroundColor[2] = (float)Color.blue(color) / 255.0f;
+	}
+	private static float[] backgroundColor = new float[3];
 	
 	public static AssetManager assets;
 	
@@ -42,32 +50,9 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 
 	public ThreatIndicatorGLRenderer() {}
 	
-	public int loadTexture(String filePath) {
-		Bitmap bitmap = null;
-		try {
-			bitmap = BitmapFactory.decodeStream(assets.open(filePath));
-		} catch (IOException e) {
-			e.printStackTrace();
-			return 0;
-		}
-		
-		int[] names = {0};
-		GLES20.glGenTextures(1, names, 0);
-		int tex = names[0];
-		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, tex);
-
-		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
-		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
-		GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
-		bitmap.recycle(); // memory is now gpu -> free it
-		
-		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, tex);
-		
-		return tex;
-	}
-	
 	public void onSurfaceCreated(GL10 arg0, EGLConfig arg1) {
-		GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+		//GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+		GLES20.glClearColor(backgroundColor[0], backgroundColor[1], backgroundColor[2], 1.0f);
 		GLES20.glEnable(GLES20.GL_DEPTH_TEST);
 		GLES20.glEnable(GLES20.GL_CULL_FACE);
 		GLES20.glEnable(GLES20.GL_TEXTURE_2D);
@@ -173,6 +158,30 @@ public class ThreatIndicatorGLRenderer implements Renderer {
 		GLES20.glViewport(0, 0, width, height);
 	}
 	
+	public int loadTexture(String filePath) {
+		Bitmap bitmap = null;
+		try {
+			bitmap = BitmapFactory.decodeStream(assets.open(filePath));
+		} catch (IOException e) {
+			e.printStackTrace();
+			return 0;
+		}
+		
+		int[] names = {0};
+		GLES20.glGenTextures(1, names, 0);
+		int tex = names[0];
+		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, tex);
+
+		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
+		GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
+		GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
+		bitmap.recycle(); // memory is now gpu -> free it
+		
+		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, tex);
+		
+		return tex;
+	}
+	
 	// see http://stackoverflow.com/questions/309424/read-convert-an-inputstream-to-a-string
 	private static String inputStreamToString(InputStream is) {
 	    Scanner scanner = new Scanner(is);