update layout to present "Apps..." option on the main screen
This commit is contained in:
parent
dc7aee1e8e
commit
165e95a880
|
@ -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);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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,8 +49,33 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<LinearLayout android:gravity="center_horizontal"
|
</LinearLayout>
|
||||||
android:orientation="horizontal" android:layout_width="match_parent"
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/lblStatus"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:fontFamily="sans-serif-light"
|
||||||
|
android:text="asdasd"
|
||||||
|
android:lines="1"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:layout_margin="12dp"
|
||||||
|
android:layout_above="@+id/button_row"
|
||||||
|
android:gravity="center"
|
||||||
|
android:ellipsize="end"
|
||||||
|
/>
|
||||||
|
|
||||||
|
|
||||||
|
<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"
|
android:layout_height="wrap_content"
|
||||||
|
|
||||||
>
|
>
|
||||||
|
@ -69,29 +95,22 @@
|
||||||
android:layout_height="40dp"
|
android:layout_height="40dp"
|
||||||
android:text="@string/menu_browse"
|
android:text="@string/menu_browse"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:singleLine="true"
|
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:background="@drawable/rounded_button"
|
||||||
android:layout_marginLeft="10dp"
|
android:layout_marginLeft="10dp"
|
||||||
/>
|
/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/lblStatus"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:textSize="14sp"
|
|
||||||
android:fontFamily="sans-serif-light"
|
|
||||||
android:text=""
|
|
||||||
android:lines="1"
|
|
||||||
android:maxLines="1"
|
|
||||||
android:layout_margin="12dp"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:gravity="center"
|
|
||||||
android:ellipsize="end"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue