updates to layout to make it cleaner

res/drawable/tilebg.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/classyfabric"
+    android:tileMode="repeat" />

res/layout-land/layout_main.xml

@@ -3,21 +3,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/viewMain"
-	android:background="@drawable/onionrootonlygrey"
+    android:paddingTop="0sp"
-    android:paddingTop="0sp">
+    android:background="@drawable/tilebg"
+    >
     
     <!-- 
     <org.torproject.android.RandomColorCircleView  android:layout_width="fill_parent"
 	      android:layout_height="fill_parent"></org.torproject.android.RandomColorCircleView>
         -->
     <RelativeLayout
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
-		android:layout_height="fill_parent">
+		android:layout_height="match_parent">
 		
+        
+        <!-- 
     	<RelativeLayout android:id="@+id/layoutHeaderMain"
 		android:layout_width="fill_parent"
-		android:layout_height="30dp"
+		android:layout_height="30dp">
-		android:background="#A0909090">
           
           <ImageView android:id="@+id/radioModeImage"
  		    android:layout_width="wrap_content"
@@ -41,13 +43,12 @@
             		android:fontFamily="sans-serif-light"	
             
              />
-	</RelativeLayout>
+	</RelativeLayout> -->
 	
 		<LinearLayout android:gravity="center_vertical"
 		    	    android:layout_gravity="center_vertical|left"
-		    android:layout_below="@+id/layoutHeaderMain"
 		     android:orientation="vertical" android:layout_width="240dip"
-		      android:layout_height="fill_parent"
+		      android:layout_height="match_parent"
 		      		android:id="@+id/boxStatus"
 		      >
     	
@@ -63,7 +64,6 @@
 	<TextView android:id="@+id/lblStatus"
 		android:text="@string/press_to_start"
 		android:gravity="center_horizontal"
-		android:textStyle="bold"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginBottom="20dp"
@@ -103,7 +103,6 @@
 			android:textSize="15sp"
 			android:text="@string/main_layout_download"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 							android:fontFamily="sans-serif-light"	
 			
 			 />
@@ -116,7 +115,6 @@
 			android:text="@string/main_layout_upload"
 			android:textSize="15sp"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 							android:fontFamily="sans-serif-light"	
 			
 			 />
@@ -139,7 +137,6 @@
 			 android:layout_alignParentLeft="true"
 			android:textSize="15sp"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 							android:fontFamily="sans-serif-light"	
 			
 			 />
@@ -151,7 +148,6 @@
 			 android:layout_alignParentRight="true"
 			android:textSize="15sp"
 			android:gravity="center_vertical"
-			android:textStyle="bold" 
 							android:fontFamily="sans-serif-light"	
 			
 			/>

res/layout/layout_main.xml

@@ -3,16 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/viewMain"
-	android:background="@drawable/onionrootonlygrey"
+    android:paddingTop="0sp"
-    android:paddingTop="0sp">
+    android:background="@drawable/tilebg"
+    >
     <!-- 
     <org.torproject.android.RandomColorCircleView  android:layout_width="fill_parent"
 	      android:layout_height="fill_parent"></org.torproject.android.RandomColorCircleView>
         -->
+        <!-- 
     	<RelativeLayout android:id="@+id/layoutHeaderMain"
 		android:layout_width="fill_parent"
 		android:layout_height="30dp"
-		android:background="#A0909090">
+		android:background="#A0343434">
                <ImageView android:id="@+id/radioModeImage"
  		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
@@ -22,7 +24,7 @@
 			android:layout_toRightOf="@+id/radioModeLabel"
 			android:layout_alignParentRight="true"
 			android:layout_alignParentTop="true"
-			android:src="@drawable/tor25"
+			android:src="@drawable/ic_stat_tor"
 			/>
 		<TextView android:id="@+id/radioModeText"
  		    android:layout_width="wrap_content"
@@ -36,10 +38,12 @@
             android:fontFamily="sans-serif-light"
             
              />
-	</RelativeLayout>
+	</RelativeLayout> -->
 		<LinearLayout android:gravity="center_vertical|center_horizontal"
 		     android:orientation="vertical" android:layout_width="fill_parent"
-		      android:layout_height="fill_parent">
+		      android:layout_height="fill_parent"
+		      
+		      >
     	
        <org.torproject.android.ImageProgressView
 		android:id="@+id/imgStatus"
@@ -53,16 +57,15 @@
 	<TextView android:id="@+id/lblStatus"
 		android:text="@string/press_to_start"
 		android:gravity="center_horizontal"
-		android:textStyle="bold"
+		android:textSize="20sp"
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
-		android:layout_height="40dp"
+		android:layout_height="wrap_content"
-		android:layout_marginBottom="20dp"
+		android:layout_marginBottom="40dp"
 		android:layout_marginLeft="60dp"
 		android:layout_marginRight="60dp"
 		android:textColor="#ffffff"
 		android:maxLines="2"
 		android:fontFamily="sans-serif-light"	
