[tor-commits] [orbot/master] more UI updates

[n8fr8]

commit d9bd32a646c7ad9c698dfd898589dacaac3694b5
Author: n8fr8 
Date:   Fri Dec 8 16:11:34 2017 -0500

more UI updates
---
 .../org/torproject/android/OrbotMainActivity.java  |  52 ---
 app/src/main/res/layout/layout_main.xml| 160 +
 app/src/main/res/layout/layout_orbot_control.xml   |  99 -
 app/src/main/res/values/strings.xml|   4 +-
 4 files changed, 166 insertions(+), 149 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 88637331..1b006ae6 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -70,6 +70,7 @@ import android.util.AttributeSet;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -264,23 +265,30 @@ public class OrbotMainActivity extends AppCompatActivity
 setSupportActionBar(toolbar);
 
 mDrawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+/**
   mDrawerToggle = new ActionBarDrawerToggle(
   this,  mDrawer,
   toolbar,
   R.string.btn_okay, R.string.btn_cancel
-  );
+  );**/
 
 
-  getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-  getSupportActionBar().setHomeButtonEnabled(true);
+  //getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  //getSupportActionBar().setHomeButtonEnabled(true);
   
-  mDrawer.setDrawerListener(mDrawerToggle);
-  mDrawerToggle.syncState();
+  //mDrawer.setDrawerListener(mDrawerToggle);
+  //mDrawerToggle.syncState();
 
 mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog);
 
 lblStatus = (TextView)findViewById(R.id.lblStatus);
-lblStatus.setOnLongClickListener(this);
+lblStatus.setOnClickListener(new View.OnClickListener() {
+@Override
+public void onClick(View v) {
+mDrawer.openDrawer(Gravity.RIGHT);
+}
+});
+
 imgStatus = (ImageProgressView)findViewById(R.id.imgStatus);
 imgStatus.setOnLongClickListener(this);
 imgStatus.setOnTouchListener(this);
@@ -432,7 +440,6 @@ public class OrbotMainActivity extends AppCompatActivity
 
});
 
-((TextView)findViewById(R.id.torInfo)).setText("Tor v" + 
BINARY_TOR_VERSION);
 
 mPulsator = (PulsatorLayout) findViewById(R.id.pulsator);
 
@@ -1327,9 +1334,8 @@ public class OrbotMainActivity extends AppCompatActivity
 } else if (torStatus == TorServiceConstants.STATUS_OFF) {
 
 imgStatus.setImageResource(R.drawable.toroff);
-
+lblStatus.setText("Tor v" + BINARY_TOR_VERSION);
mBtnStart.setText(R.string.menu_start);
-
 mPulsator.start();
 
 }
@@ -1388,20 +1394,7 @@ public class OrbotMainActivity extends AppCompatActivity
 @Override
 public void handleMessage(final Message msg) {

-   String newTorStatus = msg.getData().getString("status");
-   String log = (String)msg.obj;
 
-   if (torStatus == null && newTorStatus != null) //first time 
status
-   {
-   
findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
-   updateStatus(log, newTorStatus);
-   
-   //now you can handle the intents properly
-   handleIntents();
-   
-   }
-   else
-   updateStatus(log, newTorStatus);
 
 switch (msg.what) {
 case MESSAGE_TRAFFIC_COUNT:
@@ -1417,7 +1410,22 @@ public class OrbotMainActivity extends AppCompatActivity
 
 break;
 default:
+String newTorStatus = msg.getData().getString("status");
+String log = (String)msg.obj;
+
+if (torStatus == null && newTorStatus != null) //first 
time status
+{
+
findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
+updateStatus(log, newTorStatus);
+
+//now you can handle the intents properly
+handleIntents();
+
+}
+else
+updateStatus(log, newTorStatus);
 super.handleMessage(msg);
+break;
 }
 }
 };
diff --git a/app/src/main/res/layout/layout_main.xml 
b/app/src/main/res/layout/layout_main.xml
index a955fd0a..535efa7a 100644

[tor-commits] [orbot/master] more UI updates and small improvements

[n8fr8]

commit e6bd23a1e253824989d5b643543700d3cc8f1c26
Author: n8fr8 
Date:   Mon Dec 11 15:02:05 2017 -0500

