Various bug fixes.

This commit is contained in:
NerdNumber9
2017-01-06 20:57:50 -05:00
parent 2b988c51ad
commit 606de03c7c
7 changed files with 59 additions and 6 deletions
@@ -143,6 +143,10 @@ class MainActivity : BaseActivity() {
nav_view.post { recreate() }
} else if (resultCode and SettingsActivity.FLAG_LANG_CHANGED != 0) {
nav_view.post { recreate() }
} else if (resultCode and SettingsActivity.FLAG_EH_RECREATE != 0) {
TaskStackBuilder.create(this)
.addNextIntent(Intent(this, MainActivity::class.java))
.startActivities()
}
} else {
super.onActivityResult(requestCode, resultCode, data)
@@ -80,6 +80,7 @@ class SettingsActivity : BaseActivity(),
const val FLAG_THEME_CHANGED = 0x1
const val FLAG_DATABASE_CLEARED = 0x2
const val FLAG_LANG_CHANGED = 0x4
const val FLAG_EH_RECREATE = 0x8
}
}
@@ -35,6 +35,10 @@ class SettingsEhFragment : SettingsFragment() {
findPreference("ex_migrate_library") as Preference
}
val useJpTitlePref by lazy {
findPreference("use_jp_title") as SwitchPreference
}
override fun onViewCreated(view: View, savedState: Bundle?) {
super.onViewCreated(view, savedState)
@@ -46,6 +50,7 @@ class SettingsEhFragment : SettingsFragment() {
enableExhentaiPref.setOnPreferenceChangeListener { preference, newVal ->
newVal as Boolean
(activity as SettingsActivity).parentFlags = SettingsActivity.FLAG_EH_RECREATE
if(!newVal) {
preferences.enableExhentai().set(false)
true
@@ -59,5 +64,10 @@ class SettingsEhFragment : SettingsFragment() {
MetadataFetchDialog().askMigration(activity)
true
}
useJpTitlePref.setOnPreferenceChangeListener { preference, any ->
(activity as SettingsActivity).parentFlags = SettingsActivity.FLAG_EH_RECREATE
true
}
}
}
@@ -1,10 +1,13 @@
package exh.metadata
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.util.UrlUtil
import exh.metadata.models.ExGalleryMetadata
import exh.metadata.models.Tag
import exh.plusAssign
import uy.kohesive.injekt.injectLazy
import java.text.SimpleDateFormat
import java.util.*
@@ -23,6 +26,8 @@ private val ONGOING_SUFFIX = arrayOf(
val EX_DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US)
private val prefs: PreferencesHelper by injectLazy()
fun ExGalleryMetadata.copyTo(manga: Manga) {
exh?.let {
manga.source = if(it)
@@ -32,7 +37,12 @@ fun ExGalleryMetadata.copyTo(manga: Manga) {
}
url?.let { manga.url = it }
thumbnailUrl?.let { manga.thumbnail_url = it }
title?.let { manga.title = it }
val titleObj = if(prefs.useJapaneseTitle().getOrDefault())
altTitle ?: title
else
title
titleObj?.let { manga.title = it }
//Set artist (if we can find one)
tags[ARTIST_NAMESPACE]?.let {