Merge branch 'dev'

d4rken-org · Nov 9, 2018 · 8f4db49 · 8f4db49
2 parents a586fbb + f04d63b
commit 8f4db49
Show file tree

Hide file tree

Showing 8 changed files with 185 additions and 56 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ def gitSha() {
 def packageName = "subreddit.android.appstore"
 
 android {
- def signingPropFile = new File(System.properties['user.home'], ".signing/${packageName}/signing.properties")
+ def signingPropFile = new File(System.properties['user.home'], ".appconfig/${packageName}/signing.properties")
  if (signingPropFile.canRead()) {
  Properties signingProps = new Properties()
  signingProps.load(new FileInputStream(signingPropFile))
@@ -29,19 +29,19 @@ android {
  }
  }
 
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
+ buildToolsVersion '28.0.3'
 
  def versionMajor = 0
  def versionMinor = 9
- def versionPatch = 0
+ def versionPatch = 1
  def versionBuild = 0
 
 
  defaultConfig {
  applicationId "${packageName}"
  minSdkVersion 16
- targetSdkVersion 27
+ targetSdkVersion 28
  versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
  versionName "${versionMajor}.${versionMinor}.${versionPatch}"
  }
@@ -84,7 +84,7 @@ android {
 
  // Remove mockRelease as it's not needed.
  android.variantFilter { variant ->
- if (variant.buildType.name.equals('release') && variant.getFlavors().get(0).name.equals('mock')) {
+ if (variant.buildType.name == 'release' && variant.getFlavors().get(0).name == 'mock') {
  variant.setIgnore(true)
  }
  }
@@ -155,16 +155,21 @@ tasks.withType(Test) {
  systemProperty "robolectric.logging", "stdout"
 }
 ext {
- supportLibVersion = '27.1.1'
+ supportLibVersion = '28.0.0'
 }
 //noinspection GroovyAssignabilityCheck
-configurations.all {
- //noinspection GroovyAssignabilityCheck
- resolutionStrategy.force "com.android.support:recyclerview-v7:${supportLibVersion}"
- resolutionStrategy.force "com.android.support:support-annotations:${supportLibVersion}"
- resolutionStrategy.force "com.android.support:support-v4:${supportLibVersion}"
- resolutionStrategy.force "com.android.support:appcompat-v7:${supportLibVersion}"
- resolutionStrategy.force "com.android.support:design:${supportLibVersion}"
+configurations {
+ all {
+ //noinspection GroovyAssignabilityCheck
+// resolutionStrategy.force "com.android.support:recyclerview-v7:${supportLibVersion}"
+// resolutionStrategy.force "com.android.support:support-annotations:${supportLibVersion}"
+ resolutionStrategy.force "com.android.support:support-v4:${supportLibVersion}"
+// resolutionStrategy.force "com.android.support:appcompat-v7:${supportLibVersion}"
+// resolutionStrategy.force "com.android.support:design:${supportLibVersion}"
+ }
+ // https://stackoverflow.com/questions/49811851
+ cleanedAnnotations
+ compile.exclude group: 'org.jetbrains' , module:'annotations'
 }
 dependencies {
  // Support libs
@@ -198,21 +203,21 @@ dependencies {
 
  // RX
  implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
- implementation 'io.reactivex.rxjava2:rxjava:2.1.16'
+ implementation 'io.reactivex.rxjava2:rxjava:2.1.17'
 
  // Gson
- implementation 'com.google.code.gson:gson:2.8.0'
+ implementation 'com.google.code.gson:gson:2.8.2'
 
  //Dagger
- implementation 'com.google.dagger:dagger:2.13'
- annotationProcessor "com.google.dagger:dagger-compiler:2.13"
+ implementation 'com.google.dagger:dagger:2.16'
+ annotationProcessor "com.google.dagger:dagger-compiler:2.16"
 
  //Butterknife
  implementation 'com.jakewharton:butterknife:8.8.1'
  annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
  // Timber
- implementation 'com.jakewharton.timber:timber:4.7.0'
+ implementation 'com.jakewharton.timber:timber:4.7.1'
 
  // Hamcrest
  testImplementation 'org.hamcrest:hamcrest-library:1.3'

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -9,9 +9,9 @@
  <string name="button_filter">Filter</string>
  <string name="button_refresh">Aktualisieren</string>
  <string name="button_search">Suchen</string>
- <string name="data_option_loadmedia_summary">Lade App-Icons und Bildschirmfotos</string>
- <string name="data_option_loadmedia_title">App-Icons &amp; Bildschirmfotos</string>
- <string name="data_options">Dateioptionen</string>
+ <string name="options_loadmedia_summary">Lade App-Icons und Bildschirmfotos</string>
+ <string name="options_loadmedia_title">App-Icons &amp; Bildschirmfotos</string>
+ <string name="options">Optionen</string>
  <string name="error">Fehler beim Herunterladen des Repositorys</string>
  <string name="fdroid">F-Droid</string>
  <string name="flag">App melden</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -30,10 +30,10 @@
  <string name="app_category_new">Nuovo</string>
  <string name="view_update">Mostra aggiornamenti</string>
  <string name="error">Errore nell\'ottenere il repository</string>
- <string name="data_options">Opzioni dei dati</string>
+ <string name="options">Opzioni dei dati</string>
  <string name="screenshots">Screenshot</string>
- <string name="data_option_loadmedia_title">Icone e schermate</string>
- <string name="data_option_loadmedia_summary">Carica icone e schermate delle app</string>
+ <string name="options_loadmedia_title">Icone e schermate</string>
+ <string name="options_loadmedia_summary">Carica icone e schermate delle app</string>
  <string name="update">Aggiornamento disponibile</string>
  <string name="update_error">Errore nel controllo degli aggiornamenti</string>
  <string name="update_confirm">Aggiorna</string>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,51 @@
+<resources>
+ <string name="app_name">Sklep /r/Android</string>
+ <string name="button_refresh">Odśwież</string>
+ <string name="button_filter">Filtruj</string>
+ <string name="button_search">Wyszukaj</string>
+ <string name="screen_details">Szczegóły</string>
+ <string name="button_contact">Skontaktuj się z deweloperem</string>
+ <string name="button_download">Pobierz</string>
+ <string name="gplay">Google Play</string>
+ <string name="fdroid">F-Droid</string>
+ <string name="website">Strona</string>
+ <string name="mail">E-Mail</string>
+ <string name="reddit">Reddit</string>
+ <string name="twitter">Twitter</string>
+ <string name="instagram">Instagram</string>
+ <string name="hint_type_to_filter">Wpisz, by filtrować</string>
+ <string name="button_about">O programie</string>
+ <string name="text_contributors">Kontrybutorzy</string>
+ <string name="licenses">Licencje</string>
+ <string name="version">Wersja</string>
+ <string name="bugreport">Zgłoś błąd</string>
+ <string name="settings">Ustawienia</string>
+ <string name="more">Więcej</string>
+ <string name="appearance">Wygląd</string>
+ <string name="preference_theme">Motyw</string>
+ <string name="preference_theme_desc">Używany motyw</string>
+ <string name="restart">Zmiana motywu wymaga restartu</string>
+ <string name="later">Później</string>
+ <string name="app_category_everything">Wszystko</string>
+ <string name="app_category_new">Nowe</string>
+ <string name="view_update">Widok</string>
+ <string name="error">Błąd przy pobieraniu repozytorium</string>
+ <string name="options">Opcje</string>
+ <string name="screenshots">Zrzuty ekranu</string>
+ <string name="options_loadmedia_title">Ikony i zrzuty ekranu</string>
+ <string name="options_loadmedia_summary">Załaduj ikony aplikacji i zrzuty ekranu</string>
+ <string name="options_savetagfilters_title">Zapisz wybrane tagi filtrów</string>
+ <string name="options_savetagfilters_summary">Zawsze filtruj według tych samych tagów</string>
+ <string name="update">Dostępna aktualizacja</string>
+ <string name="update_error">Błąd przy sprawdzaniu aktualizacji</string>
+ <string name="update_confirm">Aktualizacja</string>
+ <string name="cancel">Anuluj</string>
+ <string name="flag">Zgłoś aplikację</string>
+ <string name="no_message">Wpisz wiadomość</string>
+ <string name="no_email_client">Brak klienta e-mail</string>
+ <string name="flag_text">Opisz, dlaczego zgłaszasz tą aplikację. Zostaniesz przekierowany do reddit, by wysłać wiadomość do moderatorów r/Android</string>
+ <string name="error_contributors">Wystąpił błąd przy pobieraniu kontrybutorów.</string>
+ <string name="build_from_fdroid">Uwaga: Jeżeli pobrałeś tą aplikację z F-Droid, link pobierania będzie wymagał reinstalacji.</string>
+ <string name="no_download_client">Brak klienta dla tego pobrania</string>
+ <string name="submitapp">Zaproponuj aplikację</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -1,43 +1,51 @@
 <resources>
- <string name="app_category_everything">Всё</string>
  <string name="app_name">/r/Android App store</string>
- <string name="appearance">Вид</string>
- <string name="bugreport">Сообщить об ошибке</string>
- <string name="button_about">О программе</string>
- <string name="button_contact">Контакты</string>
- <string name="button_download">Загрузить</string>
- <string name="button_filter">Фильтр</string>
  <string name="button_refresh">Обновить</string>
+ <string name="button_filter">Фильтр</string>
  <string name="button_search">Поиск</string>
- <string name="data_option_loadmedia_summary">Загрузить иконки и скриншоты приложения</string>
- <string name="data_option_loadmedia_title">Иконки и скриншоты</string>
- <string name="data_options">Настройки передачи данных</string>
- <string name="error">Ошибка при получении данных репозитория</string>
- <string name="fdroid">F-Droid</string>
- <string name="flag">Пометить приложение</string>
- <string name="flag_text">Пожалуйста, опишите почему вы пометили это приложение. Вы будете перенаправлены на Reddit чтобы отправить личное сообщение модераторам r/Android</string>
+ <string name="screen_details">Подробнее</string>
+ <string name="button_contact">Контакты</string>
+ <string name="button_download">Загрузить</string>
  <string name="gplay">Google Play</string>
- <string name="hint_type_to_filter">Напишите для фильтрации</string>
+ <string name="fdroid">F-Droid</string>
+ <string name="website">Веб-сайт</string>
+ <string name="mail">Электронная почта</string>
+ <string name="reddit">Reddit</string>
+ <string name="twitter">Twitter</string>
  <string name="instagram">Instagram</string>
- <string name="later">Позже</string>
+ <string name="hint_type_to_filter">Напишите для фильтрации</string>
+ <string name="button_about">О программе</string>
+ <string name="text_contributors">Внёсшие вклад</string>
  <string name="licenses">Лицензии</string>
- <string name="mail">Электронная почта</string>
+ <string name="version">Версия</string>
+ <string name="bugreport">Сообщить об ошибке</string>
+ <string name="settings">Настройки</string>
  <string name="more">Больше</string>
- <string name="no_message">Пожалуйста, введите сообщение</string>
+ <string name="appearance">Вид</string>
  <string name="preference_theme">Тема</string>
  <string name="preference_theme_desc">Используемая тема</string>
- <string name="reddit">Reddit</string>
  <string name="restart">Для применения темы нужен перезапуск приложения</string>
- <string name="screen_details">Подробнее</string>
+ <string name="later">Позже</string>
+ <string name="app_category_everything">Всё</string>
+ <string name="app_category_new">New</string>
+ <string name="view_update">View</string>
+ <string name="error">Ошибка при получении данных репозитория</string>
+ <string name="options">Options</string>
  <string name="screenshots">Скриншоты</string>
- <string name="settings">Настройки</string>
- <string name="text_contributors">Внёсшие вклад</string>
- <string name="twitter">Twitter</string>
+ <string name="options_loadmedia_title">Icons &amp; screenshots</string>
+ <string name="options_loadmedia_summary">Load app icons and screenshots</string>
+ <string name="options_savetagfilters_title">Save selected Tag filters</string>
+ <string name="options_savetagfilters_summary">Filter by the same selected Tags every time</string>
  <string name="update">Доступно обновление</string>
+ <string name="update_error">Error checking for updates</string>
  <string name="update_confirm">Обновить</string>
- <string name="version">Версия</string>
- <string name="website">Веб-сайт</string>
- <string name="app_category_new">Новое</string>
+ <string name="cancel">Cancel</string>
+ <string name="flag">Пометить приложение</string>
+ <string name="no_message">Пожалуйста, введите сообщение</string>
  <string name="no_email_client">Отсутствует почтовый клиент</string>
+ <string name="flag_text">Пожалуйста, опишите почему вы пометили это приложение. Вы будете перенаправлены на Reddit чтобы отправить личное сообщение модераторам r/Android</string>
+ <string name="error_contributors">There was a problem fetching contributors.</string>
+ <string name="build_from_fdroid">sbtis</string>
+ <string name="no_download_client">No client available for this download</string>
  <string name="submitapp">Отправить приложение</string>
-</resources>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,65 @@
+<resources>
+ <string name="app_name">/r/Android App store</string>
+ <string name="button_refresh">Yenile</string>
+ <string name="button_filter">Filtre</string>
+ <string name="button_search">Ara</string>
+ <string name="screen_details">Ayrıntılar</string>
+ <string name="button_contact">Geliştirici ile iletişime geç</string>
+ <string name="button_download">İndir</string>
+ <string name="gplay">Google Play</string>
+ <string name="fdroid">F-Droid</string>
+ <string name="website">Websitesi</string>
+ <string name="mail">E-Mail</string>
+ <string name="reddit">Reddit</string>
+ <string name="twitter">Twitter</string>
+ <string name="instagram">Instagram</string>
+ <string name="hint_type_to_filter">Filtreleri yazınız</string>
+ <string name="button_about">Hakkında</string>
+ <string name="text_contributors">Katkıda bulunanlar</string>
+ <string name="licenses">Lisanslar</string>
+ <string name="version">Versiyon</string>
+ <string name="bugreport">Hata bildir</string>
+ <string name="settings">Ayarlar</string>
+ <string name="more">Daha fazla</string>
+ <string name="appearance">Görünüm</string>
+ <string name="preference_theme">Tema</string>
+ <string name="preference_theme_desc">Kullanılacak tema</string>
+ <string name="restart">Temanın aktif olması için yeniden başlatma gereklidir</string>
+ <string name="later">Sonra</string>
+ <string name="app_category_everything">Tümü</string>
+ <string name="app_category_new">Yeni</string>
+ <string name="view_update">Görüntüle</string>
+ <string name="error">Repo alınırken hata oluştu</string>
+ <string name="options">Seçenkler</string>
+ <string name="screenshots">Ekran alıntısı</string>
+ <string name="options_loadmedia_title"><![CDATA[İkonlar & Ekran alıntısı]]></string>
+ <string name="options_loadmedia_summary">Uygulama ikonlarını ve ekran alıntılarını yükle</string>
+ <string name="options_savetagfilters_title">Seçili etiket filtrelerini kaydet</string>
+ <string name="options_savetagfilters_summary">Aygnı etiketleri her zaman filtrele</string>
+ <string name="update">Güncelleme mevcut</string>
+ <string name="update_error">Güncellemeler kontrol edilirken hata oluştu</string>
+ <string name="update_confirm">Güncelle</string>
+ <string name="cancel">Vazgeç</string>
+ <string name="flag">Uygulamayı bildir</string>
+ <string name="no_message">Lütfen bir mesaj giriniz</string>
+ <string name="no_email_client">Kullanılabilir bir email istemcisi yok</string>
+ <string name="flag_text">Lütfen bu uygulamayı neden bildirdiğinizi açıklayınız. r/Android moderatör ekibine özel mesaj göndermek için Reddit\'e yönlendiriliceksiniz</string>
+ <string name="error_contributors">Katkıda bulunanlar alınırken hata oluştu.</string>
+ <string name="build_from_fdroid">Not: Eğer bu uygulamayı F-Droid\'den indirdiyseniz, indirme linki yeniden yükleme gerektirmektedir.</string>
+ <plurals name="x_items">
+ <item quantity="one">%s öğe</item>
+ <item quantity="other">%s öğeler</item>
+ </plurals>
+ <string-array name="themes">
+ <item>Açık</item>
+ <item>Koyu</item>
+ <item>AMOLED</item>
+ </string-array>
+ <string-array name="themesValues">
+ <item>0</item>
+ <item>1</item>
+ <item>2</item>
+ </string-array>
+ <string name="no_download_client">Bu indirme için herhangi bir istemci bulunmamakta</string>
+ <string name="submitapp">Bir uygulama gönder</string>
+</resources>
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.1.3'
- classpath "io.realm:realm-gradle-plugin:3.1.2"
+ classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath "io.realm:realm-gradle-plugin:5.1.0"
  classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
  }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jul 27 16:48:48 CEST 2018
+#Fri Nov 09 19:26:20 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip