Browse Source

Revert "- removed darktheme_check_box from widget config - removed widget_usedarktheme string"

This reverts commit f109a49a
pull/565/head
Eric Kok 4 years ago
parent
commit
9aa13d0b0d
  1. 8
      app/src/main/java/org/transdroid/core/widget/ListWidgetConfig.java
  2. 5
      app/src/main/java/org/transdroid/core/widget/ListWidgetConfigActivity.java
  3. 8
      app/src/main/res/layout/activity_widgetconfig.xml
  4. 1
      app/src/main/res/values-bg/strings.xml
  5. 1
      app/src/main/res/values-cs/strings.xml
  6. 1
      app/src/main/res/values-da/strings.xml
  7. 1
      app/src/main/res/values-de/strings.xml
  8. 1
      app/src/main/res/values-es/strings.xml
  9. 1
      app/src/main/res/values-fa/strings.xml
  10. 1
      app/src/main/res/values-fr/strings.xml
  11. 1
      app/src/main/res/values-he/strings.xml
  12. 1
      app/src/main/res/values-hu/strings.xml
  13. 1
      app/src/main/res/values-it/strings.xml
  14. 1
      app/src/main/res/values-ja/strings.xml
  15. 1
      app/src/main/res/values-ko/strings.xml
  16. 1
      app/src/main/res/values-nl/strings.xml
  17. 1
      app/src/main/res/values-pl/strings.xml
  18. 1
      app/src/main/res/values-pt-rBR/strings.xml
  19. 1
      app/src/main/res/values-pt/strings.xml
  20. 1
      app/src/main/res/values-ru/strings.xml
  21. 1
      app/src/main/res/values-sl/strings.xml
  22. 1
      app/src/main/res/values-sv/strings.xml
  23. 1
      app/src/main/res/values-tr/strings.xml
  24. 1
      app/src/main/res/values-zh-rCN/strings.xml
  25. 3
      app/src/main/res/values/strings.xml

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

