kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 06:40:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #1345 from Bnyro/master

Browse Source 
small fixes
This commit is contained in:
Bnyro 2022-09-22 18:35:31 +02:00 committed by GitHub
commit e0d2edb186
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId 'com.github.libretube' applicationId 'com.github.libretube'
minSdk 21 minSdk 21
targetSdk 33 targetSdk 33
versionCode 18 versionCode 19
versionName '0.5.1' versionName '0.6.0'
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
resValue "string", "app_name", "LibreTube" resValue "string", "app_name", "LibreTube"

16
app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
View File

@ -279,22 +279,6 @@ class MainActivity : BaseActivity() {
return true return true
} }
}) })
searchItem.setOnActionExpandListener(
object : MenuItem.OnActionExpandListener {
override fun onMenuItemActionExpand(p0: MenuItem): Boolean {
return true
}
override fun onMenuItemActionCollapse(p0: MenuItem): Boolean {
val currentFragmentId = navController.currentDestination?.id
if (currentFragmentId == R.id.searchFragment || currentFragmentId == R.id.searchResultFragment) {
navController.popBackStack()
}
return true
}
}
)
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)
} }

2
app/src/main/java/com/github/libretube/ui/activities/SettingsActivity.kt
View File

@ -18,7 +18,7 @@ class SettingsActivity : BaseActivity() {
setContentView(binding.root) setContentView(binding.root)
binding.backImageButton.setOnClickListener { binding.backImageButton.setOnClickListener {
onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
if (savedInstanceState == null) { if (savedInstanceState == null) {

2
app/src/main/res/layout/fragment_channel.xml
View File

@ -107,8 +107,6 @@
android:id="@+id/channel_recView" android:id="@+id/channel_recView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:nestedScrollingEnabled="false" /> android:nestedScrollingEnabled="false" />
</RelativeLayout> </RelativeLayout>