Merge pull request #31 from kuylar/fix/lateinit_player_2_electric_boo…

…galoo

fix: lateinit crashing. again

app/src/main/java/dev/kuylar/lighttube/ui/fragment/AddVideoToPlaylistFragment.kt

@@ -28,12 +28,12 @@ class AddVideoToPlaylistFragment(private val videoId: String) : BottomSheetDialo
 		savedInstanceState: Bundle?
 	): View {
 		binding = FragmentAddVideoToPlaylistBinding.inflate(inflater, container, false)
-		api = (activity as MainActivity).getApi()
 		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		api = (activity as MainActivity).getApi()
 
 		binding.buttonNewPlaylist.setOnClickListener {
 			Utils.showPlaylistDialog(

app/src/main/java/dev/kuylar/lighttube/ui/fragment/LibraryFragment.kt

@@ -31,15 +31,15 @@ class LibraryFragment : Fragment() {
 		savedInstanceState: Bundle?
 	): View {
 		binding = FragmentLibraryBinding.inflate(inflater)
-		(activity as MainActivity).apply {
-			this@LibraryFragment.api = getApi()
-			this@LibraryFragment.player = getPlayer()
-		}
 		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		(activity as MainActivity).apply {
+			this@LibraryFragment.api = getApi()
+			this@LibraryFragment.player = getPlayer()
+		}
 		val adapter = RendererRecyclerAdapter(items)
 		binding.recyclerLibrary.layoutManager = LinearLayoutManager(context)
 		binding.recyclerLibrary.adapter = adapter

app/src/main/java/dev/kuylar/lighttube/ui/fragment/PlaylistFragment.kt

@@ -1,10 +1,10 @@
 package dev.kuylar.lighttube.ui.fragment
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.snackbar.Snackbar
@@ -34,15 +34,15 @@ class PlaylistFragment : Fragment() {
 		arguments?.let {
 			id = it.getString("id")!!
 		}
-		(activity as MainActivity).apply {
-			this@PlaylistFragment.api = getApi()
-			supportActionBar?.title = ""
-		}
 		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		(activity as MainActivity).apply {
+			this@PlaylistFragment.api = getApi()
+			supportActionBar?.title = ""
+		}
 		val adapter = RendererRecyclerAdapter(items)
 		binding.recyclerPlaylist.layoutManager = LinearLayoutManager(context)
 		binding.recyclerPlaylist.adapter = adapter

app/src/main/java/dev/kuylar/lighttube/ui/fragment/RecyclerViewFragment.kt

@@ -37,10 +37,6 @@ class RecyclerViewFragment : Fragment() {
 		savedInstanceState: Bundle?
 	): View {
 		binding = FragmentRecyclerviewBinding.inflate(inflater)
-		(activity as MainActivity).apply {
-			this@RecyclerViewFragment.api = getApi()
-			this@RecyclerViewFragment.player = getPlayer()
-		}
 		type = arguments?.getString("type")!!
 		args = arguments?.getString("args")!!
 		params = arguments?.getString("params")
@@ -49,6 +45,10 @@ class RecyclerViewFragment : Fragment() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		(activity as MainActivity).apply {
+			this@RecyclerViewFragment.api = getApi()
+			this@RecyclerViewFragment.player = getPlayer()
+		}
 		val adapter = RendererRecyclerAdapter(items)
 		binding.recycler.layoutManager = LinearLayoutManager(context)
 		binding.recycler.adapter = adapter

app/src/main/java/dev/kuylar/lighttube/ui/fragment/SearchFragment.kt

@@ -34,16 +34,16 @@ class SearchFragment : Fragment() {
 		savedInstanceState: Bundle?
 	): View {
 		binding = FragmentSearchBinding.inflate(inflater)
-		(activity as MainActivity).apply {
-			this@SearchFragment.api = getApi()
-			this@SearchFragment.player = getPlayer()
-		}
 		query = arguments?.getString("query") ?: "asdf"
 		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		(activity as MainActivity).apply {
+			this@SearchFragment.api = getApi()
+			this@SearchFragment.player = getPlayer()
+		}
 		val adapter = RendererRecyclerAdapter(items)
 		binding.recyclerSearch.layoutManager = LinearLayoutManager(context)
 		binding.recyclerSearch.adapter = adapter

app/src/main/java/dev/kuylar/lighttube/ui/fragment/SubscriptionsFragment.kt

@@ -33,15 +33,15 @@ class SubscriptionsFragment : Fragment() {
 		savedInstanceState: Bundle?
 	): View {
 		binding = FragmentSubscriptionsBinding.inflate(inflater)
-		(activity as MainActivity).apply {
-			this@SubscriptionsFragment.api = getApi()
-			this@SubscriptionsFragment.player = getPlayer()
-		}
 		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		(activity as MainActivity).apply {
+			this@SubscriptionsFragment.api = getApi()
+			this@SubscriptionsFragment.player = getPlayer()
+		}
 		val adapter = SubscriptionFeedRecyclerAdapter(items, this::playVideo)
 		binding.recyclerFeed.layoutManager = LinearLayoutManager(context)
 		binding.recyclerFeed.adapter = adapter

app/src/main/java/dev/kuylar/lighttube/ui/fragment/VideoCommentsFragment.kt

@@ -40,14 +40,14 @@ class VideoCommentsFragment : Fragment() {
 		inflater: LayoutInflater, container: ViewGroup?,
 		savedInstanceState: Bundle?
 	): View {
-		api = (activity as MainActivity).getApi()
-		player = (activity as MainActivity).getPlayer()
 		binding = FragmentVideoCommentsBinding.inflate(inflater)
 		return binding.root
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		api = (activity as MainActivity).getApi()
+		player = (activity as MainActivity).getPlayer()
 		val adapter = RendererRecyclerAdapter(items)
 		binding.recyclerComments.layoutManager = LinearLayoutManager(context)
 		binding.recyclerComments.adapter = adapter

app/src/main/java/dev/kuylar/lighttube/ui/fragment/VideoInfoFragment.kt

@@ -37,8 +37,6 @@ class VideoInfoFragment : Fragment() {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		api = (requireActivity() as MainActivity).getApi()
-		player = (requireActivity() as MainActivity).getPlayer()
 		arguments?.let {
 			id = it.getString("id")!!
 			playlistId = it.getString("playlistId")
@@ -55,6 +53,8 @@ class VideoInfoFragment : Fragment() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
+		api = (requireActivity() as MainActivity).getApi()
+		player = (requireActivity() as MainActivity).getPlayer()
 		if (id.isNotBlank())
 			thread {
 				try {