Skip to content

Commit cabb92c

Browse files
alperozturk96alperozturk96
committed
wip
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent f8b4329 commit cabb92c

3 files changed

Lines changed: 50 additions & 16 deletions

File tree

‎app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import com.nextcloud.client.jobs.folderDownload.FolderDownloadEventBroadcaster
7171
import com.nextcloud.client.jobs.upload.FileUploadEventBroadcaster
7272
import com.nextcloud.client.jobs.upload.FileUploadHelper
7373
import com.nextcloud.client.jobs.upload.FileUploadWorker
74-
import com.nextcloud.client.media.PlayerServiceConnection
7574
import com.nextcloud.client.network.ClientFactory.CreationException
7675
import com.nextcloud.client.player.ui.PlayerLauncher
7776
import com.nextcloud.client.preferences.AppPreferences
@@ -143,7 +142,6 @@ import com.owncloud.android.ui.interfaces.TransactionInterface
143142
import com.owncloud.android.ui.navigation.NavigatorScreen
144143
import com.owncloud.android.ui.preview.PreviewImageActivity
145144
import com.owncloud.android.ui.preview.PreviewImageFragment
146-
import com.owncloud.android.ui.preview.PreviewMediaActivity
147145
import com.owncloud.android.ui.preview.PreviewMediaFragment
148146
import com.owncloud.android.ui.preview.PreviewMediaFragment.Companion.newInstance
149147
import com.owncloud.android.ui.preview.PreviewTextFileFragment
@@ -223,7 +221,6 @@ class FileDisplayActivity :
223221
private var searchOpen = false
224222

225223
private var searchView: SearchView? = null
226-
private var mPlayerConnection: PlayerServiceConnection? = null
227224
private var lastDisplayedAccountName: String? = null
228225

229226
@Inject
@@ -295,10 +292,7 @@ class FileDisplayActivity :
295292
showSortListGroup(savedInstanceState.getBoolean(KEY_IS_SORT_GROUP_VISIBLE))
296293
}
297294

298-
mPlayerConnection = PlayerServiceConnection(this)
299-
300295
checkStoragePath()
301-
302296
observeWorkerState()
303297
startMetadataSyncForRoot()
304298
handleBackPress()
@@ -866,14 +860,17 @@ class FileDisplayActivity :
866860
}
867861
}
868862

