Seil0/teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

update theme colors to better reflect material design guidelines

Browse Source 
* dark primary: #000000 -> #121212
This commit is contained in:
Jannik
2020-12-05 21:51:12 +01:00
parent e34e5b2bbd
commit 82bf34e4cb
15 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/mosad/teapod/MainActivity.kt
View File

@ -30,8 +30,6 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
import com.google.android.material.bottomnavigation.BottomNavigationView
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.mosad.teapod.databinding.ActivityMainBinding
import org.mosad.teapod.parser.AoDParser
import org.mosad.teapod.player.PlayerActivity
@ -41,7 +39,6 @@ import org.mosad.teapod.ui.components.LoginDialog
import org.mosad.teapod.ui.fragments.*
import org.mosad.teapod.util.DataTypes
import org.mosad.teapod.util.StorageController
import org.mosad.teapod.util.TMDBApiController
import kotlin.system.measureTimeMillis
class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
@ -156,25 +153,15 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
}
/**
* Show the media fragment for the selected media.
* The media fragment is not stored in activeBaseFragment,
* as it doesn't replace a fragment but is added on top of one.
* Show a fragment on top of the current fragment.
* The current fragment is replaced and the new one is added
* to the back stack.
*/
fun showMediaFragment(mediaId: Int) = GlobalScope.launch {
val mediaFragment = MediaFragment(mediaId)
fun showFragment(fragment: Fragment) {
supportFragmentManager.commit {
add(R.id.nav_host_fragment, mediaFragment, "MediaFragment")
addToBackStack(null)
show(mediaFragment)
}
}
fun showAboutFragment() {
val aboutFragment = AboutFragment()
supportFragmentManager.commit {
replace(R.id.nav_host_fragment, aboutFragment, "AboutFragment")
addToBackStack(aboutFragment.javaClass.name)
show(aboutFragment)
replace(R.id.nav_host_fragment, fragment, fragment.javaClass.simpleName)
addToBackStack(fragment.javaClass.name)
show(fragment)
}
}

2
app/src/main/java/org/mosad/teapod/ui/fragments/AccountFragment.kt
View File

@ -53,7 +53,7 @@ class AccountFragment : Fragment() {
}
binding.linearInfo.setOnClickListener {
(activity as MainActivity).showAboutFragment()
(activity as MainActivity).showFragment(AboutFragment())
}
binding.switchSecondary.setOnClickListener {

4
app/src/main/java/org/mosad/teapod/ui/fragments/HomeFragment.kt
View File

@ -57,7 +57,7 @@ class HomeFragment : Fragment() {
adapterMyList = MediaItemAdapter(myListMedia)
adapterMyList.onItemClick = { mediaId, _ ->
(activity as MainActivity).showMediaFragment(mediaId)
(activity as MainActivity).showFragment(MediaFragment(mediaId))
}
binding.recyclerMyList.adapter = adapterMyList
@ -65,7 +65,7 @@ class HomeFragment : Fragment() {
private fun initActions() {
adapterNewEpisodes.onItemClick = { mediaId, _ ->
(activity as MainActivity).showMediaFragment(mediaId)
(activity as MainActivity).showFragment(MediaFragment(mediaId))
}
}
}

2
app/src/main/java/org/mosad/teapod/ui/fragments/LibraryFragment.kt
View File

@ -35,7 +35,7 @@ class LibraryFragment : Fragment() {
context?.let {
adapter = MediaItemAdapter(AoDParser.itemMediaList)
adapter.onItemClick = { mediaId, _ ->
(activity as MainActivity).showMediaFragment(mediaId)
(activity as MainActivity).showFragment(MediaFragment(mediaId))
}
binding.recyclerMediaLibrary.adapter = adapter

2
app/src/main/java/org/mosad/teapod/ui/fragments/SearchFragment.kt
View File

@ -33,7 +33,7 @@ class SearchFragment : Fragment() {
adapter = MediaItemAdapter(AoDParser.itemMediaList)
adapter!!.onItemClick = { mediaId, _ ->
binding.searchText.clearFocus()
(activity as MainActivity).showMediaFragment(mediaId)
(activity as MainActivity).showFragment(MediaFragment(mediaId))
}
binding.recyclerMediaSearch.adapter = adapter