Minor edits

jcerdenia · Nov 22, 2020 · 67f883d · 67f883d
1 parent 98ec402
commit 67f883d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/activity/MainActivity.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/activity/MainActivity.kt
@@ -37,7 +37,7 @@ class MainActivity : AppCompatActivity(),
             val feedId = intent?.getStringExtra(EXTRA_FEED_ID)
                 ?: NiceFeedPreferences.getLastViewedFeedId(this)
             val entryId = intent?.getStringExtra(EXTRA_ENTRY_ID)
-            val mainFragment = EntryListFragment.newInstance(feedId, entryId)
+            val mainFragment = EntryListFragment.newInstance(feedId, entryId, entryId != null)
             loadFragments(mainFragment, FeedListFragment.newInstance())
         }
     }

diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/fragment/ManageFeedsFragment.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/fragment/ManageFeedsFragment.kt
@@ -185,6 +185,7 @@ class ManageFeedsFragment: VisibleFragment(),
 
             setOnChangeListener(object : SpeedDialView.OnChangeListener {
                 override fun onToggleChanged(isOpen: Boolean) { } // Blank on purpose
+
                 override fun onMainActionSelected(): Boolean {
                     resetSelection()
                     return true

diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/fragment/SettingsFragment.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/fragment/SettingsFragment.kt
@@ -196,9 +196,7 @@ class SettingsFragment: VisibleFragment(), AboutFragment.Callback {
                 }
             }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                // Do nothing
-            }
+            override fun onNothingSelected(parent: AdapterView<*>?) { } // Do nothing
         }
     }
 

diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/EntryListViewModel.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/EntryListViewModel.kt
@@ -107,11 +107,11 @@ class EntryListViewModel: ViewModel(), UpdateManager.UpdateReceiver {
     }
 
     fun submitQuery(query: String) {
-        this.query = query
+        this.query = query.trim()
         sourceEntriesLiveData.value?.let { source ->
             val filteredEntries = filterEntries(source, filter)
-            entriesLiveData.value = if (query.isNotEmpty()) {
-                queryEntries(filteredEntries, query)
+            entriesLiveData.value = if (this.query.isNotEmpty()) {
+                queryEntries(filteredEntries, this.query)
             } else filteredEntries
         }
     }

diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/ManageFeedsViewModel.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/ManageFeedsViewModel.kt
@@ -39,7 +39,7 @@ class ManageFeedsViewModel: ViewModel() {
     }
 
     private fun setObservableFeeds(feeds: List<FeedManageable>) {
-        val feedsQueried = queryFeeds(feeds, query)
+        val feedsQueried = queryFeeds(feeds, query.toLowerCase(Locale.ROOT))
         feedsManageableLiveData.value = sortFeeds(feedsQueried, order)
     }
 
@@ -65,7 +65,7 @@ class ManageFeedsViewModel: ViewModel() {
     }
 
     fun submitQuery(query: String) {
-        this.query = query.toLowerCase(Locale.ROOT).trim()
+        this.query = query.trim()
         sourceFeedsLiveData.value?.let { setObservableFeeds(it) }
     }
 

diff --git a/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/SearchFeedsViewModel.kt b/app/src/main/java/com/joshuacerdenia/android/nicefeed/ui/viewmodel/SearchFeedsViewModel.kt
@@ -24,6 +24,6 @@ class SearchFeedsViewModel: FeedAddingViewModel() {
     }
 
     fun performSearch(query: String) {
-        mutableQuery.value = query
+        mutableQuery.value = query.trim()
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
-                override fun onNothingSelected(parent: AdapterView<*>?) {
-                    // Do nothing
-                }
+                override fun onNothingSelected(parent: AdapterView<*>?) { } // Do nothing
             }
         }
@@ Expand Down @@