Removed hiding history when history is disabled

This commit is contained in:
Omar 2022-03-08 20:44:12 +02:00
parent ebe90262cb
commit c3bf711c7d
3 changed files with 5 additions and 33 deletions

View file

@ -164,24 +164,12 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
adapter = songAdapter adapter = songAdapter
layoutManager = linearLayoutManager() layoutManager = linearLayoutManager()
} }
if (!PreferenceUtil.pauseHistory) { // Observe only if keep history is not paused
libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
songAdapter.swapDataSet(it)
binding.empty.isVisible = it.isEmpty()
}
}
else {
historyDisabled() // Update Ui
binding.emptyButton.setOnClickListener {
findNavController().navigate(
R.id.settingsActivity,
null,
navOptions
)
findNavController().popBackStack()
} libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
songAdapter.swapDataSet(it)
binding.empty.isVisible = it.isEmpty()
} }
} }
private fun loadFavorite() { private fun loadFavorite() {
@ -253,11 +241,6 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
return if (RetroUtil.isLandscape()) 4 else 2 return if (RetroUtil.isLandscape()) 4 else 2
} }
private fun historyDisabled() {
binding.empty.isVisible = true
binding.emptyText.text = getString(R.string.history_paused)
binding.emptyButton.isVisible = true
}
override fun onArtist(artistId: Long, view: View) { override fun onArtist(artistId: Long, view: View) {
findNavController().navigate( findNavController().navigate(

View file

@ -62,21 +62,12 @@
android:id="@+id/emptyText" android:id="@+id/emptyText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/no_songs" android:text="@string/no_songs"
android:textAppearance="@style/TextViewHeadline5" android:textAppearance="@style/TextViewHeadline5"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
tools:visibility="visible" /> tools:visibility="visible" />
<Button
android:id="@+id/emptyButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/settings_button"
android:background="@drawable/widget_button_background"
android:visibility="invisible"/>
</LinearLayout> </LinearLayout>
<com.google.android.material.progressindicator.CircularProgressIndicator <com.google.android.material.progressindicator.CircularProgressIndicator

View file

@ -262,8 +262,6 @@
<string name="no_purchase_found">No purchase found.</string> <string name="no_purchase_found">No purchase found.</string>
<string name="no_results">No results</string> <string name="no_results">No results</string>
<string name="no_songs">You have no songs</string> <string name="no_songs">You have no songs</string>
<string name="history_paused">You have paused history.</string>
<string name="settings_button">Settings</string>
<string name="normal">Normal</string> <string name="normal">Normal</string>
<string name="normal_lyrics">Normal lyrics</string> <string name="normal_lyrics">Normal lyrics</string>
<string name="not_listed_in_media_store"> <string name="not_listed_in_media_store">