user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search Backtracking Added

Browse Source
This commit is contained in:
tom5079
2020-08-03 21:31:39 +09:00
parent c317abe64b
commit 2ab7672092
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
View File

@@ -42,7 +42,6 @@ import androidx.core.view.GravityCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
import com.arlib.floatingsearchview.FloatingSearchView import com.arlib.floatingsearchview.FloatingSearchView
import com.arlib.floatingsearchview.FloatingSearchViewDayNight
import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
import com.arlib.floatingsearchview.util.view.SearchInputView import com.arlib.floatingsearchview.util.view.SearchInputView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
@@ -98,6 +97,7 @@ class MainActivity : AppCompatActivity() {
setText(query, TextView.BufferType.EDITABLE) setText(query, TextView.BufferType.EDITABLE)
} }
} }
private var queryStack = mutableListOf<String>()
private var mode = Mode.SEARCH private var mode = Mode.SEARCH
private var sortMode = SortMode.NEWEST private var sortMode = SortMode.NEWEST
@@ -159,11 +159,12 @@ class MainActivity : AppCompatActivity() {
initView() initView()
} }
@OptIn(ExperimentalStdlibApi::class)
override fun onBackPressed() { override fun onBackPressed() {
when { when {
main_drawer_layout.isDrawerOpen(GravityCompat.START) -> main_drawer_layout.closeDrawer(GravityCompat.START) main_drawer_layout.isDrawerOpen(GravityCompat.START) -> main_drawer_layout.closeDrawer(GravityCompat.START)
query.isNotEmpty() -> runOnUiThread { queryStack.removeLastOrNull() != null && queryStack.isNotEmpty() -> runOnUiThread {
query = "" query = queryStack.last()
cancelFetch() cancelFetch()
clearGalleries() clearGalleries()
@@ -278,6 +279,7 @@ class MainActivity : AppCompatActivity() {
clearGalleries() clearGalleries()
currentPage = 0 currentPage = 0
query = "" query = ""
queryStack.clear()
mode = Mode.SEARCH mode = Mode.SEARCH
fetchGalleries(query, sortMode) fetchGalleries(query, sortMode)
loadBlocks() loadBlocks()
@@ -287,6 +289,7 @@ class MainActivity : AppCompatActivity() {
clearGalleries() clearGalleries()
currentPage = 0 currentPage = 0
query = "" query = ""
queryStack.clear()
mode = Mode.HISTORY mode = Mode.HISTORY
fetchGalleries(query, sortMode) fetchGalleries(query, sortMode)
loadBlocks() loadBlocks()
@@ -296,6 +299,7 @@ class MainActivity : AppCompatActivity() {
clearGalleries() clearGalleries()
currentPage = 0 currentPage = 0
query = "" query = ""
queryStack.clear()
mode = Mode.DOWNLOAD mode = Mode.DOWNLOAD
fetchGalleries(query, sortMode) fetchGalleries(query, sortMode)
loadBlocks() loadBlocks()
@@ -305,6 +309,7 @@ class MainActivity : AppCompatActivity() {
clearGalleries() clearGalleries()
currentPage = 0 currentPage = 0
query = "" query = ""
queryStack.clear()
mode = Mode.FAVORITE mode = Mode.FAVORITE
fetchGalleries(query, sortMode) fetchGalleries(query, sortMode)
loadBlocks() loadBlocks()
@@ -990,6 +995,11 @@ class MainActivity : AppCompatActivity() {
val preference = PreferenceManager.getDefaultSharedPreferences(this) val preference = PreferenceManager.getDefaultSharedPreferences(this)
val defaultQuery = preference.getString("default_query", "")!! val defaultQuery = preference.getString("default_query", "")!!
if (query != queryStack.lastOrNull()) {
queryStack.remove(query)
queryStack.add(query)
}
galleryIDs = null galleryIDs = null
if (galleryIDs?.isActive == true) if (galleryIDs?.isActive == true)