diff options
23 files changed, 224 insertions, 35 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 5df0488..40f608d 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -31,7 +31,6 @@ import org.connectbot.util.PreferenceConstants; import org.connectbot.util.TerminalViewPager; import android.annotation.TargetApi; -import android.app.AlertDialog; import android.app.Dialog; import android.content.ComponentName; import android.content.Context; @@ -874,7 +873,8 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne final TerminalView terminalView = adapter.getCurrentTerminalView(); final View resizeView = inflater.inflate(R.layout.dia_resize, null, false); - new AlertDialog.Builder(ConsoleActivity.this) + new android.support.v7.app.AlertDialog.Builder( + ConsoleActivity.this, R.style.AlertDialogTheme) .setView(resizeView) .setPositiveButton(R.string.button_resize, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/java/org/connectbot/EditHostActivity.java b/app/src/main/java/org/connectbot/EditHostActivity.java index d5e2458..427fe26 100644 --- a/app/src/main/java/org/connectbot/EditHostActivity.java +++ b/app/src/main/java/org/connectbot/EditHostActivity.java @@ -234,7 +234,7 @@ public class EditHostActivity extends AppCompatActivity implements HostEditorFra private void showDiscardDialog() { android.support.v7.app.AlertDialog.Builder builder = - new android.support.v7.app.AlertDialog.Builder(this); + new android.support.v7.app.AlertDialog.Builder(this, R.style.AlertDialogTheme); builder.setMessage(R.string.discard_host_changes_message) .setPositiveButton(R.string.discard_host_button, new DialogInterface.OnClickListener() { @Override diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java index 2a522dc..7fbbf40 100644 --- a/app/src/main/java/org/connectbot/HelpActivity.java +++ b/app/src/main/java/org/connectbot/HelpActivity.java @@ -17,7 +17,6 @@ package org.connectbot; -import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -53,7 +52,8 @@ public class HelpActivity extends AppCompatActivity { public void onClick(View v) { final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts, null, false); - new AlertDialog.Builder(HelpActivity.this) + new android.support.v7.app.AlertDialog.Builder( + HelpActivity.this, R.style.AlertDialogTheme) .setView(shortcuts) .setTitle(R.string.keyboard_shortcuts) .show(); diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 39f810c..d83bd0c 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -28,7 +28,6 @@ import org.connectbot.transport.TransportFactory; import org.connectbot.util.HostDatabase; import org.connectbot.util.PreferenceConstants; -import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -295,7 +294,8 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta return; } - new AlertDialog.Builder(HostListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + HostListActivity.this, R.style.AlertDialogTheme) .setMessage(getString(R.string.disconnect_all_message)) .setPositiveButton(R.string.disconnect_all_pos, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -454,7 +454,8 @@ public class HostListActivity extends AppCompatListActivity implements OnHostSta delete.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { // prompt user to make sure they really want this - new AlertDialog.Builder(HostListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + HostListActivity.this, R.style.AlertDialogTheme) .setMessage(getString(R.string.delete_message, host.getNickname())) .setPositiveButton(R.string.delete_pos, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/java/org/connectbot/PortForwardListActivity.java b/app/src/main/java/org/connectbot/PortForwardListActivity.java index e5d3210..efd4f72 100644 --- a/app/src/main/java/org/connectbot/PortForwardListActivity.java +++ b/app/src/main/java/org/connectbot/PortForwardListActivity.java @@ -26,7 +26,6 @@ import org.connectbot.service.TerminalBridge; import org.connectbot.service.TerminalManager; import org.connectbot.util.HostDatabase; -import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -36,7 +35,6 @@ import android.content.res.Resources; import android.database.SQLException; import android.graphics.Paint; import android.os.Bundle; -import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.support.annotation.VisibleForTesting; @@ -167,7 +165,8 @@ public class PortForwardListActivity extends AppCompatListActivity { } }); - new AlertDialog.Builder(PortForwardListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PortForwardListActivity.this, R.style.AlertDialogTheme) .setView(portForwardView) .setPositiveButton(R.string.portforward_pos, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -312,7 +311,8 @@ public class PortForwardListActivity extends AppCompatListActivity { } }); - new AlertDialog.Builder(PortForwardListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PortForwardListActivity.this, R.style.AlertDialogTheme) .setView(editTunnelView) .setPositiveButton(R.string.button_change, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -368,7 +368,8 @@ public class PortForwardListActivity extends AppCompatListActivity { delete.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { // prompt user to make sure they really want this - new AlertDialog.Builder(PortForwardListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PortForwardListActivity.this, R.style.AlertDialogTheme) .setMessage(getString(R.string.delete_message, portForward.getNickname())) .setPositiveButton(R.string.delete_pos, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java index df00333..85ca570 100644 --- a/app/src/main/java/org/connectbot/PubkeyListActivity.java +++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java @@ -41,7 +41,6 @@ import com.trilead.ssh2.crypto.Base64; import com.trilead.ssh2.crypto.PEMDecoder; import com.trilead.ssh2.crypto.PEMStructure; -import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; @@ -219,7 +218,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi final View view = View.inflate(this, R.layout.dia_password, null); final EditText passwordField = (EditText) view.findViewById(android.R.id.text1); - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, R.style.AlertDialogTheme) .setView(view) .setPositiveButton(R.string.pubkey_unlock, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -376,7 +376,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi final String state = Environment.getExternalStorageState(); if (!Environment.MEDIA_MOUNTED_READ_ONLY.equals(state) && !Environment.MEDIA_MOUNTED.equals(state)) { - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, R.style.AlertDialogTheme) .setMessage(R.string.alert_sdcard_absent) .setNegativeButton(android.R.string.cancel, null).create().show(); return; @@ -398,7 +399,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi Log.d(TAG, names.toString()); // prompt user to select any file from the sdcard root - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, R.style.AlertDialogTheme) .setTitle(R.string.pubkey_list_pick) .setItems(namesList, new OnClickListener() { public void onClick(DialogInterface arg0, int arg1) { @@ -527,7 +529,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi View.inflate(PubkeyListActivity.this, R.layout.dia_changepassword, null); ((TableRow) changePasswordView.findViewById(R.id.old_password_prompt)) .setVisibility(pubkey.isEncrypted() ? View.VISIBLE : View.GONE); - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, R.style.AlertDialogTheme) .setView(changePasswordView) .setPositiveButton(R.string.button_change, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { @@ -536,7 +539,9 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi String password2 = ((EditText) changePasswordView.findViewById(R.id.password2)).getText().toString(); if (!password1.equals(password2)) { - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, + R.style.AlertDialogTheme) .setMessage(R.string.alert_passwords_do_not_match_msg) .setPositiveButton(android.R.string.ok, null) .create().show(); @@ -545,7 +550,9 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi try { if (!pubkey.changePassword(oldPassword, password1)) - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, + R.style.AlertDialogTheme) .setMessage(R.string.alert_wrong_password_msg) .setPositiveButton(android.R.string.ok, null) .create().show(); @@ -556,7 +563,9 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi } } catch (Exception e) { Log.e(TAG, "Could not change private key password", e); - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, + R.style.AlertDialogTheme) .setMessage(R.string.alert_key_corrupted_msg) .setPositiveButton(android.R.string.ok, null) .create().show(); @@ -587,7 +596,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi delete.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { // prompt user to make sure they really want this - new AlertDialog.Builder(PubkeyListActivity.this) + new android.support.v7.app.AlertDialog.Builder( + PubkeyListActivity.this, R.style.AlertDialogTheme) .setMessage(getString(R.string.delete_message, pubkey.getNickname())) .setPositiveButton(R.string.delete_pos, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml new file mode 100644 index 0000000..fde152b --- /dev/null +++ b/app/src/main/res/drawable/ic_android.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:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5V19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5V19h1c0.55,0 1,-0.45 1,-1V8H6v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zm17,0c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zm-4.97,-5.84l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5H9V4h1v1zm5,0h-1V4h1v1z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_code.xml b/app/src/main/res/drawable/ic_code.xml new file mode 100644 index 0000000..6dc41cf --- /dev/null +++ b/app/src/main/res/drawable/ic_code.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:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zm5.2,0l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_format_size.xml b/app/src/main/res/drawable/ic_format_size.xml new file mode 100644 index 0000000..760c272 --- /dev/null +++ b/app/src/main/res/drawable/ic_format_size.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:pathData="M9,4v3h5v12h3V7h5V4H9zm-6,8h3v7h3v-7h3V9H3v3z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_laptop.xml b/app/src/main/res/drawable/ic_laptop.xml new file mode 100644 index 0000000..d2e02b3 --- /dev/null +++ b/app/src/main/res/drawable/ic_laptop.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:pathData="M22,18V3H2v15H0v2h24v-2h-2zm-8,0h-4v-1h4v1zm6,-3H4V5h16v10z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_palette.xml b/app/src/main/res/drawable/ic_palette.xml new file mode 100644 index 0000000..046768c --- /dev/null +++ b/app/src/main/res/drawable/ic_palette.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:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5H16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zm-5.5,9c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zm3,-4C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zm5,0c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zm3,4c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml new file mode 100644 index 0000000..727a3ae --- /dev/null +++ b/app/src/main/res/drawable/ic_person.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:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zm0,2c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml new file mode 100644 index 0000000..fc41a67 --- /dev/null +++ b/app/src/main/res/drawable/ic_sync.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:pathData="M12,4V1L8,5l4,4V6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zm0,14c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_sync_disabled.xml b/app/src/main/res/drawable/ic_sync_disabled.xml new file mode 100644 index 0000000..c6536bf --- /dev/null +++ b/app/src/main/res/drawable/ic_sync_disabled.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:pathData="M10,6.35V4.26c-0.8,0.21 -1.55,0.54 -2.23,0.96l1.46,1.46c0.25,-0.12 0.5,-0.24 0.77,-0.33zm-7.14,-0.94l2.36,2.36C4.45,8.99 4,10.44 4,12c0,2.21 0.91,4.2 2.36,5.64L4,20h6v-6l-2.24,2.24C6.68,15.15 6,13.66 6,12c0,-1 0.25,-1.94 0.68,-2.77l8.08,8.08c-0.25,0.13 -0.5,0.25 -0.77,0.34v2.09c0.8,-0.21 1.55,-0.54 2.23,-0.96l2.36,2.36 1.27,-1.27L4.14,4.14 2.86,5.41zM20,4h-6v6l2.24,-2.24C17.32,8.85 18,10.34 18,12c0,1 -0.25,1.94 -0.68,2.77l1.46,1.46C19.55,15.01 20,13.56 20,12c0,-2.21 -0.91,-4.2 -2.36,-5.64L20,4z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_vpn_key.xml b/app/src/main/res/drawable/ic_vpn_key.xml new file mode 100644 index 0000000..1e4af64 --- /dev/null +++ b/app/src/main/res/drawable/ic_vpn_key.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:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_vpn_lock.xml b/app/src/main/res/drawable/ic_vpn_lock.xml new file mode 100644 index 0000000..771bc73 --- /dev/null +++ b/app/src/main/res/drawable/ic_vpn_lock.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:pathData="M22,4v-0.5C22,2.12 20.88,1 19.5,1S17,2.12 17,3.5V4c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1V5c0,-0.55 -0.45,-1 -1,-1zm-0.8,0h-3.4v-0.5c0,-0.94 0.76,-1.7 1.7,-1.7s1.7,0.76 1.7,1.7V4zm-2.28,8c0.04,0.33 0.08,0.66 0.08,1 0,2.08 -0.8,3.97 -2.1,5.39 -0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1H7v-2h2c0.55,0 1,-0.45 1,-1V8h2c1.1,0 2,-0.9 2,-2V3.46c-0.95,-0.3 -1.95,-0.46 -3,-0.46C5.48,3 1,7.48 1,13s4.48,10 10,10 10,-4.48 10,-10c0,-0.34 -0.02,-0.67 -0.05,-1h-2.03zM10,20.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L8,16v1c0,1.1 0.9,2 2,2v1.93z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/drawable/ic_zip.xml b/app/src/main/res/drawable/ic_zip.xml new file mode 100644 index 0000000..e8d4a44 --- /dev/null +++ b/app/src/main/res/drawable/ic_zip.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:pathData="M19,3H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm-5,6h-2v2h2v2h-2v-2h-2V9h2V7h-2V5h2v2h2v2zm0,8h-2v-2h-2v-2h2v2h2v2z" + android:fillColor="#FFFFFF"/> +</vector> diff --git a/app/src/main/res/layout/act_hostlist.xml b/app/src/main/res/layout/act_hostlist.xml index 24e4058..afa1bd3 100644 --- a/app/src/main/res/layout/act_hostlist.xml +++ b/app/src/main/res/layout/act_hostlist.xml @@ -54,6 +54,7 @@ android:layout_alignParentRight="true" android:layout_margin="16dp" android:src="@drawable/ic_add" + android:tint="@android:color/white" app:backgroundTint="@color/accent" app:rippleColor="@color/dark_accent" /> diff --git a/app/src/main/res/layout/fragment_host_editor.xml b/app/src/main/res/layout/fragment_host_editor.xml index d368d20..0f9139c 100644 --- a/app/src/main/res/layout/fragment_host_editor.xml +++ b/app/src/main/res/layout/fragment_host_editor.xml @@ -41,7 +41,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_laptop" android:contentDescription="@string/protocol_spinner_label" style="@style/ListItemIcon" /> @@ -178,6 +178,14 @@ android:layout_height="wrap_content" > + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:src="@drawable/ic_person" + android:contentDescription="@string/hostpref_color_title" + style="@style/ListItemIcon" + /> + <android.support.design.widget.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -209,7 +217,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_palette" android:contentDescription="@string/hostpref_color_title" style="@style/ListItemIcon" /> @@ -241,7 +249,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_format_size" android:contentDescription="@string/hostpref_fontsize_title" style="@style/ListItemIcon" /> @@ -297,7 +305,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_vpn_key" android:contentDescription="@string/hostpref_pubkeyid_title" style="@style/ListItemIcon" /> @@ -330,7 +338,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_keyboard" android:contentDescription="@string/hostpref_delkey_title" style="@style/ListItemIcon" /> @@ -363,7 +371,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_code" android:contentDescription="@string/hostpref_encoding_title" style="@style/ListItemIcon" /> @@ -402,7 +410,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_vpn_lock" android:contentDescription="@string/hostpref_authagent_title" style="@style/ListItemIcon" /> @@ -470,7 +478,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_zip" android:contentDescription="@string/hostpref_compression_title" style="@style/ListItemIcon" /> @@ -515,7 +523,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_laptop" android:contentDescription="@string/hostpref_wantsession_title" style="@style/ListItemIcon" /> @@ -560,7 +568,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_sync" android:contentDescription="@string/hostpref_stayconnected_title" style="@style/ListItemIcon" /> @@ -605,7 +613,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_sync_disabled" android:contentDescription="@string/hostpref_quickdisconnect_title" style="@style/ListItemIcon" /> @@ -650,7 +658,7 @@ <ImageView android:layout_width="24dp" android:layout_height="24dp" - android:src="@drawable/icon" + android:src="@drawable/ic_android" android:contentDescription="@string/hostpref_postlogin_title" style="@style/ListItemIcon" /> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index b1020da..66c6e6f 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 xmlns:tools="http://schemas.android.com/tools"> +<resources> <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> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index badb25e..d09ab89 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -9,7 +9,17 @@ <string name="title_help">Aide</string> <string name="title_colors">Couleurs</string> <string name="title_color_picker">Choisissez une couleur</string> + <string name="title_settings">Préférences</string> + <string name="title_pubkey_generate">Générer</string> <string name="help_intro">Sélectionnez un sujet ci-dessous pour plus d\'informations.</string> + <string name="terms_and_conditions">Conditions générales d\'utilisation</string> + <string name="hints">Astuces</string> + <string name="host_shortcuts_header">Raccourcis serveur</string> + <string name="next_host">Serveur suivant</string> + <string name="prev_host">Serveur précédent</string> + <string name="keyboard_shortcuts">Raccourcis clavier</string> + <string name="increase_font_size">Agrandir la police</string> + <string name="decrease_font_size">Diminuer la police</string> <string name="pubkey_generate">Générer</string> <string name="pubkey_delete">Supprimer la clé</string> <string name="pubkey_gather_entropy">Génération d\'entropie</string> @@ -91,6 +101,7 @@ <string name="pref_wifilock_title">Garder le Wi-Fi actif</string> <string name="pref_wifilock_summary">Empêcher la désactivation du Wi-Fi quand une session est active</string> <string name="pref_bumpyarrows_title">Flêches vibrantes</string> + <string name="pref_bumpyarrows_summary">Vibrer lors de l\'envoi d\'une touche \"flèche\"; utile lorsque la connexion lag</string> <string name="pref_bell_category">Cloche du terminal</string> <string name="pref_bell_title">Alerte sonore</string> <string name="pref_bell_volume_title">Volume de l\'alerte</string> @@ -115,6 +126,8 @@ <string name="hostpref_wantsession_summary">Décochez cette case pour n\'utiliser que les redirections de port</string> <string name="hostpref_stayconnected_title">Rester connecté</string> <string name="hostpref_stayconnected_summary">Essayer de se reconnecter à l\'hôte si on est déconnecté</string> + <string name="hostpref_quickdisconnect_title">Fermer à la déconnexion</string> + <string name="hostpref_quickdisconnect_summary">Fermer immédiatement sans confirmation lorsque le serveur a fermé la connexion</string> <string name="hostpref_delkey_title">Touche SUPPR</string> <string name="hostpref_delkey_summary">Le code de touche envoyé quand la touche SUPPR est appuyée.</string> <string name="hostpref_encoding_title">Encodage</string> @@ -165,6 +178,9 @@ <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="disconnect_all_message">Êtes-vous certain de vouloir vous déconnecter de tous les serveurs ?</string> + <string name="disconnect_all_pos">Oui</string> + <string name="disconnect_all_neg">Annuler</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> @@ -201,5 +217,20 @@ <string name="image_description_key_is_locked">Clef verrouillée</string> <string name="image_description_toggle_control_character">Activer/désactiver le caractère \"contrôle\"</string> <string name="image_description_send_escape_character">Envoyer \"échap\"</string> + <string name="image_description_send_tab_character">Envoyer une tabulation</string> <string name="image_description_show_keyboard">Afficher le clavier.</string> + <string name="image_description_up">Flèche haut</string> + <string name="image_description_down">Flèche bas</string> + <string name="image_description_left">Flèche gauche</string> + <string name="image_description_right">Flèche droite</string> + <string name="protocol_spinner_label">Protocole</string> + <string name="expand">Développer</string> + <string name="hostpref_authagent_with_confirmation">Demander une confirmation</string> + <string name="hostpref_add_host">Ajouter un serveur</string> + <string name="hostpref_edit_host">Enregistrer le serveur</string> + <string name="pubkey_add_new">Ajouter une clé publique</string> + <string name="pubkey_import_existing">Importer une clé publique</string> + <string name="discard_host_changes_message">L\'hôte est invalide, souhaitez-vous supprimer les modifications ?</string> + <string name="discard_host_button">Supprimer</string> + <string name="discard_host_cancel_button">Continuer l\'édition</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6bb5e28..9eb0320 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -13,9 +13,27 @@ <string name="title_pubkey_generate">生成</string> <string name="help_intro">特定の情報について知りたいときは、以下のトピックを選択してください。</string> <string name="terms_and_conditions">利用規約</string> + <string name="hints">ヒント</string> + <string name="host_shortcuts_header">ホスト ショートカット</string> + <string name="host_shortcuts_content">Androidのデスクトップ上で長押しすると、頻繁に使用するSSHホストへ直接ショートカットを作成します。</string> + <string name="scroll_hints_header">後方にスクロール/前方にスクロール</string> + <string name="scroll_hints_content">画面の右側を指でスワイプすることで、ローカル端末のバッファの履歴を後方および前方にスクロールすることができます。</string> + <string name="scrolling_back">後方にスクロール中</string> + <string name="scrolling_forward">前方にスクロール中</string> + <string name="page_updn_header">ページアップ/ページダウン</string> + <string name="page_updn_content">注: これは、設定で有効にする必要があります。\n\n画面の左側の三分の一で上下に指をスワイプすると、リモートホストへページアップ、ページダウンキーを送信します。irssiやtinyfugueなど、多くのプログラムは、これを履歴のスクロールバックにマップします。</string> + <string name="page_up">ページアップ</string> + <string name="page_down">ページダウン</string> + <string name="switching_hosts_header">ホストの切り替え中</string> + <string name="switching_hosts_content">画面の片側から反対側に指をスワイプすると、現在接続されたホストの間で切り替わります。</string> + <string name="next_host">次のホスト</string> + <string name="prev_host">前のホスト</string> <string name="keyboard_shortcuts">キーボードショートカット</string> <string name="increase_font_size">フォントサイズを大きくする</string> + <string name="increase_font_shortcut">Ctrl と +</string> <string name="decrease_font_size">フォントサイズを小さくする</string> + <string name="decrease_font_shortcut">Ctrl と -</string> + <string name="paste_shortcut">Ctrl-Shift-V</string> <string name="pubkey_generate">生成</string> <string name="pubkey_delete">鍵を削除</string> <string name="pubkey_gather_entropy">エントロピー収集中</string> @@ -74,6 +92,8 @@ <string name="pref_rotation_summary">キーボードのポップイン/アウト時の向きの変更</string> <string name="pref_titlebarhide_title">タイトルバーを自動的に隠す</string> <string name="pref_titlebarhide_summary">タイトルバーとアクセスメニューを表示するにはコンソールをタップ</string> + <string name="pref_pg_updn_gesture_title">ページアップ/ページダウン ジェスチャ</string> + <string name="pref_pg_updn_gesture_summary">画面の左の三分の一をスワイプすると、端末にページアップ/ダウンを送信します</string> <string name="pref_fullscreen_title">全画面</string> <string name="pref_fullscreen_summary">ステータスバーを隠蔽しコンソールとして利用</string> <string name="pref_keyboard_category">キーボード</string> @@ -99,6 +119,7 @@ <string name="pref_wifilock_title">Wi-Fiをスリープしない</string> <string name="pref_wifilock_summary">セッションが有効な間Wi-FiがOFFになるのを防ぎます</string> <string name="pref_bumpyarrows_title">矢印で振動</string> + <string name="pref_bumpyarrows_summary">矢印キーを送信するときに振動します。タイムラグのある接続時に便利です</string> <string name="pref_bell_category">端末音設定</string> <string name="pref_bell_title">ベル音</string> <string name="pref_bell_volume_title">ボリューム設定</string> @@ -221,6 +242,7 @@ <string name="image_description_down">下矢印</string> <string name="image_description_left">左矢印</string> <string name="image_description_right">右矢印</string> + <string name="image_description_volume">音量</string> <string name="button_key_esc">Esc</string> <string name="button_key_ctrl">Ctrl</string> <string name="button_key_home">Home</string> @@ -239,4 +261,14 @@ <string name="button_key_f10">F10</string> <string name="button_key_f11">F11</string> <string name="button_key_f12">F12</string> + <string name="protocol_spinner_label">プロトコル</string> + <string name="expand">展開</string> + <string name="hostpref_authagent_with_confirmation">確認が必要</string> + <string name="hostpref_add_host">ホストを追加</string> + <string name="hostpref_edit_host">ホストを保存</string> + <string name="pubkey_add_new">新しい公開鍵を追加</string> + <string name="pubkey_import_existing">既存の公開鍵をインポート</string> + <string name="discard_host_changes_message">ホストURIが正しくありません。変更を破棄しますか?</string> + <string name="discard_host_button">破棄</string> + <string name="discard_host_cancel_button">編集を続ける</string> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f782fb4..80e0a81 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,6 +24,10 @@ <item name="colorAccent">@color/accent</item> </style> + <style name="AlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert"> + <item name="colorAccent">@color/accent</item> + </style> + <style name="KeyboardKey"> <item name="android:layout_width">45dip</item> <item name="android:layout_height">30dip</item> @@ -101,4 +105,6 @@ <item name="colorAccent">@color/accent</item> </style> + + </resources> |