diff options
| author | alescdb <alescdb@users.noreply.github.com> | 2015-08-22 23:08:57 +0200 |
|---|---|---|
| committer | alescdb <alescdb@users.noreply.github.com> | 2015-08-22 23:08:57 +0200 |
| commit | 875c25941378b5953f0e98d1e4f558f5449ab530 (patch) | |
| tree | 0a33bab879191a3d0d3d072be1ee39975ecea7fa /app/src/main/res | |
| parent | 3ded4be36ba90973bca35c376b76edfcef812cd0 (diff) | |
| parent | 2656c48899c6c2abc9ed51f9694968351673a040 (diff) | |
| download | connectbot-875c25941378b5953f0e98d1e4f558f5449ab530.tar.gz connectbot-875c25941378b5953f0e98d1e4f558f5449ab530.tar.bz2 connectbot-875c25941378b5953f0e98d1e4f558f5449ab530.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'app/src/main/res')
67 files changed, 919 insertions, 930 deletions
diff --git a/app/src/main/res/anim/fade_out_delayed.xml b/app/src/main/res/anim/fade_out_delayed.xml index 20ca839..5c40b70 100644 --- a/app/src/main/res/anim/fade_out_delayed.xml +++ b/app/src/main/res/anim/fade_out_delayed.xml @@ -19,9 +19,9 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:fromAlpha="1.0" - android:toAlpha="0.0" android:duration="500" - android:startOffset="1000" android:fillAfter="true" + android:fromAlpha="1.0" + android:startOffset="1000" + android:toAlpha="0.0" /> diff --git a/app/src/main/res/anim/fade_stay_hidden.xml b/app/src/main/res/anim/fade_stay_hidden.xml index e62ca8b..30e00fa 100644 --- a/app/src/main/res/anim/fade_stay_hidden.xml +++ b/app/src/main/res/anim/fade_stay_hidden.xml @@ -19,8 +19,8 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:fromAlpha="0.0" - android:toAlpha="0.0" android:duration="500" android:fillAfter="true" + android:fromAlpha="0.0" + android:toAlpha="0.0" /> diff --git a/app/src/main/res/anim/keyboard_fade_in.xml b/app/src/main/res/anim/keyboard_fade_in.xml index edd5b94..fa5351f 100644 --- a/app/src/main/res/anim/keyboard_fade_in.xml +++ b/app/src/main/res/anim/keyboard_fade_in.xml @@ -19,7 +19,7 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" + android:duration="100" android:fromAlpha="0.0" - android:toAlpha="1.0" - android:duration="100" /> + android:interpolator="@android:anim/accelerate_interpolator" + android:toAlpha="1.0"/> diff --git a/app/src/main/res/anim/keyboard_fade_out.xml b/app/src/main/res/anim/keyboard_fade_out.xml index 1f37d32..fcc63e3 100644 --- a/app/src/main/res/anim/keyboard_fade_out.xml +++ b/app/src/main/res/anim/keyboard_fade_out.xml @@ -19,7 +19,7 @@ --> <alpha xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:anim/accelerate_interpolator" + android:duration="100" android:fromAlpha="1.0" - android:toAlpha="0.0" - android:duration="100" /> + android:interpolator="@android:anim/accelerate_interpolator" + android:toAlpha="0.0"/> diff --git a/app/src/main/res/anim/slide_left_in.xml b/app/src/main/res/anim/slide_left_in.xml index 29a0048..c60e917 100644 --- a/app/src/main/res/anim/slide_left_in.xml +++ b/app/src/main/res/anim/slide_left_in.xml @@ -19,6 +19,9 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="300"/> + <translate + android:duration="300" + android:fromXDelta="100%p" + android:toXDelta="0"/> <!-- <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" /> --> </set> diff --git a/app/src/main/res/anim/slide_left_out.xml b/app/src/main/res/anim/slide_left_out.xml index 9c46442..bd7360d 100644 --- a/app/src/main/res/anim/slide_left_out.xml +++ b/app/src/main/res/anim/slide_left_out.xml @@ -19,6 +19,9 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="300"/> + <translate + android:duration="300" + android:fromXDelta="0" + android:toXDelta="-100%p"/> <!-- <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" /> --> </set> diff --git a/app/src/main/res/anim/slide_right_in.xml b/app/src/main/res/anim/slide_right_in.xml index 0d52c9f..c69f371 100644 --- a/app/src/main/res/anim/slide_right_in.xml +++ b/app/src/main/res/anim/slide_right_in.xml @@ -19,6 +19,9 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="300"/> + <translate + android:duration="300" + android:fromXDelta="-100%p" + android:toXDelta="0"/> <!-- <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" /> --> </set> diff --git a/app/src/main/res/anim/slide_right_out.xml b/app/src/main/res/anim/slide_right_out.xml index ace4e9d..2f7abbe 100644 --- a/app/src/main/res/anim/slide_right_out.xml +++ b/app/src/main/res/anim/slide_right_out.xml @@ -19,6 +19,9 @@ --> <set xmlns:android="http://schemas.android.com/apk/res/android"> - <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="300"/> + <translate + android:duration="300" + android:fromXDelta="0" + android:toXDelta="100%p"/> <!-- <alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="300" /> --> </set> diff --git a/app/src/main/res/color/blue.xml b/app/src/main/res/color/blue.xml index 981c3ef..7ff859c 100644 --- a/app/src/main/res/color/blue.xml +++ b/app/src/main/res/color/blue.xml @@ -19,8 +19,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_selected="true" android:color="#000" /> - <item android:state_focused="true" android:color="#000" /> - <item android:state_pressed="true" android:color="#000" /> - <item android:color="#88f" /> + <item android:color="#000" android:state_selected="true"/> + <item android:color="#000" android:state_focused="true"/> + <item android:color="#000" android:state_pressed="true"/> + <item android:color="#88f"/> </selector> diff --git a/app/src/main/res/color/green.xml b/app/src/main/res/color/green.xml index 388ea58..acb166c 100644 --- a/app/src/main/res/color/green.xml +++ b/app/src/main/res/color/green.xml @@ -19,8 +19,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_selected="true" android:color="#000" /> - <item android:state_focused="true" android:color="#000" /> - <item android:state_pressed="true" android:color="#000" /> - <item android:color="#8f8" /> + <item android:color="#000" android:state_selected="true"/> + <item android:color="#000" android:state_focused="true"/> + <item android:color="#000" android:state_pressed="true"/> + <item android:color="#8f8"/> </selector> diff --git a/app/src/main/res/color/red.xml b/app/src/main/res/color/red.xml index b7e18cd..440ee69 100644 --- a/app/src/main/res/color/red.xml +++ b/app/src/main/res/color/red.xml @@ -19,8 +19,8 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_selected="true" android:color="#000" /> - <item android:state_focused="true" android:color="#000" /> - <item android:state_pressed="true" android:color="#000" /> - <item android:color="#f00" /> + <item android:color="#000" android:state_selected="true"/> + <item android:color="#000" android:state_focused="true"/> + <item android:color="#000" android:state_pressed="true"/> + <item android:color="#f00"/> </selector> diff --git a/app/src/main/res/drawable/connected.xml b/app/src/main/res/drawable/connected.xml index 7b633d3..7e15a8d 100644 --- a/app/src/main/res/drawable/connected.xml +++ b/app/src/main/res/drawable/connected.xml @@ -21,14 +21,14 @@ xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:state_checked="true" - android:drawable="@android:drawable/presence_online" /> + android:drawable="@android:drawable/presence_online" + android:state_checked="true"/> <item - android:state_expanded="true" - android:drawable="@android:drawable/presence_busy" /> + android:drawable="@android:drawable/presence_busy" + android:state_expanded="true"/> <item - android:drawable="@android:drawable/presence_invisible" /> + android:drawable="@android:drawable/presence_invisible"/> </selector> diff --git a/app/src/main/res/drawable/pubkey.xml b/app/src/main/res/drawable/pubkey.xml index 1926d24..0dbdba9 100644 --- a/app/src/main/res/drawable/pubkey.xml +++ b/app/src/main/res/drawable/pubkey.xml @@ -21,10 +21,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:state_checked="true" - android:drawable="@drawable/pubkey_unlocked" /> + android:drawable="@drawable/pubkey_unlocked" + android:state_checked="true"/> <item - android:drawable="@drawable/pubkey_locked" /> + android:drawable="@drawable/pubkey_locked"/> </selector>
\ No newline at end of file diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml index 9cde624..cbccd91 100644 --- a/app/src/main/res/layout-land/item_host.xml +++ b/app/src/main/res/layout-land/item_host.xml @@ -18,8 +18,9 @@ */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout android:id="@android:id/content" + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:padding="10dip" @@ -27,38 +28,38 @@ <ImageView android:id="@android:id/icon" - android:src="@drawable/connected" - android:contentDescription="@string/image_description_connected" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" + android:contentDescription="@string/image_description_connected" android:paddingTop="5dip" + android:src="@drawable/connected" /> <LinearLayout - android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:orientation="horizontal" > - <TextView - android:id="@android:id/text1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceLarge" - /> + <TextView + android:id="@android:id/text1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" + /> + + <TextView + android:id="@android:id/text2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:textAppearance="?android:attr/textAppearanceSmall" + /> - <TextView - android:id="@android:id/text2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="10dip" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml index a3f95f4..c368d09 100644 --- a/app/src/main/res/layout-large/act_console.xml +++ b/app/src/main/res/layout-large/act_console.xml @@ -17,255 +17,279 @@ */ --> -<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:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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:background="#222222" - android:textAppearance="?android:attr/textAppearanceMedium" - app:tabIndicatorColor="@android:color/white" /> - - <TextView - android:id="@android:id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_below="@id/toolbar" - android:gravity="center" - android:text="@string/terminal_no_hosts_connected" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <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:background="#80000000" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" - android:padding="5dip" - android:visibility="gone"> - - <TextView - android:id="@+id/console_password_instructions" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:visibility="gone" /> - - <EditText - android:id="@+id/console_password" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/console_password_instructions" - android:password="true" - android:singleLine="true" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/console_boolean_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="#80000000" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" - android:padding="5dip" - android:visibility="gone"> - - <TextView - android:id="@+id/console_prompt" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Button - android:id="@+id/console_prompt_no" - 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" - android:paddingBottom="10dip" - android:paddingLeft="40dip" - android:paddingRight="40dip" - android:paddingTop="5dip" - android:text="@string/button_no" /> - - <Button - android:id="@+id/console_prompt_yes" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/console_prompt" - android:layout_toLeftOf="@+id/console_prompt_no" - android:paddingBottom="10dip" - android:paddingLeft="40dip" - android:paddingRight="40dip" - android:paddingTop="5dip" - android:text="@string/button_yes" /> - - </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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - android:background="#55f0f0f0" - android:contentDescription="@string/image_description_show_keyboard" - android:padding="0dp" - android:src="@drawable/button_keyboard" - android:textSize="10dip" /> - - </LinearLayout> +<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:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + 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:background="?attr/colorPrimary" + android:textAppearance="?android:attr/textAppearanceMedium" + app:tabIndicatorColor="@android:color/white"/> + + <TextView + android:id="@android:id/empty" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_below="@id/toolbar" + android:gravity="center" + android:text="@string/terminal_no_hosts_connected" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <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:background="#80000000" + android:fadingEdge="horizontal" + android:fadingEdgeLength="25dip" + android:padding="5dip" + android:visibility="gone" + > + + <TextView + android:id="@+id/console_password_instructions" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:visibility="gone" + /> + + <EditText + android:id="@+id/console_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/console_password_instructions" + android:password="true" + android:singleLine="true" + /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/console_boolean_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:background="#80000000" + android:fadingEdge="horizontal" + android:fadingEdgeLength="25dip" + android:padding="5dip" + android:visibility="gone" + > + + <TextView + android:id="@+id/console_prompt" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + + <Button + android:id="@+id/console_prompt_no" + 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" + android:paddingBottom="10dip" + android:paddingLeft="40dip" + android:paddingRight="40dip" + android:paddingTop="5dip" + android:text="@string/button_no" + /> + + <Button + android:id="@+id/console_prompt_yes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/console_prompt" + android:layout_toLeftOf="@+id/console_prompt_no" + android:paddingBottom="10dip" + android:paddingLeft="40dip" + android:paddingRight="40dip" + android:paddingTop="5dip" + android:text="@string/button_yes" + /> + + </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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_show_keyboard" + android:padding="0dp" + android:src="@drawable/button_keyboard" + android:textSize="10dip" + /> + + </LinearLayout> </RelativeLayout> diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml index 24d34ba..7ee7f0a 100644 --- a/app/src/main/res/layout-port/item_host.xml +++ b/app/src/main/res/layout-port/item_host.xml @@ -18,8 +18,8 @@ */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/content" +<RelativeLayout android:id="@android:id/content" + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:padding="10dip" @@ -27,31 +27,31 @@ <ImageView android:id="@android:id/icon" - android:src="@drawable/connected" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:paddingTop="5dip" android:contentDescription="@string/image_description_connected" + android:paddingTop="5dip" + android:src="@drawable/connected" /> - + <TextView - android:id="@android:id/text1" + android:id="@android:id/text1" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:ellipsize="end" android:paddingRight="20dip" android:singleLine="true" - android:ellipsize="end" android:textAppearance="?android:attr/textAppearanceLarge" /> <TextView - android:id="@android:id/text2" + android:id="@android:id/text2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" android:layout_below="@android:id/text1" + android:textAppearance="?android:attr/textAppearanceSmall" /> - + </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/act_colors.xml b/app/src/main/res/layout/act_colors.xml index 53f492c..9081e05 100644 --- a/app/src/main/res/layout/act_colors.xml +++ b/app/src/main/res/layout/act_colors.xml @@ -24,49 +24,43 @@ android:layout_height="fill_parent"> <LinearLayout - android:orientation="horizontal" + android:id="@+id/spinners" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:id="@+id/spinners"> + android:orientation="horizontal"> <Spinner android:id="@+id/fg" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:minHeight="60dp" android:layout_weight="1" android:gravity="center" + android:minHeight="60dp" /> <Spinner android:id="@+id/bg" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_alignTop="@id/fg" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_toRightOf="@id/fg" - android:minHeight="60dp" android:layout_weight="1" android:gravity="center" + android:minHeight="60dp" /> </LinearLayout> <GridView android:id="@+id/color_grid" - android:layout_height="fill_parent" android:layout_width="fill_parent" - android:padding="10dp" - android:verticalSpacing="10dp" - android:horizontalSpacing="10dp" - android:numColumns="auto_fit" + android:layout_height="fill_parent" + android:layout_below="@+id/spinners" android:columnWidth="60dp" - android:stretchMode="columnWidth" android:gravity="center" + android:horizontalSpacing="10dp" android:minHeight="60dp" - android:layout_below="@+id/spinners" + android:numColumns="auto_fit" + android:padding="10dp" + android:stretchMode="columnWidth" + android:verticalSpacing="10dp" /> </RelativeLayout> diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml index ca29a29..e3f6e90 100644 --- a/app/src/main/res/layout/act_console.xml +++ b/app/src/main/res/layout/act_console.xml @@ -17,239 +17,263 @@ */ --> -<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"> - - <TextView - android:id="@android:id/empty" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:gravity="center" - android:text="@string/terminal_no_hosts_connected" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <android.support.v4.view.ViewPager - android:id="@+id/console_flip" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> - - <RelativeLayout - android:id="@+id/console_password_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="#80000000" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" - android:padding="5dip" - android:visibility="gone"> - - <TextView - android:id="@+id/console_password_instructions" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:visibility="gone" /> - - <EditText - android:id="@+id/console_password" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/console_password_instructions" - android:password="true" - android:singleLine="true" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/console_boolean_group" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="#80000000" - android:fadingEdge="horizontal" - android:fadingEdgeLength="25dip" - android:padding="5dip" - android:visibility="gone"> - - <TextView - android:id="@+id/console_prompt" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Button - android:id="@+id/console_prompt_no" - 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" - android:paddingBottom="10dip" - android:paddingLeft="40dip" - android:paddingRight="40dip" - android:paddingTop="5dip" - android:text="@string/button_no" /> - - <Button - android:id="@+id/console_prompt_yes" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/console_prompt" - android:layout_toLeftOf="@+id/console_prompt_no" - android:paddingBottom="10dip" - android:paddingLeft="40dip" - android:paddingRight="40dip" - android:paddingTop="5dip" - android:text="@string/button_yes" /> - - </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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - 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_height="30dip" - android:layout_margin="0dp" - android:layout_weight="1" - android:background="#55f0f0f0" - android:contentDescription="@string/image_description_show_keyboard" - android:padding="0dp" - android:src="@drawable/button_keyboard" - android:textSize="10dip" /> - - </LinearLayout> +<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"> + + <TextView + android:id="@android:id/empty" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:text="@string/terminal_no_hosts_connected" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <android.support.v4.view.ViewPager + android:id="@+id/console_flip" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + /> + + <RelativeLayout + android:id="@+id/console_password_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:background="#80000000" + android:fadingEdge="horizontal" + android:fadingEdgeLength="25dip" + android:padding="5dip" + android:visibility="gone" + > + + <TextView + android:id="@+id/console_password_instructions" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="5dip" + android:textAppearance="?android:attr/textAppearanceMedium" + android:visibility="gone" + /> + + <EditText + android:id="@+id/console_password" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/console_password_instructions" + android:password="true" + android:singleLine="true" + /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/console_boolean_group" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:background="#80000000" + android:fadingEdge="horizontal" + android:fadingEdgeLength="25dip" + android:padding="5dip" + android:visibility="gone" + > + + <TextView + android:id="@+id/console_prompt" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + + <Button + android:id="@+id/console_prompt_no" + 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" + android:paddingBottom="10dip" + android:paddingLeft="40dip" + android:paddingRight="40dip" + android:paddingTop="5dip" + android:text="@string/button_no" + /> + + <Button + android:id="@+id/console_prompt_yes" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/console_prompt" + android:layout_toLeftOf="@+id/console_prompt_no" + android:paddingBottom="10dip" + android:paddingLeft="40dip" + android:paddingRight="40dip" + android:paddingTop="5dip" + android:text="@string/button_yes" + /> + + </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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + 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_height="30dip" + android:layout_margin="0dp" + android:layout_weight="1" + android:background="#55f0f0f0" + android:contentDescription="@string/image_description_show_keyboard" + android:padding="0dp" + android:src="@drawable/button_keyboard" + android:textSize="10dip" + /> + + </LinearLayout> </RelativeLayout> diff --git a/app/src/main/res/layout/act_eula.xml b/app/src/main/res/layout/act_eula.xml index de4ddc4..f70188b 100644 --- a/app/src/main/res/layout/act_eula.xml +++ b/app/src/main/res/layout/act_eula.xml @@ -16,74 +16,72 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context="org.connectbot.EulaActivity"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.connectbot.EulaActivity"> <ScrollView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - > + android:layout_width="fill_parent" + android:layout_height="wrap_content" + > <LinearLayout - android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="10dip" - > + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="10dip" + > <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device." - android:textAppearance="?android:attr/textAppearanceMedium" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="ConnectBot is a simple, powerful, open-source Secure Shell (SSH) client for your Android device." + android:textAppearance="?android:attr/textAppearanceMedium" + /> <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="10dip" - android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps." - android:textAppearance="?android:attr/textAppearanceMedium" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="10dip" + android:text="It can manage several SSH sessions, create secure tunnels, and copy/paste between other apps." + android:textAppearance="?android:attr/textAppearanceMedium" + /> <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="10dip" - android:autoLink="web" - android:text="@string/copyright_info" - android:textAppearance="?android:attr/textAppearanceSmall" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingTop="10dip" + android:text="@string/copyright_info" + android:textAppearance="?android:attr/textAppearanceSmall" + /> <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="10dip" - android:text="About and Credits" - android:textAppearance="?android:attr/textAppearanceMedium" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="10dip" + android:text="About and Credits" + android:textAppearance="?android:attr/textAppearanceMedium" + /> <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="10dip" - android:autoLink="web" - android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license. Copyright \u00a9 2007 Trilead AG. http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license. Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005. http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com" - android:textSize="14sp" - android:textColor="#bebebe" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:autoLink="web" + android:paddingTop="10dip" + android:text="Copyright \u00a9 2007-2008 Kenny Root http://the-b.org, Jeffrey Sharkey http://jsharkey.org\n\nBased in part on the Trilead SSH2 client, provided under a BSD-style license. Copyright \u00a9 2007 Trilead AG. http://www.trilead.com\n\nAlso based on JTA Telnet/SSH client, provided under the GPLv2 license. Copyright \u00a9 Matthias L. Jugel, Marcus Meiner 1996-2005. http://www.javassh.org\n\nAlso based in part on the JSOCKS library, provided under the GNU LGPL license. http://jsocks.sourceforge.net\n\nAlso based in part on JZlib provided under a BSD-style license. Copyright \u00a9 JCraft, Inc., 2000-2004 http://www.jcraft.com" + android:textColor="#bebebe" + android:textSize="14sp" + /> <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingTop="10dip" - android:text="@string/msg_version" - android:textAppearance="?android:attr/textAppearanceSmall" - /> + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingTop="10dip" + android:text="@string/msg_version" + android:textAppearance="?android:attr/textAppearanceSmall" + /> </LinearLayout> diff --git a/app/src/main/res/layout/act_generatepubkey.xml b/app/src/main/res/layout/act_generatepubkey.xml index f10b80b..feb0ed9 100644 --- a/app/src/main/res/layout/act_generatepubkey.xml +++ b/app/src/main/res/layout/act_generatepubkey.xml @@ -20,166 +20,171 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:scrollbars="vertical" - android:layout_width="fill_parent"> + android:scrollbars="vertical"> <TableLayout - android:orientation="vertical" + android:layout_width="fill_parent" android:layout_height="wrap_content" + android:orientation="vertical" android:paddingLeft="10dip" android:paddingRight="10dip" - android:scrollbars="vertical" - android:layout_width="fill_parent"> + android:scrollbars="vertical"> <TableRow> + <TextView - android:text="@string/prompt_nickname" - android:paddingRight="10dip" android:gravity="end|center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:paddingRight="10dip" + android:text="@string/prompt_nickname" + android:textAppearance="?android:attr/textAppearanceMedium"/> <EditText android:id="@+id/nickname" - android:hint="@string/prompt_nickname_hint_pubkey" android:layout_height="wrap_content" - android:singleLine="true" - android:layout_weight="1" /> + android:layout_weight="1" + android:hint="@string/prompt_nickname_hint_pubkey" + android:singleLine="true"/> </TableRow> <TableRow> + <TextView - android:text="@string/prompt_type" - android:paddingRight="10dip" - android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_gravity="center_vertical" android:gravity="bottom|end" - android:layout_gravity="center_vertical" /> + android:paddingRight="10dip" + android:text="@string/prompt_type" + android:textAppearance="?android:attr/textAppearanceMedium"/> <RadioGroup android:id="@+id/key_type" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:checkedButton="@+id/rsa"> + android:checkedButton="@+id/rsa" + android:orientation="horizontal"> <RadioButton android:id="@+id/rsa" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="RSA" - android:paddingRight="3dip"/> + android:paddingRight="3dip" + android:text="RSA"/> <RadioButton android:id="@+id/dsa" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="DSA" - android:paddingRight="3dip"/> + android:paddingRight="3dip" + android:text="DSA"/> <RadioButton android:id="@+id/ec" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="EC" /> + android:text="EC"/> </RadioGroup> </TableRow> <TableRow> + <TextView - android:text="@string/prompt_bits" + android:gravity="end|center_vertical" android:paddingRight="10dip" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="end|center_vertical" /> + android:text="@string/prompt_bits" + android:textAppearance="?android:attr/textAppearanceMedium"/> <EditText android:id="@+id/bits" - android:inputType="number" android:layout_height="wrap_content" - android:text="1024" + android:layout_weight="1" + android:inputType="number" android:singleLine="true" - android:layout_weight="1" /> + android:text="1024"/> </TableRow> <SeekBar - android:layout_height="wrap_content" android:id="@+id/bits_slider" android:layout_width="fill_parent" - android:paddingBottom="10dip" + android:layout_height="wrap_content" android:max="3328" - android:progress="256" /> + android:paddingBottom="10dip" + android:progress="256"/> <TextView - android:text="@string/prompt_password_can_be_blank" - android:gravity="start" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_width="wrap_content" /> + android:gravity="start" + android:text="@string/prompt_password_can_be_blank"/> <TableRow> + <TextView - android:paddingRight="10dip" - android:gravity="end|center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/prompt_password" /> + android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_password" + android:textAppearance="?android:attr/textAppearanceMedium"/> <EditText android:id="@+id/password1" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" android:password="true" - android:singleLine="true" - android:layout_weight="1" /> + android:singleLine="true"/> </TableRow> <TableRow android:paddingBottom="6dip"> + <LinearLayout - android:paddingRight="10dip" + android:gravity="end|center_vertical" android:orientation="vertical" - android:gravity="end|center_vertical"> + android:paddingRight="10dip"> <TextView - android:gravity="end|bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/prompt_password" /> + android:gravity="end|bottom" + android:text="@string/prompt_password" + android:textAppearance="?android:attr/textAppearanceMedium"/> <TextView - android:gravity="end|top" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="@string/prompt_again" /> + android:gravity="end|top" + android:text="@string/prompt_again" + android:textAppearance="?android:attr/textAppearanceSmall"/> </LinearLayout> <EditText android:id="@+id/password2" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="1" android:password="true" - android:singleLine="true" - android:layout_weight="1" /> + android:singleLine="true"/> </TableRow> <CheckBox + android:id="@+id/unlock_at_startup" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/unlock_at_startup" - android:text="@string/pubkey_load_on_start" /> + android:text="@string/pubkey_load_on_start"/> <CheckBox + android:id="@+id/confirm_use" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/confirm_use" - android:text="@string/pubkey_confirm_use" /> + android:text="@string/pubkey_confirm_use"/> <Button + android:id="@+id/save" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/save" - android:text="@string/pubkey_generate" + android:layout_marginTop="6dip" android:enabled="false" - android:layout_marginTop="6dip"/> + android:text="@string/pubkey_generate"/> </TableLayout> </ScrollView> diff --git a/app/src/main/res/layout/act_help.xml b/app/src/main/res/layout/act_help.xml index adf17f3..b4bb808 100644 --- a/app/src/main/res/layout/act_help.xml +++ b/app/src/main/res/layout/act_help.xml @@ -27,29 +27,29 @@ <LinearLayout android:id="@+id/topics" - android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" + android:orientation="vertical" > <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/msg_version" - android:paddingTop="2dip" - android:textAppearance="?android:attr/textAppearanceSmall" android:gravity="end" android:paddingRight="2dip" + android:paddingTop="2dip" + android:text="@string/msg_version" + android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/help_intro" + android:gravity="center_horizontal" android:paddingTop="2dip" + android:text="@string/help_intro" android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center_horizontal" /> </LinearLayout> diff --git a/app/src/main/res/layout/act_help_topic.xml b/app/src/main/res/layout/act_help_topic.xml index 7123d63..f02e35e 100644 --- a/app/src/main/res/layout/act_help_topic.xml +++ b/app/src/main/res/layout/act_help_topic.xml @@ -19,9 +19,9 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" > <org.connectbot.util.HelpTopicView diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml index a0214d4..647563c 100644 --- a/app/src/main/res/layout/act_hostlist.xml +++ b/app/src/main/res/layout/act_hostlist.xml @@ -20,36 +20,36 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" > <LinearLayout android:id="@+id/quickconnect" - android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentStart="true" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:orientation="horizontal" > <Spinner android:id="@+id/transport_selection" - android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_height="wrap_content" /> <EditText android:id="@+id/front_quickconnect" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:ellipsize="end" + android:focusableInTouchMode="true" android:hint="username@hostname:port" android:inputType="textEmailAddress" android:maxLines="1" - android:ellipsize="end" - android:focusableInTouchMode="true" android:singleLine="true"/> </LinearLayout> @@ -65,10 +65,10 @@ android:id="@android:id/empty" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:layout_above="@+id/quickconnect" + android:gravity="center" android:text="@string/list_host_empty" android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center" - android:layout_above="@+id/quickconnect" /> </RelativeLayout> diff --git a/app/src/main/res/layout/act_portforwardlist.xml b/app/src/main/res/layout/act_portforwardlist.xml index b8589d0..46393ae 100644 --- a/app/src/main/res/layout/act_portforwardlist.xml +++ b/app/src/main/res/layout/act_portforwardlist.xml @@ -19,22 +19,24 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" > - <ListView android:id="@android:id/list" + <ListView + android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" /> - <TextView android:id="@android:id/empty" + <TextView + android:id="@android:id/empty" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:gravity="center" android:text="@string/portforward_list_empty" android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center" /> </LinearLayout> diff --git a/app/src/main/res/layout/act_pubkeylist.xml b/app/src/main/res/layout/act_pubkeylist.xml index ceabb52..0737d05 100644 --- a/app/src/main/res/layout/act_pubkeylist.xml +++ b/app/src/main/res/layout/act_pubkeylist.xml @@ -19,22 +19,24 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:orientation="vertical" > - <ListView android:id="@android:id/list" + <ListView + android:id="@android:id/list" android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" /> - <TextView android:id="@android:id/empty" + <TextView + android:id="@android:id/empty" android:layout_width="fill_parent" android:layout_height="fill_parent" + android:gravity="center" android:text="@string/pubkey_list_empty" android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center" /> </LinearLayout> diff --git a/app/src/main/res/layout/dia_changepassword.xml b/app/src/main/res/layout/dia_changepassword.xml index fe5f1dc..7f0d5b2 100644 --- a/app/src/main/res/layout/dia_changepassword.xml +++ b/app/src/main/res/layout/dia_changepassword.xml @@ -26,64 +26,67 @@ > <TableRow android:id="@+id/old_password_prompt"> + <TextView - android:text="@string/prompt_old_password" - android:paddingRight="10dip" + android:layout_width="wrap_content" android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_old_password" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content" /> <EditText android:id="@+id/old_password" android:layout_width="200dip" android:layout_height="wrap_content" - android:singleLine="true" android:password="true" + android:singleLine="true" /> </TableRow> <TableRow> + <TextView - android:text="@string/prompt_password" - android:paddingRight="10dip" + android:layout_width="wrap_content" android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_password" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="wrap_content" /> <EditText android:id="@+id/password1" android:layout_width="200dip" android:layout_height="wrap_content" - android:singleLine="true" android:password="true" + android:singleLine="true" /> </TableRow> <TableRow> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" android:gravity="end" + android:orientation="vertical" > <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/prompt_password" - android:paddingRight="10dip" android:gravity="end|bottom" + android:paddingRight="10dip" + android:text="@string/prompt_password" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/prompt_again" - android:paddingRight="10dip" android:gravity="end|top" + android:paddingRight="10dip" + android:text="@string/prompt_again" android:textAppearance="?android:attr/textAppearanceSmall" /> </LinearLayout> @@ -92,8 +95,8 @@ android:id="@+id/password2" android:layout_width="200dip" android:layout_height="wrap_content" - android:singleLine="true" android:password="true" + android:singleLine="true" /> </TableRow> </TableLayout> diff --git a/app/src/main/res/layout/dia_gatherentropy.xml b/app/src/main/res/layout/dia_gatherentropy.xml index 8c7153a..2fc4a60 100644 --- a/app/src/main/res/layout/dia_gatherentropy.xml +++ b/app/src/main/res/layout/dia_gatherentropy.xml @@ -19,9 +19,9 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:orientation="vertical" android:paddingLeft="10dip" android:paddingRight="10dip" > @@ -29,16 +29,16 @@ <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" + android:gravity="center" android:text="@string/pubkey_touch_hint" - android:textAppearance="?android:attr/textAppearanceMedium" - android:gravity="center"/> + android:textAppearance="?android:attr/textAppearanceMedium"/> <org.connectbot.util.EntropyView android:id="@+id/entropy" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:background="#666666ff" android:layout_marginBottom="10dip" android:layout_marginTop="10dip" + android:background="#666666ff" android:drawingCacheQuality="auto"/> </LinearLayout> diff --git a/app/src/main/res/layout/dia_keyboard_shortcuts.xml b/app/src/main/res/layout/dia_keyboard_shortcuts.xml new file mode 100644 index 0000000..b6fb589 --- /dev/null +++ b/app/src/main/res/layout/dia_keyboard_shortcuts.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ ConnectBot: simple, powerful, open-source SSH client for Android + ~ Copyright 2015 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" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <ScrollView + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TableLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="24dip" + android:stretchColumns="1"> + <TableRow> + <TextView + android:text="Ctrl-Shift-V" + android:padding="3dip" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + <TextView + android:text="@string/console_menu_paste" + android:padding="3dip" + android:gravity="end" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + </TableRow> + + <TableRow> + <TextView + android:text="Ctrl and +" + android:padding="3dip" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + <TextView + android:text="@string/increase_font_size" + android:padding="3dip" + android:layout_weight="1" + android:gravity="end" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + </TableRow> + + <TableRow> + <TextView + android:text="Ctrl and -" + android:padding="3dip" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + <TextView + android:text="@string/decrease_font_size" + android:padding="3dip" + android:gravity="end" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + /> + </TableRow> + + </TableLayout> + + </ScrollView> +</RelativeLayout> diff --git a/app/src/main/res/layout/dia_password.xml b/app/src/main/res/layout/dia_password.xml index 599af83..148e197 100644 --- a/app/src/main/res/layout/dia_password.xml +++ b/app/src/main/res/layout/dia_password.xml @@ -28,10 +28,10 @@ <EditText android:id="@android:id/text1" android:layout_width="250dip" - android:singleLine="true" android:layout_height="wrap_content" + android:hint="@string/prompt_password" android:password="true" - android:hint="Password" + android:singleLine="true" /> </LinearLayout> diff --git a/app/src/main/res/layout/dia_portforward.xml b/app/src/main/res/layout/dia_portforward.xml index ed6aa40..f2ef3ed 100644 --- a/app/src/main/res/layout/dia_portforward.xml +++ b/app/src/main/res/layout/dia_portforward.xml @@ -19,8 +19,8 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_height="fill_parent" android:layout_width="fill_parent" + android:layout_height="fill_parent" android:scrollbars="vertical" > @@ -32,72 +32,77 @@ > <TableRow> + <TextView - android:text="@string/prompt_nickname" - android:paddingRight="10dip" android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_nickname" android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText android:id="@+id/nickname" - android:hint="Internal Webserver" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:singleLine="true" android:layout_weight="1" + android:hint="Internal Webserver" + android:singleLine="true" /> </TableRow> <TableRow> + <TextView - android:text="@string/prompt_type" - android:paddingRight="10dip" android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_type" android:textAppearance="?android:attr/textAppearanceMedium" /> - <Spinner android:id="@+id/portforward_type" + <Spinner + android:id="@+id/portforward_type" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_weight="1" android:entries="@array/list_portforward_types" android:prompt="@string/prompt_type" - android:layout_weight="1" /> </TableRow> <TableRow> + <TextView - android:text="@string/prompt_source_port" - android:paddingRight="10dip" android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_source_port" android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText android:id="@+id/portforward_source" - android:hint="8080" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:hint="8080" android:inputType="number" /> </TableRow> <TableRow> + <TextView - android:text="@string/prompt_destination" - android:paddingRight="10dip" android:gravity="end|center_vertical" + android:paddingRight="10dip" + android:text="@string/prompt_destination" android:textAppearance="?android:attr/textAppearanceMedium" /> <EditText android:id="@+id/portforward_destination" - android:hint="localhost:80" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" + android:hint="localhost:80" android:inputType="textEmailAddress" /> </TableRow> diff --git a/app/src/main/res/layout/dia_resize.xml b/app/src/main/res/layout/dia_resize.xml index 781243d..e31d58e 100644 --- a/app/src/main/res/layout/dia_resize.xml +++ b/app/src/main/res/layout/dia_resize.xml @@ -19,9 +19,9 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:orientation="horizontal" android:paddingLeft="10dip" android:paddingRight="10dip" > @@ -30,17 +30,17 @@ android:id="@+id/width" android:layout_width="100dip" android:layout_height="wrap_content" - android:singleLine="true" android:numeric="integer" + android:singleLine="true" android:text="80"/> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="x" + android:gravity="end|bottom" android:paddingLeft="10dip" android:paddingRight="10dip" - android:gravity="end|bottom" + android:text="x" android:textAppearance="?android:attr/textAppearanceLarge" /> @@ -49,7 +49,7 @@ android:id="@+id/height" android:layout_width="100dip" android:layout_height="wrap_content" - android:singleLine="true" android:numeric="integer" + android:singleLine="true" android:text="25"/> </LinearLayout> diff --git a/app/src/main/res/layout/item_portforward.xml b/app/src/main/res/layout/item_portforward.xml index 105ef58..f2214a7 100644 --- a/app/src/main/res/layout/item_portforward.xml +++ b/app/src/main/res/layout/item_portforward.xml @@ -19,10 +19,10 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" android:gravity="start|center_vertical" - android:layout_width="fill_parent" + android:orientation="vertical" android:padding="10dip" > @@ -30,20 +30,20 @@ android:id="@android:id/text1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="Tunnel Nickname" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:text="Tunnel Nickname" + android:textAppearance="?android:attr/textAppearanceLarge" /> <TextView android:id="@android:id/text2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="Local port 8080 to 192.168.1.1:80" android:layout_below="@android:id/text1" + android:text="Local port 8080 to 192.168.1.1:80" + android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> diff --git a/app/src/main/res/layout/item_pubkey.xml b/app/src/main/res/layout/item_pubkey.xml index 34a7330..ed0c7d2 100644 --- a/app/src/main/res/layout/item_pubkey.xml +++ b/app/src/main/res/layout/item_pubkey.xml @@ -18,8 +18,9 @@ */ --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout android:id="@android:id/content" + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" android:padding="10dip"> @@ -28,29 +29,31 @@ android:id="@android:id/icon1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/pubkey" - android:contentDescription="@string/image_description_key_is_locked" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_marginLeft="10dip"/> + android:layout_marginLeft="10dip" + android:contentDescription="@string/image_description_key_is_locked" + android:src="@drawable/pubkey"/> <TextView android:id="@android:id/text1" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:text="Key Example" - android:layout_alignParentStart="true" android:layout_alignParentLeft="true" - android:bufferType="normal" android:layout_width="wrap_content" android:layout_toLeftOf="@android:id/icon1"/> + android:layout_alignParentStart="true" + android:layout_toLeftOf="@android:id/icon1" + android:bufferType="normal" + android:text="Key Example" + android:textAppearance="?android:attr/textAppearanceLarge"/> <TextView android:id="@android:id/text2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="DSA 1024-bit" android:layout_below="@android:id/text1" + android:text="DSA 1024-bit" + android:textAppearance="?android:attr/textAppearanceSmall" /> </RelativeLayout> diff --git a/app/src/main/res/layout/item_terminal.xml b/app/src/main/res/layout/item_terminal.xml index 9a8ff19..b34c800 100644 --- a/app/src/main/res/layout/item_terminal.xml +++ b/app/src/main/res/layout/item_terminal.xml @@ -28,10 +28,10 @@ android:id="@+id/terminal_overlay" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" + android:layout_centerInParent="true" android:background="#aa000000" android:padding="10dip" - android:layout_centerInParent="true" + android:textAppearance="?android:attr/textAppearanceLarge" /> </RelativeLayout> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index d19430f..bc6f6db 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -171,9 +171,6 @@ <string name="delete_message">Estas segur que vols esborrar \'%1$s\'?</string> <string name="delete_pos">Sí, esborra</string> <string name="delete_neg">Cancel·la</string> - <string name="wizard_agree">Accepto</string> - <string name="wizard_next">Següent</string> - <string name="wizard_back">Enrere</string> <string name="terminal_no_hosts_connected">No hi ha servidors connectats actualment</string> <string name="terminal_connecting">Connectant a %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Clau de servidor \'%1$s\' verificada: %2$s</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1d38c19..18d80b4 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -166,9 +166,6 @@ <string name="delete_message">Určitě chcete smazat \'%1$s\'?</string> <string name="delete_pos">Ano, smazat</string> <string name="delete_neg">Zrušit</string> - <string name="wizard_agree">Souhlasím</string> - <string name="wizard_next">Další</string> - <string name="wizard_back">Zpět</string> <string name="terminal_no_hosts_connected">Žádný host není připojený</string> <string name="terminal_connecting">Připojování k %1$s:%2$d přes %3$s</string> <string name="terminal_failed">Selhalo ověření klíče hosta</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 5cd6da7..1b98e6b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Er du sikker på at du vil slette \'%1$s\'?</string> <string name="delete_pos">Ja, slet</string> <string name="delete_neg">Afbryd</string> - <string name="wizard_agree">Godkend</string> - <string name="wizard_next">Næste</string> - <string name="wizard_back">Tilbage</string> <string name="terminal_no_hosts_connected">Ingen forbindelser aktive i øjeblikket</string> <string name="terminal_connecting">Forbinder til %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Verificeret vært \'%1$s\' nøgle: %2$s</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d9dcc40..1cda6a7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -171,9 +171,6 @@ <string name="delete_message">Soll \'%1$s\' wirklich gelöscht werden?</string> <string name="delete_pos">Ja, löschen</string> <string name="delete_neg">Abbrechen</string> - <string name="wizard_agree">Zustimmung</string> - <string name="wizard_next">Weiter</string> - <string name="wizard_back">Zurück</string> <string name="terminal_no_hosts_connected">Zur Zeit keine Hosts verbunden</string> <string name="terminal_connecting">Verbinde mit %1$s:%2$d mittels %3$s</string> <string name="terminal_sucess">Host \'%1$s\' Schlüssel: %2$s bestätigt</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c0d8471..0ab0094 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -170,9 +170,6 @@ <string name="delete_message">¿Está seguro de que quiere eliminar \'%1$s\'?</string> <string name="delete_pos">Sí, eliminar</string> <string name="delete_neg">Cancelar</string> - <string name="wizard_agree">De acuerdo</string> - <string name="wizard_next">Siguiente</string> - <string name="wizard_back">Atrás</string> <string name="terminal_no_hosts_connected">No hay equipos conectados ahora</string> <string name="terminal_connecting">Conectando a %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Host (equipo anfitrion) \'%1$s\' clave: %2$s verifiado.</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index a8462fc..19aac2f 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -172,9 +172,6 @@ <string name="delete_message">Ziur zaude \'%1$s\' ezabatu nahi duzula?</string> <string name="delete_pos">Bai, ezabatu</string> <string name="delete_neg">Utzi</string> - <string name="wizard_agree">Ados</string> - <string name="wizard_next">Hurrengoa</string> - <string name="wizard_back">Atzera</string> <string name="terminal_no_hosts_connected">Ez dago ostalaririk konektatuta une honetan</string> <string name="terminal_connecting">%1$s:%2$d-ra konektatzen %3$s bidez</string> <string name="terminal_sucess">Egiaztatutako ostalaria \'%1$s\' gakoa: %2$s</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index d17bd22..2311edf 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -168,9 +168,6 @@ <string name="delete_message">Oletko varma että haluat poistaa: \'%1$s\'?</string> <string name="delete_pos">Kyllä, poista</string> <string name="delete_neg">Peru</string> - <string name="wizard_agree">Hyväksy</string> - <string name="wizard_next">Seuraava</string> - <string name="wizard_back">Edellinen</string> <string name="terminal_no_hosts_connected">Yhteenkään palvelimeen ei ole yhdistetty</string> <string name="terminal_connecting">Muodostetaan %3$s-yhteys palvelimeen %1$s:%2$d</string> <string name="terminal_sucess">Varmennettiin palvelin \'%1$s\' avain: %2$s</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6c34f56..28afe2b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -179,9 +179,6 @@ <string name="delete_message">Êtes-vous sûr de vouloir supprimer \'%1$s\' ?</string> <string name="delete_pos">Oui, supprimer</string> <string name="delete_neg">Annuler</string> - <string name="wizard_agree">Accepter</string> - <string name="wizard_next">Suivant</string> - <string name="wizard_back">Précédent</string> <string name="terminal_no_hosts_connected">Aucun hôte actuellement connecté</string> <string name="terminal_connecting">Connexion à %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Clé de vérification de l\'hôte \'%1$s\' : %2$s</string> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 10c0623..aae25e2 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -170,9 +170,6 @@ <string name="delete_message">האם אכן למחוק את \'%1$s\'?</string> <string name="delete_pos">כן, למחוק</string> <string name="delete_neg">ביטול</string> - <string name="wizard_agree">מוסכם</string> - <string name="wizard_next">הבא</string> - <string name="wizard_back">הקודם</string> <string name="terminal_no_hosts_connected">אין מארחים מחוברים כרגע</string> <string name="terminal_connecting">מתבצעת התחברות אל %1$s:%2$d דרך %3$s</string> <string name="terminal_sucess">מפתח של המארח המאומת \'%1$s\': %2$s</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 61becd0..9e71521 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Biztosan törli a \'%1$s\'-t?</string> <string name="delete_pos">Igen, törlés</string> <string name="delete_neg">Mégsem</string> - <string name="wizard_agree">Elfogad</string> - <string name="wizard_next">Következő</string> - <string name="wizard_back">Vissza</string> <string name="terminal_no_hosts_connected">Nincs csatlakozva</string> <string name="terminal_connecting">Csatlakozás %1$s:%2$d a %3$s protokollon</string> <string name="terminal_sucess">Azonosított \'%1$s\' gépnév kulcsa: %2$s</string> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index c8d93c9..6d89a84 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -168,9 +168,6 @@ <string name="delete_message">Apakah anda yakin ingin menghapus %1$s?</string> <string name="delete_pos">Ya, hapus</string> <string name="delete_neg">Batal</string> - <string name="wizard_agree">Setuju</string> - <string name="wizard_next">Selanjutnya</string> - <string name="wizard_back">Sebelumnya</string> <string name="terminal_no_hosts_connected">Tidak ada host yang saat ini terhubung</string> <string name="terminal_connecting">Menyambungkan ke %1$s:%2$d melalui %3$s</string> <string name="terminal_sucess">Host terverifikasi \'%1$s\' kunci: %2$s</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 174849a..81ccb65 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -148,9 +148,6 @@ <string name="delete_message">Ert þú viss um að þú viljir eyða \'%1$s\'?</string> <string name="delete_pos">Já, eyða</string> <string name="delete_neg">Hætta við</string> - <string name="wizard_agree">Samþykkja</string> - <string name="wizard_next">Næsta</string> - <string name="wizard_back">Til baka</string> <string name="terminal_no_hosts_connected">Engir þjónar tengdir í augnablikinu</string> <string name="terminal_connecting">Tengist við %1$s:%2$d með %3$s</string> <string name="terminal_failed">Ekki tókst að staðfesta lykil þjóns.</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index abc690a..cfd0e2c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -171,9 +171,6 @@ <string name="delete_message">Sei sicuro di voler eliminare \'%1$s\'?</string> <string name="delete_pos">Sì, elimina</string> <string name="delete_neg">Annulla</string> - <string name="wizard_agree">Accetto</string> - <string name="wizard_next">Successiva</string> - <string name="wizard_back">Precedente</string> <string name="terminal_no_hosts_connected">Nessun host attualmente connesso</string> <string name="terminal_connecting">Connessione a %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Host verificato \'%1$s\' chiave: %2$s</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b44efa8..34adda8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -184,9 +184,6 @@ <string name="delete_message">\'%1$s\'を削除してよろしいですか?</string> <string name="delete_pos">はい、削除します</string> <string name="delete_neg">キャンセル</string> - <string name="wizard_agree">同意します</string> - <string name="wizard_next">次へ</string> - <string name="wizard_back">戻る</string> <string name="terminal_no_hosts_connected">接続済みのホストはありません．</string> <string name="terminal_connecting">%1$s:%2$dに%3$sで接続しています</string> <string name="terminal_sucess">ホスト\'%1$s\' キー%2$s を検証しました</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 54d7d30..a350b18 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -156,9 +156,6 @@ <string name="list_delkey_del">삭제</string> <string name="delete_pos">예, 삭제</string> <string name="delete_neg">취소</string> - <string name="wizard_agree">동의</string> - <string name="wizard_next">다음</string> - <string name="wizard_back">뒤로</string> <string name="terminal_no_hosts_connected">현재 연결된 호스트가 없음</string> <string name="terminal_connecting">%3$s(으)로 %1$s:%2$d에 연결 중</string> <string name="terminal_failed">호스트 키를 확인할 수 없습니다.</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 50ce19e..af4e09b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Er du sikker på at du vil slette \'%1$s\'?</string> <string name="delete_pos">Ja, slett</string> <string name="delete_neg">Avbryt</string> - <string name="wizard_agree">Godta</string> - <string name="wizard_next">Neste</string> - <string name="wizard_back">Tilbake</string> <string name="terminal_no_hosts_connected">Ingen verter tilkoblet for øyeblikket</string> <string name="terminal_connecting">Kobler til %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Verifiserte vert \'%1$s\' sin nøkkel: %2$s</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1488b3a..93f5c02 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Weet je zeker dat je \'%1$s\' wilt verwijderen?</string> <string name="delete_pos">Ja, verwijder</string> <string name="delete_neg">Annuleren</string> - <string name="wizard_agree">Ga akkoord</string> - <string name="wizard_next">Volgende</string> - <string name="wizard_back">Terug</string> <string name="terminal_no_hosts_connected">Momenteel geen hosts verbonden</string> <string name="terminal_connecting">Bezig met verbinden naar %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Gecontroleerde host \'%1$s\' sleutel: %2$s</string> diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 9dcad52..a506fa1 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -71,9 +71,6 @@ <string name="list_delkey_backspace">Retorn enrèire</string> <string name="list_delkey_del">Suprimir</string> <string name="delete_neg">Anullar</string> - <string name="wizard_agree">Acceptar</string> - <string name="wizard_next">Seguent</string> - <string name="wizard_back">Precedent</string> <string name="terminal_connecting">Connexion a %1$s:%2$d via %3$s</string> <string name="no">Non</string> <string name="with_confirmation">Aprèp confirmacion</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 37c92f4..b605ae1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -171,9 +171,6 @@ <string name="delete_message">Jesteś pewien, że chcesz usunąć \'%1$s\'?</string> <string name="delete_pos">Tak, usuń</string> <string name="delete_neg">Anuluj</string> - <string name="wizard_agree">Akceptuj</string> - <string name="wizard_next">Dalej</string> - <string name="wizard_back">Wróć</string> <string name="terminal_no_hosts_connected">Żaden host nie jest obecnie połączony</string> <string name="terminal_connecting">Łączenie z hostem %1$s:%2$d przez %3$s</string> <string name="terminal_sucess">Host \'%1$s \' zweryfikowany kluczem: %2$s</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7aadeaa..a7e9570 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -171,9 +171,6 @@ <string name="delete_message">Certeza que quer deletar \'%1$s\' ?</string> <string name="delete_pos">Sim, apagar</string> <string name="delete_neg">Cancelar</string> - <string name="wizard_agree">Aceito</string> - <string name="wizard_next">Próximo</string> - <string name="wizard_back">Voltar</string> <string name="terminal_no_hosts_connected">Sem host conectado atualmente</string> <string name="terminal_connecting">Conectando no %1$s:%2$d via %3$s</string> <string name="terminal_sucess">"Anfitrião comprovado \'%1$s\' chave: %2$s"</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 70be69b..d1fc2cd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Tem a certeza que deseja eliminar \'%1$s\'?</string> <string name="delete_pos">Sim, apagar</string> <string name="delete_neg">Cancelar</string> - <string name="wizard_agree">Aceitar</string> - <string name="wizard_next">Seguinte</string> - <string name="wizard_back">Retroceder</string> <string name="terminal_no_hosts_connected">Nenhum anfitrião ligado actualmente</string> <string name="terminal_connecting">A ligar a %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Verificado anfitrião \'%1$s\' chave: %2$s</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6eae2ba..a3fa802 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -172,9 +172,6 @@ <string name="delete_message">Вы уверены, что хотите удалить \'%1$s\'?</string> <string name="delete_pos">Да, удалить</string> <string name="delete_neg">Отменить</string> - <string name="wizard_agree">Соглашаюсь</string> - <string name="wizard_next">Далее</string> - <string name="wizard_back">Назад</string> <string name="terminal_no_hosts_connected">Нет подключенных узлов</string> <string name="terminal_connecting">Подключение к %1$s:%2$d через %3$s</string> <string name="terminal_sucess">Проверенный узел \'%1$s\' ключ: %2$s</string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 47f4aea..60e0b87 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Naozaj chcete zmazať \'%1$s\'?</string> <string name="delete_pos">Áno, vymazať</string> <string name="delete_neg">Zrušiť</string> - <string name="wizard_agree">Súhlasím</string> - <string name="wizard_next">Ďalej</string> - <string name="wizard_back">Späť</string> <string name="terminal_no_hosts_connected">Žiadny hostiteľ nie je pripijený</string> <string name="terminal_connecting">Pripájanie k %1$s:%2$d cez %3$s</string> <string name="terminal_sucess">Hostiteľ overený \'%1$s\' kľúč: %2$s</string> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 6adca1d..28d97d4 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -156,9 +156,6 @@ <string name="delete_message">Ali ste prepričani, da želite izbrisati \'%1$s\'?</string> <string name="delete_pos">Da, izbriši.</string> <string name="delete_neg">Prekliči</string> - <string name="wizard_agree">Se strinjam</string> - <string name="wizard_next">Naprej</string> - <string name="wizard_back">Nazaj</string> <string name="terminal_no_hosts_connected">Trenutno ni noben gostitelj povezan</string> <string name="terminal_connecting">Povezujem se na %1$s:%2$d preko %3$s</string> <string name="terminal_sucess">Preverjen gostitelj \'%1$s\' ključ: %2$s</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index c0613fb..a3430c5 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -184,9 +184,6 @@ <string name="delete_message">Желите ли заиста да обришете „%1$s“?</string> <string name="delete_pos">Да, обриши</string> <string name="delete_neg">Одустани</string> - <string name="wizard_agree">Прихваћам</string> - <string name="wizard_next">Следеће</string> - <string name="wizard_back">Назад</string> <string name="terminal_no_hosts_connected">Нема повезаних домаћина тренутно</string> <string name="terminal_connecting">Повезујем се са %1$s:%2$d преко %3$s</string> <string name="terminal_sucess">Verified host \'%1$s\' key: %2$s</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5151a14..5ea2a55 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -169,9 +169,6 @@ <string name="delete_message">Är du säker att du vill ta bort \'%1$s\'?</string> <string name="delete_pos">Ja, ta bort</string> <string name="delete_neg">Avbryt</string> - <string name="wizard_agree">Godkänn</string> - <string name="wizard_next">Nästa</string> - <string name="wizard_back">Tillbaka</string> <string name="terminal_no_hosts_connected">Inga värdar anslutna</string> <string name="terminal_connecting">Ansluter till %1$s:%2$d via %3$s</string> <string name="terminal_sucess">Verifierad värd \'%1$s\' nyckel: %2$s</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index dd9cfed..41cc553 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -171,9 +171,6 @@ <string name="delete_message">\'%1$s\' silinecek onaylıyor musunuz?</string> <string name="delete_pos">Evet, sil</string> <string name="delete_neg">İptal Et</string> - <string name="wizard_agree">Kabul et</string> - <string name="wizard_next">İleri</string> - <string name="wizard_back">Geri dön</string> <string name="terminal_no_hosts_connected">Hiçbir sunucuya bağlanılmadı</string> <string name="terminal_connecting">%3$s ile %1$s:%2$d bağlanıyor</string> <string name="terminal_sucess">Host doğrulaması \'%1$s\' anahtar: %2$s</string> diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml deleted file mode 100644 index f831811..0000000 --- a/app/src/main/res/values-v11/styles.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?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. - */ ---> -<resources> - <style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> - <item name="android:windowContentOverlay">@null</item> - <item name="android:actionBarStyle">@style/SolidActionBar</item> - </style> - - <style name="SolidActionBar" parent="android:Widget.Holo.ActionBar"> - <item name="android:background">#222222</item> - </style> -</resources> diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml deleted file mode 100644 index f831811..0000000 --- a/app/src/main/res/values-v14/styles.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?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. - */ ---> -<resources> - <style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> - <item name="android:windowContentOverlay">@null</item> - <item name="android:actionBarStyle">@style/SolidActionBar</item> - </style> - - <style name="SolidActionBar" parent="android:Widget.Holo.ActionBar"> - <item name="android:background">#222222</item> - </style> -</resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index cab5816..9e10f66 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -184,9 +184,6 @@ <string name="delete_message">确定要删除\'%1$s\'吗？</string> <string name="delete_pos">是，删除</string> <string name="delete_neg">取消</string> - <string name="wizard_agree">同意</string> - <string name="wizard_next">下一页</string> - <string name="wizard_back">返回</string> <string name="terminal_no_hosts_connected">当前没有连接主机</string> <string name="terminal_connecting">正在通过%3$s连接到 %1$s:%2$d</string> <string name="terminal_sucess">验证主机 %1$s 键值： %2$s</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1dd6541..4c4d541 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -184,9 +184,6 @@ <string name="delete_message">您確定要刪除 \'%1$s\'</string> <string name="delete_pos">是，刪除</string> <string name="delete_neg">取消</string> - <string name="wizard_agree">同意</string> - <string name="wizard_next">下一步</string> - <string name="wizard_back">返回</string> <string name="terminal_no_hosts_connected">目前沒有已連線主機</string> <string name="terminal_connecting">連接到 %1$s:%2$d，通過 %3$s</string> <string name="terminal_sucess">驗證主機 \'%1$s\' 金鑰： %2$s</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c2ce2e7..ecbe757 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,8 +18,8 @@ */ --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" - xmlns:tools="http://schemas.android.com/tools"> +<resources xmlns:tools="http://schemas.android.com/tools" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Summary of what ConnectBot is; used as a short description in the Android running apps list --> <string name="app_desc">"Simple, powerful, open-source SSH client."</string> @@ -56,6 +56,13 @@ <!-- Title for the help page with the terms & conditions of the app. --> <string name="terms_and_conditions">"Terms & Conditions"</string> + <!-- Title for the help dialog showing keyboard shortcuts. --> + <string name="keyboard_shortcuts">"Keyboard Shortcuts"</string> + <!-- Text in a keyboard shortcuts list lined up to keys which increase the terminal font-size. --> + <string name="increase_font_size">"Increase Font Size"</string> + <!-- Text in a keyboard shortcuts list lined up to keys which decrease the terminal font-size. --> + <string name="decrease_font_size">"Decrease Font Size"</string> + <string name="pubkey_generate">"Generate"</string> <string name="pubkey_import">"Import"</string> <string name="pubkey_delete">"Delete key"</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml deleted file mode 100644 index f0cd073..0000000 --- a/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?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. - */ ---> -<resources> - <style name="NoTitle" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> - <item name="android:windowNoTitle">true</item> - <item name="android:windowContentOverlay">@null</item> - </style> -</resources> |