nyancrimew/PlayerAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove force null check

Browse source
This commit is contained in:
h4h13 2019-10-09 18:22:02 +05:30
parent 12f6f0a505
commit 8d8149839a
7 changed files with 48 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
View file

@ -117,7 +117,7 @@ class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<Artist
companion object {
@JvmField
val TAG = ArtistsFragment::class.java.simpleName
val TAG: String = ArtistsFragment::class.java.simpleName
fun newInstance(): ArtistsFragment {

2
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
View file

@ -80,7 +80,7 @@ class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearL
companion object {
@JvmField
val TAG = GenresFragment::class.java.simpleName
val TAG: String = GenresFragment::class.java.simpleName
fun newInstance(): GenresFragment {
return GenresFragment()

6
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
View file

@ -60,11 +60,11 @@ class PlaylistsFragment : AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, L
}
override fun showEmptyView() {
adapter!!.swapDataSet(ArrayList())
adapter?.swapDataSet(ArrayList())
}
override fun playlists(playlists: ArrayList<Playlist>) {
adapter!!.swapDataSet(playlists)
adapter?.swapDataSet(playlists)
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@ -77,7 +77,7 @@ class PlaylistsFragment : AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, L
companion object {
@JvmField
val TAG = PlaylistsFragment::class.java.simpleName
val TAG: String = PlaylistsFragment::class.java.simpleName
fun newInstance(): PlaylistsFragment {
val args = Bundle()

8
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
View file

@ -83,12 +83,12 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
}
public override fun setUsePalette(usePalette: Boolean) {
adapter!!.usePalette(usePalette)
adapter?.usePalette(usePalette)
}
override fun setGridSize(gridSize: Int) {
layoutManager!!.spanCount = gridSize
adapter!!.notifyDataSetChanged()
layoutManager?.spanCount = gridSize
adapter?.notifyDataSetChanged()
}
override fun onResume() {
@ -104,7 +104,7 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
}
override fun showEmptyView() {
adapter!!.swapDataSet(ArrayList())
adapter?.swapDataSet(ArrayList())
}
override fun loadSortOrder(): String {

1
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
View file

@ -60,6 +60,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
if (sections.isEmpty()) {
showEmptyView()
shortcuts.visibility = View.GONE
} else {
emptyContainer.hide()
}

7
app/src/main/res/layout/abs_playlists.xml
View file

@ -196,4 +196,11 @@
tools:text="Hemanth savarala" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.Group
android:id="@+id/shortcuts"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="history,lastAdded,topPlayed,actionShuffle" />
</androidx.constraintlayout.widget.ConstraintLayout>

56
app/src/main/res/layout/home_content.xml
View file

@ -20,7 +20,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/contentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants"
android:focusable="true"
android:focusableInTouchMode="true"
@ -28,34 +28,40 @@
<include layout="@layout/abs_playlists" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false" />
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/emptyContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
tools:visibility="gone" />
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="96dp"
android:layout_height="96dp"
app:srcCompat="@drawable/ic_play_arrow_white_64dp" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/emptyText"
<LinearLayout
android:id="@+id/emptyContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/start_play_music"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnBackground" />
</LinearLayout>
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<code.name.monkey.retromusic.views.IconImageView
android:layout_width="96dp"
android:layout_height="96dp"
app:srcCompat="@drawable/ic_play_arrow_white_64dp" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/emptyText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/start_play_music"
android:textAppearance="@style/TextViewNormal"
android:textColor="?colorOnBackground" />
</LinearLayout>
</FrameLayout>
</LinearLayout>