-		android:background="#dd333333"
 		 />
 	
 	
@@ -84,7 +87,6 @@
 			android:textSize="15sp"
 			android:text="@string/main_layout_download"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 			android:fontFamily="sans-serif-light" />
 	    <TextView
 			android:id="@+id/trafficLabelUp"
@@ -95,7 +97,6 @@
 			android:text="@string/main_layout_upload"
 			android:textSize="15sp"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 			android:fontFamily="sans-serif-light" />
 		
 		</RelativeLayout>
@@ -116,7 +117,6 @@
 			 android:layout_alignParentLeft="true"
 			android:textSize="15sp"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 			android:fontFamily="sans-serif-light"
 			 />
 		<TextView
@@ -127,7 +127,6 @@
 			 android:layout_alignParentRight="true"
 			android:textSize="15sp"
 			android:gravity="center_vertical"
-			android:textStyle="bold"
 			android:fontFamily="sans-serif-light"
 			 />
 		</RelativeLayout>

res/menu/main.xml

@@ -23,7 +23,7 @@
  <item android:id="@+id/menu_start"
         android:title="@string/menu_start"
          android:icon="@drawable/ic_action_start"
-          yourapp:showAsAction="ifRoom"
+          yourapp:showAsAction="never"
          />
 
  <item android:id="@+id/menu_settings"
@@ -55,14 +55,14 @@
  <item android:id="@+id/menu_about"
         android:title="@string/menu_about"
          android:icon="@drawable/ic_menu_about"
-                  yourapp:showAsAction="ifRoom"
+                  yourapp:showAsAction="never"
          
          />
  
   <item android:id="@+id/menu_wizard"
         android:title="@string/menu_wizard"
          android:icon="@drawable/ic_menu_goto"
-                  yourapp:showAsAction="ifRoom"
+                  yourapp:showAsAction="never"
          
          />
  <!-- 
@@ -77,42 +77,5 @@
                   yourapp:showAsAction="never"
          
          />
-  
-   <!-- 
-  <item android:id="@+id/menu_diag"
-        android:title="Test Mode"
-         android:icon="@drawable/ic_menu_check"
-                  yourapp:showAsAction="never"
-         
-         />
-          -->
  
 </menu>
-<!-- 
- MenuItem mItem = null;
-        
-        mItemOnOff = menu.add(0, 1, Menu.NONE, getString(R.string.menu_start));
-        mItemOnOff.setIcon(android.R.drawable.ic_media_play);
-        mItemOnOff.setAlphabeticShortcut('t');
-        mItemOnOff.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        
-        mItem = menu.add(0, 4, Menu.NONE, getString(R.string.menu_settings));
-        mItem.setIcon(R.drawable.ic_menu_settings);
-        mItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-       
-        mItem = menu.add(0, 7, Menu.NONE, getString(R.string.menu_verify));
-        mItem.setIcon(R.drawable.ic_menu_check);
-        mItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-      
-        mItem =  menu.add(0,6, Menu.NONE, getString(R.string.menu_about));
-        mItem.setIcon(R.drawable.ic_menu_about);
-        mItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        
-        mItem = menu.add(0, 3, Menu.NONE, getString(R.string.menu_wizard));
-        mItem.setIcon(R.drawable.ic_menu_goto);
-        mItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-       
-        mItem = menu.add(0, 8, Menu.NONE, getString(R.string.menu_exit));
-        mItem.setIcon(R.drawable.ic_menu_exit);
-        mItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-  -->

res/raw/torpolipo.conf

@@ -6,8 +6,6 @@ proxyName = "localhost"
 cacheIsShared = false
 socksParentProxy = "localhost:9050"
 socksProxyType = socks5
-chunkHighMark = 819200
-objectHighMark = 128
 diskCacheRoot = ""
 localDocumentRoot = ""
 disableLocalInterface = true
@@ -21,3 +19,5 @@ maxConnectionRequests = 120
 serverMaxSlots = 8
 serverSlots = 2
 tunnelAllowedPorts = 1-65535
+chunkHighMark = 512000
+objectHighMark = 128

res/values/strings.xml

@@ -246,7 +246,7 @@
   <string name="set_locale_summary">Choose the locale and language for Orbot</string>
   <string name="wizard_locale_title">Choose Language</string>
   <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by The Tor Project  </string>
+  <string name="powered_by">powered by Tor</string>
   <string name="btn_save_settings">Save Settings</string>
   <string name="no_internet_connection_tor">No internet connection; Tor is on standby...</string>
   <string name="bandwidth_">Bandwidth:</string>

res/values/theme.xml

@@ -5,4 +5,10 @@
     <style name="DefaultTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowNoTitle">true</item>
     </style>
+    
+    <!-- the theme applied to the application or activity -->
+    <style name="CustomActionBarTheme"
+           parent="@style/Theme.AppCompat">
+        <item name="android:windowActionBarOverlay">true</item>
+    </style>
 </resources>