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

improve landscape view on smaller screens

This commit is contained in:
Nathan Freitas 2017-03-01 23:08:31 -05:00
parent fc4b0940d9
commit 673e6c8af7
2 changed files with 104 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android" package="org.torproject.android"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="15208000" android:versionCode="15401000"
android:versionName="15.3.0-beta-1-multi"> android:versionName="15.4.0-beta-1-multi">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"
@ -38,7 +38,6 @@
android:theme="@style/DefaultTheme"> android:theme="@style/DefaultTheme">
<activity <activity
android:name=".OrbotMainActivity" android:name=".OrbotMainActivity"
android:configChanges="orientation|screenSize"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:launchMode="singleTop"> android:launchMode="singleTop">
<intent-filter> <intent-filter>

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

@ -1,99 +1,97 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:gravity="center_vertical|center_horizontal" <LinearLayout android:gravity="center_vertical|center_horizontal"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:layout_width="match_parent" android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/dark_purple" android:background="@color/dark_purple"
> >
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize" /> android:minHeight="?attr/actionBarSize" />
<android.support.v4.widget.DrawerLayout <android.support.v4.widget.DrawerLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
> >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/content_frame"
> <RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/content_frame"
<LinearLayout >
android:layout_width="match_parent"
android:layout_height="400dp"
android:id="@+id/frameMain"
android:visibility="visible"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<org.torproject.android.ui.ImageProgressView
android:id="@+id/imgStatus"
android:layout_width="match_parent"
android:layout_height="209dp"
android:padding="0dp" <LinearLayout
android:layout_margin="0dp" android:layout_width="match_parent"
android:src="@drawable/toroff" /> android:layout_height="400dp"
android:id="@+id/frameMain"
android:visibility="visible"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<org.torproject.android.ui.ImageProgressView
android:id="@+id/imgStatus"
android:layout_width="match_parent"
android:layout_height="180dp"
android:padding="0dp"
android:layout_margin="0dp"
android:src="@drawable/toroff" />
<LinearLayout android:gravity="center_horizontal"
android:orientation="horizontal" android:layout_width="match_parent"
android:layout_height="wrap_content"
<LinearLayout android:gravity="center_horizontal" >
android:orientation="horizontal" android:layout_width="match_parent" <Button
android:layout_height="wrap_content" 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: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>
<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>
<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>
<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>
<LinearLayout <LinearLayout
@ -109,36 +107,36 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/right_drawer" android:id="@+id/right_drawer"
android:layout_gravity="end" android:layout_gravity="end"
android:background="#333333" android:background="#333333"
android:padding="6dp" android:padding="6dp"
> >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/menu_log" android:text="@string/menu_log"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
/> />
<TextView <TextView
android:id="@+id/orbotLog" android:id="@+id/orbotLog"
android:textSize="12sp" android:textSize="12sp"
android:gravity="start" android:gravity="start"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textIsSelectable="true" android:textIsSelectable="true"
android:fontFamily="monospace" android:fontFamily="monospace"
/> />
</LinearLayout> </LinearLayout>
</android.support.v4.widget.DrawerLayout> </android.support.v4.widget.DrawerLayout>
</LinearLayout> </LinearLayout>