kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #561 from Bnyro/master

Browse Source 
small fixes
This commit is contained in:
Bnyro 2022-06-19 10:02:34 +02:00 committed by GitHub
commit 777fb24b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.constraintlayout.motion.widget.MotionLayout import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContentProviderCompat.requireContext
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.core.view.isVisible import androidx.core.view.isVisible
@ -87,8 +86,6 @@ import com.squareup.picasso.Picasso
import java.io.IOException import java.io.IOException
import java.util.concurrent.Executors import java.util.concurrent.Executors
import kotlin.math.abs import kotlin.math.abs
import kotlinx.coroutines.NonCancellable.isActive
import org.chromium.base.ThreadUtils.runOnUiThread
import org.chromium.net.CronetEngine import org.chromium.net.CronetEngine
import retrofit2.HttpException import retrofit2.HttpException

13
app/src/main/res/drawable/ic_history.xml
View File

@ -1,10 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24">
android:tint="?android:attr/colorControlNormal">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M12,2c5.523,0 10,4.477 10,10s-4.477,10 -10,10c-1.702,0 -3.305,-0.425 -4.708,-1.175L2,22l1.176,-5.29C2.426,15.306 2,13.703 2,12 2,6.477 6.477,2 12,2zM13,7h-2v7h6v-2h-4L13,7z"/> android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z" />
</vector> </vector>

10
app/src/main/res/drawable/ic_history_filled.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FF000000"
android:pathData="M12,2c5.523,0 10,4.477 10,10s-4.477,10 -10,10c-1.702,0 -3.305,-0.425 -4.708,-1.175L2,22l1.176,-5.29C2.426,15.306 2,13.703 2,12 2,6.477 6.477,2 12,2zM13,7h-2v7h6v-2h-4L13,7z" />
</vector>

14
app/src/main/res/drawable/ic_login.xml
View File

@ -4,11 +4,11 @@
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal"> android:tint="?android:attr/colorControlNormal">
<path <path
android:pathData="M9,3h8a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H9m6,-9 l-4,-4m4,4 l-4,4m4,-4H5" android:pathData="M9,3h8a2,2 0,0 1,2 2v14a2,2 0,0 1,-2 2H9m6,-9 l-4,-4m4,4 l-4,4m4,-4H5"
android:strokeLineJoin="round" android:strokeLineJoin="round"
android:strokeWidth="2" android:strokeWidth="2"
android:fillColor="#00000000" android:fillColor="#00000000"
android:strokeColor="@android:color/black" android:strokeColor="@android:color/black"
android:strokeLineCap="round"/> android:strokeLineCap="round" />
</vector> </vector>

6
app/src/main/res/drawable/ic_login_filled.xml
View File

@ -4,7 +4,7 @@
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24" android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal"> android:tint="?android:attr/colorControlNormal">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M10,11H4V3a1,1 0,0 1,1 -1h14a1,1 0,0 1,1 1v18a1,1 0,0 1,-1 1H5a1,1 0,0 1,-1 -1v-8h6v3l5,-4 -5,-4v3z"/> android:pathData="M10,11H4V3a1,1 0,0 1,1 -1h14a1,1 0,0 1,1 1v18a1,1 0,0 1,-1 1H5a1,1 0,0 1,-1 -1v-8h6v3l5,-4 -5,-4v3z" />
</vector> </vector>

10
app/src/main/res/layout/exo_styled_player_control_view.xml
View File

@ -225,19 +225,21 @@
android:padding="@dimen/exo_styled_controls_padding" android:padding="@dimen/exo_styled_controls_padding"
android:clipToPadding="false"> android:clipToPadding="false">
<Button android:id="@id/exo_rew_with_amount" <Button
android:id="@id/exo_rew_with_amount"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
style="@style/ExoStyledControls.Button.Center.RewWithAmount"/> style="@style/ExoStyledControls.Button.Center.RewWithAmount" />
<ImageButton <ImageButton
android:id="@id/exo_play_pause" android:id="@id/exo_play_pause"
style="@style/ExoStyledControls.Button.Center.PlayPause" /> style="@style/ExoStyledControls.Button.Center.PlayPause" />
<Button android:id="@id/exo_ffwd_with_amount" <Button
android:id="@id/exo_ffwd_with_amount"
android:paddingLeft="4dp" android:paddingLeft="4dp"
android:paddingRight="4dp" android:paddingRight="4dp"
style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/> style="@style/ExoStyledControls.Button.Center.FfwdWithAmount" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/xml/advanced_settings.xml
View File

@ -35,7 +35,7 @@
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:icon="@drawable/ic_history" android:icon="@drawable/ic_history_filled"
app:key="search_history_toggle" app:key="search_history_toggle"
app:title="@string/search_history" /> app:title="@string/search_history" />

2
app/src/main/res/xml/settings.xml
View File

@ -64,7 +64,7 @@
android:icon="@drawable/ic_update" android:icon="@drawable/ic_update"
app:key="update" app:key="update"
app:summary="@string/update_summary" app:summary="@string/update_summary"
app:title="App version" /> app:title="App version" />
<Preference <Preference
android:icon="@drawable/ic_info" android:icon="@drawable/ic_info"

12
app/src/main/res/xml/sponsorblock_settings.xml
View File

@ -6,23 +6,23 @@
app:key="sb_enabled_key" app:key="sb_enabled_key"
app:title="@string/sponsorblock" app:title="@string/sponsorblock"
android:summaryOff="@string/disabled" android:summaryOff="@string/disabled"
android:summaryOn="@string/enabled" android:summaryOn="@string/enabled"
defaultValue="true"/> app:defaultValue="true" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="sb_notifications_key" app:key="sb_notifications_key"
app:title="@string/sponsorblock_notifications" app:title="@string/sponsorblock_notifications"
android:summaryOff="@string/disabled" android:summaryOff="@string/disabled"
android:summaryOn="@string/enabled" android:summaryOn="@string/enabled"
defaultValue="true"/> app:defaultValue="true" />
<PreferenceCategory app:title="@string/category_segments"> <PreferenceCategory app:title="@string/category_segments">
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="sponsors_category_key" app:key="sponsors_category_key"
app:title="@string/category_sponsor" app:title="@string/category_sponsor"
app:summary="@string/category_sponsor_description" app:summary="@string/category_sponsor_description"
defaultValue="true"/> app:defaultValue="true" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="selfpromo_category_key" app:key="selfpromo_category_key"