fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-07 23:48:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

improving some navigation through search

Browse Source
This commit is contained in:
tibbi 2023-01-08 18:38:40 +01:00
parent 6e57f8815d
commit e55ae2c447
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -70,7 +70,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:a064515a00' implementation 'com.github.SimpleMobileTools:Simple-Commons:a95c7109bd'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

21
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
View File

@ -199,16 +199,12 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
checkSwipeRefreshAvailability() checkSwipeRefreshAvailability()
checkShortcuts() checkShortcuts()
if (!mIsSearchOpen) { if (!main_menu.isSearchOpen) {
refreshMenuItems() refreshMenuItems()
} }
setupQuickFilter() setupQuickFilter()
/*main_toolbar.setNavigationOnClickListener {
onBackPressed()
}*/
if (config.caldavSync) { if (config.caldavSync) {
updateCalDAVEvents() updateCalDAVEvents()
} }
@ -237,7 +233,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
goToTodayButton = findItem(R.id.go_to_today) goToTodayButton = findItem(R.id.go_to_today)
findItem(R.id.print).isVisible = config.storedView != MONTHLY_DAILY_VIEW findItem(R.id.print).isVisible = config.storedView != MONTHLY_DAILY_VIEW
findItem(R.id.filter).isVisible = mShouldFilterBeVisible findItem(R.id.filter).isVisible = mShouldFilterBeVisible
findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible && !mIsSearchOpen findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible && !main_menu.isSearchOpen
findItem(R.id.go_to_date).isVisible = config.storedView != EVENTS_LIST_VIEW findItem(R.id.go_to_date).isVisible = config.storedView != EVENTS_LIST_VIEW
findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync findItem(R.id.refresh_caldav_calendars).isVisible = config.caldavSync
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations) findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
@ -275,7 +271,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
} }
override fun onBackPressed() { override fun onBackPressed() {
if (mIsSearchOpen) { if (main_menu.isSearchOpen) {
closeSearch() closeSearch()
} else { } else {
swipe_refresh_layout.isRefreshing = false swipe_refresh_layout.isRefreshing = false
@ -371,7 +367,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
} }
private fun closeSearch() { private fun closeSearch() {
mSearchMenuItem?.collapseActionView() main_menu.closeSearch()
} }
private fun checkCalDAVUpdateListener() { private fun checkCalDAVUpdateListener() {
@ -947,7 +943,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
fragment.arguments = bundle fragment.arguments = bundle
supportFragmentManager.beginTransaction().add(R.id.fragments_holder, fragment).commitNow() supportFragmentManager.beginTransaction().add(R.id.fragments_holder, fragment).commitNow()
//main_toolbar.navigationIcon = null main_menu.toggleForceArrowBackIcon(false)
} }
private fun fixDayCode(dayCode: String? = null): String? = when { private fun fixDayCode(dayCode: String? = null): String? = when {
@ -1047,12 +1043,15 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
if (currentFragments.size > 1) { if (currentFragments.size > 1) {
showBackNavigationArrow() showBackNavigationArrow()
} else { } else {
//main_toolbar.navigationIcon = null main_menu.toggleForceArrowBackIcon(false)
} }
} }
private fun showBackNavigationArrow() { private fun showBackNavigationArrow() {
//main_toolbar.navigationIcon = resources.getColoredDrawableWithColor(R.drawable.ic_arrow_left_vector, getProperStatusBarColor().getContrastColor()) main_menu.toggleForceArrowBackIcon(true)
main_menu.onNavigateBackClickListener = {
onBackPressed()
}
} }
private fun refreshViewPager() { private fun refreshViewPager() {