Browse Source

Merge pull request #529 from twig/auto-daynight-theme

Automatically switch between day/night themes
pull/536/head
Eric Kok 5 years ago committed by GitHub
parent
commit
505688eb6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      app/src/main/java/org/transdroid/core/app/settings/ApplicationSettings.java
  2. 38
      app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java
  3. 9
      app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java
  4. 7
      app/src/main/java/org/transdroid/core/gui/DetailsActivity.java
  5. 6
      app/src/main/java/org/transdroid/core/gui/DetailsFragment.java
  6. 8
      app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java
  7. 15
      app/src/main/java/org/transdroid/core/gui/navigation/SetLabelDialog.java
  8. 15
      app/src/main/java/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java
  9. 12
      app/src/main/java/org/transdroid/core/gui/navigation/SetTrackersDialog.java
  10. 13
      app/src/main/java/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java
  11. 7
      app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java
  12. 7
      app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java
  13. 7
      app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java
  14. 7
      app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java
  15. 6
      app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java
  16. 8
      app/src/main/java/org/transdroid/core/widget/ListWidgetConfig.java
  17. 5
      app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java
  18. 4
      app/src/main/java/org/transdroid/core/widget/ListWidgetPreviewAdapter.java
  19. 3
      app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java
  20. 5
      app/src/main/java/org/transdroid/core/widget/ListWidgetViewsService.java
  21. 4
      app/src/main/res/drawable-night/details_list_background.xml
  22. 0
      app/src/main/res/drawable-night/loading_progress.xml
  23. 4
      app/src/main/res/drawable/details_list_background.xml
  24. 0
      app/src/main/res/drawable/loading_progress.xml
  25. 12
      app/src/main/res/layout/activity_widgetconfig.xml
  26. 4
      app/src/main/res/layout/list_item_widget.xml
  27. 70
      app/src/main/res/layout/list_item_widget_light.xml
  28. 17
      app/src/main/res/layout/widget_torrents.xml
  29. 222
      app/src/main/res/layout/widget_torrents_dark.xml
  30. 1
      app/src/main/res/values-bg/strings.xml
  31. 1
      app/src/main/res/values-cs/strings.xml
  32. 1
      app/src/main/res/values-da/strings.xml
  33. 1
      app/src/main/res/values-de/strings.xml
  34. 1
      app/src/main/res/values-es/strings.xml
  35. 1
      app/src/main/res/values-fa/strings.xml
  36. 1
      app/src/main/res/values-fr/strings.xml
  37. 1
      app/src/main/res/values-he/strings.xml
  38. 1
      app/src/main/res/values-hu/strings.xml
  39. 1
      app/src/main/res/values-it/strings.xml
  40. 1
      app/src/main/res/values-ja/strings.xml
  41. 1
      app/src/main/res/values-ko/strings.xml
  42. 9
      app/src/main/res/values-night/colors_transdroid.xml
  43. 15
      app/src/main/res/values-night/styles_transdroid.xml
  44. 1
      app/src/main/res/values-nl/strings.xml
  45. 1
      app/src/main/res/values-pl/strings.xml
  46. 1
      app/src/main/res/values-pt-rBR/strings.xml
  47. 1
      app/src/main/res/values-pt/strings.xml
  48. 1
      app/src/main/res/values-ru/strings.xml
  49. 1
      app/src/main/res/values-sl/strings.xml
  50. 1
      app/src/main/res/values-sv/strings.xml
  51. 1
      app/src/main/res/values-tr/strings.xml
  52. 10
      app/src/main/res/values-v21/styles.xml
  53. 1
      app/src/main/res/values-zh-rCN/strings.xml
  54. 10
      app/src/main/res/values/colors_transdroid.xml
  55. 3
      app/src/main/res/values/strings.xml
  56. 8
      app/src/main/res/values/styles.xml
  57. 15
      app/src/main/res/values/styles_transdroid.xml
  58. 4
      app/src/main/res/xml/listwidget_info.xml
  59. 8
      app/src/main/res/xml/pref_system.xml

4
app/src/main/java/org/transdroid/core/app/settings/ApplicationSettings.java

@ -712,8 +712,7 @@ public class ApplicationSettings {
StatusType.valueOf(prefs.getString("widget_status_" + appWidgetId, StatusType.ShowAll.name())), StatusType.valueOf(prefs.getString("widget_status_" + appWidgetId, StatusType.ShowAll.name())),
TorrentsSortBy.valueOf(prefs.getString("widget_sortby_" + appWidgetId, TorrentsSortBy.Alphanumeric.name())), TorrentsSortBy.valueOf(prefs.getString("widget_sortby_" + appWidgetId, TorrentsSortBy.Alphanumeric.name())),
prefs.getBoolean("widget_reverse_" + appWidgetId, false), prefs.getBoolean("widget_reverse_" + appWidgetId, false),
prefs.getBoolean("widget_showstatus_" + appWidgetId, false), prefs.getBoolean("widget_showstatus_" + appWidgetId, false));
prefs.getBoolean("widget_darktheme_" + appWidgetId, false));
// @formatter:on // @formatter:on
} }
@ -733,7 +732,6 @@ public class ApplicationSettings {
edit.putString("widget_sortby_" + appWidgetId, settings.getSortBy().name()); edit.putString("widget_sortby_" + appWidgetId, settings.getSortBy().name());
edit.putBoolean("widget_reverse_" + appWidgetId, settings.shouldReserveSort()); edit.putBoolean("widget_reverse_" + appWidgetId, settings.shouldReserveSort());
edit.putBoolean("widget_showstatus_" + appWidgetId, settings.shouldShowStatusView()); edit.putBoolean("widget_showstatus_" + appWidgetId, settings.shouldShowStatusView());
edit.putBoolean("widget_darktheme_" + appWidgetId, settings.shouldUseDarkTheme());
edit.apply(); edit.apply();
} }

38
app/src/main/java/org/transdroid/core/app/settings/SettingsUtils.java

@ -0,0 +1,38 @@
package org.transdroid.core.app.settings;
import android.content.Context;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.AppCompatDelegate;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
public class SettingsUtils {
/**
* Set the theme according to the user preference.
*/
public static void applyDayNightTheme(AppCompatActivity activity) {
SystemSettings settings = SystemSettings_.getInstance_(activity);
if (settings.autoDarkTheme()) {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
} else {
AppCompatDelegate.setDefaultNightMode(settings.useDarkTheme() ?
AppCompatDelegate.MODE_NIGHT_YES :
AppCompatDelegate.MODE_NIGHT_NO
);
}
}
public static MaterialDialog.Builder applyDialogTheme(MaterialDialog.Builder builder) {
SystemSettings settings = SystemSettings_.getInstance_(builder.getContext());
if (settings.autoDarkTheme()) {
return builder;
}
return builder.theme(settings.useDarkTheme() ? Theme.DARK: Theme.LIGHT);
}
}

9
app/src/main/java/org/transdroid/core/app/settings/SystemSettings.java

