dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update layout to present "Apps..." option on the main screen

This commit is contained in:
n8fr8 2017-10-25 10:53:30 -04:00
parent dc7aee1e8e
commit 165e95a880
4 changed files with 67 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/torproject/android/OrbotMainActivity.java
View File

@ -355,6 +355,12 @@ public class OrbotMainActivity extends AppCompatActivity
}); });
findViewById(R.id.btnApps).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
enableVPN(true);
}
});
} }

10
app/src/main/res/layout-land/layout_main.xml
View File

@ -71,6 +71,16 @@
android:background="@drawable/rounded_button" android:background="@drawable/rounded_button"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
/> />
<Button
android:id="@+id/btnApps"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/menu_apps"
android:ellipsize="end"
android:singleLine="true"
android:background="@drawable/rounded_button"
android:layout_marginLeft="10dp"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

81
app/src/main/res/layout/layout_main.xml
View File

@ -36,7 +36,8 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"> android:layout_alignParentStart="true"
android:weightSum="1">
<org.torproject.android.ui.ImageProgressView <org.torproject.android.ui.ImageProgressView
android:id="@+id/imgStatus" android:id="@+id/imgStatus"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -48,33 +49,6 @@
<LinearLayout android:gravity="center_horizontal"
android:orientation="horizontal" android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<Button
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/menu_start"
android:id="@+id/btnStart"
android:background="@drawable/rounded_button"
/>
<Button
android:id="@+id/btnBrowser"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/menu_browse"
android:ellipsize="end"
android:singleLine="true"
android:background="@drawable/rounded_button"
android:layout_marginLeft="10dp"
/>
</LinearLayout>
</LinearLayout> </LinearLayout>
@ -84,16 +58,61 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14sp" android:textSize="14sp"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:text="" android:text="asdasd"
android:lines="1" android:lines="1"
android:maxLines="1" android:maxLines="1"
android:layout_margin="12dp" android:layout_margin="12dp"
android:layout_alignParentBottom="true" android:layout_above="@+id/button_row"
android:gravity="center" android:gravity="center"
android:ellipsize="end" android:ellipsize="end"
/> />
</RelativeLayout>
<LinearLayout
android:id="@+id/button_row"
android:gravity="center_horizontal|bottom"
android:layout_gravity="bottom"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_margin="6dp"
android:layout_height="wrap_content"
>
<Button
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/menu_start"
android:id="@+id/btnStart"
android:background="@drawable/rounded_button"
/>
<Button
android:id="@+id/btnBrowser"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/menu_browse"
android:ellipsize="end"
android:maxLines="1"
android:background="@drawable/rounded_button"
android:layout_marginLeft="10dp"
/>
<Button
android:id="@+id/btnApps"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text="@string/menu_apps"
android:ellipsize="end"
android:maxLines="1"
android:background="@drawable/rounded_button"
android:layout_marginLeft="10dp"
/>
</LinearLayout>
</RelativeLayout>
<LinearLayout <LinearLayout

2
app/src/main/res/values/strings.xml
View File

@ -21,7 +21,7 @@
<string name="menu_settings">Settings</string> <string name="menu_settings">Settings</string>
<string name="menu_log">Log</string> <string name="menu_log">Log</string>
<string name="menu_info">Help</string> <string name="menu_info">Help</string>
<string name="menu_apps">VPN</string> <string name="menu_apps">Apps...</string>
<string name="menu_start">Start</string> <string name="menu_start">Start</string>
<string name="menu_stop">Stop</string> <string name="menu_stop">Stop</string>
<string name="menu_about">About</string> <string name="menu_about">About</string>