863+
fun canBePreviewed(file: OCFile?): Boolean =
864+
file != null && (MimeTypeUtil.isAudio(file) || MimeTypeUtil.isVideo(file))
865+
869866
private fun tryStartWaitingPreview(success: Boolean): Boolean {
870867
if (!success) return false
871868

872869
mWaitingToPreview = mWaitingToPreview?.fileId?.let { storageManager.getFileById(it) }
873870
val file = mWaitingToPreview ?: return false
874871

875872
return when {
876-
PreviewMediaActivity.canBePreviewed(file) -> {
873+
canBePreviewed(file) -> {
877874
startMediaPreview(file, 0, true, true, true, true)
878875
true
879876
}
@@ -2039,7 +2036,7 @@ class FileDisplayActivity :
20392036
} else if (PreviewTextFileFragment.canBePreviewed(file)) {
20402037
setFabVisible?.onComplete(false)
20412038
startTextPreview(file, false)
2042-
} else if (PreviewMediaActivity.Companion.canBePreviewed(file)) {
2039+
} else if (canBePreviewed(file)) {
20432040
setFabVisible?.onComplete(false)
20442041
startMediaPreview(file, 0, true, true, false, true)
20452042
} else {
@@ -2181,7 +2178,7 @@ class FileDisplayActivity :
21812178

21822179
if (result.isSuccess) {
21832180
val removedFile = operation.file
2184-
tryStopPlaying(removedFile)
2181+
file?.let { playbackModel.stopPlaying(it) }
21852182
val leftFragment = this.leftFragment
21862183

21872184
// check if file is still available, if so do nothing
@@ -2299,13 +2296,6 @@ class FileDisplayActivity :
22992296
}
23002297
}
23012298

2302-
private fun tryStopPlaying(file: OCFile) {
2303-
// placeholder for stop-on-delete future code
2304-
if (mPlayerConnection != null && MimeTypeUtil.isAudio(file) && mPlayerConnection?.isPlaying() == true) {
2305-
mPlayerConnection?.stop(file)
2306-
}
2307-
}
2308-
23092299
/**
23102300
* Updates the view associated to the activity after the finish of an operation trying to move a file.
23112301
*

‎app/src/main/res/values/styles.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,4 +497,43 @@
497497
<item name="android:windowBackground">@android:color/black</item>
498498
<item name="android:colorControlHighlight">@color/primary</item>
499499
</style>
500+
501+
<style name="PlayerTimeTextViewStyle">
502+
<item name="android:layout_width">wrap_content</item>
503+
<item name="android:layout_height">wrap_content</item>
504+
<item name="android:singleLine">true</item>
505+
<item name="android:ellipsize">end</item>
506+
<item name="android:gravity">center</item>
507+
<item name="android:textColor">@color/player_default_text_color</item>
508+
<item name="android:textSize">@dimen/player_progress_time_text_size
509+
</item>
510+
</style>
511+
512+
<style name="PlayerSeekBarStyle" parent="@android:style/Widget.SeekBar">
513+
<item name="android:progressDrawable">@drawable/player_progress_drawable</item>
514+
<item name="android:thumb">@drawable/player_progress_thumb</item>
515+
<item name="android:minHeight">@dimen/player_progress_drawable_height</item>
516+
<item name="android:maxHeight">@dimen/player_progress_drawable_height</item>
517+
</style>
518+
519+
<style name="PlayerButtonStyle" parent="@style/Widget.Material3.Button.IconButton">
520+
<item name="iconSize">32dp</item>
521+
522+
<item name="android:layout_width">@dimen/minimum_size_for_touchable_area</item>
523+
<item name="android:layout_height">@dimen/minimum_size_for_touchable_area</item>
524+
525+
<item name="android:padding">0dp</item>
526+
<item name="android:insetLeft">0dp</item>
527+
<item name="android:insetRight">0dp</item>
528+
<item name="android:insetTop">0dp</item>
529+
<item name="android:insetBottom">0dp</item>
530+
531+
<item name="android:layout_marginStart">@dimen/player_button_margin_horizontal</item>
532+
<item name="android:layout_marginEnd">@dimen/player_button_margin_horizontal</item>
533+
<item name="android:layout_marginTop">@dimen/player_button_margin_vertical</item>
534+
<item name="android:layout_marginBottom">@dimen/player_button_margin_vertical</item>
535+
536+
<item name="iconGravity">textStart</item>
537+
<item name="iconPadding">0dp</item>
538+
</style>
500539
</resources>

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ stateless4jVersion = "2.6.0"
8686
webkitVersion = "1.16.0"
8787
workRuntime = "2.11.2"
8888
foundationVersion = "1.11.2"
89+
kotlinxCoroutinesVersion = "1.11.0"
8990

9091
[libraries]
9192
# Crypto
@@ -243,6 +244,10 @@ work-runtime = { module = "androidx.work:work-runtime", version.ref = "workRunti
243244
work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntime" }
244245
foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "foundationVersion" }
245246

247+
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesVersion" }
248+
kotlinx-coroutines-guava = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-guava", version.ref = "kotlinxCoroutinesVersion" }
249+
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesVersion" }
250+
246251
[bundles]
247252
media3 = ["media3-ui", "media3-session", "media3-exoplayer", "media3-datasource"]
248253
espresso = ["espresso-core", "espresso-contrib", "espresso-web", "espresso-accessibility", "espresso-intents", "espresso-idling-resource"]

0 commit comments

Comments
 (0)