aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable-hdpi/ic_volume_up.pngbin0 -> 518 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_volume_up.pngbin0 -> 365 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_volume_up.pngbin0 -> 654 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_volume_up.pngbin0 -> 998 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/ic_volume_up.pngbin0 -> 1304 bytes
-rw-r--r--app/src/main/res/layout/item_host.xml6
-rw-r--r--app/src/main/res/layout/item_portforward.xml32
-rw-r--r--app/src/main/res/layout/item_pubkey.xml58
-rw-r--r--app/src/main/res/layout/volume_preference_dialog_layout.xml51
-rw-r--r--app/src/main/res/values/strings.xml3
10 files changed, 109 insertions, 41 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_up.png b/app/src/main/res/drawable-hdpi/ic_volume_up.png
new file mode 100644
index 0000000..62d22be
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_volume_up.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_up.png b/app/src/main/res/drawable-mdpi/ic_volume_up.png
new file mode 100644
index 0000000..57d7871
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_volume_up.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_up.png b/app/src/main/res/drawable-xhdpi/ic_volume_up.png
new file mode 100644
index 0000000..2e751a4
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_volume_up.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_up.png b/app/src/main/res/drawable-xxhdpi/ic_volume_up.png
new file mode 100644
index 0000000..96c1f98
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_volume_up.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_volume_up.png b/app/src/main/res/drawable-xxxhdpi/ic_volume_up.png
new file mode 100644
index 0000000..fd633b6
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_volume_up.png
Binary files differ
diff --git a/app/src/main/res/layout/item_host.xml b/app/src/main/res/layout/item_host.xml
index 6059393..0ea220e 100644
--- a/app/src/main/res/layout/item_host.xml
+++ b/app/src/main/res/layout/item_host.xml
@@ -30,13 +30,9 @@
android:id="@android:id/icon"
android:layout_width="40dp"
android:layout_height="40dp"
- android:layout_alignParentStart="true"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginStart="16dp"
- android:layout_marginLeft="16dp"
android:contentDescription="@string/image_description_connected"
android:src="@drawable/connected"
+ style="@style/ListItemIcon"
/>
<LinearLayout
diff --git a/app/src/main/res/layout/item_portforward.xml b/app/src/main/res/layout/item_portforward.xml
index f2214a7..a3b2e52 100644
--- a/app/src/main/res/layout/item_portforward.xml
+++ b/app/src/main/res/layout/item_portforward.xml
@@ -18,32 +18,34 @@
*/
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:gravity="start|center_vertical"
+ android:minHeight="72dp"
+ android:layout_centerVertical="true"
android:orientation="vertical"
- android:padding="10dip"
- >
+ android:layout_marginLeft="16dp"
+ android:layout_marginStart="16dp"
+ style="@style/SelectableItem">
<TextView
android:id="@android:id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:text="Tunnel Nickname"
- android:textAppearance="?android:attr/textAppearanceLarge"
- />
+ android:ellipsize="end"
+ android:paddingTop="20dp"
+ android:singleLine="true"
+ android:textAppearance="@style/ListItemFirstLineText"
+ tools:text="Tunnel Nickname"/>
<TextView
android:id="@android:id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@android:id/text1"
- android:text="Local port 8080 to 192.168.1.1:80"
- android:textAppearance="?android:attr/textAppearanceSmall"
- />
+ android:paddingBottom="20dp"
+ android:textAppearance="@style/ListItemSecondLineText"
+ tools:text="Local port 8080 to 192.168.1.1:80"/>
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_pubkey.xml b/app/src/main/res/layout/item_pubkey.xml
index 6f63af9..1fb4cae 100644
--- a/app/src/main/res/layout/item_pubkey.xml
+++ b/app/src/main/res/layout/item_pubkey.xml
@@ -21,38 +21,54 @@
<RelativeLayout
android:id="@android:id/content"
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:padding="10dip">
+ android:minHeight="72dp"
+ style="@style/SelectableItem">
<ImageView
android:id="@android:id/icon"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
android:contentDescription="@string/image_description_key_is_locked"
- android:src="@drawable/pubkey"/>
+ android:src="@drawable/pubkey"
+ style="@style/ListItemIcon"/>
- <TextView
- android:id="@android:id/text1"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_toLeftOf="@android:id/icon1"
- android:bufferType="normal"
- android:text="Key Example"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:layout_alignWithParentIfMissing="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="16dp"
+ android:layout_marginLeft="72dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginStart="72dp"
+ android:layout_toRightOf="@android:id/icon"
+ android:layout_toEndOf="@android:id/icon"
+ android:orientation="vertical"
+ >
- <TextView
- android:id="@android:id/text2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/text1"
- android:text="DSA 1024-bit"
- android:textAppearance="?android:attr/textAppearanceSmall"
- />
+ <TextView
+ android:id="@android:id/text1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:paddingTop="20dp"
+ android:singleLine="true"
+ android:textAppearance="@style/ListItemFirstLineText"
+ tools:text="Key Example"/>
+
+ <TextView
+ android:id="@android:id/text2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="20dp"
+ android:textAppearance="@style/ListItemSecondLineText"
+ tools:text="DSA 1024-bit"/>
+
+ </LinearLayout>
</RelativeLayout>
diff --git a/app/src/main/res/layout/volume_preference_dialog_layout.xml b/app/src/main/res/layout/volume_preference_dialog_layout.xml
new file mode 100644
index 0000000..37f7bac
--- /dev/null
+++ b/app/src/main/res/layout/volume_preference_dialog_layout.xml
@@ -0,0 +1,51 @@
+<?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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:orientation="horizontal"
+ tools:ignore="PrivateResource"
+ android:paddingLeft="?attr/dialogPreferredPadding"
+ android:paddingStart="?attr/dialogPreferredPadding"
+ android:paddingEnd="?attr/dialogPreferredPadding"
+ android:paddingRight="?attr/dialogPreferredPadding"
+ >
+
+ <ImageView
+ android:id="@+id/volume_up"
+ android:contentDescription="@string/image_description_volume"
+ android:layout_marginBottom="24dp"
+ android:layout_marginTop="24dp"
+ android:layout_height="36dp"
+ android:layout_width="36dp"
+ android:src="@drawable/ic_volume_up"
+ />
+
+ <SeekBar
+ android:id="@+id/volume_bar"
+ android:layout_gravity="center_vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:max="100"
+ android:progress="0"
+ android:secondaryProgress="0"
+ />
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e76ade4..824f664 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -583,6 +583,9 @@
purposes. -->
<string name="image_description_right">Arrow right</string>
+ <!-- Describes the "volume" icon in the bell volume dialog for accessibility purposes. -->
+ <string name="image_description_volume">Volume</string>
+
<!-- Text for the "Esc" button in virtual keyboard. -->
<string name="button_key_esc">Esc</string>
<!-- Text for the "Ctrl" button in virtual keyboard. -->