kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Merge branch 'libre-tube:master' into master

Browse Source
This commit is contained in:
Giles Munn 2022-11-12 17:39:13 +00:00 committed by GitHub
commit 694dacfe15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
app/release/output-metadata.json
View File

@ -1,72 +0,0 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.github.libretube",
"variantName": "release",
"elements": [
{
"type": "UNIVERSAL",
"filters": [],
"attributes": [],
"versionCode": 21,
"versionName": "0.7.0",
"outputFile": "app-universal-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "armeabi-v7a"
}
],
"attributes": [],
"versionCode": 21,
"versionName": "0.7.0",
"outputFile": "app-armeabi-v7a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 21,
"versionName": "0.7.0",
"outputFile": "app-arm64-v8a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 21,
"versionName": "0.7.0",
"outputFile": "app-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86"
}
],
"attributes": [],
"versionCode": 21,
"versionName": "0.7.0",
"outputFile": "app-x86-release.apk"
}
],
"elementType": "File"
}

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

@ -52,6 +52,7 @@ class MainActivity : BaseActivity() {
val autoRotationEnabled = PreferenceHelper.getBoolean(PreferenceKeys.AUTO_ROTATION, false)
lateinit var searchView: SearchView
lateinit var searchItem: MenuItem
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -202,6 +203,8 @@ class MainActivity : BaseActivity() {
private fun removeSearchFocus() {
searchView.setQuery("", false)
searchView.clearFocus()
searchView.isIconified = true
searchItem.collapseActionView()
searchView.onActionViewCollapsed()
}
@ -211,6 +214,7 @@ class MainActivity : BaseActivity() {
// stuff for the search in the topBar
val searchItem = menu.findItem(R.id.action_search)
this.searchItem = searchItem
searchView = searchItem.actionView as SearchView
val searchViewModel = ViewModelProvider(this)[SearchViewModel::class.java]

3
app/src/main/java/com/github/libretube/util/LayoutHelper.kt
View File

@ -1,3 +0,0 @@
package com.github.libretube.util
object LayoutHelper

6
app/src/main/res/menu/action_bar.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
@ -9,8 +8,7 @@
android:icon="@drawable/ic_search"
android:title="@string/search_hint"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always|collapseActionView"
tools:ignore="AlwaysShowAction" />
app:showAsAction="ifRoom|collapseActionView" />
<item
android:id="@+id/action_settings"

2
app/src/main/res/values/strings.xml
View File

@ -346,7 +346,7 @@
<string name="recentlyUpdated">Recently updated</string>
<string name="recentlyUpdatedReversed">Recently updated (reversed)</string>
<string name="show_more">Show more</string>
<string name="time_code">Time code</string>
<string name="time_code">Time code (seconds)</string>
<string name="added_to_playlist">Added to playlist</string>
<string name="playing_queue">Playing queue</string>
<string name="queue">Queue</string>