@ -26,7 +26,6 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import com.afollestad.materialdialogs.Theme;
/** /**
* Allows instantiation of the settings specified in R.xml.pref_system. * Allows instantiation of the settings specified in R.xml.pref_system.
@ -59,12 +58,12 @@ public class SystemSettings {
return prefs.getBoolean("system_checkupdates", true); return prefs.getBoolean("system_checkupdates", true);
} }
public boolean useDarkTheme() { public boolean autoDarkTheme() {
return prefs.getBoolean("system_usedarktheme", false); return prefs.getBoolean("system_autodarktheme", true);
} }
public Theme getMaterialDialogtheme() { public boolean useDarkTheme() {
return useDarkTheme() ? Theme.DARK: Theme.LIGHT; return prefs.getBoolean("system_usedarktheme", false);
} }
/** /**

7
app/src/main/java/org/transdroid/core/gui/DetailsActivity.java

@ -40,7 +40,7 @@ import org.androidannotations.annotations.ViewById;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ApplicationSettings;
import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.app.settings.ServerSetting;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.LocalTorrent;
import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.log.Log;
import org.transdroid.core.gui.navigation.Label; import org.transdroid.core.gui.navigation.Label;
@ -114,10 +114,7 @@ public class DetailsActivity extends AppCompatActivity implements TorrentTasksEx
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// Set the theme according to the user preference SettingsUtils.applyDayNightTheme(this);
if (SystemSettings_.getInstance_(this).useDarkTheme()) {
setTheme(R.style.TransdroidTheme_Dark);
}
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

6
app/src/main/java/org/transdroid/core/gui/DetailsFragment.java

@ -122,11 +122,7 @@ public class DetailsFragment extends Fragment implements OnTrackersUpdatedListen
// On large screens where this fragment is shown next to the torrents list, we show a continues grey vertical // On large screens where this fragment is shown next to the torrents list, we show a continues grey vertical
// line to separate the lists visually // line to separate the lists visually
if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) { if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) {
if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) { detailsContainer.setBackgroundResource(R.drawable.details_list_background);
detailsContainer.setBackgroundResource(R.drawable.details_list_background_dark);
} else {
detailsContainer.setBackgroundResource(R.drawable.details_list_background_light);
}
} }
createMenuOptions(); createMenuOptions();

8
app/src/main/java/org/transdroid/core/gui/TorrentsActivity.java

@ -68,8 +68,8 @@ import org.transdroid.R;
import org.transdroid.core.app.search.SearchHelper_; import org.transdroid.core.app.search.SearchHelper_;
import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ApplicationSettings;
import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.app.settings.ServerSetting;
import org.transdroid.core.app.settings.SettingsUtils;
import org.transdroid.core.app.settings.SystemSettings; import org.transdroid.core.app.settings.SystemSettings;
import org.transdroid.core.app.settings.SystemSettings_;
import org.transdroid.core.app.settings.WebsearchSetting; import org.transdroid.core.app.settings.WebsearchSetting;
import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.LocalTorrent;
import org.transdroid.core.gui.lists.SimpleListItem; import org.transdroid.core.gui.lists.SimpleListItem;
@ -221,10 +221,8 @@ public class TorrentsActivity extends AppCompatActivity implements TorrentTasksE
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// Set the theme according to the user preference SettingsUtils.applyDayNightTheme(this);
if (SystemSettings_.getInstance_(this).useDarkTheme()) {
setTheme(R.style.TransdroidTheme_Dark);
}
// Catch any uncaught exception to log it // Catch any uncaught exception to log it
Thread.setDefaultUncaughtExceptionHandler(new LogUncaughtExceptionHandler(this, Thread.getDefaultUncaughtExceptionHandler())); Thread.setDefaultUncaughtExceptionHandler(new LogUncaughtExceptionHandler(this, Thread.getDefaultUncaughtExceptionHandler()));
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);

15
app/src/main/java/org/transdroid/core/gui/navigation/SetLabelDialog.java

@ -30,7 +30,7 @@ import com.nispok.snackbar.Snackbar;
import com.nispok.snackbar.SnackbarManager; import com.nispok.snackbar.SnackbarManager;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -56,8 +56,12 @@ public class SetLabelDialog {
final ListView labelsList = (ListView) setLabelLayout.findViewById(R.id.labels_list); final ListView labelsList = (ListView) setLabelLayout.findViewById(R.id.labels_list);
final EditText newLabelEdit = (EditText) setLabelLayout.findViewById(R.id.newlabel_edit); final EditText newLabelEdit = (EditText) setLabelLayout.findViewById(R.id.newlabel_edit);
final MaterialDialog dialog = new MaterialDialog.Builder(context).customView(setLabelLayout, false).positiveText(R.string.status_update) MaterialDialog.Builder builder = new MaterialDialog.Builder(context)
.neutralText(R.string.status_label_remove).negativeText(android.R.string.cancel).callback(new MaterialDialog.ButtonCallback() { .customView(setLabelLayout, false)
.positiveText(R.string.status_update)
.neutralText(R.string.status_label_remove)
.negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onPositive(MaterialDialog dialog) {
// User should have provided a new label // User should have provided a new label
@ -72,7 +76,10 @@ public class SetLabelDialog {
public void onNeutral(MaterialDialog dialog) { public void onNeutral(MaterialDialog dialog) {
onLabelPickedListener.onLabelPicked(null); onLabelPickedListener.onLabelPicked(null);
} }
}).theme(SystemSettings_.getInstance_(context).getMaterialDialogtheme()).build(); });
final MaterialDialog dialog = SettingsUtils
.applyDialogTheme(builder)
.build();
if (currentLabels.size() == 0) { if (currentLabels.size() == 0) {
// Hide the list (and its label) if there are no labels yet // Hide the list (and its label) if there are no labels yet

15
app/src/main/java/org/transdroid/core/gui/navigation/SetStorageLocationDialog.java

@ -24,7 +24,7 @@ import android.widget.EditText;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
public class SetStorageLocationDialog { public class SetStorageLocationDialog {
@ -38,14 +38,21 @@ public class SetStorageLocationDialog {
View locationLayout = LayoutInflater.from(context).inflate(R.layout.dialog_storagelocation, null); View locationLayout = LayoutInflater.from(context).inflate(R.layout.dialog_storagelocation, null);
final EditText locationText = (EditText) locationLayout.findViewById(R.id.location_edit); final EditText locationText = (EditText) locationLayout.findViewById(R.id.location_edit);
locationText.setText(currentLocation); locationText.setText(currentLocation);
new MaterialDialog.Builder(context).customView(locationLayout, false).positiveText(R.string.status_update) MaterialDialog.Builder builder = new MaterialDialog.Builder(context)
.negativeText(android.R.string.cancel).callback(new MaterialDialog.ButtonCallback() { .customView(locationLayout, false)
.positiveText(R.string.status_update)
.negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onPositive(MaterialDialog dialog) {
// User is done editing and requested to update given the text input // User is done editing and requested to update given the text input
onStorageLocationUpdatedListener.onStorageLocationUpdated(locationText.getText().toString()); onStorageLocationUpdatedListener.onStorageLocationUpdated(locationText.getText().toString());
} }
}).theme(SystemSettings_.getInstance_(context).getMaterialDialogtheme()).show(); });
SettingsUtils
.applyDialogTheme(builder)
.show();
} }
public interface OnStorageLocationUpdatedListener { public interface OnStorageLocationUpdatedListener {

12
app/src/main/java/org/transdroid/core/gui/navigation/SetTrackersDialog.java

@ -25,7 +25,7 @@ import android.widget.EditText;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -42,14 +42,18 @@ public class SetTrackersDialog extends DialogFragment {
View trackersLayout = LayoutInflater.from(context).inflate(R.layout.dialog_trackers, null); View trackersLayout = LayoutInflater.from(context).inflate(R.layout.dialog_trackers, null);
final EditText trackersText = (EditText) trackersLayout.findViewById(R.id.trackers_edit); final EditText trackersText = (EditText) trackersLayout.findViewById(R.id.trackers_edit);
trackersText.setText(currentTrackers); trackersText.setText(currentTrackers);
new MaterialDialog.Builder(context).customView(trackersLayout, false).positiveText(R.string.status_update) MaterialDialog.Builder builder = new MaterialDialog.Builder(context)
.negativeText(android.R.string.cancel).callback(new MaterialDialog.ButtonCallback() { .customView(trackersLayout, false)
.positiveText(R.string.status_update)
.negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onPositive(MaterialDialog dialog) {
// User is done editing and requested to update given the text input // User is done editing and requested to update given the text input
onTrackersUpdatedListener.onTrackersUpdated(Arrays.asList(trackersText.getText().toString().split("\n"))); onTrackersUpdatedListener.onTrackersUpdated(Arrays.asList(trackersText.getText().toString().split("\n")));
} }
}).theme(SystemSettings_.getInstance_(context).getMaterialDialogtheme()).show(); });
SettingsUtils.applyDialogTheme(builder).show();
} }
public interface OnTrackersUpdatedListener { public interface OnTrackersUpdatedListener {

13
app/src/main/java/org/transdroid/core/gui/navigation/SetTransferRatesDialog.java

@ -26,7 +26,7 @@ import android.widget.TextView;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
public class SetTransferRatesDialog { public class SetTransferRatesDialog {
@ -41,8 +41,12 @@ public class SetTransferRatesDialog {
final TextView maxSpeedDown = (TextView) transferRatesLayout.findViewById(R.id.maxspeeddown_text); final TextView maxSpeedDown = (TextView) transferRatesLayout.findViewById(R.id.maxspeeddown_text);
final TextView maxSpeedUp = (TextView) transferRatesLayout.findViewById(R.id.maxspeedup_text); final TextView maxSpeedUp = (TextView) transferRatesLayout.findViewById(R.id.maxspeedup_text);
MaterialDialog dialog = new MaterialDialog.Builder(context).customView(transferRatesLayout, false).positiveText(R.string.status_update) MaterialDialog.Builder builder = new MaterialDialog.Builder(context)
.neutralText(R.string.status_maxspeed_reset).negativeText(android.R.string.cancel).callback(new MaterialDialog.ButtonCallback() { .customView(transferRatesLayout, false)
.positiveText(R.string.status_update)
.neutralText(R.string.status_maxspeed_reset)
.negativeText(android.R.string.cancel)
.callback(new MaterialDialog.ButtonCallback() {
@Override @Override
public void onPositive(MaterialDialog dialog) { public void onPositive(MaterialDialog dialog) {
int maxDown = -1, maxUp = -1; int maxDown = -1, maxUp = -1;
@ -63,7 +67,8 @@ public class SetTransferRatesDialog {
public void onNeutral(MaterialDialog dialog) { public void onNeutral(MaterialDialog dialog) {
onRatesPickedListener.resetRates(); onRatesPickedListener.resetRates();
} }
}).theme(SystemSettings_.getInstance_(context).getMaterialDialogtheme()).build(); });
MaterialDialog dialog = SettingsUtils.applyDialogTheme(builder).build();
bindButtons(dialog.getCustomView(), maxSpeedDown, R.id.down1Button, R.id.down2Button, R.id.down3Button, R.id.down4Button, R.id.down5Button, bindButtons(dialog.getCustomView(), maxSpeedDown, R.id.down1Button, R.id.down2Button, R.id.down3Button, R.id.down4Button, R.id.down5Button,
R.id.down6Button, R.id.down7Button, R.id.down8Button, R.id.down9Button, R.id.down0Button); R.id.down6Button, R.id.down7Button, R.id.down8Button, R.id.down9Button, R.id.down0Button);

7
app/src/main/java/org/transdroid/core/gui/remoterss/RemoteRssActivity.java

@ -44,7 +44,7 @@ import org.androidannotations.annotations.ViewById;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ApplicationSettings;
import org.transdroid.core.app.settings.ServerSetting; import org.transdroid.core.app.settings.ServerSetting;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.LocalTorrent;
import org.transdroid.core.gui.lists.SimpleListItemAdapter; import org.transdroid.core.gui.lists.SimpleListItemAdapter;
import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.log.Log;
@ -108,10 +108,7 @@ public class RemoteRssActivity extends AppCompatActivity implements RefreshableA
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// Set the theme according to the user preference SettingsUtils.applyDayNightTheme(this);
if (SystemSettings_.getInstance_(this).useDarkTheme()) {
setTheme(R.style.TransdroidTheme_Dark);
}
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

7
app/src/main/java/org/transdroid/core/gui/rss/RssfeedsActivity.java

@ -39,7 +39,7 @@ import org.androidannotations.annotations.ViewById;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ApplicationSettings;
import org.transdroid.core.app.settings.RssfeedSetting; import org.transdroid.core.app.settings.RssfeedSetting;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import org.transdroid.core.gui.TorrentsActivity_; import org.transdroid.core.gui.TorrentsActivity_;
import org.transdroid.core.gui.log.Log; import org.transdroid.core.gui.log.Log;
import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.gui.navigation.NavigationHelper;
@ -70,10 +70,7 @@ public class RssfeedsActivity extends AppCompatActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// Set the theme according to the user preference SettingsUtils.applyDayNightTheme(this);
if (SystemSettings_.getInstance_(this).useDarkTheme()) {
setTheme(R.style.TransdroidTheme_Dark);
}
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

7
app/src/main/java/org/transdroid/core/gui/rss/RssitemsActivity.java

@ -30,7 +30,7 @@ import org.androidannotations.annotations.FragmentById;
import org.androidannotations.annotations.OptionsItem; import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.ViewById; import org.androidannotations.annotations.ViewById;
import org.transdroid.R; import org.transdroid.R;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import org.transdroid.core.gui.TorrentsActivity_; import org.transdroid.core.gui.TorrentsActivity_;
import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.gui.navigation.NavigationHelper;
import org.transdroid.core.rssparser.Channel; import org.transdroid.core.rssparser.Channel;
@ -52,10 +52,7 @@ public class RssitemsActivity extends AppCompatActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// Set the theme according to the user preference SettingsUtils.applyDayNightTheme(this);
if (SystemSettings_.getInstance_(this).useDarkTheme()) {
setTheme(R.style.TransdroidTheme_Dark);
}
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

7
app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java

@ -48,7 +48,7 @@ import org.transdroid.core.app.search.SearchHelper;
import org.transdroid.core.app.search.SearchHelper.SearchSortOrder; import org.transdroid.core.app.search.SearchHelper.SearchSortOrder;
import org.transdroid.core.app.search.SearchSite; import org.transdroid.core.app.search.SearchSite;
import org.transdroid.core.app.settings.ApplicationSettings; import org.transdroid.core.app.settings.ApplicationSettings;
import org.transdroid.core.app.settings.SystemSettings_; import org.transdroid.core.app.settings.SettingsUtils;
import org.transdroid.core.app.settings.WebsearchSetting; import org.transdroid.core.app.settings.WebsearchSetting;
import org.transdroid.core.gui.TorrentsActivity_; import org.transdroid.core.gui.TorrentsActivity_;
import org.transdroid.core.gui.navigation.NavigationHelper; import org.transdroid.core.gui.navigation.NavigationHelper;
@ -88,10 +88,7 @@ public class SearchActivity extends AppCompatActivity {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
// Set the theme according to the user preference SettingsUtils.applyDayNightTheme(this);
if (SystemSettings_.getInstance_(this).useDarkTheme()) {
setTheme(R.style.TransdroidTheme_Dark);
}
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

6
app/src/main/java/org/transdroid/core/gui/search/SearchResultsFragment.java

@ -86,11 +86,7 @@ public class SearchResultsFragment extends Fragment {
// On large screens where this fragment is shown next to the sites list; we show a continues grey vertical line // On large screens where this fragment is shown next to the sites list; we show a continues grey vertical line
// to separate the lists visually // to separate the lists visually
if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) { if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) {
if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) { resultsList.setBackgroundResource(R.drawable.details_list_background);
resultsList.setBackgroundResource(R.drawable.details_list_background_dark);
} else {
resultsList.setBackgroundResource(R.drawable.details_list_background_light);
}
} }
// Set up the list adapter, which allows multi-select // Set up the list adapter, which allows multi-select

8
app/src/main/java/org/transdroid/core/widget/ListWidgetConfig.java

@ -30,16 +30,14 @@ public class ListWidgetConfig {
private final TorrentsSortBy sortBy; private final TorrentsSortBy sortBy;
private final boolean reserveSort; private final boolean reserveSort;
private final boolean showStatusView; private final boolean showStatusView;
private final boolean useDarkTheme;
public ListWidgetConfig(int serverId, StatusType statusType, TorrentsSortBy sortBy, boolean reverseSort, public ListWidgetConfig(int serverId, StatusType statusType, TorrentsSortBy sortBy, boolean reverseSort,
boolean showStatusView, boolean useDarkTheme) { boolean showStatusView) {
this.serverId = serverId; this.serverId = serverId;
this.statusType = statusType; this.statusType = statusType;
this.sortBy = sortBy; this.sortBy = sortBy;
this.reserveSort = reverseSort; this.reserveSort = reverseSort;
this.showStatusView = showStatusView; this.showStatusView = showStatusView;
this.useDarkTheme = useDarkTheme;
} }
public int getServerId() { public int getServerId() {
@ -62,8 +60,4 @@ public class ListWidgetConfig {
return showStatusView; return showStatusView;
} }
public boolean shouldUseDarkTheme() {
return useDarkTheme;
}
} }

5
app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java

@ -73,7 +73,7 @@ public class ListWidgetConfigActivity extends AppCompatActivity {
@ViewById @ViewById
protected Spinner serverSpinner, filterSpinner, sortSpinner; protected Spinner serverSpinner, filterSpinner, sortSpinner;
@ViewById @ViewById
protected CheckBox reverseorderCheckBox, showstatusCheckBox, darkthemeCheckBox; protected CheckBox reverseorderCheckBox, showstatusCheckBox;
@ViewById @ViewById
protected TextView filterText, serverText, errorText; protected TextView filterText, serverText, errorText;
@ViewById @ViewById
@ -127,8 +127,7 @@ public class ListWidgetConfigActivity extends AppCompatActivity {
TorrentsSortBy sortBy = ((SortByListItem) sortSpinner.getSelectedItem()).getSortBy(); TorrentsSortBy sortBy = ((SortByListItem) sortSpinner.getSelectedItem()).getSortBy();
boolean reverseSort = reverseorderCheckBox.isChecked(); boolean reverseSort = reverseorderCheckBox.isChecked();
boolean showstatus = showstatusCheckBox.isChecked(); boolean showstatus = showstatusCheckBox.isChecked();
boolean useDarkTheme = darkthemeCheckBox.isChecked(); ListWidgetConfig config = new ListWidgetConfig(server, statusType, sortBy, reverseSort, showstatus);
ListWidgetConfig config = new ListWidgetConfig(server, statusType, sortBy, reverseSort, showstatus, useDarkTheme);
applicationSettings.setWidgetConfig(appWidgetId, config); applicationSettings.setWidgetConfig(appWidgetId, config);
// Return the widget configuration result // Return the widget configuration result

4
app/src/main/java/org/transdroid/core/widget/ListWidgetPreviewAdapter.java

@ -42,7 +42,7 @@ public class ListWidgetPreviewAdapter extends ArrayAdapter<Torrent> {
* @param torrents The already-retrieved, non-null list of torrents to show * @param torrents The already-retrieved, non-null list of torrents to show
*/ */
public ListWidgetPreviewAdapter(Context context, int foo, List<Torrent> torrents) { public ListWidgetPreviewAdapter(Context context, int foo, List<Torrent> torrents) {
super(context, R.layout.list_item_widget_light, torrents); super(context, R.layout.list_item_widget, torrents);
} }
@Override @Override
@ -51,7 +51,7 @@ public class ListWidgetPreviewAdapter extends ArrayAdapter<Torrent> {
// Get the views // Get the views
ViewHolder holder; ViewHolder holder;
if (convertView == null) { if (convertView == null) {
convertView = LayoutInflater.from(getContext()).inflate(R.layout.list_item_widget_light, parent, false); convertView = LayoutInflater.from(getContext()).inflate(R.layout.list_item_widget, parent, false);
holder = new ViewHolder(); holder = new ViewHolder();
holder.nameText = (TextView) convertView.findViewById(R.id.name_text); holder.nameText = (TextView) convertView.findViewById(R.id.name_text);
holder.progressText = (TextView) convertView.findViewById(R.id.progress_text); holder.progressText = (TextView) convertView.findViewById(R.id.progress_text);

3
app/src/main/java/org/transdroid/core/widget/ListWidgetProvider.java

@ -79,8 +79,7 @@ public class ListWidgetProvider extends AppWidgetProvider {
} }
// Load the dark or light widget layout xml // Load the dark or light widget layout xml
RemoteViews rv = new RemoteViews(context.getPackageName(), RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_torrents);
config.shouldUseDarkTheme() ? R.layout.widget_torrents_dark : R.layout.widget_torrents_light);
// Set up the widget's list view loading service which refers to the WidgetViewsFactory // Set up the widget's list view loading service which refers to the WidgetViewsFactory
Intent data = new Intent(context, ListWidgetViewsService_.class); Intent data = new Intent(context, ListWidgetViewsService_.class);

5
app/src/main/java/org/transdroid/core/widget/ListWidgetViewsService.java

@ -30,7 +30,7 @@ import org.transdroid.R;
import org.transdroid.core.app.settings.*; import org.transdroid.core.app.settings.*;
import org.transdroid.core.gui.lists.LocalTorrent; import org.transdroid.core.gui.lists.LocalTorrent;
import org.transdroid.core.gui.log.*; import org.transdroid.core.gui.log.*;
import org.transdroid.core.service.*; import org.transdroid.core.service.ConnectivityHelper_;
import org.transdroid.daemon.Daemon; import org.transdroid.daemon.Daemon;
import org.transdroid.daemon.IDaemonAdapter; import org.transdroid.daemon.IDaemonAdapter;
import org.transdroid.daemon.Torrent; import org.transdroid.daemon.Torrent;
@ -166,8 +166,7 @@ class WidgetViewsFactory implements RemoteViewsService.RemoteViewsFactory {
public RemoteViews getViewAt(int position) { public RemoteViews getViewAt(int position) {
// Load the dark or light widget list item layout xml // Load the dark or light widget list item layout xml
RemoteViews rv = new RemoteViews(context.getPackageName(), RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.list_item_widget);
config.shouldUseDarkTheme() ? R.layout.list_item_widget_dark : R.layout.list_item_widget_light);
// Bind the torrent details texts and status colour // Bind the torrent details texts and status colour
Torrent torrent = torrents.get(position); Torrent torrent = torrents.get(position);

4
app/src/main/res/drawable/details_list_background_dark.xml → app/src/main/res/drawable-night/details_list_background.xml

@ -16,6 +16,6 @@
along with Transdroid. If not, see <http://www.gnu.org/licenses/>. along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
--> -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:left="2dp" android:drawable="@color/divider_dark" /> <item android:left="2dp" android:drawable="@color/transdroid_divider" />
<item android:left="4dp" android:drawable="@color/background_dark" /> <item android:left="4dp" android:drawable="@color/transdroid_background" />
</layer-list> </layer-list>

0
app/src/main/res/drawable/loading_progress_dark.xml → app/src/main/res/drawable-night/loading_progress.xml

4
app/src/main/res/drawable/details_list_background_light.xml → app/src/main/res/drawable/details_list_background.xml

@ -16,6 +16,6 @@
along with Transdroid. If not, see <http://www.gnu.org/licenses/>. along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
--> -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:left="2dp" android:drawable="@color/divider_light" /> <item android:left="2dp" android:drawable="@color/transdroid_divider" />
<item android:left="4dp" android:drawable="@color/background_light" /> <item android:left="4dp" android:drawable="@color/transdroid_background" />
</layer-list> </layer-list>

0
app/src/main/res/drawable/loading_progress_light.xml → app/src/main/res/drawable/loading_progress.xml

12
app/src/main/res/layout/activity_widgetconfig.xml

@ -28,13 +28,13 @@
android:background="@null" android:background="@null"
android:padding="@dimen/widget_preview_padding" > android:padding="@dimen/widget_preview_padding" >
<include layout="@layout/widget_torrents_light" /> <include layout="@layout/widget_torrents" />
</FrameLayout> </FrameLayout>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/background_light" android:background="@color/transdroid_background"
android:fillViewport="true" android:fillViewport="true"
android:paddingLeft="@dimen/margin_default" android:paddingLeft="@dimen/margin_default"
android:paddingRight="@dimen/margin_default" > android:paddingRight="@dimen/margin_default" >
@ -99,14 +99,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half" android:layout_marginTop="@dimen/margin_half"
android:text="@string/widget_showstatusview" /> android:text="@string/widget_showstatusview" />
<CheckBox
android:id="@+id/darktheme_check_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_half"
android:text="@string/widget_usedarktheme" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

4
app/src/main/res/layout/list_item_widget_dark.xml → app/src/main/res/layout/list_item_widget.xml

@ -36,7 +36,7 @@
android:fontFamily="sans-serif-condensed" android:fontFamily="sans-serif-condensed"
android:maxLines="1" android:maxLines="1"
android:paddingTop="@dimen/widget_list_item_padding" android:paddingTop="@dimen/widget_list_item_padding"
android:textColor="@color/text_bright_dark" android:textColor="@color/transdroid_text_bright"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="@dimen/text_enlarged" /> android:textSize="@dimen/text_enlarged" />
@ -49,6 +49,7 @@
android:layout_marginLeft="@dimen/widget_list_item_padding" android:layout_marginLeft="@dimen/widget_list_item_padding"
android:layout_marginTop="4dip" android:layout_marginTop="4dip"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/transdroid_text_bright"
android:paddingBottom="@dimen/widget_list_item_padding" android:paddingBottom="@dimen/widget_list_item_padding"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="@dimen/text_small" /> android:textSize="@dimen/text_small" />
@ -62,6 +63,7 @@
android:layout_marginLeft="@dimen/widget_list_item_padding_left" android:layout_marginLeft="@dimen/widget_list_item_padding_left"
android:layout_toLeftOf="@id/ratio_text" android:layout_toLeftOf="@id/ratio_text"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/transdroid_text_bright"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="@dimen/text_small" /> android:textSize="@dimen/text_small" />

70
app/src/main/res/layout/list_item_widget_light.xml

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010-2018 Eric Kok et al.
Transdroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Transdroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/widget_line_layout"
android:layout_width="fill_parent"
android:layout_height="@dimen/widget_list_item_height"
android:background="?android:attr/selectableItemBackground"
android:paddingRight="@dimen/widget_list_item_padding" >
<TextView
android:id="@+id/status_view"
android:layout_width="6dp"
android:layout_height="@dimen/widget_list_item_height" />
<TextView
android:id="@+id/name_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/widget_list_item_padding_left"
android:ellipsize="end"
android:fontFamily="sans-serif-condensed"
android:maxLines="1"
android:paddingTop="@dimen/widget_list_item_padding"
android:textColor="@color/text_bright_light"
android:textIsSelectable="false"
android:textSize="@dimen/text_enlarged" />
<TextView
android:id="@+id/ratio_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/name_text"
android:layout_marginLeft="@dimen/widget_list_item_padding"
android:layout_marginTop="4dip"
android:maxLines="1"
android:textColor="@color/text_bright_light"
android:paddingBottom="@dimen/widget_list_item_padding"
android:textIsSelectable="false"
android:textSize="@dimen/text_small" />
<TextView
android:id="@+id/progress_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/ratio_text"
android:layout_alignParentLeft="true"
android:layout_marginLeft="@dimen/widget_list_item_padding_left"
android:layout_toLeftOf="@id/ratio_text"
android:maxLines="1"
android:textColor="@color/text_bright_light"
android:textIsSelectable="false"
android:textSize="@dimen/text_small" />
</RelativeLayout>

17
app/src/main/res/layout/widget_torrents_light.xml → app/src/main/res/layout/widget_torrents.xml

@ -19,7 +19,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/background_light"> android:background="@color/transdroid_background">
<LinearLayout <LinearLayout
android:id="@+id/header_wrapper" android:id="@+id/header_wrapper"
@ -56,10 +56,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fontFamily="sans-serif-condensed" android:fontFamily="sans-serif-condensed"
android:maxLines="1" android:singleLine="true"
android:textColor="@color/text_actionbar_dark"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="@dimen/ui_navigation_filter" android:textSize="@dimen/ui_navigation_filter"
android:textColor="@color/transdroid_text_actionbar"
tools:text="Filter" /> tools:text="Filter" />
<TextView <TextView
@ -69,10 +69,10 @@
android:layout_marginTop="-4dip" android:layout_marginTop="-4dip"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:maxLines="1" android:singleLine="true"
android:textColor="@color/text_actionbar_dark"
android:textIsSelectable="false" android:textIsSelectable="false"
android:textSize="@dimen/ui_navigation_server" android:textSize="@dimen/ui_navigation_server"
android:textColor="@color/transdroid_text_actionbar"
tools:text="Server"/> tools:text="Server"/>
</LinearLayout> </LinearLayout>
@ -94,7 +94,6 @@
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:paddingTop="@dimen/ui_serverstatus_signmargin" android:paddingTop="@dimen/ui_serverstatus_signmargin"
android:text="↑" android:text="↑"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_sign" android:textSize="@dimen/ui_serverstatus_sign"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -105,7 +104,6 @@
android:layout_toLeftOf="@id/upcount_sign" android:layout_toLeftOf="@id/upcount_sign"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="end" android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_bignumber" /> android:textSize="@dimen/ui_serverstatus_bignumber" />
<TextView <TextView
@ -116,7 +114,6 @@
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:paddingTop="@dimen/ui_serverstatus_signmargin" android:paddingTop="@dimen/ui_serverstatus_signmargin"
android:text="↓" android:text="↓"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_sign" android:textSize="@dimen/ui_serverstatus_sign"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
@ -127,7 +124,6 @@
android:layout_toLeftOf="@id/downcount_sign" android:layout_toLeftOf="@id/downcount_sign"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="end" android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_bignumber" /> android:textSize="@dimen/ui_serverstatus_bignumber" />
<TextView <TextView
@ -140,7 +136,6 @@
android:layout_marginTop="-4dip" android:layout_marginTop="-4dip"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="end" android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_smallnumber" /> android:textSize="@dimen/ui_serverstatus_smallnumber" />
<TextView <TextView
@ -153,7 +148,6 @@
android:layout_marginTop="-4dip" android:layout_marginTop="-4dip"
android:fontFamily="sans-serif-light" android:fontFamily="sans-serif-light"
android:gravity="end" android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_smallnumber" /> android:textSize="@dimen/ui_serverstatus_smallnumber" />
</RelativeLayout> </RelativeLayout>
@ -209,7 +203,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@id/bottomline_view" android:layout_above="@id/bottomline_view"
android:layout_below="@id/topline_view"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:maxWidth="400dip" android:maxWidth="400dip"

222
app/src/main/res/layout/widget_torrents_dark.xml

@ -1,222 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010-2018 Eric Kok et al.
Transdroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Transdroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Transdroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_dark">
<ImageButton
android:id="@+id/icon_image"
android:layout_width="@dimen/widget_header_height"
android:layout_height="@dimen/widget_header_height"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/widget_opentransdroid"
android:padding="@dimen/widget_header_padding"
android:scaleType="fitXY"
android:src="@drawable/ic_launcher" />
<ImageButton
android:id="@+id/refresh_button"
android:layout_width="@dimen/widget_header_height"
android:layout_height="@dimen/widget_header_height"
android:layout_alignParentRight="true"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/action_refresh"
android:padding="@dimen/widget_header_padding"
android:scaleType="fitXY"
android:src="@drawable/ic_action_refresh" />
<ImageButton
android:id="@+id/pauseall_button"
android:layout_width="@dimen/widget_header_height"
android:layout_height="@dimen/widget_header_height"
android:layout_toLeftOf="@id/refresh_button"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/action_pauseall"
android:padding="@dimen/widget_header_padding"
android:scaleType="fitXY"
android:src="@drawable/ic_action_pause" />
<ImageButton
android:id="@+id/resumeall_button"
android:layout_width="@dimen/widget_header_height"
android:layout_height="@dimen/widget_header_height"
android:layout_toLeftOf="@id/pauseall_button"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/action_resumeall"
android:padding="@dimen/widget_header_padding"
android:scaleType="fitXY"
android:src="@drawable/ic_action_resume" />
<LinearLayout
android:id="@+id/navigation_view"
android:layout_width="match_parent"
android:layout_height="@dimen/widget_header_height"
android:layout_toLeftOf="@id/resumeall_button"
android:layout_toRightOf="@id/icon_image"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingRight="@dimen/margin_half"
android:paddingTop="3dp">
<TextView
android:id="@+id/filter_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fontFamily="sans-serif-condensed"
android:maxLines="1"
android:textColor="@color/text_actionbar_dark"
android:textIsSelectable="false"
android:textSize="@dimen/ui_navigation_filter"
tools:text="Filter" />
<TextView
android:id="@+id/server_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-4dip"
android:ellipsize="marquee"
android:fontFamily="sans-serif-light"
android:maxLines="1"
android:textColor="@color/text_actionbar_dark"
android:textIsSelectable="false"
android:textSize="@dimen/ui_navigation_server"
tools:text="Server" />
</LinearLayout>
<RelativeLayout
android:id="@+id/serverstatus_view"
android:layout_width="match_parent"
android:layout_height="@dimen/widget_header_height"
android:layout_toLeftOf="@id/resumeall_button"
android:layout_toRightOf="@id/icon_image"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:paddingTop="@dimen/ui_serverstatus_margin"
android:visibility="gone">
<TextView
android:id="@+id/upcount_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:fontFamily="sans-serif-light"
android:paddingTop="@dimen/ui_serverstatus_signmargin"
android:text="↑"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_sign"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/upcount_text"
android:layout_width="@dimen/ui_serverstatus_width"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/upcount_sign"
android:fontFamily="sans-serif-light"
android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_bignumber" />
<TextView
android:id="@+id/downcount_sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/upcount_text"
android:fontFamily="sans-serif-light"
android:paddingTop="@dimen/ui_serverstatus_signmargin"
android:text="↓"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_sign"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/downcount_text"
android:layout_width="@dimen/ui_serverstatus_width"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/downcount_sign"
android:fontFamily="sans-serif-light"
android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_bignumber" />
<TextView
android:id="@+id/upspeed_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/upcount_text"
android:layout_alignParentRight="true"
android:layout_below="@id/upcount_text"
android:layout_marginTop="-4dip"
android:fontFamily="sans-serif-light"
android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_smallnumber" />
<TextView
android:id="@+id/downspeed_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/downcount_text"
android:layout_alignRight="@id/downcount_sign"
android:layout_below="@id/downcount_text"
android:layout_marginTop="-4dip"
android:fontFamily="sans-serif-light"
android:gravity="end"
android:textColor="@color/text_bright_dark"
android:textSize="@dimen/ui_serverstatus_smallnumber" />
</RelativeLayout>
<TextView
android:id="@+id/topline_view"
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_below="@id/icon_image"
android:background="@color/green" />
<TextView
android:id="@+id/bottomline_view"
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:background="@color/green" />
<ListView
android:id="@+id/torrents_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/bottomline_view"
android:layout_below="@id/topline_view"
android:visibility="gone" />
<TextView
android:id="@+id/error_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/bottomline_view"
android:layout_below="@id/topline_view"
android:layout_gravity="center"
android:gravity="center"
android:maxWidth="400dip"
android:padding="@dimen/margin_default"
android:textIsSelectable="false"
android:visibility="gone" />
</RelativeLayout>

1
app/src/main/res/values-bg/strings.xml

@ -126,7 +126,6 @@
<string name="rss_service_newfor">Нови торенти за %1$s</string> <string name="rss_service_newfor">Нови торенти за %1$s</string>
<string name="widget_loading">Зареждане&#8230;</string> <string name="widget_loading">Зареждане&#8230;</string>
<string name="widget_opentransdroid">Отвори Transdroid</string> <string name="widget_opentransdroid">Отвори Transdroid</string>
<string name="widget_usedarktheme">Тъмна тема за интерфейса (няма преглед)</string>
<string name="pref_servers">Сървъри</string> <string name="pref_servers">Сървъри</string>
<string name="pref_addserver">Добавяне на нов сървър</string> <string name="pref_addserver">Добавяне на нов сървър</string>
<string name="pref_defaultserver">Стандартен сървър</string> <string name="pref_defaultserver">Стандартен сървър</string>

1
app/src/main/res/values-cs/strings.xml

@ -171,7 +171,6 @@
<string name="widget_sortby">SEŘADIT VÝSLEDKY</string> <string name="widget_sortby">SEŘADIT VÝSLEDKY</string>
<string name="widget_reversesortorder">Obrátit seřazení</string> <string name="widget_reversesortorder">Obrátit seřazení</string>
<string name="widget_showstatusview">Stav serveru místo jeho názvu</string> <string name="widget_showstatusview">Stav serveru místo jeho názvu</string>
<string name="widget_usedarktheme">Použít tmavé téma (není náhled)</string>
<string name="widget_done">HOTOVO</string> <string name="widget_done">HOTOVO</string>
<string name="pref_servers">Servery</string> <string name="pref_servers">Servery</string>
<string name="pref_addserver">Přidat nový server</string> <string name="pref_addserver">Přidat nový server</string>

1
app/src/main/res/values-da/strings.xml

@ -187,7 +187,6 @@
<string name="widget_sortby">SORTERINGS RÆKKEFØLGE</string> <string name="widget_sortby">SORTERINGS RÆKKEFØLGE</string>
<string name="widget_reversesortorder">Omvendt sorterings rækkefølge</string> <string name="widget_reversesortorder">Omvendt sorterings rækkefølge</string>
<string name="widget_showstatusview">Server status i stedet for titel</string> <string name="widget_showstatusview">Server status i stedet for titel</string>
<string name="widget_usedarktheme">Brug mørkt tema (ingen preview)</string>
<string name="widget_done">FÆRDIG</string> <string name="widget_done">FÆRDIG</string>
<string name="pref_servers">Servere</string> <string name="pref_servers">Servere</string>
<string name="pref_addserver">Tilføj ny server</string> <string name="pref_addserver">Tilføj ny server</string>

1
app/src/main/res/values-de/strings.xml

@ -203,7 +203,6 @@
<string name="widget_sortby">SORTIERREIHENFOLGE</string> <string name="widget_sortby">SORTIERREIHENFOLGE</string>
<string name="widget_reversesortorder">Umgekehrte Sortierreihenfolge</string> <string name="widget_reversesortorder">Umgekehrte Sortierreihenfolge</string>
<string name="widget_showstatusview">Serverstatus anstelle des Titels</string> <string name="widget_showstatusview">Serverstatus anstelle des Titels</string>
<string name="widget_usedarktheme">Dunkles Thema benutzen (keine Vorschau)</string>
<string name="widget_done">FERTIG</string> <string name="widget_done">FERTIG</string>
<string name="pref_servers">Server</string> <string name="pref_servers">Server</string>
<string name="pref_addserver">Neuen Server hinzufügen</string> <string name="pref_addserver">Neuen Server hinzufügen</string>

1
app/src/main/res/values-es/strings.xml

@ -156,7 +156,6 @@
<string name="widget_sortby">CRITERIO DE ORDENACIÓN</string> <string name="widget_sortby">CRITERIO DE ORDENACIÓN</string>
<string name="widget_reversesortorder">Invertir criterio de ordenación</string> <string name="widget_reversesortorder">Invertir criterio de ordenación</string>
<string name="widget_showstatusview">Estado del servidor en lugar del título</string> <string name="widget_showstatusview">Estado del servidor en lugar del título</string>
<string name="widget_usedarktheme">Usar tema oscuro (sin vista previa)</string>
<string name="widget_done">HECHO</string> <string name="widget_done">HECHO</string>
<string name="pref_servers">Servidores</string> <string name="pref_servers">Servidores</string>
<string name="pref_addserver">Añadir nuevo servidor</string> <string name="pref_addserver">Añadir nuevo servidor</string>

1
app/src/main/res/values-fa/strings.xml

@ -195,7 +195,6 @@
<string name="widget_sortby">مرتب کردن بر اساس سفارش </string> <string name="widget_sortby">مرتب کردن بر اساس سفارش </string>
<string name="widget_reversesortorder">معکوس مرتب کردن بر اساس سفارش </string> <string name="widget_reversesortorder">معکوس مرتب کردن بر اساس سفارش </string>
<string name="widget_showstatusview">وضعیت کارگزار بهجای عنوان</string> <string name="widget_showstatusview">وضعیت کارگزار بهجای عنوان</string>
<string name="widget_usedarktheme">استفاده از تم تیره (بدون پیش نمایش) </string>
<string name="widget_done">تمام</string> <string name="widget_done">تمام</string>
<string name="pref_servers">سرورها</string> <string name="pref_servers">سرورها</string>
<string name="pref_addserver">اضافه کردن سرور جدید </string> <string name="pref_addserver">اضافه کردن سرور جدید </string>

1
app/src/main/res/values-fr/strings.xml

@ -187,7 +187,6 @@
<string name="widget_sortby">ORDRE DE TRI</string> <string name="widget_sortby">ORDRE DE TRI</string>
<string name="widget_reversesortorder">Ordre de tri inversé</string> <string name="widget_reversesortorder">Ordre de tri inversé</string>
<string name="widget_showstatusview">Statut du serveur plutôt que le titre</string> <string name="widget_showstatusview">Statut du serveur plutôt que le titre</string>
<string name="widget_usedarktheme">Utilisez thème sombre (pas d\'aperçu)</string>
<string name="widget_done">FINI</string> <string name="widget_done">FINI</string>
<string name="pref_servers">Serveurs</string> <string name="pref_servers">Serveurs</string>
<string name="pref_addserver">Ajouter un nouveau serveur</string> <string name="pref_addserver">Ajouter un nouveau serveur</string>

1
app/src/main/res/values-he/strings.xml

@ -160,7 +160,6 @@
<string name="widget_loading">טוען...</string> <string name="widget_loading">טוען...</string>
<string name="widget_sortby">ממוין לפי</string> <string name="widget_sortby">ממוין לפי</string>
<string name="widget_reversesortorder">הפוך את הרשימה</string> <string name="widget_reversesortorder">הפוך את הרשימה</string>
<string name="widget_usedarktheme">השתמש בעיצוב כהה</string>
<string name="widget_done">סיים</string> <string name="widget_done">סיים</string>
<string name="pref_servers">שרתים</string> <string name="pref_servers">שרתים</string>
<string name="pref_addserver">הוסף שרת חדש</string> <string name="pref_addserver">הוסף שרת חדש</string>

1
app/src/main/res/values-hu/strings.xml

@ -203,7 +203,6 @@
<string name="widget_sortby">RENDEZÉSI SORREND</string> <string name="widget_sortby">RENDEZÉSI SORREND</string>
<string name="widget_reversesortorder">Fordított sorrend</string> <string name="widget_reversesortorder">Fordított sorrend</string>
<string name="widget_showstatusview">Kiszolgáló állapota a címe helyett</string> <string name="widget_showstatusview">Kiszolgáló állapota a címe helyett</string>
<string name="widget_usedarktheme">Sötét téma használata (nincs előnézet)</string>
<string name="widget_done">KÉSZ</string> <string name="widget_done">KÉSZ</string>
<string name="pref_servers">Szerverek</string> <string name="pref_servers">Szerverek</string>
<string name="pref_addserver">Új szerver hozzáadása</string> <string name="pref_addserver">Új szerver hozzáadása</string>

1
app/src/main/res/values-it/strings.xml

@ -203,7 +203,6 @@
<string name="widget_sortby">TIPO ORDINAMENTO</string> <string name="widget_sortby">TIPO ORDINAMENTO</string>
<string name="widget_reversesortorder">Inverti ordinamento</string> <string name="widget_reversesortorder">Inverti ordinamento</string>
<string name="widget_showstatusview">Stato del server anzichè il titolo</string> <string name="widget_showstatusview">Stato del server anzichè il titolo</string>
<string name="widget_usedarktheme">Utilizza tema scuro (nessuna anteprima)</string>
<string name="widget_done">FINE</string> <string name="widget_done">FINE</string>
<string name="pref_servers">Server</string> <string name="pref_servers">Server</string>
<string name="pref_addserver">Aggiungi nuovo server</string> <string name="pref_addserver">Aggiungi nuovo server</string>

1
app/src/main/res/values-ja/strings.xml

@ -195,7 +195,6 @@
<string name="widget_sortby">ソート順</string> <string name="widget_sortby">ソート順</string>
<string name="widget_reversesortorder">ソート順を逆にする</string> <string name="widget_reversesortorder">ソート順を逆にする</string>
<string name="widget_showstatusview">タイトルにサーバーステータスを表示</string> <string name="widget_showstatusview">タイトルにサーバーステータスを表示</string>
<string name="widget_usedarktheme">ダーク・テーマを使用 (プレビューなし)</string>
<string name="widget_done">完了</string> <string name="widget_done">完了</string>
<string name="pref_servers">サーバー</string> <string name="pref_servers">サーバー</string>
<string name="pref_addserver">新しいサーバーを追加</string> <string name="pref_addserver">新しいサーバーを追加</string>

1
app/src/main/res/values-ko/strings.xml

@ -195,7 +195,6 @@
<string name="widget_sortby">정렬 순서</string> <string name="widget_sortby">정렬 순서</string>
<string name="widget_reversesortorder">역순 정렬</string> <string name="widget_reversesortorder">역순 정렬</string>
<string name="widget_showstatusview">제목 대신 서버 상태 표시</string> <string name="widget_showstatusview">제목 대신 서버 상태 표시</string>
<string name="widget_usedarktheme">어두운 테마 사용 (미리보기 없음)</string>
<string name="widget_done">완료</string> <string name="widget_done">완료</string>
<string name="pref_servers">서버</string> <string name="pref_servers">서버</string>
<string name="pref_addserver">새 서버 추가</string> <string name="pref_addserver">새 서버 추가</string>

9
app/src/main/res/values/colors_transdroid_dark.xml → app/src/main/res/values-night/colors_transdroid.xml

@ -18,9 +18,8 @@
--> -->
<resources> <resources>
<color name="pressed_transdroid_dark">#CCaada62</color> <color name="transdroid_pressed">#CCaada62</color>
<color name="divider_dark">#303030</color> <color name="transdroid_divider">#303030</color>
<color name="background_dark">#000</color> <color name="transdroid_background">#2e2e2e</color>
<color name="text_bright_dark">#fff</color> <color name="transdroid_text_bright">#fff</color>
<color name="text_actionbar_dark">#fff</color>
</resources> </resources>

15
app/src/main/res/values/styles_transdroid_dark.xml → app/src/main/res/values-night/styles_transdroid.xml

@ -18,17 +18,20 @@
<resources> <resources>
<style name="Theme.Transdroid.Dark" parent="Theme.AppCompat.NoActionBar"> <style name="Theme.Transdroid.Auto" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="drawer_background">@color/transdroid_background</item>
<item name="activatable_background">@drawable/activatable_background</item>
<item name="colorPrimary">@color/green</item> <item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item> <item name="colorPrimaryDark">@color/green_dark</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">@color/grey</item> <item name="actionModeBackground">@color/grey</item>
<item name="android:textViewStyle">@style/DefaultTextView</item> <item name="android:textViewStyle">@style/DefaultTextView</item>
<item name="android:windowBackground">@color/background_dark</item> <item name="android:windowBackground">@color/transdroid_background</item>
<item name="loading_progress">@drawable/loading_progress_dark</item> <item name="loading_progress">@drawable/loading_progress</item>
<item name="text_bright">@color/text_bright_dark</item> <item name="text_bright">@color/transdroid_text_bright</item>
<item name="text_actionbar">@color/text_actionbar_dark</item> <item name="text_actionbar">@color/transdroid_text_actionbar</item>
<item name="text_actionbar_secondary">@color/text_actionbar_light</item> <item name="text_actionbar_secondary">@color/transdroid_text_actionbar</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values-nl/strings.xml

@ -199,7 +199,6 @@
<string name="widget_sortby">SORTEERVOLGORDE</string> <string name="widget_sortby">SORTEERVOLGORDE</string>
<string name="widget_reversesortorder">Omgekeerde sorteervolgorde</string> <string name="widget_reversesortorder">Omgekeerde sorteervolgorde</string>
<string name="widget_showstatusview">Serverstatus i.p.v. titel</string> <string name="widget_showstatusview">Serverstatus i.p.v. titel</string>
<string name="widget_usedarktheme">Gebruik donker kleurenschema (geen preview)</string>
<string name="widget_done">KLAAR</string> <string name="widget_done">KLAAR</string>
<string name="pref_servers">Servers</string> <string name="pref_servers">Servers</string>
<string name="pref_addserver">Nieuwe server toevoegen</string> <string name="pref_addserver">Nieuwe server toevoegen</string>

1
app/src/main/res/values-pl/strings.xml

@ -171,7 +171,6 @@
<string name="widget_sortby">SORTOWANIE</string> <string name="widget_sortby">SORTOWANIE</string>
<string name="widget_reversesortorder">Odwrócony porządek sortowania</string> <string name="widget_reversesortorder">Odwrócony porządek sortowania</string>
<string name="widget_showstatusview">Status serwera zamiast tytułu</string> <string name="widget_showstatusview">Status serwera zamiast tytułu</string>
<string name="widget_usedarktheme">Użyj ciemnego motywu (brak podglądu)</string>
<string name="widget_done">GOTOWE</string> <string name="widget_done">GOTOWE</string>
<string name="pref_servers">Serwery</string> <string name="pref_servers">Serwery</string>
<string name="pref_addserver">Dodaj nowy serwer</string> <string name="pref_addserver">Dodaj nowy serwer</string>

1
app/src/main/res/values-pt-rBR/strings.xml

@ -203,7 +203,6 @@
<string name="widget_sortby">Ordem de classificação</string> <string name="widget_sortby">Ordem de classificação</string>
<string name="widget_reversesortorder">Ordem Invertida</string> <string name="widget_reversesortorder">Ordem Invertida</string>
<string name="widget_showstatusview">Estado do servidor ao invés do título</string> <string name="widget_showstatusview">Estado do servidor ao invés do título</string>
<string name="widget_usedarktheme">Usar tema escuro (sem visualização)</string>
<string name="widget_done">Concluído</string> <string name="widget_done">Concluído</string>
<string name="pref_servers">Servidores</string> <string name="pref_servers">Servidores</string>
<string name="pref_addserver">Adicionar novo servidor</string> <string name="pref_addserver">Adicionar novo servidor</string>

1
app/src/main/res/values-pt/strings.xml

@ -203,7 +203,6 @@
<string name="widget_sortby">CRITÉRIO DE ORDENAÇÃO</string> <string name="widget_sortby">CRITÉRIO DE ORDENAÇÃO</string>
<string name="widget_reversesortorder">Inverter critério de ordenação</string> <string name="widget_reversesortorder">Inverter critério de ordenação</string>
<string name="widget_showstatusview">Estado do servidor em vez de título</string> <string name="widget_showstatusview">Estado do servidor em vez de título</string>
<string name="widget_usedarktheme">Usar o tema escuro (sem antevisão)</string>
<string name="widget_done">FEITO</string> <string name="widget_done">FEITO</string>
<string name="pref_servers">Servidores</string> <string name="pref_servers">Servidores</string>
<string name="pref_addserver">Adicionar novo servidor</string> <string name="pref_addserver">Adicionar novo servidor</string>

1
app/src/main/res/values-ru/strings.xml

@ -220,7 +220,6 @@
<string name="widget_sortby">ПОРЯДОК СОРТИРОВКИ</string> <string name="widget_sortby">ПОРЯДОК СОРТИРОВКИ</string>
<string name="widget_reversesortorder">Обратный порядок сортировки</string> <string name="widget_reversesortorder">Обратный порядок сортировки</string>
<string name="widget_showstatusview">Статистика сервера вместо названия</string> <string name="widget_showstatusview">Статистика сервера вместо названия</string>
<string name="widget_usedarktheme">Использовать темную тему (без предпросмотра)</string>
<string name="widget_done">ГОТОВО</string> <string name="widget_done">ГОТОВО</string>
<string name="pref_servers">Серверы</string> <string name="pref_servers">Серверы</string>
<string name="pref_addserver">Добавить новый сервер</string> <string name="pref_addserver">Добавить новый сервер</string>

1
app/src/main/res/values-sl/strings.xml

@ -219,7 +219,6 @@
<string name="widget_sortby">VRSTNI RED</string> <string name="widget_sortby">VRSTNI RED</string>
<string name="widget_reversesortorder">Obratni vrstni red</string> <string name="widget_reversesortorder">Obratni vrstni red</string>
<string name="widget_showstatusview">Status strežnika namesto naziva</string> <string name="widget_showstatusview">Status strežnika namesto naziva</string>
<string name="widget_usedarktheme">Uporabi temno temo (ni predogleda)</string>
<string name="widget_done">OPRAVLJENO</string> <string name="widget_done">OPRAVLJENO</string>
<string name="pref_servers">Strežniki</string> <string name="pref_servers">Strežniki</string>
<string name="pref_addserver">Dodaj nov strežnik</string> <string name="pref_addserver">Dodaj nov strežnik</string>

1
app/src/main/res/values-sv/strings.xml

@ -203,7 +203,6 @@
<string name="widget_sortby">SÖKORDNING</string> <string name="widget_sortby">SÖKORDNING</string>
<string name="widget_reversesortorder">Omvänd sökordning</string> <string name="widget_reversesortorder">Omvänd sökordning</string>
<string name="widget_showstatusview">Serverstatus iställer för titel</string> <string name="widget_showstatusview">Serverstatus iställer för titel</string>
<string name="widget_usedarktheme">Använd mörkt tema (ingen förhandsvisning)</string>
<string name="widget_done">FÄRDIG</string> <string name="widget_done">FÄRDIG</string>
<string name="pref_servers">Servrar</string> <string name="pref_servers">Servrar</string>
<string name="pref_addserver">Lägg til ny server</string> <string name="pref_addserver">Lägg til ny server</string>

1
app/src/main/res/values-tr/strings.xml

@ -202,7 +202,6 @@
<string name="widget_sortby">SIRALAMA DÜZENİ</string> <string name="widget_sortby">SIRALAMA DÜZENİ</string>
<string name="widget_reversesortorder">Ters sıralama düzeni</string> <string name="widget_reversesortorder">Ters sıralama düzeni</string>
<string name="widget_showstatusview">Başlık yerine sunucu durumu</string> <string name="widget_showstatusview">Başlık yerine sunucu durumu</string>
<string name="widget_usedarktheme">Karanlık temayı kullanın (önizleme yok)</string>
<string name="widget_done">BİTTİ</string> <string name="widget_done">BİTTİ</string>
<string name="pref_servers">Sunucular</string> <string name="pref_servers">Sunucular</string>
<string name="pref_addserver">Yeni sunucu ekle</string> <string name="pref_addserver">Yeni sunucu ekle</string>

10
app/src/main/res/values-v21/styles.xml

@ -16,16 +16,6 @@
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="TransdroidTheme" parent="Theme.Transdroid.Light">
<item name="drawer_background">@color/background_light</item>
<item name="activatable_background">@drawable/activatable_background</item>
</style>
<style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Dark">
<item name="drawer_background">@color/background_dark</item>
<item name="activatable_background">@drawable/activatable_background</item>
</style>
<style name="DefaultToolbar"> <style name="DefaultToolbar">
<item name="android:background">?attr/colorPrimary</item> <item name="android:background">?attr/colorPrimary</item>
<item name="android:elevation">3dp</item> <item name="android:elevation">3dp</item>

1
app/src/main/res/values-zh-rCN/strings.xml

@ -179,7 +179,6 @@
<string name="widget_sortby">排序顺序</string> <string name="widget_sortby">排序顺序</string>
<string name="widget_reversesortorder">反向排序</string> <string name="widget_reversesortorder">反向排序</string>
<string name="widget_showstatusview">服务器状态而不是标题</string> <string name="widget_showstatusview">服务器状态而不是标题</string>
<string name="widget_usedarktheme">使用暗色主题(无预览)</string>
<string name="widget_done">完成</string> <string name="widget_done">完成</string>
<string name="pref_servers">服务器</string> <string name="pref_servers">服务器</string>
<string name="pref_addserver">添加服务器</string> <string name="pref_addserver">添加服务器</string>

10
app/src/main/res/values/colors_transdroid_light.xml → app/src/main/res/values/colors_transdroid.xml

@ -18,9 +18,9 @@
--> -->
<resources> <resources>
<color name="pressed_transdroid_light">#CC8ACC12</color> <color name="transdroid_pressed">#CC8ACC12</color>
<color name="divider_light">#bdbdbd</color> <color name="transdroid_divider">#bdbdbd</color>
<color name="background_light">#fff</color> <color name="transdroid_background">#fff</color>
<color name="text_bright_light">#000</color> <color name="transdroid_text_bright">#000</color>
<color name="text_actionbar_light">#000</color> <color name="transdroid_text_actionbar">#fff</color>
</resources> </resources>

3
app/src/main/res/values/strings.xml

@ -233,7 +233,6 @@
<string name="widget_sortby">SORT ORDER</string> <string name="widget_sortby">SORT ORDER</string>
<string name="widget_reversesortorder">Reversed sort order</string> <string name="widget_reversesortorder">Reversed sort order</string>
<string name="widget_showstatusview">Server status instead of title</string> <string name="widget_showstatusview">Server status instead of title</string>
<string name="widget_usedarktheme">Use dark theme (no preview)</string>
<string name="widget_done">DONE</string> <string name="widget_done">DONE</string>
<string name="pref_servers">Servers</string> <string name="pref_servers">Servers</string>
@ -347,6 +346,8 @@
<string name="pref_dormantasinactive_info">Torrents at 0KB/s (no data transfer) will be filtered as being inactive</string> <string name="pref_dormantasinactive_info">Torrents at 0KB/s (no data transfer) will be filtered as being inactive</string>
<string name="pref_checkupdates">Check for updates</string> <string name="pref_checkupdates">Check for updates</string>
<string name="pref_checkupdates_info">Check transdroid.org for latest app version</string> <string name="pref_checkupdates_info">Check transdroid.org for latest app version</string>
<string name="pref_autodarktheme">Auto night mode</string>
<string name="pref_autodarktheme_info">Automatically choose between light or dark theme</string>
<string name="pref_usedarktheme">Use dark UI theme</string> <string name="pref_usedarktheme">Use dark UI theme</string>
<string name="pref_usedarktheme_info">Requires a restart to take effect</string> <string name="pref_usedarktheme_info">Requires a restart to take effect</string>
<string name="pref_clearsearch">Clear search history</string> <string name="pref_clearsearch">Clear search history</string>

8
app/src/main/res/values/styles.xml

@ -16,14 +16,10 @@
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="TransdroidTheme" parent="Theme.Transdroid.Light"> <style name="TransdroidTheme" parent="Theme.Transdroid.Auto">
<item name="drawer_background">@color/background_light</item>
<item name="activatable_background">@drawable/activatable_background</item>
</style> </style>
<style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Dark"> <style name="TransdroidTheme.Dark" parent="Theme.Transdroid.Auto">
<item name="drawer_background">@color/background_dark</item>
<item name="activatable_background">@drawable/activatable_background</item>
</style> </style>
<!-- No theme background to let the user's wall paper shine through --> <!-- No theme background to let the user's wall paper shine through -->

15
app/src/main/res/values/styles_transdroid_light.xml → app/src/main/res/values/styles_transdroid.xml

@ -19,18 +19,21 @@
<resources> <resources>
<style name="Theme.Transdroid.Light" parent="Theme.AppCompat.Light.NoActionBar"> <style name="Theme.Transdroid.Auto" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="drawer_background">@color/transdroid_background</item>
<item name="activatable_background">@drawable/activatable_background</item>
<item name="colorPrimary">@color/green</item> <item name="colorPrimary">@color/green</item>
<item name="colorPrimaryDark">@color/green_dark</item> <item name="colorPrimaryDark">@color/green_dark</item>
<item name="colorControlHighlight">@color/green_light</item> <item name="colorControlHighlight">@color/green_light</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">@color/grey</item> <item name="actionModeBackground">@color/grey</item>
<item name="android:textViewStyle">@style/DefaultTextView</item> <item name="android:textViewStyle">@style/DefaultTextView</item>
<item name="android:windowBackground">@color/background_light</item> <item name="android:windowBackground">@color/transdroid_background</item>
<item name="loading_progress">@drawable/loading_progress_light</item> <item name="loading_progress">@drawable/loading_progress</item>
<item name="text_bright">@color/text_bright_light</item> <item name="text_bright">@color/transdroid_text_bright</item>
<item name="text_actionbar">@color/text_actionbar_dark</item> <item name="text_actionbar">@color/transdroid_text_actionbar</item>
<item name="text_actionbar_secondary">@color/text_actionbar_light</item> <item name="text_actionbar_secondary">@color/transdroid_text_actionbar</item>
</style> </style>
</resources> </resources>

4
app/src/main/res/xml/listwidget_info.xml

@ -17,8 +17,8 @@
--> -->
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:configure="org.transdroid.core.widget.ListWidgetConfigActivity_" android:configure="org.transdroid.core.widget.ListWidgetConfigActivity_"
android:initialKeyguardLayout="@layout/widget_torrents_light" android:initialKeyguardLayout="@layout/widget_torrents"
android:initialLayout="@layout/widget_torrents_light" android:initialLayout="@layout/widget_torrents"
android:minHeight="110dip" android:minHeight="110dip"
android:minResizeHeight="40dip" android:minResizeHeight="40dip"
android:minResizeWidth="110dp" android:minResizeWidth="110dp"

8
app/src/main/res/xml/pref_system.xml

@ -31,8 +31,16 @@
android:entryValues="@array/pref_autorefresh_intervalvalues" android:entryValues="@array/pref_autorefresh_intervalvalues"
android:defaultValue="0" /> android:defaultValue="0" />
<CheckBoxPreference
android:key="system_autodarktheme"
android:title="@string/pref_autodarktheme"
android:summary="@string/pref_autodarktheme_info"
android:disableDependentsState="true"
android:defaultValue="true" />
<CheckBoxPreference <CheckBoxPreference
android:key="system_usedarktheme" android:key="system_usedarktheme"
android:dependency="system_autodarktheme"
android:title="@string/pref_usedarktheme" android:title="@string/pref_usedarktheme"
android:summary="@string/pref_usedarktheme_info" android:summary="@string/pref_usedarktheme_info"
android:defaultValue="false" /> android:defaultValue="false" />

Loading…
Cancel
Save