Skip to content

Commit

Permalink
more UI updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@n8fr8
n8fr8 committed Dec 8, 2017
1 parent 7303a33 commit d9bd32a
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 149 deletions.
52 changes: 30 additions & 22 deletions app/src/main/java/org/torproject/android/OrbotMainActivity.java
View file
Expand Up @@ -70,6 +70,7 @@
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;
Expand Down Expand Up @@ -264,23 +265,30 @@ private void doLayout ()
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);
Expand Down Expand Up @@ -432,7 +440,6 @@ public void onNothingSelected(AdapterView<?> parentView) {

});

((TextView)findViewById(R.id.torInfo)).setText("Tor v" + BINARY_TOR_VERSION);

mPulsator = (PulsatorLayout) findViewById(R.id.pulsator);

Expand Down Expand Up @@ -1327,9 +1334,8 @@ public void onClick(View v) {
} 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();

}
Expand Down Expand Up @@ -1388,20 +1394,7 @@ public boolean onLongClick(View view) {
@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:
Expand All @@ -1417,7 +1410,22 @@ public void handleMessage(final Message msg) {

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;
}
}
};
Expand Down
160 changes: 134 additions & 26 deletions app/src/main/res/layout/layout_main.xml
View file
Expand Up @@ -68,40 +68,64 @@
/>
</FrameLayout>

<TextView
android:id="@+id/lblStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:fontFamily="sans-serif-light"
android:lines="1"
android:text="[ ]"
android:maxLines="1"
android:layout_margin="12dp"
android:ellipsize="end"
android:layout_gravity="top|center"
android:gravity="center"
android:layout_below="@+id/frameMain"
/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@+id/frameMain"
android:layout_below="@+id/lblStatus"
android:id="@+id/controls"

>

<LinearLayout
android:id="@+id/spinnerBox"
android:layout_gravity="left"
android:layout_gravity="center"
android:orientation="vertical"
android:layout_width="170sp"
android:layout_width="170dp"
android:layout_height="100dp"
android:background="#11CCCCCC"
android:layout_margin="3dp"
android:layout_weight="1"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Select Region"
android:layout_margin="12dp"

/>
<Spinner
android:id="@+id/spinnerCountry"
android:layout_width="140dp"
android:layout_width="165dp"
android:layout_height="wrap_content"
android:layout_margin="12dp"

/>

</LinearLayout>


<LinearLayout
android:id="@+id/row_vpn"
android:layout_gravity="right"
android:layout_gravity="center"
android:orientation="vertical"
android:layout_width="170sp"
android:layout_width="170dp"
android:layout_height="100dp"
android:background="#11CCCCCC"
android:layout_margin="3dp"
Expand Down Expand Up @@ -131,42 +155,126 @@
</LinearLayout>

</LinearLayout>
<TextView
android:id="@+id/lblStatus"



<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:fontFamily="sans-serif-light"
android:lines="1"
android:text="[ ]"
android:maxLines="1"
android:layout_margin="12dp"
android:ellipsize="end"
android:layout_gravity="top|center"
android:gravity="center"
android:orientation="horizontal"
android:layout_below="@+id/controls"
/>
android:id="@+id/traffic"

>

<LinearLayout
android:layout_gravity="center"
android:orientation="horizontal"
android:layout_width="170dp"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1"
>
<TextView
android:id="@+id/trafficLabelDown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/main_layout_download"
android:gravity="center"
android:fontFamily="sans-serif-light"
android:layout_margin="3dp"
android:lines="1"

/>


</RelativeLayout>
<TextView
android:id="@+id/trafficDown"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:fontFamily="sans-serif-light"
android:text="0kbps"
android:layout_margin="3dp"
android:lines="1"

/>
</LinearLayout>


<LinearLayout
android:layout_width="250dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/left_drawer"
android:layout_gravity="start"
android:background="#333333"
android:layout_gravity="center"
android:orientation="horizontal"
android:layout_width="170dp"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:layout_weight="1"

>
<TextView
android:id="@+id/trafficLabelUp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/main_layout_upload"
android:gravity="center_vertical"
android:fontFamily="sans-serif-light"
android:layout_margin="3dp"
/>

<include layout="@layout/layout_orbot_control"/>
<TextView
android:id="@+id/trafficUp"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:fontFamily="sans-serif-light"
android:text="0kbps"
android:layout_margin="3dp"
android:lines="1"

/>

</LinearLayout>

</LinearLayout>

<LinearLayout
android:id="@+id/row_bridges"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="#11CCCCCC"
android:layout_margin="3dp"
android:layout_weight="1"
android:layout_below="@+id/traffic"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:fontFamily="sans-serif-light"
android:text="Having trouble connecting?"
android:layout_margin="3dp"
android:lines="1"

/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/btnBridges"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bridges"
android:layout_margin="3dp"
android:singleLine="true"
app:switchPadding="9dp"
android:gravity="center_vertical"
/>
</LinearLayout>



</RelativeLayout>



<LinearLayout
android:layout_width="320dp"
Expand Down

0 comments on commit d9bd32a

Please sign in to comment.