From aa9611314214569d6fa8bd13e47911184d8558bb Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Thu, 14 Nov 2013 19:37:36 +0100 Subject: [PATCH] Fixed #30 simply by adding the '/s' text (as is done in LocalTorrent). Maybe need to localize in the future. --- core/src/org/transdroid/core/gui/ServerStatusView.java | 4 ++-- core/src/org/transdroid/core/gui/TorrentsActivity.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/org/transdroid/core/gui/ServerStatusView.java b/core/src/org/transdroid/core/gui/ServerStatusView.java index b6cfd0c0..c477eae9 100644 --- a/core/src/org/transdroid/core/gui/ServerStatusView.java +++ b/core/src/org/transdroid/core/gui/ServerStatusView.java @@ -84,8 +84,8 @@ public class ServerStatusView extends RelativeLayout implements OnRatesPickedLis downcountText.setText(Integer.toString(downcount)); upcountText.setText(Integer.toString(upcount)); - downspeedText.setText(FileSizeConverter.getSize(downspeed)); - upspeedText.setText(FileSizeConverter.getSize(upspeed)); + downspeedText.setText(FileSizeConverter.getSize(downspeed) + "/s"); + upspeedText.setText(FileSizeConverter.getSize(upspeed) + "/s"); downcountSign.setVisibility(View.VISIBLE); upcountSign.setVisibility(View.VISIBLE); setClickListener(onStartDownPickerClicked); diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 9f6064f2..69c17cf3 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -45,14 +45,12 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.cookie.BasicClientCookie; import org.transdroid.core.R; import org.transdroid.core.app.settings.ApplicationSettings; -import org.transdroid.core.app.settings.ServerSetting; -import org.transdroid.core.app.settings.SystemSettings_; +import org.transdroid.core.app.settings.*; import org.transdroid.core.app.settings.WebsearchSetting; import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.NoProgressHeaderTransformer; import org.transdroid.core.gui.lists.SimpleListItem; -import org.transdroid.core.gui.log.Log; -import org.transdroid.core.gui.log.Log_; +import org.transdroid.core.gui.log.*; import org.transdroid.core.gui.navigation.FilterListAdapter; import org.transdroid.core.gui.navigation.FilterListAdapter_; import org.transdroid.core.gui.navigation.FilterListDropDownAdapter;