diff --git a/app/src/main/java/com/github/libretube/MainActivity.kt b/app/src/main/java/com/github/libretube/MainActivity.kt index d2fba1f71..d35dc9ba6 100644 --- a/app/src/main/java/com/github/libretube/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/MainActivity.kt @@ -33,20 +33,30 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this) RetrofitInstance.url=sharedPreferences.getString("instance", "https://pipedapi.kavin.rocks/")!! - DynamicColors.applyToActivitiesIfAvailable(application) - - setContentView(R.layout.activity_main) + bottomNavigationView = findViewById(R.id.bottomNav) - - navController = findNavController(R.id.fragment) bottomNavigationView.setupWithNavController(navController) - - - + bottomNavigationView.setOnItemSelectedListener { + when(it.itemId){ + R.id.home2 -> { + navController.navigate(R.id.home2) + true + } + R.id.subscriptions -> { + navController.navigate(R.id.subscriptions) + true + } + R.id.library -> { + navController.navigate(R.id.library) + true + } + } + false + } toolbar = findViewById(R.id.toolbar) val hexColor = String.format("#%06X", 0xFFFFFF and 0xcc322d) @@ -91,8 +101,6 @@ class MainActivity : AppCompatActivity() { finish() } } - - } override fun onConfigurationChanged(newConfig: Configuration) { diff --git a/app/src/main/java/com/github/libretube/obj/SearchItem.kt b/app/src/main/java/com/github/libretube/obj/SearchItem.kt index 030c9a297..d8f6bd4d5 100644 --- a/app/src/main/java/com/github/libretube/obj/SearchItem.kt +++ b/app/src/main/java/com/github/libretube/obj/SearchItem.kt @@ -4,7 +4,8 @@ data class SearchItem( var url: String?, var thumbnail: String?, var uploaderName: String?, - var uploaded: String?, + var uploaded: Long?, + var shortDescription: String?, //Video only attributes var title: String?, var uploaderUrl: String?, @@ -20,5 +21,5 @@ data class SearchItem( var videos: Long? = -1, var verified: Boolean? = null ){ - constructor() : this("","","","","","","","",0,0,null) + constructor() : this("","","",0,"","","","","",0,0,null) } diff --git a/app/src/main/java/com/github/libretube/obj/StreamItem.kt b/app/src/main/java/com/github/libretube/obj/StreamItem.kt index 343980f78..7d1133c50 100644 --- a/app/src/main/java/com/github/libretube/obj/StreamItem.kt +++ b/app/src/main/java/com/github/libretube/obj/StreamItem.kt @@ -11,7 +11,8 @@ data class StreamItem( var duration: Long?, var views: Long?, var uploaderVerified: Boolean?, - var uploaded: Long? + var uploaded: Long?, + var shortDescription: String? ){ - constructor() : this("","","","","","","",0,0,null,0) + constructor() : this("","","","","","","",0,0,null,0,"") }