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

use proper kotlin syntax

Browse Source
This commit is contained in:
Bnyro 2022-10-09 18:43:11 +02:00
parent 93ebedc328
commit 6d9b55e519
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/constants/ShareObjectType.kt Normal file
View File

@ -0,0 +1,7 @@
package com.github.libretube.constants
object ShareObjectType {
const val VIDEO = 0
const val PLAYLIST = 1
const val CHANNEL = 2
}

2
app/src/main/java/com/github/libretube/ui/adapters/ChannelAdapter.kt
View File

@ -49,7 +49,7 @@ class ChannelAdapter(
videoInfo.text =
video.views.formatShort() + " " +
ContextUtils.getApplicationContext().resources.getString(R.string.views_placeholder) +
root.context.getString(R.string.views_placeholder) +
" • " + DateUtils.getRelativeTimeSpanString(video.uploaded!!)
thumbnailDuration.text =

16
app/src/main/java/com/github/libretube/ui/dialogs/ShareDialog.kt
View File

@ -7,6 +7,7 @@ import androidx.fragment.app.DialogFragment
import com.github.libretube.R
import com.github.libretube.constants.PIPED_FRONTEND_URL
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.constants.ShareObjectType
import com.github.libretube.constants.YOUTUBE_FRONTEND_URL
import com.github.libretube.databinding.DialogShareBinding
import com.github.libretube.db.DatabaseHolder.Companion.Database
@ -16,8 +17,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
class ShareDialog(
private val id: String,
private val isPlaylist: Boolean,
private val isChannel: Boolean,
private val shareObjectType: Int,
private val position: Long? = null
) : DialogFragment() {
private var binding: DialogShareBinding? = null
@ -51,14 +51,10 @@ class ShareDialog(
// only available for custom instances
else -> instanceUrl
}
var path = if (!isChannel) {
if (!isPlaylist) {
"/watch?v=$id"
} else {
"/playlist?list=$id"
}
} else {
"/c/$id"
var path = when (shareObjectType) {
ShareObjectType.VIDEO -> "/watch?v=$id"
ShareObjectType.PLAYLIST -> "/playlist?list=$id"
else -> "/c/$id"
}
var url = "$host$path"

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

@ -11,6 +11,7 @@ import com.github.libretube.R
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.constants.IntentData
import com.github.libretube.constants.ShareObjectType
import com.github.libretube.databinding.FragmentChannelBinding
import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.formatShort
@ -126,7 +127,7 @@ class ChannelFragment : BaseFragment() {
}
binding.channelShare.setOnClickListener {
val shareDialog = ShareDialog(response.name!!, false, true)
val shareDialog = ShareDialog(response.name!!, ShareObjectType.CHANNEL)
shareDialog.show(childFragmentManager, ShareDialog::class.java.name)
}
}

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

@ -40,6 +40,7 @@ import com.github.libretube.api.RetrofitInstance
import com.github.libretube.api.SubscriptionHelper
import com.github.libretube.constants.IntentData
import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.constants.ShareObjectType
import com.github.libretube.databinding.DoubleTapOverlayBinding
import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
import com.github.libretube.databinding.FragmentPlayerBinding
@ -425,7 +426,7 @@ class PlayerFragment : BaseFragment() {
// share button
binding.relPlayerShare.setOnClickListener {
val shareDialog = ShareDialog(videoId!!, false, false, exoPlayer.currentPosition / 1000)
val shareDialog = ShareDialog(videoId!!, ShareObjectType.VIDEO, exoPlayer.currentPosition / 1000)
shareDialog.show(childFragmentManager, ShareDialog::class.java.name)
}

3
app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
View File

@ -6,6 +6,7 @@ import android.util.Log
import android.widget.Toast
import com.github.libretube.R
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.ShareObjectType
import com.github.libretube.databinding.DialogTextPreferenceBinding
import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.toID
@ -74,7 +75,7 @@ class PlaylistOptionsBottomSheet(
}
// share the playlist
context?.getString(R.string.share) -> {
val shareDialog = ShareDialog(playlistId, true, false)
val shareDialog = ShareDialog(playlistId, ShareObjectType.PLAYLIST)
// using parentFragmentManager, childFragmentManager doesn't work here
shareDialog.show(parentFragmentManager, ShareDialog::class.java.name)
}

3
app/src/main/java/com/github/libretube/ui/sheets/VideoOptionsBottomSheet.kt
View File

@ -4,6 +4,7 @@ import android.os.Bundle
import android.widget.Toast
import com.github.libretube.R
import com.github.libretube.constants.IntentData
import com.github.libretube.constants.ShareObjectType
import com.github.libretube.ui.dialogs.AddToPlaylistDialog
import com.github.libretube.ui.dialogs.DownloadDialog
import com.github.libretube.ui.dialogs.ShareDialog
@ -73,7 +74,7 @@ class VideoOptionsBottomSheet(
downloadDialog.show(parentFragmentManager, DownloadDialog::class.java.name)
}
context?.getString(R.string.share) -> {
val shareDialog = ShareDialog(videoId, false, false)
val shareDialog = ShareDialog(videoId, ShareObjectType.VIDEO)
// using parentFragmentManager is important here
shareDialog.show(parentFragmentManager, ShareDialog::class.java.name)
}