x/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2026-05-16 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

make code review changes

Browse Source 
switch to TaskHandler
switch to XML

Changelog: changed
This commit is contained in:
Kai
2025-06-04 12:59:48 -05:00
parent 42dd8d6152
commit 4ce9f64808
20 changed files with 908 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+1 -14
View File
@@ -143,10 +143,6 @@ android {
}
buildFeatures {
buildConfig true
compose true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.2"
}
sourceSets {
main {
@@ -160,9 +156,7 @@ android {
dependencies {
implementation 'com.google.dagger:dagger:2.48'
implementation 'androidx.test:monitor:1.7.2'
implementation 'androidx.compose.material:material-icons-extended:1.7.8'
implementation 'com.github.bumptech.glide:compose:1.0.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout-compose:1.1.1'
implementation 'com.google.android.material:material:1.12.0'
annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
//Core
@@ -222,7 +216,6 @@ dependencies {
//Database
implementation("androidx.room:room-runtime:2.6.1")
annotationProcessor("androidx.room:room-compiler:2.6.1")
debugImplementation 'androidx.compose.ui:ui-tooling:1.7.8'
ksp("androidx.room:room-compiler:2.6.1")
implementation("androidx.room:room-ktx:2.6.1")
@@ -236,10 +229,4 @@ dependencies {
testImplementation "org.mockito:mockito-core:5.4.0"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
//Compose
def composeBom = platform('androidx.compose:compose-bom:2025.02.00')
implementation composeBom
androidTestImplementation composeBom
implementation 'androidx.compose.material3:material3'
}
app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
+4
View File
@@ -325,6 +325,10 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
_fragBrowser = BrowserFragment.newInstance();
_fragShorts.onShownEvent.subscribe {
_fragVideoDetail.closeVideoDetails()
};
//Overlays
_fragVideoDetail = VideoDetailFragment.newInstance();
//Overlay Init
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt
+7 -5
View File
@@ -15,6 +15,7 @@ import android.view.ViewGroup
import android.widget.*
import androidx.core.animation.doOnEnd
import androidx.lifecycle.lifecycleScope
import androidx.media3.common.util.UnstableApi
import com.futo.platformplayer.R
import com.futo.platformplayer.Settings
import com.futo.platformplayer.UIDialogs
@@ -375,6 +376,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
fun newInstance() = MenuBottomBarFragment().apply { }
@UnstableApi
//Add configurable buttons here
var buttonDefinitions = listOf(
ButtonDefinition(0, R.drawable.ic_home, R.drawable.ic_home_filled, R.string.home, canToggle = true, { it.currentMain is HomeFragment }, {
@@ -386,11 +388,11 @@ class MenuBottomBarFragment : MainActivityFragment() {
it.navigate<HomeFragment>()
}
}),
ButtonDefinition(1, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.shorts, canToggle = true, { it.currentMain is ShortsFragment }, { it.navigate<ShortsFragment>() }),
ButtonDefinition(2, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>() }),
ButtonDefinition(3, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>() }),
ButtonDefinition(4, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>() }),
ButtonDefinition(5, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>() }),
ButtonDefinition(1, R.drawable.ic_subscriptions, R.drawable.ic_subscriptions_filled, R.string.subscriptions, canToggle = true, { it.currentMain is SubscriptionsFeedFragment }, { it.navigate<SubscriptionsFeedFragment>() }),
ButtonDefinition(2, R.drawable.ic_creators, R.drawable.ic_creators_filled, R.string.creators, canToggle = false, { it.currentMain is CreatorsFragment }, { it.navigate<CreatorsFragment>() }),
ButtonDefinition(3, R.drawable.ic_sources, R.drawable.ic_sources_filled, R.string.sources, canToggle = false, { it.currentMain is SourcesFragment }, { it.navigate<SourcesFragment>() }),
ButtonDefinition(4, R.drawable.ic_playlist, R.drawable.ic_playlist_filled, R.string.playlists, canToggle = false, { it.currentMain is PlaylistsFragment }, { it.navigate<PlaylistsFragment>() }),
ButtonDefinition(5, R.drawable.ic_smart_display, R.drawable.ic_smart_display_filled, R.string.shorts, canToggle = true, { it.currentMain is ShortsFragment }, { it.navigate<ShortsFragment>() }),
ButtonDefinition(6, R.drawable.ic_history, R.drawable.ic_history, R.string.history, canToggle = false, { it.currentMain is HistoryFragment }, { it.navigate<HistoryFragment>() }),
ButtonDefinition(7, R.drawable.ic_download, R.drawable.ic_download, R.string.downloads, canToggle = false, { it.currentMain is DownloadsFragment }, { it.navigate<DownloadsFragment>() }),
ButtonDefinition(8, R.drawable.ic_chat, R.drawable.ic_chat_filled, R.string.comments, canToggle = true, { it.currentMain is CommentsFragment }, { it.navigate<CommentsFragment>() }),
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
+357 -513
View File
File diff suppressed because it is too large Load Diff
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
+49 -55
View File
@@ -17,15 +17,10 @@ import com.futo.platformplayer.UIDialogs
import com.futo.platformplayer.api.media.models.video.IPlatformVideo
import com.futo.platformplayer.api.media.structures.IPager
import com.futo.platformplayer.constructs.Event0
import com.futo.platformplayer.constructs.TaskHandler
import com.futo.platformplayer.logging.Logger
import com.futo.platformplayer.states.StateApp
import com.futo.platformplayer.states.StatePlatform
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlin.coroutines.cancellation.CancellationException
@UnstableApi
class ShortsFragment : MainFragment() {
@@ -33,8 +28,8 @@ class ShortsFragment : MainFragment() {
override val isTab: Boolean = true
override val hasBottomBar: Boolean get() = true
private var loadPagerJob: Job? = null
private var nextPageJob: Job? = null
private var loadPagerTask: TaskHandler<ShortsFragment, IPager<IPlatformVideo>>? = null
private var nextPageTask: TaskHandler<ShortsFragment, List<IPlatformVideo>>? = null
private var shortsPager: IPager<IPlatformVideo>? = null
private val videos: MutableList<IPlatformVideo> = mutableListOf()
@@ -65,10 +60,6 @@ class ShortsFragment : MainFragment() {
setLoading(true)
if (loadPagerJob?.isActive == false && videos.isEmpty()) {
loadPager()
}
Logger.i(TAG, "Creating adapter")
val customViewAdapter =
CustomViewAdapter(videos, layoutInflater, this@ShortsFragment, overlayQualityContainer) {
@@ -80,7 +71,8 @@ class ShortsFragment : MainFragment() {
customViewAdapter.onResetTriggered.subscribe {
setLoading(true)
loadPager()
loadPagerJob!!.invokeOnCompletion {
loadPagerTask!!.success {
setLoading(false)
}
}
@@ -89,7 +81,19 @@ class ShortsFragment : MainFragment() {
this.customViewAdapter = customViewAdapter
loadPagerJob!!.invokeOnCompletion {
if (loadPagerTask == null && videos.isEmpty()) {
loadPager()
loadPagerTask!!.success {
applyData()
}
} else {
applyData()
}
}
private fun applyData() {
val viewPager = viewPager!!
viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
fun play(adapter: CustomViewAdapter, position: Int) {
val recycler = (viewPager.getChildAt(0) as RecyclerView)
@@ -134,52 +138,48 @@ class ShortsFragment : MainFragment() {
})
setLoading(false)
}
}
private fun nextPage() {
nextPageJob?.cancel()
nextPageTask?.cancel()
nextPageJob = CoroutineScope(Dispatchers.Main).launch {
try {
withContext(Dispatchers.IO) {
val nextPageTask =
TaskHandler<ShortsFragment, List<IPlatformVideo>>(StateApp.instance.scopeGetter, {
shortsPager!!.nextPage()
}
} catch (_: CancellationException) {
return@launch
}
// if it's been canceled then don't update the results
if (!isActive) {
return@launch
}
val newVideos = shortsPager!!.getResults()
CoroutineScope(Dispatchers.Main).launch {
return@TaskHandler shortsPager!!.getResults()
}).success { newVideos ->
val prevCount = customViewAdapter!!.itemCount
videos.addAll(newVideos)
customViewAdapter!!.notifyItemRangeInserted(prevCount, newVideos.size)
nextPageTask = null
}
}
nextPageTask.run(this)
this.nextPageTask = nextPageTask
}
// we just completely reset the data structure so we want to tell the adapter that
@SuppressLint("NotifyDataSetChanged")
private fun loadPager() {
loadPagerJob?.cancel()
loadPagerTask?.cancel()
val loadPagerTask =
TaskHandler<ShortsFragment, IPager<IPlatformVideo>>(StateApp.instance.scopeGetter, {
val pager = StatePlatform.instance.getShorts()
return@TaskHandler pager
}).success { pager ->
videos.clear()
videos.addAll(pager.getResults())
shortsPager = pager
// if the view pager exists go back to the beginning
videos.clear()
viewPager?.adapter?.notifyDataSetChanged()
viewPager?.currentItem = 0
loadPagerJob = CoroutineScope(Dispatchers.Main).launch {
val pager = try {
withContext(Dispatchers.IO) {
StatePlatform.instance.getShorts()
}
} catch (_: CancellationException) {
return@launch
} catch (err: Throwable) {
loadPagerTask = null
}.exception<Throwable> { err ->
val message = "Unable to load shorts $err"
Logger.i(TAG, message)
if (context != null) {
@@ -189,21 +189,12 @@ class ShortsFragment : MainFragment() {
)
)
}
return@launch
return@exception
}
// if it's been canceled then don't set the video pager
if (!isActive) {
return@launch
}
this.loadPagerTask = loadPagerTask
videos.clear()
videos.addAll(pager.getResults())
shortsPager = pager
// if the viewPager exists then trigger data changed
viewPager?.adapter?.notifyDataSetChanged()
}
loadPagerTask.run(this)
}
private fun setLoading(isLoading: Boolean) {
@@ -223,6 +214,10 @@ class ShortsFragment : MainFragment() {
override fun onDestroy() {
super.onDestroy()
loadPagerTask?.cancel()
loadPagerTask = null
nextPageTask?.cancel()
nextPageTask = null
customViewAdapter?.previousShownView?.stop()
}
@@ -265,7 +260,6 @@ class ShortsFragment : MainFragment() {
override fun onViewRecycled(holder: CustomViewHolder) {
super.onViewRecycled(holder)
holder.shortView.cancel()
}
override fun onViewAttachedToWindow(holder: CustomViewHolder) {
app/src/main/java/com/futo/platformplayer/video/PlayerManager.kt
+9 -6
View File
@@ -34,15 +34,18 @@ class PlayerManager {
@Synchronized
fun attach(view: PlayerView, stateName: String) {
if(view != _currentView || _currentView?.player == null) {
_currentView?.player = null;
switchState(stateName);
view.player = player;
_currentView = view;
if (view != _currentView) {
_currentView?.player = null
_currentView = null
switchState(stateName)
view.player = player
_currentView = view
}
}
fun detach() {
_currentView?.player = null;
_currentView?.player = null
_currentView = null
}
fun getState(name: String): PlayerState {
app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt
-2
View File
@@ -72,8 +72,6 @@ import kotlin.math.abs
abstract class FutoVideoPlayerBase : RelativeLayout {
private val TAG = "FutoVideoPlayerBase"
// private val TEMP_DIRECTORY = StateApp.instance.getTempDirectory();
private var _mediaSource: MediaSource? = null;
var lastVideoSource: IVideoSource? = null
app/src/main/res/drawable/ic_comment.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:autoMirrored="true">
<path
android:fillColor="@android:color/white"
android:pathData="M260,540L700,540L700,509.23L260,509.23L260,540ZM260,415.38L700,415.38L700,384.62L260,384.62L260,415.38ZM260,290.77L700,290.77L700,260L260,260L260,290.77ZM840,803.08L716.92,680L175.38,680Q152.33,680 136.16,663.84Q120,647.67 120,624.62L120,175.38Q120,152.33 136.16,136.16Q152.33,120 175.38,120L784.62,120Q807.67,120 823.84,136.16Q840,152.33 840,175.38L840,803.08ZM175.38,649.23L730.62,649.23L809.23,730.77L809.23,175.38Q809.23,166.15 801.54,158.46Q793.85,150.77 784.62,150.77L175.38,150.77Q166.15,150.77 158.46,158.46Q150.77,166.15 150.77,175.38L150.77,624.62Q150.77,633.85 158.46,641.54Q166.15,649.23 175.38,649.23ZM150.77,649.23Q150.77,649.23 150.77,641.54Q150.77,633.85 150.77,624.62L150.77,175.38Q150.77,166.15 150.77,158.46Q150.77,150.77 150.77,150.77L150.77,150.77Q150.77,150.77 150.77,158.46Q150.77,166.15 150.77,175.38L150.77,649.23Z"/>
</vector>
app/src/main/res/drawable/ic_smart_display.xml
+1 -1
View File
@@ -5,5 +5,5 @@
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M405.85,617L619.69,478.77L405.85,341.31L405.85,617ZM175.38,760Q152.33,760 136.16,743.84Q120,727.67 120,704.62L120,255.38Q120,232.33 136.16,216.16Q152.33,200 175.38,200L784.62,200Q807.67,200 823.84,216.16Q840,232.33 840,255.38L840,704.62Q840,727.67 823.84,743.84Q807.67,760 784.62,760L175.38,760ZM175.38,729.23L784.62,729.23Q793.85,729.23 801.54,721.54Q809.23,713.85 809.23,704.62L809.23,255.38Q809.23,246.15 801.54,238.46Q793.85,230.77 784.62,230.77L175.38,230.77Q166.15,230.77 158.46,238.46Q150.77,246.15 150.77,255.38L150.77,704.62Q150.77,713.85 158.46,721.54Q166.15,729.23 175.38,729.23ZM150.77,729.23Q150.77,729.23 150.77,721.54Q150.77,713.85 150.77,704.62L150.77,255.38Q150.77,246.15 150.77,238.46Q150.77,230.77 150.77,230.77L150.77,230.77Q150.77,230.77 150.77,238.46Q150.77,246.15 150.77,255.38L150.77,704.62Q150.77,713.85 150.77,721.54Q150.77,729.23 150.77,729.23L150.77,729.23Z"/>
android:pathData="M405.85,617L619.69,478.77L405.85,341.31L405.85,617ZM175.38,760Q152.33,760 136.16,743.84Q120,727.67 120,704.62L120,255.38Q120,232.33 136.16,216.16Q152.33,200 175.38,200L784.62,200Q807.67,200 823.84,216.16Q840,232.33 840,255.38L840,704.62Q840,727.67 823.84,743.84Q807.67,760 784.62,760L175.38,760ZM175.38,729.23L784.62,729.23Q793.85,729.23 801.54,721.54Q809.23,713.85 809.23,704.62L809.23,255.38Q809.23,246.15 801.54,238.46Q793.85,230.77 784.62,230.77L175.38,230.77Q166.15,230.77 158.46,238.46Q150.77,246.15 150.77,255.38L150.77,704.62Q150.77,713.85 158.46,721.54Q166.15,729.23 175.38,729.23ZM150.77,729.23Q150.77,729.23 150.77,721.54Q150.77,713.85 150.77,704.62L150.77,255.38Q150.77,246.15 150.77,238.46Q150.77,230.77 150.77,230.77L150.77,230.77Q150.77,230.77 150.77,238.46Q150.77,246.15 150.77,255.38L150.77,704.62Q150.77,713.85 150.77,721.54Q150.77,729.23 150.77,729.23Z"/>
</vector>
app/src/main/res/drawable/ic_smart_display_filled.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M405.85,617L619.69,478.77L405.85,341.31L405.85,617ZM175.38,760Q152.15,760 136.08,743.92Q120,727.85 120,704.62L120,255.38Q120,232.15 136.08,216.08Q152.15,200 175.38,200L784.62,200Q807.85,200 823.92,216.08Q840,232.15 840,255.38L840,704.62Q840,727.85 823.92,743.92Q807.85,760 784.62,760L175.38,760Z"/>
</vector>
app/src/main/res/drawable/ic_thumb_down.xml
+3 -3
View File
@@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M13.15,9.6H33.3V31.45L20.8,44L20.2,43.55Q19.9,43.3 19.75,42.95Q19.6,42.6 19.6,42.2V42L21.7,31.45H6.85Q5.75,31.45 4.9,30.6Q4.05,29.75 4.05,28.7V26.15Q4.05,25.9 4.05,25.575Q4.05,25.25 4.15,24.95L9.75,11.85Q10.1,10.9 11.1,10.25Q12.1,9.6 13.15,9.6ZM31.75,11.15H12.85Q12.4,11.15 11.975,11.375Q11.55,11.6 11.3,12.15L5.6,25.6V28.7Q5.6,29.2 5.95,29.55Q6.3,29.9 6.85,29.9H23.55L21.25,41.45L31.75,30.75ZM31.75,30.75V29.9Q31.75,29.9 31.75,29.55Q31.75,29.2 31.75,28.7V25.6V12.15Q31.75,11.6 31.75,11.375Q31.75,11.15 31.75,11.15ZM33.3,31.45V29.9H40.45V11.15H33.3V9.6H42V31.45Z"/>
android:pathData="M262.65,192.31L666,192.31L666,628.92L415.69,880L403.6,871.19Q398.38,866.31 395.38,859.23Q392.38,852.15 392.38,843.77L392.38,839.92L433.54,628.92L136.85,628.92Q115.46,628.92 98.46,611.92Q81.46,594.92 81.46,573.54L81.46,523.18Q81.46,517.62 81.12,511.27Q80.77,504.92 83,499.46L195.15,237.15Q202.49,218.21 222.44,205.26Q242.39,192.31 262.65,192.31ZM635.23,223.08L256.69,223.08Q248.23,223.08 239.38,227.69Q230.54,232.31 225.92,243.08L112.23,512.08L112.23,573.54Q112.23,583.54 119.15,590.85Q126.08,598.15 136.85,598.15L470.62,598.15L424.54,829.46L635.23,615.46L635.23,223.08ZM635.23,615.46L635.23,615.46L635.23,598.15L635.23,598.15Q635.23,598.15 635.23,590.85Q635.23,583.54 635.23,573.54L635.23,512.08L635.23,243.08Q635.23,232.31 635.23,227.69Q635.23,223.08 635.23,223.08L635.23,223.08L635.23,615.46ZM666,628.92L666,598.15L809,598.15L809,223.08L666,223.08L666,192.31L839.77,192.31L839.77,628.92L666,628.92Z"/>
</vector>
app/src/main/res/drawable/ic_thumb_down_filled.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M261.31,192.31L684.46,192.31L684.46,628.92L434.15,880L425,873.23Q417.08,866.77 413.96,859.46Q410.85,852.15 410.85,843.77L410.85,839.92L452,628.92L135.38,628.92Q113.92,628.92 96.96,611.96Q80,595 80,573.54L80,523.08Q80,515.15 81.73,505.65Q83.46,496.15 86.15,489.77L193.69,237.15Q201.92,218.46 221.27,205.38Q240.62,192.31 261.31,192.31ZM715.23,628.92L715.23,192.31L840,192.31L840,628.92L715.23,628.92Z"/>
</vector>
app/src/main/res/drawable/ic_thumb_up.xml
+3 -3
View File
@@ -1,9 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M34.85,40H14.7V18.15L27.15,5.6L27.8,6.05Q28.05,6.3 28.2,6.65Q28.35,7 28.35,7.4V7.6L26.25,18.15H41.15Q42.2,18.15 43.05,19Q43.9,19.85 43.9,20.95V23.45Q43.9,23.75 43.9,24.05Q43.9,24.35 43.8,24.65L38.2,37.75Q37.8,38.7 36.8,39.35Q35.8,40 34.85,40ZM16.2,38.45H35.15Q35.55,38.45 36,38.225Q36.45,38 36.7,37.45L42.35,24V20.95Q42.35,20.45 42,20.075Q41.65,19.7 41.15,19.7H24.45L26.7,8.15L16.2,18.85ZM16.2,18.85V19.7Q16.2,19.7 16.2,20.075Q16.2,20.45 16.2,20.95V24V37.45Q16.2,38 16.2,38.225Q16.2,38.45 16.2,38.45ZM14.7,18.15V19.7H7.55V38.45H14.7V40H6V18.15Z"/>
android:pathData="M696.77,800L293.54,800L293.54,363.38L543.08,112.31L555.84,121.12Q561.15,126 564.15,133.08Q567.15,140.15 567.15,147.77L567.15,152.38L525.23,363.38L822.69,363.38Q844.08,363.38 861.08,380.38Q878.08,397.38 878.08,418.77L878.08,469.13Q878.08,474.69 878.04,481.04Q878,487.38 875.77,492.85L764.38,755.15Q756,774.22 736.19,787.11Q716.38,800 696.77,800ZM324.31,769.23L702.85,769.23Q710.54,769.23 719.77,764.62Q729,760 733.62,749.23L847.31,480.23L847.31,418.77Q847.31,408.77 840,401.46Q832.69,394.15 822.69,394.15L488.92,394.15L534.23,162.85L324.31,376.85L324.31,769.23ZM324.31,376.85L324.31,376.85L324.31,394.15L324.31,394.15Q324.31,394.15 324.31,401.46Q324.31,408.77 324.31,418.77L324.31,480.23L324.31,749.23Q324.31,760 324.31,764.62Q324.31,769.23 324.31,769.23L324.31,769.23L324.31,376.85ZM293.54,363.38L293.54,394.15L150.54,394.15L150.54,769.23L293.54,769.23L293.54,800L119.77,800L119.77,363.38L293.54,363.38Z"/>
</vector>
app/src/main/res/drawable/ic_thumb_up_filled.xml
+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="48dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M698.69,800L275.54,800L275.54,363.38L525.85,112.31L535.77,119.08Q542.92,125.54 546.04,132.85Q549.15,140.15 549.15,147.77L549.15,152.38L508,363.38L824.62,363.38Q846.08,363.38 863.04,380.35Q880,397.31 880,418.77L880,469.23Q880,477.15 878.27,486.65Q876.54,496.15 873.85,502.54L766.31,755.15Q758.08,773.85 738.73,786.92Q719.38,800 698.69,800ZM244.77,363.38L244.77,800L120,800L120,363.38L244.77,363.38Z"/>
</vector>
app/src/main/res/drawable/thumb_down_selector.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/ic_thumb_down_filled" />
<item android:drawable="@drawable/ic_thumb_down" />
</selector>
app/src/main/res/drawable/thumb_up_selector.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@drawable/ic_thumb_up_filled" />
<item android:drawable="@drawable/ic_thumb_up" />
</selector>
app/src/main/res/layout/view_short.xml
+3 -8
View File
@@ -15,21 +15,16 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.compose.ui.platform.ComposeView
android:id="@+id/shorts_overlay_content_compose_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="1dp"
app:layout_constraintBottom_toBottomOf="parent" />
<include layout="@layout/view_short_overlay" />
<!-- make the overlay clickable to intercept touches-->
<!-- make the overlay clickable to intercept touches -->
<FrameLayout
android:id="@+id/short_view_loading_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#77000000"
android:elevation="4dp"
android:clickable="true"
android:elevation="4dp"
android:visibility="gone">
<ImageView
app/src/main/res/layout/view_short_overlay.xml
+293
View File
@@ -0,0 +1,293 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Main content buttons and text -->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Title section -->
<LinearLayout
android:id="@+id/title_section"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="16dp"
android:orientation="vertical"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/buttons_section"
app:layout_constraintStart_toStartOf="parent">
<!-- Channel info row -->
<LinearLayout
android:id="@+id/channel_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minWidth="48dp"
android:orientation="horizontal"
android:paddingVertical="8dp">
<com.futo.platformplayer.views.others.CreatorThumbnail
android:id="@+id/creator_thumbnail"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginEnd="8dp"
android:contentDescription="@string/cd_creator_thumbnail" />
<TextView
android:id="@+id/channel_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:shadowColor="@android:color/black"
android:text=""
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<!-- Video title -->
<TextView
android:id="@+id/video_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:shadowColor="@android:color/black"
android:text=""
android:textColor="@android:color/white"
android:textSize="14sp" />
</LinearLayout>
<!-- Buttons section -->
<LinearLayout
android:id="@+id/buttons_section"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginBottom="16dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<!-- Like button -->
<FrameLayout
android:id="@+id/like_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="12dp"
android:visibility="gone">
<com.google.android.material.button.MaterialButton
android:id="@+id/like_button"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:checkable="true"
android:contentDescription="@string/cd_image_like_icon"
app:backgroundTint="@color/transparent"
app:icon="@drawable/thumb_up_selector"
app:iconSize="24dp"
app:iconTint="@android:color/white"
app:rippleColor="@color/ripple"
app:toggleCheckedStateOnClick="true" />
<TextView
android:id="@+id/like_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:shadowColor="@android:color/black"
android:textColor="@android:color/white"
android:textSize="12sp" />
</FrameLayout>
<!-- Dislike button -->
<FrameLayout
android:id="@+id/dislike_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="12dp"
android:visibility="gone">
<com.google.android.material.button.MaterialButton
android:id="@+id/dislike_button"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:checkable="true"
android:contentDescription="@string/cd_image_dislike_icon"
app:backgroundTint="@color/transparent"
app:icon="@drawable/thumb_down_selector"
app:iconSize="24dp"
app:iconTint="@android:color/white"
app:rippleColor="@color/ripple"
app:toggleCheckedStateOnClick="true" />
<TextView
android:id="@+id/dislike_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:shadowColor="@android:color/black"
android:textColor="@android:color/white"
android:textSize="12sp" />
</FrameLayout>
<!-- Comments button -->
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="12dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/comments_button"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="8dp"
android:contentDescription="@string/comments"
app:icon="@drawable/ic_comment"
app:iconSize="24dp"
app:iconTint="@android:color/white"
app:rippleColor="@color/ripple" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:importantForAccessibility="no"
android:shadowColor="@android:color/black"
android:text="@string/comments"
android:textColor="@android:color/white"
android:textSize="12sp" />
</FrameLayout>
<!-- Share button -->
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="12dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/share_button"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:contentDescription="@string/share"
app:icon="@drawable/ic_share"
app:iconSize="24dp"
app:iconTint="@android:color/white"
app:rippleColor="@color/ripple" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:importantForAccessibility="no"
android:shadowColor="@android:color/black"
android:text="@string/share"
android:textColor="@android:color/white"
android:textSize="12sp" />
</FrameLayout>
<!-- Refresh button -->
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="12dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/refresh_button"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:contentDescription="@string/refresh"
app:icon="@drawable/ic_refresh"
app:iconSize="24dp"
app:iconTint="@android:color/white"
app:rippleColor="@color/ripple" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:importantForAccessibility="no"
android:shadowColor="@android:color/black"
android:text="@string/refresh"
android:textColor="@android:color/white"
android:textSize="12sp" />
</FrameLayout>
<!-- Quality/More button -->
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/quality_button"
style="@style/Widget.Material3.Button.IconButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:contentDescription="@string/quality"
app:icon="@drawable/ic_more"
app:iconSize="24dp"
app:iconTint="@android:color/white"
app:rippleColor="@color/ripple" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:importantForAccessibility="no"
android:shadowColor="@android:color/black"
android:text="@string/quality"
android:textColor="@android:color/white"
android:textSize="12sp" />
</FrameLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- Play/Pause overlay -->
<FrameLayout
android:id="@+id/play_pause_overlay"
android:layout_width="94dp"
android:layout_height="94dp"
android:layout_gravity="center"
android:background="@drawable/rounded_outline"
android:backgroundTint="@color/play_pause_background"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/play_pause_icon"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_gravity="center"
android:contentDescription="@string/play"
android:src="@drawable/ic_play"
app:tint="@android:color/white" />
</FrameLayout>
</FrameLayout>
app/src/main/res/values/colors.xml
+4
View File
@@ -39,6 +39,10 @@
<color name="text_color_tinted">#ACACAC</color>
<color name="pastel_red">#C25353</color>
<!--shorts-->
<color name="play_pause_background">#33555555</color>
<color name="ripple">#33FFFFFF</color>
<!--material 3 colors-->
<color name="md_theme_primary">#8F4C38</color>
<color name="md_theme_onPrimary">#FFFFFF</color>
app/src/main/res/values/strings.xml
+1
View File
@@ -36,6 +36,7 @@
<string name="preferred_quality">Preferred Quality</string>
<string name="preferred_quality_description">Default quality for watching a video</string>
<string name="update">Update</string>
<string name="refresh">Refresh</string>
<string name="close">Close</string>
<string name="never">Never</string>
<string name="import_options">Select any of the following available import options.</string>