aboutsummaryrefslogtreecommitdiffstats
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java34
-rw-r--r--app/src/main/java/org/connectbot/ConsoleActivity.java4
-rw-r--r--app/src/main/res/layout-land/item_host.xml65
-rw-r--r--app/src/main/res/layout-large/act_console.xml7
-rw-r--r--app/src/main/res/layout-port/item_host.xml57
-rw-r--r--app/src/main/res/layout/item_host.xml76
-rw-r--r--app/src/main/res/values/styles.xml10
7 files changed, 127 insertions, 126 deletions
diff --git a/app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java b/app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java
new file mode 100644
index 0000000..fbadb9b
--- /dev/null
+++ b/app/src/androidTest/java/org/connectbot/FixJacocoTestRunner.java
@@ -0,0 +1,34 @@
+/*
+ * This class comes from a StackOverflow post:
+ * http://stackoverflow.com/questions/30337375/empty-jacoco-report-for-android-espresso/31600193#31600193
+ *
+ * This should be fixed in com.android.test.support:runner:0.4 and this class can be removed.
+ */
+package org.connectbot;
+
+import android.os.Bundle;
+import android.support.test.runner.AndroidJUnitRunner;
+import android.util.Log;
+
+import java.lang.reflect.Method;
+
+public class FixJacocoTestRunner extends AndroidJUnitRunner {
+
+ static {
+ System.setProperty("jacoco-agent.destfile", "/data/data/" + BuildConfig.APPLICATION_ID + "/coverage.ec");
+ }
+
+ @Override
+ public void finish(int resultCode, Bundle results) {
+ try {
+ Class rt = Class.forName("org.jacoco.agent.rt.RT");
+ Method getAgent = rt.getMethod("getAgent");
+ Method dump = getAgent.getReturnType().getMethod("dump", boolean.class);
+ Object agent = getAgent.invoke(null);
+ dump.invoke(agent, false);
+ } catch (Throwable e) {
+ Log.d("JACOCO", e.getMessage());
+ }
+ super.finish(resultCode, results);
+ }
+}
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index ae5e3a7..95d21d8 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -500,6 +500,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
+ setTitle(adapter.getPageTitle(position));
onTerminalChanged();
}
});
@@ -1250,7 +1251,6 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
return;
}
bound.defaultBridge = view.bridge;
- setTitle(view.bridge.host.getNickname());
}
protected void updateEmptyVisible() {
@@ -1368,6 +1368,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
*/
private void setDisplayedTerminal(int requestedIndex) {
pager.setCurrentItem(requestedIndex);
+ // set activity title
+ setTitle(adapter.getPageTitle(requestedIndex));
onTerminalChanged();
}
diff --git a/app/src/main/res/layout-land/item_host.xml b/app/src/main/res/layout-land/item_host.xml
deleted file mode 100644
index cbccd91..0000000
--- a/app/src/main/res/layout-land/item_host.xml
+++ /dev/null
@@ -1,65 +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.
- */
--->
-
-<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"
- >
-
- <ImageView
- android:id="@android:id/icon"
- 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: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: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"
- />
-
-
- </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 d0ad41b..6e7ab14 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -21,6 +21,7 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#ff000000">
@@ -29,7 +30,8 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
+ android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
+ tools:ignore="InconsistentLayout"/>
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
@@ -39,7 +41,8 @@
android:textAppearance="?android:attr/textAppearanceMedium"
app:tabMode="scrollable"
app:tabContentStart="60dp"
- app:tabIndicatorColor="@android:color/white"/>
+ app:tabIndicatorColor="@android:color/white"
+ tools:ignore="InconsistentLayout"/>
<TextView
android:id="@android:id/empty"
diff --git a/app/src/main/res/layout-port/item_host.xml b/app/src/main/res/layout-port/item_host.xml
deleted file mode 100644
index 7ee7f0a..0000000
--- a/app/src/main/res/layout-port/item_host.xml
+++ /dev/null
@@ -1,57 +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.
- */
--->
-
-<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"
- >
-
- <ImageView
- android:id="@android:id/icon"
- 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"
- />
-
- <TextView
- 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:textAppearance="?android:attr/textAppearanceLarge"
- />
-
- <TextView
- android:id="@android:id/text2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- 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/item_host.xml b/app/src/main/res/layout/item_host.xml
new file mode 100644
index 0000000..56c3d34
--- /dev/null
+++ b/app/src/main/res/layout/item_host.xml
@@ -0,0 +1,76 @@
+<?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
+ 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:minHeight="72dp"
+ >
+
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="16dp"
+ android:layout_marginRight="16dp"
+ android:contentDescription="@string/image_description_connected"
+ android:src="@drawable/connected"
+ />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignWithParentIfMissing="true"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="16dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginRight="16dp"
+ android:orientation="vertical"
+ android:layout_toStartOf="@android:id/icon"
+ android:layout_toLeftOf="@android:id/icon"
+ >
+
+ <TextView
+ android:id="@android:id/text1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:paddingTop="20dp"
+ android:textAppearance="@style/ListItemFirstLineText"
+ />
+
+ <TextView
+ android:id="@android:id/text2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="20dp"
+ android:textAppearance="@style/ListItemSecondLineText"
+ />
+
+ </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 031d358..593af85 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,9 +27,17 @@
<item name="android:textSize">10sp</item>
</style>
-
<style name="KeyboardButton" parent="KeyboardKey">
<item name="android:background">@drawable/keyboard_button_selector</item>
</style>
+ <style name="ListItemFirstLineText" parent="TextAppearance.AppCompat">
+ <item name="android:textColor">?android:textColorPrimary</item>
+ <item name="android:textSize">16sp</item>
+ </style>
+
+ <style name="ListItemSecondLineText" parent="TextAppearance.AppCompat">
+ <item name="android:textColor">?android:textColorSecondary</item>
+ <item name="android:textSize">14sp</item>
+ </style>
</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 17:20:01 +0000