Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes: Labels under icons are not visible #3066

Merged
merged 11 commits into from
Feb 14, 2023
Merged

Fixes: Labels under icons are not visible #3066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44ca4cb
Made improvement to player double-tap further.
faisalcodes Feb 7, 2023
c8c214d
Minor fixes.
faisalcodes Feb 7, 2023
274f523
fix ktlint
faisalcodes Feb 7, 2023
78588b4
Merge branch 'libre-tube:master' into master
faisalcodes Feb 13, 2023
ff7b5b9
Filter out null comments returned from Piped API.
faisalcodes Feb 13, 2023
f7e8215
Merge remote-tracking branch 'origin/master'
faisalcodes Feb 13, 2023
78e6ba1
Merge branch 'libre-tube:master' into master
faisalcodes Feb 13, 2023
be48dd1
Merge remote-tracking branch 'origin/master'
faisalcodes Feb 13, 2023
f1fe391
Merge branch 'libre-tube:master' into master
faisalcodes Feb 13, 2023
b36daf1
Fixes: Labels under icons are not visible
faisalcodes Feb 13, 2023
d65ae45
Minor player controls UI improvements
Bnyro Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions app/release/output-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,61 +11,61 @@
"type": "UNIVERSAL",
"filters": [],
"attributes": [],
"versionCode": 26,
"versionName": "0.10.0",
"versionCode": 29,
"versionName": "0.12.0",
"outputFile": "app-universal-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "arm64-v8a"
"value": "x86"
}
],
"attributes": [],
"versionCode": 26,
"versionName": "0.10.0",
"outputFile": "app-arm64-v8a-release.apk"
"versionCode": 29,
"versionName": "0.12.0",
"outputFile": "app-x86-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86_64"
"value": "armeabi-v7a"
}
],
"attributes": [],
"versionCode": 26,
"versionName": "0.10.0",
"outputFile": "app-x86_64-release.apk"
"versionCode": 29,
"versionName": "0.12.0",
"outputFile": "app-armeabi-v7a-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "armeabi-v7a"
"value": "x86_64"
}
],
"attributes": [],
"versionCode": 26,
"versionName": "0.10.0",
"outputFile": "app-armeabi-v7a-release.apk"
"versionCode": 29,
"versionName": "0.12.0",
"outputFile": "app-x86_64-release.apk"
},
{
"type": "ONE_OF_MANY",
"filters": [
{
"filterType": "ABI",
"value": "x86"
"value": "arm64-v8a"
}
],
"attributes": [],
"versionCode": 26,
"versionName": "0.10.0",
"outputFile": "app-x86-release.apk"
"versionCode": 29,
"versionName": "0.12.0",
"outputFile": "app-arm64-v8a-release.apk"
}
],
"elementType": "File"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,6 +1432,10 @@ class PlayerFragment : Fragment(R.layout.fragment_player), OnlinePlayerOptions {
binding.linLayout.visibility = View.VISIBLE

updateCaptionsLanguage(captionLanguage)

binding.optionsLL.post {
binding.optionsLL.requestLayout()
}
}
}

Expand Down
14 changes: 9 additions & 5 deletions app/src/main/res/drawable/ic_download.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="48"
android:viewportHeight="48">
<path
android:fillColor="#FF000000"
android:pathData="M24,32.1 L13.9,22.05 16.35,19.6 22.3,25.55V7.15H25.7V25.55L31.65,19.6L34.1,22.05ZM10.8,40.55Q9.45,40.55 8.425,39.55Q7.4,38.55 7.4,37.15V29.45H10.8V37.15Q10.8,37.15 10.8,37.15Q10.8,37.15 10.8,37.15H37.15Q37.15,37.15 37.15,37.15Q37.15,37.15 37.15,37.15V29.45H40.55V37.15Q40.55,38.55 39.55,39.55Q38.55,40.55 37.15,40.55Z" />
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M16,11L12,15M12,15L8,11M12,15L12,3M21,15L21,17C21,18.105 20.105,19 19,19L5,19C3.895,19 3,18.105 3,17L3,15"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
</vector>
19 changes: 10 additions & 9 deletions app/src/main/res/layout/fragment_player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,45 +128,46 @@
<com.google.android.material.card.MaterialCardView
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_margin="17dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp"
android:layout_marginVertical="17dp"
app:cardCornerRadius="27dp">

<LinearLayout
android:id="@+id/optionsLL"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="18dp"
android:gravity="center"
android:orientation="horizontal">

<TextView
<com.github.libretube.ui.views.DrawableTextView
android:id="@+id/relPlayer_share"
style="@style/PlayerActionsText"
android:text="@string/share"
app:drawableTopCompat="@drawable/ic_share" />

<TextView
<com.github.libretube.ui.views.DrawableTextView
android:id="@+id/relPlayer_download"
style="@style/PlayerActionsText"
android:text="@string/download"
app:drawableTopCompat="@drawable/ic_download" />

<TextView
<com.github.libretube.ui.views.DrawableTextView
android:id="@+id/relPlayer_pip"
style="@style/PlayerActionsText"
android:text="@string/pop_up"
app:drawableTopCompat="@drawable/ic_open" />

<TextView
<com.github.libretube.ui.views.DrawableTextView
android:id="@+id/relPlayer_background"
style="@style/PlayerActionsText"
android:text="@string/audio"
app:drawableTopCompat="@drawable/ic_headphones" />

<TextView
<com.github.libretube.ui.views.DrawableTextView
android:id="@+id/relPlayer_save"
style="@style/PlayerActionsText"
android:text="@string/save"
Expand Down
14 changes: 9 additions & 5 deletions app/src/main/res/values/style.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,22 @@
</style>

<style name="PlayerActionsText">

<item name="android:autoSizeTextType" tools:targetApi="o">uniform</item>
<item name="android:autoSizeMinTextSize" tools:targetApi="o">10sp</item>
<item name="android:textSize">16sp</item>
<item name="android:autoSizeMaxTextSize" tools:targetApi="p">16sp</item>
<item name="android:autoSizeMaxTextSize" tools:targetApi="p">14sp</item>
<item name="android:textSize">14sp</item>
<item name="android:maxLines">1</item>
<item name="android:gravity">bottom</item>
<item name="android:textAlignment">center</item>
<item name="android:gravity">center</item>
<item name="android:background">?attr/selectableItemBackgroundBorderless</item>
<item name="android:layout_gravity">bottom</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_marginStart">3dp</item>
<item name="android:layout_marginEnd">3dp</item>
<item name="drawableTopDimen">24dp</item>
<item name="android:drawablePadding">3dp</item>

</style>

<style name="PlayerControlBottom">
Expand Down