diff --git a/core/res/layout/actionbar_serverstatus.xml b/core/res/layout/actionbar_serverstatus.xml
index 2518db69..0e9775d9 100644
--- a/core/res/layout/actionbar_serverstatus.xml
+++ b/core/res/layout/actionbar_serverstatus.xml
@@ -15,85 +15,95 @@
You should have received a copy of the GNU General Public License
along with Transdroid. If not, see .
-->
-
+ android:layout_width="match_parent" >
-
+ android:layout_height="match_parent"
+ android:layout_gravity="right"
+ android:background="?attr/selectable_background_transdroid"
+ android:clickable="true"
+ android:focusable="true"
+ android:paddingLeft="@dimen/margin_default"
+ android:paddingRight="@dimen/margin_default"
+ android:paddingTop="@dimen/ui_serverstatus_margin"
+ tools:ignore="UselessParent" >
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/core/res/layout/dialog_transferrates.xml b/core/res/layout/dialog_transferrates.xml
index 7eea1742..31fc6d26 100644
--- a/core/res/layout/dialog_transferrates.xml
+++ b/core/res/layout/dialog_transferrates.xml
@@ -198,12 +198,12 @@
android:text="@string/status_maxspeed_unit"
android:textAllCaps="true" />
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/res/values-h400dp/dimens.xml b/core/res/values-h400dp/dimens.xml
new file mode 100644
index 00000000..6be472c5
--- /dev/null
+++ b/core/res/values-h400dp/dimens.xml
@@ -0,0 +1,22 @@
+
+
+
+ 35sp
+ 3dp
+
+
diff --git a/core/res/values-h600dp/dimens.xml b/core/res/values-h600dp/dimens.xml
new file mode 100644
index 00000000..3cade5c1
--- /dev/null
+++ b/core/res/values-h600dp/dimens.xml
@@ -0,0 +1,22 @@
+
+
+
+ 55sp
+ 5dp
+
+
diff --git a/core/res/values-nl/strings.xml b/core/res/values-nl/strings.xml
index f0aaeff9..ba0ce89b 100644
--- a/core/res/values-nl/strings.xml
+++ b/core/res/values-nl/strings.xml
@@ -310,7 +310,7 @@ along with Transdroid. If not, see .
Het bestand lijkt geen %1$s-instellingen te bevatten
Het bestand met instellingen kon niet worden gevonden
Kan niet naar het bestand met instellingen schrijven
-Kies een positief getal
+Kies een positief getal voor beide snelheden
Geen een geldige labelnaam op of kies uit de lijst
Even wachten tot de torrentdetails zijn geladen
Geen app gevonden die %1$s kan downloaden
diff --git a/core/res/values-v16/styles.xml b/core/res/values-v16/styles.xml
index 08cdbaa8..1655ac97 100644
--- a/core/res/values-v16/styles.xml
+++ b/core/res/values-v16/styles.xml
@@ -55,8 +55,8 @@
diff --git a/core/res/values/dimens.xml b/core/res/values/dimens.xml
index 18faa95a..2526d1d3 100644
--- a/core/res/values/dimens.xml
+++ b/core/res/values/dimens.xml
@@ -40,6 +40,8 @@
15dp
13dp
56dp
+ 20sp
+ 2dp
1
diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml
index 4a6eec71..8190c96f 100644
--- a/core/res/values/strings.xml
+++ b/core/res/values/strings.xml
@@ -419,7 +419,7 @@
File does not seem to contain %1$s settings
The settings file could not be found
Can\'t write to the settings file
- Please enter a positive number
+ Please enter a positive number for both speeds
Please enter a valid label or pick from the list
Please wait until the torrent details have been loaded
No app found that can download %1$s
diff --git a/core/res/values/styles.xml b/core/res/values/styles.xml
index 2090c90e..35ef04d7 100644
--- a/core/res/values/styles.xml
+++ b/core/res/values/styles.xml
@@ -120,8 +120,8 @@
\ No newline at end of file
diff --git a/core/src/org/transdroid/core/gui/ServerStatusView.java b/core/src/org/transdroid/core/gui/ServerStatusView.java
index edd63b71..0280ad3d 100644
--- a/core/src/org/transdroid/core/gui/ServerStatusView.java
+++ b/core/src/org/transdroid/core/gui/ServerStatusView.java
@@ -38,6 +38,8 @@ public class ServerStatusView extends RelativeLayout implements OnRatesPickedLis
@ViewById
protected TextView downcountText, upcountText, downcountSign, upcountSign, downspeedText, upspeedText;
+ @ViewById
+ protected View speedswrapperLayout;
private TorrentsActivity activity;
public ServerStatusView(Context context) {
@@ -63,7 +65,7 @@ public class ServerStatusView extends RelativeLayout implements OnRatesPickedLis
upspeedText.setText(null);
downcountSign.setVisibility(View.INVISIBLE);
upcountSign.setVisibility(View.INVISIBLE);
- setClickListener(null);
+ speedswrapperLayout.setOnClickListener(null);
}
int downcount = 0, upcount = 0, downspeed = 0, upspeed = 0;
@@ -87,17 +89,8 @@ public class ServerStatusView extends RelativeLayout implements OnRatesPickedLis
upspeedText.setText(FileSizeConverter.getSize(upspeed) + "/s");
downcountSign.setVisibility(View.VISIBLE);
upcountSign.setVisibility(View.VISIBLE);
- setClickListener(onStartDownPickerClicked);
-
- }
+ speedswrapperLayout.setOnClickListener(onStartDownPickerClicked);
- private void setClickListener(OnClickListener onClick) {
- downcountText.setOnClickListener(onClick);
- upcountText.setOnClickListener(onClick);
- downspeedText.setOnClickListener(onClick);
- upspeedText.setOnClickListener(onClick);
- downcountSign.setOnClickListener(onClick);
- upcountSign.setOnClickListener(onClick);
}
private OnClickListener onStartDownPickerClicked = new OnClickListener() {
diff --git a/core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java b/core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java
index 4dc89c93..9763e922 100644
--- a/core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java
+++ b/core/src/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java
@@ -20,13 +20,12 @@ import java.security.InvalidParameterException;
import org.transdroid.core.R;
-import android.app.AlertDialog;
import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
import android.widget.Button;
import android.widget.TextView;
@@ -68,27 +67,39 @@ public class SetTransferRatesDialog extends DialogFragment {
R.id.down9Button, R.id.down0Button);
bindButtons(transferRatesContent, maxSpeedUp, R.id.up1Button, R.id.up2Button, R.id.up3Button, R.id.up4Button,
R.id.up5Button, R.id.up6Button, R.id.up7Button, R.id.up8Button, R.id.up9Button, R.id.up0Button);
- return new AlertDialog.Builder(getActivity()).setTitle(R.string.status_maxspeed).setView(transferRatesContent)
- .setPositiveButton(android.R.string.ok, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- int maxDown = -1, maxUp = -1;
- try {
- maxDown = Integer.parseInt(maxSpeedDown.getText().toString());
- maxUp = Integer.parseInt(maxSpeedUp.getText().toString());
- } catch (NumberFormatException e) {
- }
- if (maxDown <= 0 || maxUp <= 0) {
- onRatesPickedListener.onInvalidNumber();
- }
- onRatesPickedListener.onRatesPicked(maxDown, maxUp);
- }
- }).setNeutralButton(R.string.status_maxspeed_reset, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- onRatesPickedListener.resetRates();
- }
- }).setNegativeButton(android.R.string.cancel, null).create();
+ ((Button) transferRatesContent.findViewById(R.id.ok_button)).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ int maxDown = -1, maxUp = -1;
+ try {
+ maxDown = Integer.parseInt(maxSpeedDown.getText().toString());
+ maxUp = Integer.parseInt(maxSpeedUp.getText().toString());
+ } catch (NumberFormatException e) {
+ }
+ if (maxDown <= 0 || maxUp <= 0) {
+ onRatesPickedListener.onInvalidNumber();
+ }
+ onRatesPickedListener.onRatesPicked(maxDown, maxUp);
+ dismiss();
+ }
+ });
+ ((Button) transferRatesContent.findViewById(R.id.reset_button)).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onRatesPickedListener.resetRates();
+ dismiss();
+ }
+ });
+ ((Button) transferRatesContent.findViewById(R.id.cancel_button)).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dismiss();
+ }
+ });
+ Dialog dialog = new Dialog(getActivity());
+ dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+ dialog.setContentView(transferRatesContent);
+ return dialog;
}
private void bindButtons(View transferRatesContent, View numberView, int... buttonResource) {