diff --git a/.idea/misc.xml b/.idea/misc.xml index 7d683009a..ecfa9ae2a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,7 @@ + @@ -15,7 +16,7 @@ - + @@ -23,6 +24,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6775d1ee7..d500dca8b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ { val navController = findNavController(R.id.fragment) navController.popBackStack() navController.navigate(R.id.searchFragment) - //bottomNavigationView.clearFocus() - //val navController = findNavController(R.id.fragment) - //navController.navigate(R.id.searchFragment) - //navController.navigate(R.id.home2) true } R.id.action_settings -> { - true } } false } + } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { - return true - } + override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) val orientation = newConfig.orientation - if (orientation == Configuration.ORIENTATION_PORTRAIT) - { + if (orientation == Configuration.ORIENTATION_PORTRAIT) { println("Portrait") //findViewById(R.id.playerMotionLayout).getTransition(R.id.yt_transition).isEnabled = true } else if (orientation == Configuration.ORIENTATION_LANDSCAPE) { diff --git a/app/src/main/res/drawable/ic_campaign.xml b/app/src/main/res/drawable/ic_campaign.xml new file mode 100644 index 000000000..09e69863c --- /dev/null +++ b/app/src/main/res/drawable/ic_campaign.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_libretube_foreground.xml b/app/src/main/res/drawable/ic_libretube_foreground.xml new file mode 100644 index 000000000..4ea7dce4a --- /dev/null +++ b/app/src/main/res/drawable/ic_libretube_foreground.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 50efca8b1..67c809348 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -5,10 +5,31 @@ android:layout_height="match_parent" tools:context=".Library"> - - + android:layout_weight="1" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + > + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 71089cce7..9ca1adf06 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -37,7 +37,8 @@ android:layout_height="wrap_content" android:text="Description" android:textColor="@color/black" - android:textSize="20sp" + android:textSize="15sp" + android:textStyle="bold" android:paddingRight="8dp" android:paddingLeft="8dp" /> @@ -62,13 +63,12 @@ > + android:src="@drawable/ic_like" /> + + app:show_buffering="always" /> - - + android:layout_weight="1" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + > + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml index d55a8d6ef..50ce0ee35 100644 --- a/app/src/main/res/menu/bottom_menu.xml +++ b/app/src/main/res/menu/bottom_menu.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_libretube.xml b/app/src/main/res/mipmap-anydpi-v26/ic_libretube.xml new file mode 100644 index 000000000..50550f090 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_libretube.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_libretube_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_libretube_round.xml new file mode 100644 index 000000000..50550f090 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_libretube_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_libretube.png b/app/src/main/res/mipmap-hdpi/ic_libretube.png new file mode 100644 index 000000000..a5fcf96b0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_libretube.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_libretube_round.png b/app/src/main/res/mipmap-hdpi/ic_libretube_round.png new file mode 100644 index 000000000..bf6df92f0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_libretube_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_libretube.png b/app/src/main/res/mipmap-mdpi/ic_libretube.png new file mode 100644 index 000000000..0f039d949 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_libretube.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_libretube_round.png b/app/src/main/res/mipmap-mdpi/ic_libretube_round.png new file mode 100644 index 000000000..d5fb0cec1 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_libretube_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_libretube.png b/app/src/main/res/mipmap-xhdpi/ic_libretube.png new file mode 100644 index 000000000..4f8c07ab4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_libretube.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_libretube_round.png b/app/src/main/res/mipmap-xhdpi/ic_libretube_round.png new file mode 100644 index 000000000..621c7009e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_libretube_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_libretube.png b/app/src/main/res/mipmap-xxhdpi/ic_libretube.png new file mode 100644 index 000000000..18211669e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_libretube.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_libretube_round.png b/app/src/main/res/mipmap-xxhdpi/ic_libretube_round.png new file mode 100644 index 000000000..ac7f2f685 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_libretube_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_libretube.png b/app/src/main/res/mipmap-xxxhdpi/ic_libretube.png new file mode 100644 index 000000000..a294491ee Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_libretube.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_libretube_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_libretube_round.png new file mode 100644 index 000000000..80582b5f7 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_libretube_round.png differ diff --git a/app/src/main/res/navigation/nav.xml b/app/src/main/res/navigation/nav.xml index fbd19bd1e..0ac6aa103 100644 --- a/app/src/main/res/navigation/nav.xml +++ b/app/src/main/res/navigation/nav.xml @@ -11,8 +11,9 @@ android:label="fragment_home" tools:layout="@layout/fragment_home" > + android:id="@+id/action_home2_to_subscriptions" + app:destination="@id/subscriptions" + app:popUpTo="@id/home2" /> + android:id="@+id/action_subscriptions_to_home2" + app:destination="@id/home2" + app:popUpTo="@id/subscriptions" /> - + + #CB5656 + \ No newline at end of file