Merge branch 'SimpleMobileTools-master'
Fixed a conflict, ugh git please.
This commit is contained in:
Phoenix1747
commit
9259ee2d99
29 changed files with 33 additions and 1 deletions
|
|
@ -290,8 +290,9 @@ fun BaseSimpleActivity.checkWhatsNew(releases: List<Release>, currVersion: Int)
|
|||
val newReleases = arrayListOf<Release>()
|
||||
releases.filterTo(newReleases) { it.id > baseConfig.lastVersion }
|
||||
|
||||
if (newReleases.isNotEmpty())
|
||||
if (newReleases.isNotEmpty() && !baseConfig.avoidWhatsNew) {
|
||||
WhatsNewDialog(this, newReleases)
|
||||
}
|
||||
|
||||
baseConfig.lastVersion = currVersion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,4 +139,8 @@ open class BaseConfig(val context: Context) {
|
|||
var lastConflictResolution: Int
|
||||
get() = prefs.getInt(LAST_CONFLICT_RESOLUTION, CONFLICT_SKIP)
|
||||
set(lastConflictResolution) = prefs.edit().putInt(LAST_CONFLICT_RESOLUTION, lastConflictResolution).apply()
|
||||
|
||||
var avoidWhatsNew: Boolean
|
||||
get() = prefs.getBoolean(AVOID_WHATS_NEW, false)
|
||||
set(avoidWhatsNew) = prefs.edit().putBoolean(AVOID_WHATS_NEW, avoidWhatsNew).apply()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ const val SHOW_INFO_BUBBLE = "show_info_bubble"
|
|||
const val SORTING = "sorting"
|
||||
const val LAST_CONFLICT_RESOLUTION = "last_conflict_resolution"
|
||||
const val LAST_CONFLICT_APPLY_TO_ALL = "last_conflict_apply_to_all"
|
||||
const val AVOID_WHATS_NEW = "avoid_whats_new"
|
||||
|
||||
// licenses
|
||||
const val LICENSE_KOTLIN = 1
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@
|
|||
<string name="settings">Ajustaments</string>
|
||||
<string name="customize_colors">Canviar colors</string>
|
||||
<string name="use_english_language">Usar l’idioma Anglès</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Mostra elements ocults</string>
|
||||
<string name="font_size">Mida de la font</string>
|
||||
<string name="small">Petita</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Nastavení</string>
|
||||
<string name="customize_colors">Přizpůsobit barvy</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Zobrazit skryté položky</string>
|
||||
<string name="font_size">Font size</string>
|
||||
<string name="small">Small</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Indstillinger</string>
|
||||
<string name="customize_colors">Rediger farver</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Vis skjulte elementer</string>
|
||||
<string name="font_size">Skriftstørrelse</string>
|
||||
<string name="small">Lille</string>
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@
|
|||
<string name="settings">Ajustes</string>
|
||||
<string name="customize_colors">Cambiar colores</string>
|
||||
<string name="use_english_language">Usar el idioma Inglés</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Mostrar elementos ocultos</string>
|
||||
<string name="font_size">Tamaño de fuente</string>
|
||||
<string name="small">Pequeña</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Settings</string>
|
||||
<string name="customize_colors">Customize colors</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Font size</string>
|
||||
<string name="small">Small</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Paramètres</string>
|
||||
<string name="customize_colors">Personnaliser les couleurs</string>
|
||||
<string name="use_english_language">Utiliser l\'affichage en anglais</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Afficher les éléments cachés</string>
|
||||
<string name="font_size">Taille police</string>
|
||||
<string name="small">Petite</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Settings</string>
|
||||
<string name="customize_colors">Customize colors</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Font size</string>
|
||||
<string name="small">Small</string>
|
||||
|
|
|
|||
|
|
@ -233,6 +233,7 @@
|
|||
<string name="settings">Postavke</string>
|
||||
<string name="customize_colors">Prilagodi boje</string>
|
||||
<string name="use_english_language">Koristi Engleski jezik</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Veličina fonta</string>
|
||||
<string name="small">Malo</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Settings</string>
|
||||
<string name="customize_colors">Customize colors</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Betűméret</string>
|
||||
<string name="small">Kicsi</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Impostazioni</string>
|
||||
<string name="customize_colors">Personalizza i colori</string>
|
||||
<string name="use_english_language">Forza la lingua inglese</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Mostra gli elementi nascosti</string>
|
||||
<string name="font_size">Dimensione carattere</string>
|
||||
<string name="small">Piccolo</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">設定</string>
|
||||
<string name="customize_colors">表示色のカスタマイズ</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">メモのフォントサイズ</string>
|
||||
<string name="small">小</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">설정</string>
|
||||
<string name="customize_colors">앱 테마 및 색상 설정</string>
|
||||
<string name="use_english_language">영어 사용</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">숨김항목 활성화</string>
|
||||
<string name="font_size">폰트 크기</string>
|
||||
<string name="small">작게</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Nustatymai</string>
|
||||
<string name="customize_colors">Spalvø redagavimas</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Teksto dydis</string>
|
||||
<string name="small">Smulkus</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Innstillinger</string>
|
||||
<string name="customize_colors">Tilpass farger</string>
|
||||
<string name="use_english_language">Bruk engelsk språk</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Vis skjulte elementer</string>
|
||||
<string name="font_size">Skriftstørrelse</string>
|
||||
<string name="small">Liten</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Instellingen</string>
|
||||
<string name="customize_colors">Kleuren aanpassen</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Verborgen items tonen</string>
|
||||
<string name="font_size">Lettergrootte</string>
|
||||
<string name="small">Klein</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Innstillinger</string>
|
||||
<string name="customize_colors">Tilpass farger</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Skriftstørrelse</string>
|
||||
<string name="small">Liten</string>
|
||||
|
|
|
|||
|
|
@ -233,6 +233,7 @@
|
|||
<string name="settings">Ustawienia</string>
|
||||
<string name="customize_colors">Dostosuj kolory</string>
|
||||
<string name="use_english_language">Wymuś używanie przez aplikację języka angielskiego</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Pokazuj ukryte elementy</string>
|
||||
<string name="font_size">Rozmiar czcionki</string>
|
||||
<string name="small">Mała</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Configurações</string>
|
||||
<string name="customize_colors">Personalizar cores</string>
|
||||
<string name="use_english_language">Usar o idioma inglês</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Mostrar itens ocultos</string>
|
||||
<string name="font_size">Tamanho do texto</string>
|
||||
<string name="small">Pequeno</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Definições</string>
|
||||
<string name="customize_colors">Personalizar cores</string>
|
||||
<string name="use_english_language">Utilizar aplicação em inglês</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Mostrar itens ocultos</string>
|
||||
<string name="font_size">Tamanho do texto</string>
|
||||
<string name="small">Pequeno</string>
|
||||
|
|
|
|||
|
|
@ -232,6 +232,7 @@
|
|||
<string name="settings">Настройки</string>
|
||||
<string name="customize_colors">Настроить цвета</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Показывать скрытые папки</string>
|
||||
<string name="font_size">Размер шрифта</string>
|
||||
<string name="small">Мелкий</string>
|
||||
|
|
|
|||
|
|
@ -233,6 +233,7 @@
|
|||
<string name="settings">Nastavenia</string>
|
||||
<string name="customize_colors">Upraviť farby</string>
|
||||
<string name="use_english_language">Použiť angličtinu</string>
|
||||
<string name="avoid_whats_new">Nikdy nezobrazovať Novinky po aktualizovaní apky</string>
|
||||
<string name="show_hidden_items">Zobraziť skryté položky</string>
|
||||
<string name="font_size">Veľkosť písma</string>
|
||||
<string name="small">Malé</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Inställningar</string>
|
||||
<string name="customize_colors">Anpassa färger</string>
|
||||
<string name="use_english_language">Använd engelska</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Visa dolda objekt</string>
|
||||
<string name="font_size">Teckenstorlek</string>
|
||||
<string name="small">Liten</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Ayarlar</string>
|
||||
<string name="customize_colors">Renkleri özelleştir</string>
|
||||
<string name="use_english_language">İngilizce dilini kullan</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Gizli öğeleri göster</string>
|
||||
<string name="font_size">Yazı tipi boyutu</string>
|
||||
<string name="small">Küçük</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">设置</string>
|
||||
<string name="customize_colors">自定义颜色</string>
|
||||
<string name="use_english_language">强制使用英语语言</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">显示隐藏的项目</string>
|
||||
<string name="font_size">字体大小</string>
|
||||
<string name="small">小</string>
|
||||
|
|
|
|||
|
|
@ -228,6 +228,7 @@
|
|||
<string name="settings">設定</string>
|
||||
<string name="customize_colors">自訂顏色</string>
|
||||
<string name="use_english_language">使用英文語言</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">顯示隱藏的項目</string>
|
||||
<string name="font_size">字體大小</string>
|
||||
<string name="small">小</string>
|
||||
|
|
|
|||
|
|
@ -229,6 +229,7 @@
|
|||
<string name="settings">Settings</string>
|
||||
<string name="customize_colors">Customize colors</string>
|
||||
<string name="use_english_language">Use English language</string>
|
||||
<string name="avoid_whats_new">Avoid showing What\'s New on startup after app upgrade</string>
|
||||
<string name="show_hidden_items">Show hidden items</string>
|
||||
<string name="font_size">Font size</string>
|
||||
<string name="small">Small</string>
|
||||
|
|
|
|||
Loading…
Reference in a new issue