kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-28 16:00:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #5 from archroid/master

Browse Source 
Fixed backstack bugs
This commit is contained in:
Farbod 2022-02-02 19:59:15 +03:30 committed by GitHub
commit c99a1cddd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/misc.xml generated
View File

@ -13,11 +13,11 @@
<entry key="app/src/main/res/drawable/ic_share.xml" value="0.329" />
<entry key="app/src/main/res/drawable/libretube.xml" value="0.17135416666666667" />
<entry key="app/src/main/res/layout-land/fragment_player.xml" value="0.1" />
<entry key="app/src/main/res/layout/activity_main.xml" value="0.17" />
<entry key="app/src/main/res/layout/activity_main.xml" value="0.18703703703703703" />
<entry key="app/src/main/res/layout/activity_player.xml" value="0.27685185185185185" />
<entry key="app/src/main/res/layout/channel_search_row.xml" value="0.33" />
<entry key="app/src/main/res/layout/exo_styled_player_control_view.xml" value="0.12" />
<entry key="app/src/main/res/layout/fragment_home.xml" value="0.16" />
<entry key="app/src/main/res/layout/fragment_home.xml" value="0.35208333333333336" />
<entry key="app/src/main/res/layout/fragment_library.xml" value="0.11956521739130435" />
<entry key="app/src/main/res/layout/fragment_player.xml" value="0.2" />
<entry key="app/src/main/res/layout/fragment_search.xml" value="0.25" />

29
app/src/main/java/com/github/libretube/MainActivity.kt
View File

@ -4,6 +4,7 @@ import android.content.res.Configuration
import android.content.res.Resources
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import android.view.Menu
import android.view.MenuItem
import android.view.View
@ -12,6 +13,7 @@ import androidx.appcompat.widget.Toolbar
import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.core.text.HtmlCompat
import androidx.fragment.app.Fragment
import androidx.navigation.NavController
import androidx.navigation.Navigation
import com.google.android.material.bottomnavigation.BottomNavigationView
import androidx.navigation.findNavController
@ -24,6 +26,8 @@ import com.google.android.material.color.DynamicColors
class MainActivity : AppCompatActivity() {
lateinit var bottomNavigationView: BottomNavigationView
lateinit var toolbar: Toolbar
lateinit var navController : NavController
var f = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -33,13 +37,12 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main)
bottomNavigationView = findViewById<BottomNavigationView>(R.id.bottomNav)
val navController = findNavController(R.id.fragment)
navController = findNavController(R.id.fragment)
bottomNavigationView.setupWithNavController(navController)
/* bottomNavigationView.setOnItemSelectedListener {
println("fuckoff")
onNavDestinationSelected(it,navController)
}*/
@ -52,16 +55,14 @@ class MainActivity : AppCompatActivity() {
toolbar.setTitle(appName)
toolbar.setNavigationOnClickListener{
//settings fragment stuff
true
}
toolbar.setOnMenuItemClickListener{
when (it.itemId){
R.id.action_search -> {
val navController = findNavController(R.id.fragment)
navController.popBackStack()
navController.navigate(R.id.searchFragment)
f = true
true
}
}
@ -71,12 +72,12 @@ class MainActivity : AppCompatActivity() {
}
override fun onBackPressed() {
if (f){
val navController = findNavController(R.id.fragment)
navController.popBackStack()
navController.navigate(R.id.home2)
f = false
}else {super.onBackPressed()}
navController.popBackStack()
if (navController.currentBackStackEntry == null){
finish()
}
}
override fun onConfigurationChanged(newConfig: Configuration) {

1
app/src/main/java/com/github/libretube/PlayerFragment.kt
View File

@ -412,4 +412,5 @@ class PlayerFragment : Fragment() {
override fun onResume() {
super.onResume()
}
}

4
app/src/main/res/values-night/themes.xml
View File

@ -28,8 +28,8 @@
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_primaryInverse</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:statusBarColor" tools:targetApi="m">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:navigationBarColor">#342625</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>

36
app/src/main/res/values-v23/themes.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.LibreTube" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>

4
app/src/main/res/values/themes.xml
View File

@ -28,8 +28,6 @@
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_primaryInverse</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
<item name="android:navigationBarColor">#f5e9eb</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>