diff options
author | Kenny Root <kenny@the-b.org> | 2015-08-14 17:30:01 -0500 |
---|---|---|
committer | Kenny Root <kenny@the-b.org> | 2015-08-14 17:30:01 -0500 |
commit | 25458db409cf59fff40fd282a23ee17cdf2142b9 (patch) | |
tree | 07ae21940477e2b88f2cca8d6e539a067316cedd /app/src/main/res | |
parent | a04326017c5e75e96ad0e3b4d83c044017a01d54 (diff) | |
parent | 64f59c9c98b7b827f1475e8e98cb3929ba0c4d93 (diff) | |
download | connectbot-25458db409cf59fff40fd282a23ee17cdf2142b9.tar.gz connectbot-25458db409cf59fff40fd282a23ee17cdf2142b9.tar.bz2 connectbot-25458db409cf59fff40fd282a23ee17cdf2142b9.zip |
Merge pull request #124 from jklein24/tabs
Add tabs when there's more than one terminal active.
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout-large/act_console.xml | 296 | ||||
-rw-r--r-- | app/src/main/res/layout/act_console.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/values-v11/styles.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-v14/styles.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 2 |
5 files changed, 304 insertions, 8 deletions
diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml new file mode 100644 index 0000000..d735333 --- /dev/null +++ b/app/src/main/res/layout-large/act_console.xml @@ -0,0 +1,296 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> + +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="#ff000000"> + + <android.support.v7.widget.Toolbar + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/toolbar" + android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/> + + <android.support.design.widget.TabLayout + android:id="@+id/tabs" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + app:tabIndicatorColor="@android:color/white" + android:background="#222222"/> + + <TextView + android:id="@android:id/empty" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:text="@string/terminal_no_hosts_connected" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center" + android:layout_below="@id/toolbar"/> + + <android.support.v4.view.ViewPager + android:id="@+id/console_flip" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_below="@id/toolbar" + /> + + <RelativeLayout + android:id="@+id/console_password_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:padding="5dip" + android:background="#80000000" + android:fadingEdge="horizontal" + android:fadingEdgeLength="25dip" + android:visibility="gone" + > + + <TextView + android:id="@+id/console_password_instructions" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="fill_parent" + android:visibility="gone" + android:layout_marginBottom="5dip" + /> + + <EditText + android:id="@+id/console_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:password="true" + android:singleLine="true" + android:layout_below="@+id/console_password_instructions" + /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/console_boolean_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:padding="5dip" + android:background="#80000000" + android:fadingEdge="horizontal" + android:fadingEdgeLength="25dip" + android:visibility="gone" + > + + <TextView + android:id="@+id/console_prompt" + android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + + <Button + android:id="@+id/console_prompt_no" + android:text="@string/button_no" + android:paddingTop="5dip" + android:paddingBottom="10dip" + android:paddingLeft="40dip" + android:paddingRight="40dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/console_prompt" + android:clickable="false" + /> + + <Button + android:id="@+id/console_prompt_yes" + android:text="@string/button_yes" + android:paddingTop="5dip" + android:paddingBottom="10dip" + android:paddingLeft="40dip" + android:paddingRight="40dip" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@+id/console_prompt_no" + android:layout_below="@+id/console_prompt" + /> + + </RelativeLayout> + + <LinearLayout + android:id="@+id/keyboard_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:background="#55000000" + android:padding="0dip" + android:visibility="gone"> + + <Button + android:id="@+id/button_ctrl" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_toggle_control_character" + android:padding="0dp" + android:text="@string/button_key_ctrl" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <Button + android:id="@+id/button_esc" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_send_escape_character" + android:padding="0dp" + android:text="@string/button_key_esc" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <Button + android:id="@+id/button_tab" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_send_tab_character" + android:padding="0dp" + android:text="@string/button_key_tab" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <Button + android:id="@+id/button_up" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_up" + android:padding="0dp" + android:text="@string/button_key_up" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <Button + android:id="@+id/button_down" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_down" + android:padding="0dp" + android:text="@string/button_key_down" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <Button + android:id="@+id/button_left" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_left" + android:padding="0dp" + android:text="@string/button_key_left" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <Button + android:id="@+id/button_right" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_right" + android:padding="0dp" + android:text="@string/button_key_right" + android:textSize="10dip" + /> + + <View + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="#90000000" + /> + + <ImageView + android:id="@+id/button_keyboard" + android:layout_width="0px" + android:layout_weight="1" + android:layout_height="30dip" + android:layout_margin="0dp" + android:contentDescription="@string/image_description_show_keyboard" + android:padding="0dp" + android:src="@drawable/button_keyboard" + android:background="#55f0f0f0" + android:textSize="10dip" + /> + + </LinearLayout> + +</RelativeLayout> diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml index b2c0d08..5cdd7d1 100644 --- a/app/src/main/res/layout/act_console.xml +++ b/app/src/main/res/layout/act_console.xml @@ -18,11 +18,12 @@ */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="#ff000000" - > + android:background="#ff000000"> <TextView android:id="@android:id/empty" @@ -30,8 +31,7 @@ android:layout_height="fill_parent" android:text="@string/terminal_no_hosts_connected" android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center" - /> + android:gravity="center"/> <android.support.v4.view.ViewPager android:id="@+id/console_flip" diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml index 9a0c22b..f831811 100644 --- a/app/src/main/res/values-v11/styles.xml +++ b/app/src/main/res/values-v11/styles.xml @@ -18,7 +18,7 @@ */ --> <resources> - <style name="NoTitle" parent="android:Theme.Holo"> + <style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <item name="android:windowContentOverlay">@null</item> <item name="android:actionBarStyle">@style/SolidActionBar</item> </style> diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml index 3969010..f831811 100644 --- a/app/src/main/res/values-v14/styles.xml +++ b/app/src/main/res/values-v14/styles.xml @@ -18,7 +18,7 @@ */ --> <resources> - <style name="NoTitle" parent="android:Theme.DeviceDefault"> + <style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <item name="android:windowContentOverlay">@null</item> <item name="android:actionBarStyle">@style/SolidActionBar</item> </style> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 22e830b..f0cd073 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -18,7 +18,7 @@ */ --> <resources> - <style name="NoTitle" parent="android:Theme"> + <style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <item name="android:windowNoTitle">true</item> <item name="android:windowContentOverlay">@null</item> </style> |