diff options
20 files changed, 143 insertions, 100 deletions
diff --git a/app/app.iml b/app/app.iml index fb1f329..3199b90 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="connectbot" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ConnectBot" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -9,15 +9,14 @@ <facet type="android" name="Android"> <configuration> <option name="SELECTED_BUILD_VARIANT" value="debug" /> - <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" /> + <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" /> - <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" /> + <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> + <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> <afterSyncTasks> + <task>generateDebugAndroidTestSources</task> <task>generateDebugSources</task> - <task>mockableAndroidJar</task> - <task>prepareDebugUnitTestDependencies</task> </afterSyncTasks> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> @@ -29,7 +28,7 @@ </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> - <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> + <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> @@ -38,6 +37,12 @@ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> @@ -45,13 +50,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" /> @@ -59,13 +57,13 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> @@ -73,10 +71,17 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-contrib/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-intents/2.2/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/exposed-instrumentation-api-publish/0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/rules/0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test/runner/0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> @@ -94,36 +99,29 @@ </content> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" /> - <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" /> <orderEntry type="library" exported="" name="jzlib-1.1.3" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" /> - <orderEntry type="library" exported="" name="design-23.0.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" /> - <orderEntry type="library" exported="" name="sshlib-2.2.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-contrib-2.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="runner-0.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-2.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="javax.annotation-api-1.2" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="javax.inject-1" level="project" /> + <orderEntry type="library" exported="" name="design-23.1.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="hamcrest-integration-1.3" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="espresso-intents-2.2" level="project" /> + <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" /> + <orderEntry type="library" exported="" name="sshlib-2.2.1" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="rules-0.3" level="project" /> <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" /> - <orderEntry type="library" exported="" scope="TEST" name="assertj-core-1.7.0" level="project" /> - <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" /> - <orderEntry type="library" exported="" name="jsocks-1.0.0" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" /> + <orderEntry type="library" exported="" name="simplesocks-1.0.1" level="project" /> + <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" /> + <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" /> + <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" /> </component> </module>
\ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 84b3bd6..ada238c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ buildscript { dependencies { classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.0.1x' - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.4.0-beta3' classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0' } } diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_white.png b/app/src/main/res/drawable-hdpi/ic_keyboard_white.png Binary files differdeleted file mode 100644 index 5352d4c..0000000 --- a/app/src/main/res/drawable-hdpi/ic_keyboard_white.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_keyboard_white.png b/app/src/main/res/drawable-mdpi/ic_keyboard_white.png Binary files differdeleted file mode 100644 index e8c24c7..0000000 --- a/app/src/main/res/drawable-mdpi/ic_keyboard_white.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_keyboard_white.png b/app/src/main/res/drawable-xhdpi/ic_keyboard_white.png Binary files differdeleted file mode 100644 index 2b6b9b4..0000000 --- a/app/src/main/res/drawable-xhdpi/ic_keyboard_white.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_keyboard_white.png b/app/src/main/res/drawable-xxhdpi/ic_keyboard_white.png Binary files differdeleted file mode 100644 index 9d0bed2..0000000 --- a/app/src/main/res/drawable-xxhdpi/ic_keyboard_white.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white.png b/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white.png Binary files differdeleted file mode 100644 index f77d9d2..0000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_keyboard_white.png +++ /dev/null diff --git a/app/src/main/res/drawable/ic_keyboard.xml b/app/src/main/res/drawable/ic_keyboard.xml new file mode 100644 index 0000000..bd0b357 --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M20,5H4c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V7c0,-1.1 -0.9,-2 -2,-2zm-9,3h2v2h-2V8zm0,3h2v2h-2v-2zM8,8h2v2H8V8zm0,3h2v2H8v-2zm-1,2H5v-2h2v2zm0,-3H5V8h2v2zm9,7H8v-2h8v2zm0,-4h-2v-2h2v2zm0,-3h-2V8h2v2zm3,3h-2v-2h2v2zm0,-3h-2V8h2v2z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml new file mode 100644 index 0000000..2a810b3 --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_left.xml b/app/src/main/res/drawable/ic_keyboard_arrow_left.xml new file mode 100644 index 0000000..876aaca --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_arrow_left.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M15.41,16.09l-4.58,-4.59 4.58,-4.59L14,5.5l-6,6 6,6z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml new file mode 100644 index 0000000..e1e9f45 --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml new file mode 100644 index 0000000..bcb548c --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_keyboard_tab.xml b/app/src/main/res/drawable/ic_keyboard_tab.xml new file mode 100644 index 0000000..03ec6ed --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_tab.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M11.59,7.41L15.17,11H1v2h14.17l-3.59,3.59L13,18l6,-6 -6,-6 -1.41,1.41zM20,6v12h2V6h-2z"/> +</vector> diff --git a/app/src/main/res/layout/inc_keyboard.xml b/app/src/main/res/layout/inc_keyboard.xml index 945e1b9..ffea1b1 100644 --- a/app/src/main/res/layout/inc_keyboard.xml +++ b/app/src/main/res/layout/inc_keyboard.xml @@ -15,8 +15,9 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<LinearLayout android:id="@+id/keyboard_group" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/keyboard_group" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" @@ -44,123 +45,128 @@ android:id="@+id/button_ctrl" style="@style/KeyboardButton" android:contentDescription="@string/image_description_toggle_control_character" - android:text="@string/button_key_ctrl"/> + android:text="@string/button_key_ctrl" /> <Button android:id="@+id/button_esc" style="@style/KeyboardButton" android:contentDescription="@string/image_description_send_escape_character" - android:text="@string/button_key_esc"/> + android:text="@string/button_key_esc" /> - <Button + <ImageView android:id="@+id/button_tab" style="@style/KeyboardButton" + android:padding="6dp" android:contentDescription="@string/image_description_send_tab_character" - android:text="@string/button_key_tab"/> + android:src="@drawable/ic_keyboard_tab" /> - <Button + <ImageView android:id="@+id/button_up" style="@style/KeyboardButton" + android:padding="4dp" android:contentDescription="@string/image_description_up" - android:text="@string/button_key_up"/> + android:src="@drawable/ic_keyboard_arrow_up" /> - <Button + <ImageView android:id="@+id/button_down" style="@style/KeyboardButton" + android:padding="4dp" android:contentDescription="@string/image_description_down" - android:text="@string/button_key_down"/> + android:src="@drawable/ic_keyboard_arrow_down" /> - <Button + <ImageView android:id="@+id/button_left" style="@style/KeyboardButton" + android:padding="4dp" android:contentDescription="@string/image_description_left" - android:text="@string/button_key_left"/> + android:src="@drawable/ic_keyboard_arrow_left" /> - <Button + <ImageView android:id="@+id/button_right" style="@style/KeyboardButton" + android:padding="4dp" android:contentDescription="@string/image_description_right" - android:text="@string/button_key_right"/> + android:src="@drawable/ic_keyboard_arrow_right" /> <Button android:id="@+id/button_home" style="@style/KeyboardButton" - android:text="@string/button_key_home"/> + android:text="@string/button_key_home" /> <Button android:id="@+id/button_end" style="@style/KeyboardButton" - android:text="@string/button_key_end"/> + android:text="@string/button_key_end" /> <Button android:id="@+id/button_pgup" style="@style/KeyboardButton" - android:text="@string/button_key_pgup"/> + android:text="@string/button_key_pgup" /> <Button android:id="@+id/button_pgdn" style="@style/KeyboardButton" - android:text="@string/button_key_pgdn"/> + android:text="@string/button_key_pgdn" /> <Button android:id="@+id/button_f1" style="@style/KeyboardButton" - android:text="@string/button_key_f1"/> + android:text="@string/button_key_f1" /> <Button android:id="@+id/button_f2" style="@style/KeyboardButton" - android:text="@string/button_key_f2"/> + android:text="@string/button_key_f2" /> <Button android:id="@+id/button_f3" style="@style/KeyboardButton" - android:text="@string/button_key_f3"/> + android:text="@string/button_key_f3" /> <Button android:id="@+id/button_f4" style="@style/KeyboardButton" - android:text="@string/button_key_f4"/> + android:text="@string/button_key_f4" /> <Button android:id="@+id/button_f5" style="@style/KeyboardButton" - android:text="@string/button_key_f5"/> + android:text="@string/button_key_f5" /> <Button android:id="@+id/button_f6" style="@style/KeyboardButton" - android:text="@string/button_key_f6"/> + android:text="@string/button_key_f6" /> <Button android:id="@+id/button_f7" style="@style/KeyboardButton" - android:text="@string/button_key_f7"/> + android:text="@string/button_key_f7" /> <Button android:id="@+id/button_f8" style="@style/KeyboardButton" - android:text="@string/button_key_f8"/> + android:text="@string/button_key_f8" /> <Button android:id="@+id/button_f9" style="@style/KeyboardButton" - android:text="@string/button_key_f9"/> + android:text="@string/button_key_f9" /> <Button android:id="@+id/button_f10" style="@style/KeyboardButton" - android:text="@string/button_key_f10"/> + android:text="@string/button_key_f10" /> <Button android:id="@+id/button_f11" style="@style/KeyboardButton" - android:text="@string/button_key_f11"/> + android:text="@string/button_key_f11" /> <Button android:id="@+id/button_f12" style="@style/KeyboardButton" - android:text="@string/button_key_f12"/> + android:text="@string/button_key_f12" /> </LinearLayout> </HorizontalScrollView> @@ -169,5 +175,5 @@ style="@style/KeyboardKey" android:background="@drawable/keyboard_keyboard_border" android:contentDescription="@string/image_description_show_keyboard" - android:src="@drawable/ic_keyboard_white"/> + android:src="@drawable/ic_keyboard" /> </LinearLayout> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 432357f..4f86971 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -226,7 +226,6 @@ <string name="image_description_right">Tecla cursor a la derecha</string> <string name="button_key_esc">Escape</string> <string name="button_key_ctrl">Ctrl</string> - <string name="button_key_tab">TAB (Tabulador)</string> <string name="button_key_home">Inicio</string> <string name="button_key_end">Finalizar</string> <string name="button_key_pgup">Re Pág</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 6104e7a..1184ef4 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<resources> +<resources xmlns:tools="http://schemas.android.com/tools"> <string name="app_desc">SSH bezero soil, ahaltsu eta librea</string> <string name="service_desc">SSH konexio eta kargatutako gako publikoak mantentzen ditu</string> <string name="title_hosts_list">Ostalariak</string> @@ -213,5 +213,4 @@ <string name="image_description_right">Eskuina gezia</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ktrl</string> - <string name="button_key_tab">Tab</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 212114b..9d06e08 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -226,7 +226,6 @@ <string name="image_description_right">右矢印</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ctrl</string> - <string name="button_key_tab">Tab</string> <string name="button_key_home">Home</string> <string name="button_key_end">End</string> <string name="button_key_pgup">PgUp</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1daebfe..a4cb39f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -226,7 +226,6 @@ <string name="image_description_right">向右的箭头</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ctrl</string> - <string name="button_key_tab">Tab</string> <string name="button_key_home">Home</string> <string name="button_key_end">End</string> <string name="button_key_pgup">PgUp</string> diff --git a/app/src/main/res/values/notrans.xml b/app/src/main/res/values/notrans.xml index 4311e3b..5e1ab03 100644 --- a/app/src/main/res/values/notrans.xml +++ b/app/src/main/res/values/notrans.xml @@ -21,13 +21,4 @@ <string name="app_name" translatable="false">ConnectBot</string> <string name="copyright_info" translatable="false">ConnectBot is provided under the Apache License, Version 2.0 (the “License”). Here are a few key points:\n\nYou may not use this program except in compliance with the License. You may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless 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.</string> - - <!-- "Up" button in virtual keyboard. --> - <string name="button_key_up">\u25B2</string> - <!-- "Down" button in virtual keyboard. --> - <string name="button_key_down">\u25BC</string> - <!-- "Left" button in virtual keyboard. --> - <string name="button_key_left">\u25C0</string> - <!-- "Right" button in virtual keyboard. --> - <string name="button_key_right">\u25B6</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 824f664..e5dfeef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -590,8 +590,6 @@ <string name="button_key_esc">Esc</string> <!-- Text for the "Ctrl" button in virtual keyboard. --> <string name="button_key_ctrl">Ctrl</string> - <!-- Text for the "Tab" button in virtual keyboard. --> - <string name="button_key_tab">Tab</string> <!-- Text for the "Home" button in virtual keyboard. --> <string name="button_key_home">Home</string> |