more UI updates and small improvements
---
 .../org/torproject/android/OrbotMainActivity.java  | 267 -
 .../torproject/android/ui/AppManagerActivity.java  |  29 ++-
 .../torproject/android/ui/PromoAppsActivity.java   | 216 -
 .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 716 -> 0 bytes
 .../res/drawable-xhdpi/ic_autorenew_black_36dp.png | Bin 682 -> 0 bytes
 .../drawable-xhdpi/ic_filter_none_black_36dp.png   | Bin 252 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_launcher.png| Bin 5964 -> 0 bytes
 .../ic_playlist_add_check_black_36dp.png   | Bin 236 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_stat_notifyerr.png  | Bin 1796 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_stat_tor.png| Bin 1161 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png   | Bin 1378 -> 0 bytes
 app/src/main/res/drawable-xxxhdpi/inverse.png  | Bin 1027 -> 0 bytes
 app/src/main/res/drawable/classyfabric.png | Bin 8856 -> 0 bytes
 .../ic_autorenew_black_36dp.png| Bin
 app/src/main/res/drawable/ic_chatsecure.png| Bin 4013 -> 0 bytes
 app/src/main/res/drawable/ic_duckduckgo.png| Bin 5042 -> 0 bytes
 app/src/main/res/drawable/ic_twitter.png   | Bin 2797 -> 0 bytes
 app/src/main/res/drawable/icon_martus.png  | Bin 6763 -> 0 bytes
 app/src/main/res/drawable/icon_orfox.png   | Bin 7617 -> 0 bytes
 app/src/main/res/drawable/icon_story_maker.png | Bin 4290 -> 0 bytes
 app/src/main/res/drawable/tilebg.xml   |   4 -
 .../layout-v21/layout_notification_expanded.xml| 124 --
 app/src/main/res/layout/layout_main.xml|  52 +++-
 .../res/layout/layout_notification_expanded.xml|  40 +--
 app/src/main/res/layout/layout_promo_apps.xml  | 115 -
 app/src/main/res/menu/orbot_apps.xml   |  30 +++
 app/src/main/res/values/strings.xml|   5 +-
 .../org/torproject/android/service/TorService.java |  12 +-
 .../org/torproject/android/service/util/Prefs.java |   2 +-
 .../res/drawable-hdpi/ic_autorenew_black_36dp.png  | Bin 0 -> 546 bytes
 .../drawable-mdpi/ic_action_settings.png   | Bin
 .../drawable-mdpi/ic_autorenew_black_36dp.png  | Bin
 .../drawable-mdpi/ic_filter_none_black_36dp.png| Bin
 .../drawable-mdpi}/drawable-mdpi/ic_launcher.png   | Bin
 .../ic_playlist_add_check_black_36dp.png   | Bin
 .../drawable-mdpi/ic_stat_notifyerr.png| Bin
 .../drawable-mdpi}/drawable-mdpi/ic_stat_tor.png   | Bin
 .../drawable-mdpi/ic_stat_tor_xfer.png | Bin
 .../res/drawable-mdpi}/drawable-mdpi/inverse.png   | Bin
 .../drawable-xxhdpi/ic_autorenew_black_36dp.png| Bin
 .../drawable-xxhdpi/ic_filter_none_black_36dp.png  | Bin
 .../drawable-xxhdpi/ic_launcher.png| Bin
 .../ic_playlist_add_check_black_36dp.png   | Bin
 .../drawable-xxhdpi/ic_stat_tor.png| Bin
 .../drawable-xxhdpi/ic_stat_tor_xfer.png   | Bin
 .../drawable-xxhdpi/drawable-xxhdpi}/inverse.png   | Bin
 .../drawable-xxxhdpi/ic_autorenew_black_36dp.png   | Bin
 .../drawable-xxxhdpi/ic_filter_none_black_36dp.png | Bin
 .../drawable-xxxhdpi/ic_launcher.png   | Bin
 .../ic_playlist_add_check_black_36dp.png   | Bin
 .../drawable-xxxhdpi/ic_stat_tor.png   | Bin
 .../drawable-xxxhdpi/ic_stat_tor_xfer.png  | Bin
 .../drawable-xxxhdpi/drawable-xxxhdpi}/inverse.png | Bin
 .../res/layout/layout_notification_expanded.xml|  28 +--
 54 files changed, 283 insertions(+), 641 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 1b006ae6..de9b4285 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -23,8 +23,6 @@ import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.settings.SettingsPreferences;
 import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.ImageProgressView;
-import org.torproject.android.ui.PromoAppsActivity;
 import org.torproject.android.ui.Rotate3dAnimation;
 import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
 import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
@@ -34,6 +32,7 @@ import 
org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
 import org.torproject.android.vpn.VPNEnableActivity;
 
 import android.annotation.SuppressLint;
+import android.app.ActionBar;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlertDialog;
@@ -57,10 +56,8 @@ import android.os.Bundle;
 import