@ -30,14 +30,16 @@ public class ListWidgetConfig { @@ -30,14 +30,16 @@ public class ListWidgetConfig {
private final TorrentsSortBy sortBy;
private final boolean reserveSort;
private final boolean showStatusView;
private final boolean useDarkTheme;
public ListWidgetConfig(int serverId, StatusType statusType, TorrentsSortBy sortBy, boolean reverseSort,
boolean showStatusView) {
boolean showStatusView, boolean useDarkTheme) {
this.serverId = serverId;
this.statusType = statusType;
this.sortBy = sortBy;
this.reserveSort = reverseSort;
this.showStatusView = showStatusView;
this.useDarkTheme = useDarkTheme;
}
public int getServerId() {
@ -60,4 +62,8 @@ public class ListWidgetConfig { @@ -60,4 +62,8 @@ public class ListWidgetConfig {
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 { @@ -73,7 +73,7 @@ public class ListWidgetConfigActivity extends AppCompatActivity {
@ViewById
protected Spinner serverSpinner, filterSpinner, sortSpinner;
@ViewById
protected CheckBox reverseorderCheckBox, showstatusCheckBox;
protected CheckBox reverseorderCheckBox, showstatusCheckBox, darkthemeCheckBox;
@ViewById
protected TextView filterText, serverText, errorText;
@ViewById
@ -127,7 +127,8 @@ public class ListWidgetConfigActivity extends AppCompatActivity { @@ -127,7 +127,8 @@ public class ListWidgetConfigActivity extends AppCompatActivity {
TorrentsSortBy sortBy = ((SortByListItem) sortSpinner.getSelectedItem()).getSortBy();
boolean reverseSort = reverseorderCheckBox.isChecked();
boolean showstatus = showstatusCheckBox.isChecked();
ListWidgetConfig config = new ListWidgetConfig(server, statusType, sortBy, reverseSort, showstatus);
boolean useDarkTheme = darkthemeCheckBox.isChecked();
ListWidgetConfig config = new ListWidgetConfig(server, statusType, sortBy, reverseSort, showstatus, useDarkTheme);
applicationSettings.setWidgetConfig(appWidgetId, config);
// Return the widget configuration result

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

@ -99,6 +99,14 @@ @@ -99,6 +99,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half"
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>
</ScrollView>

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

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

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

@ -171,6 +171,7 @@ @@ -171,6 +171,7 @@
<string name="widget_sortby">SEŘADIT VÝSLEDKY</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_usedarktheme">Použít tmavé téma (není náhled)</string>
<string name="widget_done">HOTOVO</string>
<string name="pref_servers">Servery</string>
<string name="pref_addserver">Přidat nový server</string>

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

@ -187,6 +187,7 @@ @@ -187,6 +187,7 @@
<string name="widget_sortby">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_usedarktheme">Brug mørkt tema (ingen preview)</string>
<string name="widget_done">FÆRDIG</string>
<string name="pref_servers">Servere</string>
<string name="pref_addserver">Tilføj ny server</string>

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

@ -203,6 +203,7 @@ @@ -203,6 +203,7 @@
<string name="widget_sortby">SORTIERREIHENFOLGE</string>
<string name="widget_reversesortorder">Umgekehrte Sortierreihenfolge</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="pref_servers">Server</string>
<string name="pref_addserver">Neuen Server hinzufügen</string>

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

@ -156,6 +156,7 @@ @@ -156,6 +156,7 @@
<string name="widget_sortby">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_usedarktheme">Usar tema oscuro (sin vista previa)</string>
<string name="widget_done">HECHO</string>
<string name="pref_servers">Servidores</string>
<string name="pref_addserver">Añadir nuevo servidor</string>

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

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

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

@ -187,6 +187,7 @@ @@ -187,6 +187,7 @@
<string name="widget_sortby">ORDRE DE TRI</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_usedarktheme">Utilisez thème sombre (pas d\'aperçu)</string>
<string name="widget_done">FINI</string>
<string name="pref_servers">Serveurs</string>
<string name="pref_addserver">Ajouter un nouveau serveur</string>

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

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

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

@ -203,6 +203,7 @@ @@ -203,6 +203,7 @@
<string name="widget_sortby">RENDEZÉSI 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_usedarktheme">Sötét téma használata (nincs előnézet)</string>
<string name="widget_done">KÉSZ</string>
<string name="pref_servers">Szerverek</string>
<string name="pref_addserver">Új szerver hozzáadása</string>

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

@ -203,6 +203,7 @@ @@ -203,6 +203,7 @@
<string name="widget_sortby">TIPO ORDINAMENTO</string>
<string name="widget_reversesortorder">Inverti ordinamento</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="pref_servers">Server</string>
<string name="pref_addserver">Aggiungi nuovo server</string>

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

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

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

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

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

@ -199,6 +199,7 @@ @@ -199,6 +199,7 @@
<string name="widget_sortby">SORTEERVOLGORDE</string>
<string name="widget_reversesortorder">Omgekeerde sorteervolgorde</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="pref_servers">Servers</string>
<string name="pref_addserver">Nieuwe server toevoegen</string>

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

@ -171,6 +171,7 @@ @@ -171,6 +171,7 @@
<string name="widget_sortby">SORTOWANIE</string>
<string name="widget_reversesortorder">Odwrócony porządek sortowania</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="pref_servers">Serwery</string>
<string name="pref_addserver">Dodaj nowy serwer</string>

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

@ -203,6 +203,7 @@ @@ -203,6 +203,7 @@
<string name="widget_sortby">Ordem de classificação</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_usedarktheme">Usar tema escuro (sem visualização)</string>
<string name="widget_done">Concluído</string>
<string name="pref_servers">Servidores</string>
<string name="pref_addserver">Adicionar novo servidor</string>

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

@ -203,6 +203,7 @@ @@ -203,6 +203,7 @@
<string name="widget_sortby">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_usedarktheme">Usar o tema escuro (sem antevisão)</string>
<string name="widget_done">FEITO</string>
<string name="pref_servers">Servidores</string>
<string name="pref_addserver">Adicionar novo servidor</string>

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

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

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

@ -219,6 +219,7 @@ @@ -219,6 +219,7 @@
<string name="widget_sortby">VRSTNI RED</string>
<string name="widget_reversesortorder">Obratni vrstni red</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="pref_servers">Strežniki</string>
<string name="pref_addserver">Dodaj nov strežnik</string>

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

@ -203,6 +203,7 @@ @@ -203,6 +203,7 @@
<string name="widget_sortby">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_usedarktheme">Använd mörkt tema (ingen förhandsvisning)</string>
<string name="widget_done">FÄRDIG</string>
<string name="pref_servers">Servrar</string>
<string name="pref_addserver">Lägg til ny server</string>

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

@ -202,6 +202,7 @@ @@ -202,6 +202,7 @@
<string name="widget_sortby">SIRALAMA DÜZENİ</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_usedarktheme">Karanlık temayı kullanın (önizleme yok)</string>
<string name="widget_done">BİTTİ</string>
<string name="pref_servers">Sunucular</string>
<string name="pref_addserver">Yeni sunucu ekle</string>

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

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

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

@ -235,6 +235,7 @@ @@ -235,6 +235,7 @@
<string name="widget_sortby">SORT ORDER</string>
<string name="widget_reversesortorder">Reversed sort order</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="pref_servers">Servers</string>
@ -356,13 +357,11 @@ @@ -356,13 +357,11 @@
<string name="pref_clearsearch_success">Search history is cleared</string>
<string name="pref_import">Import settings</string>
<string name="pref_import_dialog">%1$s will try to import server, web search, RSS and system settings from: %2$s</string>
<string name="pref_import_dialog_android10">%1$s will try to import server, web search, RSS and system settings</string>
<string name="pref_import_fromfile">Use file</string>
<string name="pref_import_fromqr">Use QR code</string>
<string name="pref_import_success">Settings successfully imported</string>
<string name="pref_export">Export settings</string>
<string name="pref_export_dialog">%1$s will export server (including passwords), web search, RSS and system settings to the following plain text JSON file: %2$s</string>
<string name="pref_export_dialog_android10">%1$s will export server (including passwords), web search, RSS and system settings</string>
<string name="pref_export_tofile">To file</string>
<string name="pref_export_toqr">To QR code</string>
<string name="pref_export_success">Settings successfully exported</string>

Loading…
Cancel
Save