Small fixes

This commit is contained in:
tom5079
2019-05-16 19:40:44 +09:00
parent d090a59800
commit 234f9b069a
6 changed files with 8 additions and 11 deletions

View File

@@ -204,6 +204,8 @@ class ReaderActivity : AppCompatActivity() {
reader_fab_fullscreen.setOnClickListener { reader_fab_fullscreen.setOnClickListener {
isFullscreen = true isFullscreen = true
fullscreen(isFullscreen) fullscreen(isFullscreen)
reader_fab.close(true)
} }
} }

View File

@@ -6,16 +6,14 @@ import android.text.Editable
import android.text.TextWatcher import android.text.TextWatcher
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.MenuItem import android.view.MenuItem
import android.view.View
import android.view.WindowManager import android.view.WindowManager
import android.widget.AdapterView
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.preference.Preference import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat import androidx.preference.PreferenceFragmentCompat
import kotlinx.android.synthetic.main.dialog_default_query.*
import kotlinx.android.synthetic.main.dialog_default_query.view.* import kotlinx.android.synthetic.main.dialog_default_query.view.*
import xyz.quaver.pupil.types.Tags import xyz.quaver.pupil.types.Tags
import xyz.quaver.pupil.util.Histories import xyz.quaver.pupil.util.Histories
@@ -140,7 +138,8 @@ class SettingsActivity : AppCompatActivity() {
setOnPreferenceClickListener { setOnPreferenceClickListener {
val dialogView = LayoutInflater.from(context).inflate( val dialogView = LayoutInflater.from(context).inflate(
R.layout.dialog_default_query, R.layout.dialog_default_query,
null LinearLayout(context),
false
) )
val tags = Tags.parse( val tags = Tags.parse(
@@ -164,6 +163,7 @@ class SettingsActivity : AppCompatActivity() {
val tag = languages[tags.first { it.area == "language" }.tag] val tag = languages[tags.first { it.area == "language" }.tag]
if (tag != null) { if (tag != null) {
setSelection( setSelection(
@Suppress("UNCHECKED_CAST")
(adapter as ArrayAdapter<String>).getPosition(tag) (adapter as ArrayAdapter<String>).getPosition(tag)
) )
tags.removeByArea("language") tags.removeByArea("language")

View File

@@ -6,7 +6,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.item_reader.view.*
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

View File

@@ -23,10 +23,6 @@ class Histories(private val file: File) : ArrayList<Int>() {
companion object { companion object {
lateinit var default: Histories lateinit var default: Histories
fun load(file: File) : Histories {
return Histories(file).load()
}
} }
@UseExperimental(ImplicitReflectionSerializer::class) @UseExperimental(ImplicitReflectionSerializer::class)

View File

@@ -42,6 +42,6 @@
<string name="main_drawer_group_contact_homepage">홈페이지</string> <string name="main_drawer_group_contact_homepage">홈페이지</string>
<string name="main_drawer_group_contact_title">문의</string> <string name="main_drawer_group_contact_title">문의</string>
<string name="help_dialog_title">준비 중</string> <string name="help_dialog_title">준비 중</string>
<string name="help_dialog_message">준비중입니다.\n만화 화면에서 사진을 길게 누르면 스크롤 방식이 바뀝니다. 알고 계셨나요? :)</string> <string name="help_dialog_message">준비중입니다.</string>
<string name="reader_fab_fullscreen">전체 화면</string> <string name="reader_fab_fullscreen">전체 화면</string>
</resources> </resources>

View File

@@ -34,7 +34,7 @@
<string name="main_drawer_group_contact_email">Email me!</string> <string name="main_drawer_group_contact_email">Email me!</string>
<string name="help_dialog_title">WIP</string> <string name="help_dialog_title">WIP</string>
<string name="help_dialog_message">While in progress!\nOne thing might you don\'t know:\nLong tap an image in reader will change scrolling mode! Go try it :)</string> <string name="help_dialog_message">While in progress!</string>
<string name="update_title">Update available</string> <string name="update_title">Update available</string>
<string name="update_download_started">Download started</string> <string name="update_download_started">Download started</string>