diff --git a/app/build.gradle b/app/build.gradle index 62a5e53d..87c6680e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,24 +110,27 @@ dependencies { implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.preference:preference-ktx:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0' - implementation 'androidx.navigation:navigation-ui-ktx:2.4.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' + implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' implementation "androidx.browser:browser:1.4.0" implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" - implementation 'androidx.navigation:navigation-fragment-ktx:2.4.0' - implementation 'androidx.navigation:navigation-ui-ktx:2.4.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' + implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' implementation 'androidx.paging:paging-runtime-ktx:3.1.0' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.0' - implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.4.0" + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1" + implementation "androidx.lifecycle:lifecycle-common-java8:2.4.1" implementation "androidx.annotation:annotation:1.3.0" implementation 'androidx.gridlayout:gridlayout:1.0.0' implementation "androidx.activity:activity-ktx:1.4.0" implementation 'androidx.fragment:fragment-ktx:1.4.1' implementation 'androidx.work:work-runtime-ktx:2.7.1' + implementation 'androidx.media2:media2-widget:1.2.1' + implementation 'androidx.media2:media2-player:1.2.1' + // Use the most recent version of CameraX def cameraX_version = '1.1.0-beta01' diff --git a/app/licenses.yml b/app/licenses.yml index f020c466..39aafb07 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -918,4 +918,40 @@ copyrightHolder: Google Inc license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: http://developer.android.com/tools/extras/support-library.html \ No newline at end of file + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.media2:media2-widget:+ + name: media2-widget + copyrightHolder: Google Inc + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/media2 +- artifact: androidx.palette:palette:+ + name: palette + copyrightHolder: Google Inc + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.media2:media2-player:+ + name: media2-player + copyrightHolder: Google Inc + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/media2 +- artifact: androidx.media2:media2-session:+ + name: media2-session + copyrightHolder: Google Inc + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/media2 +- artifact: androidx.media2:media2-common:+ + name: media2-common + copyrightHolder: Google Inc + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/media2 +- artifact: androidx.media2:media2-exoplayer:+ + name: media2-exoplayer + copyrightHolder: Google Inc + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx/releases/media2 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 130b3dcb..cfcdb8c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,6 +22,11 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:replace="android:allowBackup"> + + tools:ignore="LockedOrientationActivity"> + + + + + + + + + + + + + + + + + + + tools:ignore="LockedOrientationActivity"> @@ -86,11 +109,11 @@ + tools:ignore="LockedOrientationActivity"> @@ -104,16 +127,16 @@ + tools:ignore="LockedOrientationActivity" /> + tools:ignore="LockedOrientationActivity"> @@ -142,7 +165,6 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" /> - \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt index 7a407ee1..72e83164 100644 --- a/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt @@ -50,11 +50,12 @@ import kotlin.math.ceil private const val TAG = "Post Creation Activity" data class PhotoData( - var imageUri: Uri, - var size: Long, - var uploadId: String? = null, - var progress: Int? = null, - var imageDescription: String? = null, + var imageUri: Uri, + var size: Long, + var uploadId: String? = null, + var progress: Int? = null, + var imageDescription: String? = null, + var video: Boolean, ) class PostCreationActivity : BaseActivity() { @@ -85,7 +86,7 @@ class PostCreationActivity : BaseActivity() { intent.clipData?.let { addPossibleImages(it) } val carousel: ImageCarousel = binding.carousel - carousel.addData(photoData.map { CarouselItem(it.imageUri) }) + carousel.addData(photoData.map { CarouselItem(it.imageUri, video = it.video) }) carousel.layoutCarouselCallback = { if(it){ // Became a carousel @@ -138,7 +139,7 @@ class PostCreationActivity : BaseActivity() { binding.removePhotoButton.setOnClickListener { carousel.currentPosition.takeIf { it != -1 }?.let { currentPosition -> photoData.removeAt(currentPosition) - carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) + carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription, it.video) }) binding.addPhotoButton.isEnabled = true } } @@ -164,16 +165,17 @@ class PostCreationActivity : BaseActivity() { } for (i in 0 until count) { clipData.getItemAt(i).uri.let { - val size = it.getSize() - photoData.add(PhotoData(imageUri = it, size = size)) + val sizeAndVideoPair: Pair = it.getSizeAndVideoValidate() + photoData.add(PhotoData(imageUri = it, size = sizeAndVideoPair.first, video = sizeAndVideoPair.second)) } } } /** - * Returns the size of the file of the Uri, and opens a dialog in case it is too big. + * Returns the size of the file of the Uri, and whether it is a video, + * and opens a dialog in case it is too big or in case the file is unsupported. */ - private fun Uri.getSize(): Long { + private fun Uri.getSizeAndVideoValidate(): Pair { val size: Long = if (toString().startsWith("content")) { contentResolver.query(this, null, null, null, null) @@ -191,22 +193,24 @@ class PostCreationActivity : BaseActivity() { } val sizeInkBytes = ceil(size.toDouble() / 1000).toLong() + val type = contentResolver.getType(this) + val isVideo = type?.startsWith("video/") == true + + if(isVideo && !instance.videoEnabled){ + AlertDialog.Builder(this@PostCreationActivity).apply { + setMessage(R.string.video_not_supported) + setNegativeButton(android.R.string.ok) { _, _ -> } + }.show() + } + if (sizeInkBytes > instance.maxPhotoSize || sizeInkBytes > instance.maxVideoSize) { - val maxSize = when { - instance.maxPhotoSize != instance.maxVideoSize -> { - val type = contentResolver.getType(this) - if (type?.startsWith("video/") == true) { - instance.maxVideoSize - } else instance.maxPhotoSize - } - else -> instance.maxPhotoSize - } + val maxSize = if (isVideo) instance.maxVideoSize else instance.maxPhotoSize AlertDialog.Builder(this@PostCreationActivity).apply { setMessage(getString(R.string.size_exceeds_instance_limit, photoData.size + 1, sizeInkBytes, maxSize)) setNegativeButton(android.R.string.ok) { _, _ -> } }.show() } - return size + return Pair(size, isVideo) } private val addPhotoResultContract = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> @@ -214,7 +218,7 @@ class PostCreationActivity : BaseActivity() { result.data?.clipData?.let { addPossibleImages(it) } - binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) + binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription, it.video) }) } else if (result.resultCode != Activity.RESULT_CANCELED) { Toast.makeText(applicationContext, "Error while adding images", Toast.LENGTH_SHORT).show() } @@ -306,8 +310,8 @@ class PostCreationActivity : BaseActivity() { */ private fun upload() { enableButton(false) - binding.uploadProgressBar.visibility = View.VISIBLE - binding.uploadCompletedTextview.visibility = View.INVISIBLE + binding.uploadProgressBar.visibility = VISIBLE + binding.uploadCompletedTextview.visibility = INVISIBLE binding.removePhotoButton.isEnabled = false binding.editPhotoButton.isEnabled = false binding.addPhotoButton.isEnabled = false @@ -429,21 +433,30 @@ class PostCreationActivity : BaseActivity() { val position: Int = result.data!!.getIntExtra(PhotoEditActivity.PICTURE_POSITION, 0) photoData.getOrNull(position)?.apply { imageUri = result.data!!.getStringExtra(PhotoEditActivity.PICTURE_URI)!!.toUri() - size = imageUri.getSize() + val (imageSize, imageVideo) = imageUri.getSizeAndVideoValidate() + size = imageSize + video = imageVideo progress = null uploadId = null } ?: Toast.makeText(applicationContext, "Error while editing", Toast.LENGTH_SHORT).show() - binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription) }) + binding.carousel.addData(photoData.map { CarouselItem(it.imageUri, it.imageDescription, it.video) }) } else if(result?.resultCode != Activity.RESULT_CANCELED){ Toast.makeText(applicationContext, "Error while editing", Toast.LENGTH_SHORT).show() } } private fun edit(position: Int) { - val intent = Intent(this, PhotoEditActivity::class.java) - .putExtra(PhotoEditActivity.PICTURE_URI, photoData[position].imageUri) - .putExtra(PhotoEditActivity.PICTURE_POSITION, position) - editResultContract.launch(intent) + if(photoData[position].video){ + AlertDialog.Builder(this).apply { + setMessage(R.string.video_edit_not_yet_supported) + setNegativeButton(android.R.string.ok) { _, _ -> } + }.show() + } else { + val intent = Intent(this, PhotoEditActivity::class.java) + .putExtra(PhotoEditActivity.PICTURE_URI, photoData[position].imageUri) + .putExtra(PhotoEditActivity.PICTURE_POSITION, position) + editResultContract.launch(intent) + } } } \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/SquareLayout.kt b/app/src/main/java/org/pixeldroid/app/postCreation/SquareLayout.kt index cbee61a6..f024d76b 100644 --- a/app/src/main/java/org/pixeldroid/app/postCreation/SquareLayout.kt +++ b/app/src/main/java/org/pixeldroid/app/postCreation/SquareLayout.kt @@ -2,10 +2,11 @@ package org.pixeldroid.app.postCreation import android.content.Context import android.util.AttributeSet +import android.widget.FrameLayout import android.widget.RelativeLayout internal class SquareLayout(context: Context, attrs: AttributeSet) : - RelativeLayout(context, attrs) { + FrameLayout(context, attrs) { override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { super.onMeasure(widthMeasureSpec, widthMeasureSpec) diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt b/app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt index 8e361117..2fe264ba 100644 --- a/app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt @@ -41,6 +41,7 @@ import kotlin.math.max import kotlin.math.min import kotlin.properties.Delegates import org.pixeldroid.app.R +import org.pixeldroid.app.utils.BaseFragment private const val ANIMATION_FAST_MILLIS = 50L private const val ANIMATION_SLOW_MILLIS = 100L @@ -48,7 +49,7 @@ private const val ANIMATION_SLOW_MILLIS = 100L /** * Camera fragment */ -class CameraFragment : Fragment() { +class CameraFragment : BaseFragment() { private lateinit var container: ConstraintLayout @@ -314,10 +315,15 @@ class CameraFragment : Fragment() { } private fun setupUploadImage() { + val videoEnabled: Boolean = db.instanceDao().getInstance(db.userDao().getActiveUser()!!.instance_uri).videoEnabled + var mimeTypes: Array = arrayOf("image/*") + if(videoEnabled) mimeTypes += "video/*" + // Listener for button used to view the most recent photo binding.photoViewButton.setOnClickListener { - Intent().apply { - type = "image/*" + Intent(Intent.ACTION_GET_CONTENT).apply { + type = "*/*" + putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes) action = Intent.ACTION_GET_CONTENT addCategory(Intent.CATEGORY_OPENABLE) putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true) diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselAdapter.kt b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselAdapter.kt index ca2c6384..e61febde 100644 --- a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselAdapter.kt +++ b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselAdapter.kt @@ -3,13 +3,17 @@ package org.pixeldroid.app.postCreation.carousel import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE import android.view.ViewGroup +import android.widget.ImageButton import android.widget.ImageView import androidx.annotation.IdRes import androidx.annotation.LayoutRes import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import org.pixeldroid.app.R +import org.pixeldroid.app.posts.MediaViewerActivity class CarouselAdapter( @@ -26,6 +30,8 @@ class CarouselAdapter( class MyViewHolder(itemView: View, imageViewId: Int) : RecyclerView.ViewHolder(itemView) { var img: ImageView = itemView.findViewById(imageViewId) + // Null if not relevant + val videoIndicator: ImageButton? = itemView.findViewById(R.id.videoIndicator) } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { @@ -60,10 +66,21 @@ class CarouselAdapter( } override fun onBindViewHolder(holder: MyViewHolder, position: Int) { - if(carousel) { + if (carousel) { holder.img.scaleType = imageScaleType + holder.videoIndicator?.setOnClickListener{ + with(dataList[position]) { + MediaViewerActivity.openActivity( + holder.itemView.context, + imageUrl.toString(), + caption + ) + } + } } + holder.videoIndicator?.visibility = if (dataList[position].video) VISIBLE else GONE + dataList.elementAtOrNull(position)?.let { Glide.with(holder.itemView.context) .load(it.imageUrl) @@ -83,7 +100,6 @@ class CarouselAdapter( true } - } } diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselItem.kt b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselItem.kt index 4e6f854e..37dfda86 100644 --- a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselItem.kt +++ b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/CarouselItem.kt @@ -4,7 +4,6 @@ import android.net.Uri data class CarouselItem constructor( val imageUrl: Uri, - val caption: String? = null -) { - constructor(imageUrl: Uri) : this(imageUrl, null) -} \ No newline at end of file + val caption: String? = null, + val video: Boolean +) \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt index a95ed00d..5b628b3f 100644 --- a/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt +++ b/app/src/main/java/org/pixeldroid/app/postCreation/carousel/ImageCarousel.kt @@ -49,7 +49,7 @@ class ImageCarousel( var indicator: CircleIndicator2? = null set(newIndicator) { indicator?.apply { - // if we remove it form the view, then the caption textView constraint won't work. + // if we remove it from the view, then the caption textView constraint won't work. this.visibility = View.GONE isBuiltInIndicator = false diff --git a/app/src/main/java/org/pixeldroid/app/posts/MediaViewerActivity.kt b/app/src/main/java/org/pixeldroid/app/posts/MediaViewerActivity.kt new file mode 100644 index 00000000..39c91472 --- /dev/null +++ b/app/src/main/java/org/pixeldroid/app/posts/MediaViewerActivity.kt @@ -0,0 +1,102 @@ +package org.pixeldroid.app.posts + +import android.content.Context +import android.content.Intent +import android.content.pm.ActivityInfo +import android.media.AudioManager.STREAM_MUSIC +import android.os.Bundle +import androidx.core.net.toUri +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import androidx.media.AudioAttributesCompat +import androidx.media2.common.MediaMetadata +import androidx.media2.common.UriMediaItem +import androidx.media2.player.MediaPlayer +import org.pixeldroid.app.databinding.ActivityMediaviewerBinding +import org.pixeldroid.app.utils.BaseActivity + +class MediaViewerActivity : BaseActivity() { + + private lateinit var mediaPlayer: MediaPlayer + private lateinit var binding: ActivityMediaviewerBinding + + companion object { + const val VIDEO_URL_TAG = "video_url_mediavieweractivity" + const val VIDEO_DESCRIPTION_TAG = "video_description_mediavieweractivity" + + fun openActivity(context: Context, url: String?, description: String?){ + val intent = Intent(context, MediaViewerActivity::class.java) + intent.putExtra(VIDEO_URL_TAG, url) + intent.putExtra(VIDEO_DESCRIPTION_TAG, description) + context.startActivity(intent) + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityMediaviewerBinding.inflate(layoutInflater) + setContentView(binding.root) + + val uri: String = intent.getStringExtra(VIDEO_URL_TAG).orEmpty() + val description: String? = intent.getStringExtra(VIDEO_DESCRIPTION_TAG) + + val mediaItem: UriMediaItem = UriMediaItem.Builder(uri.toUri()).build() + mediaItem.metadata = MediaMetadata.Builder() + .putString(MediaMetadata.METADATA_KEY_TITLE, description ?: "") + .build() + + mediaPlayer = MediaPlayer(this) + mediaPlayer.setMediaItem(mediaItem) + + binding.videoView.mediaControlView?.setOnFullScreenListener{ view, fullscreen -> + val windowInsetsController = ViewCompat.getWindowInsetsController(window.decorView) + if (!fullscreen) { + // Configure the behavior of the hidden system bars + windowInsetsController?.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + // Hide both the status bar and the navigation bar + windowInsetsController?.show(WindowInsetsCompat.Type.systemBars()) + supportActionBar?.show() + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + } else { + // Configure the behavior of the hidden system bars + windowInsetsController?.systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + // Hide both the status bar and the navigation bar + windowInsetsController?.hide(WindowInsetsCompat.Type.systemBars()) + + requestedOrientation = + if (mediaPlayer.videoSize.height < mediaPlayer.videoSize.width) { + ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE + } else { + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT + } + supportActionBar?.hide() + } + } + + // Configure audio + mediaPlayer.setAudioAttributes(AudioAttributesCompat.Builder() + .setLegacyStreamType(STREAM_MUSIC) + .setUsage(AudioAttributesCompat.USAGE_MEDIA) + .setContentType(AudioAttributesCompat.CONTENT_TYPE_MOVIE) + .build() + ) + + mediaPlayer.prepare() + + binding.videoView.setPlayer(mediaPlayer) + + // Start actually playing the video + mediaPlayer.play() + } + + override fun onPause() { + super.onPause() + mediaPlayer.pause() + } + + override fun onDestroy() { + super.onDestroy() + mediaPlayer.close() + } +} \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt b/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt index 1a2fbbf2..a1127538 100644 --- a/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt @@ -37,6 +37,9 @@ import com.karumi.dexter.listener.PermissionDeniedResponse import com.karumi.dexter.listener.PermissionGrantedResponse import com.karumi.dexter.listener.single.BasePermissionListener import kotlinx.coroutines.launch +import org.pixeldroid.app.posts.MediaViewerActivity.Companion.VIDEO_DESCRIPTION_TAG +import org.pixeldroid.app.posts.MediaViewerActivity.Companion.VIDEO_URL_TAG +import org.pixeldroid.app.posts.MediaViewerActivity.Companion.openActivity import retrofit2.HttpException import java.io.IOException import kotlin.math.roundToInt @@ -594,6 +597,7 @@ private class AlbumViewPagerAdapter(private val media_attachments: List 1) { albumIcon.visibility = View.VISIBLE } else { albumIcon.visibility = View.GONE + if(post.media_attachments?.get(0)?.type == Attachment.AttachmentType.video) { + videoIcon.visibility = View.VISIBLE + } else videoIcon.visibility = View.GONE + } postPreview.setOnClickListener { diff --git a/app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt b/app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt index fd5fb36f..5a33a222 100644 --- a/app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt +++ b/app/src/main/java/org/pixeldroid/app/profile/ProfilePostsRecyclerViewAdapter.kt @@ -8,4 +8,5 @@ import org.pixeldroid.app.R class ProfilePostViewHolder(val postView: View) : RecyclerView.ViewHolder(postView) { val postPreview: ImageView = postView.findViewById(R.id.postPreview) val albumIcon: ImageView = postView.findViewById(R.id.albumIcon) + val videoIcon: ImageView = postView.findViewById(R.id.albumIcon) } \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt index a0530e7c..a19a88d8 100644 --- a/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt @@ -19,6 +19,7 @@ import org.pixeldroid.app.utils.api.objects.Status import org.pixeldroid.app.posts.PostActivity import org.pixeldroid.app.utils.BaseFragment import org.pixeldroid.app.utils.ImageConverter +import org.pixeldroid.app.utils.api.objects.Attachment import org.pixeldroid.app.utils.bindingLifecycleAware import retrofit2.HttpException import java.io.IOException @@ -120,6 +121,10 @@ class SearchDiscoverFragment : BaseFragment() { holder.albumIcon.visibility = View.VISIBLE } else { holder.albumIcon.visibility = View.GONE + if(post?.media_attachments?.get(0)?.type == Attachment.AttachmentType.video) { + holder.videoIcon.visibility = View.VISIBLE + } else holder.videoIcon.visibility = View.GONE + } ImageConverter.setSquareImageFromURL(holder.postView, post?.getPostPreviewURL(), holder.postPreview, post?.media_attachments?.firstOrNull()?.blurhash) holder.postPreview.setOnClickListener { diff --git a/app/src/main/java/org/pixeldroid/app/utils/Utils.kt b/app/src/main/java/org/pixeldroid/app/utils/Utils.kt index 95720644..c724c15b 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/Utils.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/Utils.kt @@ -73,6 +73,7 @@ fun bitmapFromUri(contentResolver: ContentResolver, uri: Uri?): Bitmap = ) { decoder, _, _ -> decoder.isMutableRequired = true } } else { + @Suppress("DEPRECATION") val bitmap = MediaStore.Images.Media.getBitmap(contentResolver, uri) modifyOrientation(bitmap!!, contentResolver, uri!!) } diff --git a/app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt b/app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt index dc3f7b4e..0b76b6ef 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/AppDatabase.kt @@ -22,7 +22,7 @@ import org.pixeldroid.app.utils.api.objects.Notification PublicFeedStatusDatabaseEntity::class, Notification::class ], - version = 4 + version = 5 ) @TypeConverters(Converters::class) abstract class AppDatabase : RoomDatabase() { @@ -39,4 +39,9 @@ val MIGRATION_3_4 = object : Migration(3, 4) { database.execSQL("DELETE FROM publicPosts") database.execSQL("DELETE FROM notifications") } +} +val MIGRATION_4_5 = object : Migration(4, 5) { + override fun migrate(database: SupportSQLiteDatabase) { + database.execSQL("ALTER TABLE instances ADD COLUMN videoEnabled INTEGER NOT NULL DEFAULT 1") + } } \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt b/app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt index df33746e..40f52c76 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/DBUtils.kt @@ -9,6 +9,7 @@ import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEF import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_PHOTO_SIZE import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_TOOT_CHARS import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_MAX_VIDEO_SIZE +import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity.Companion.DEFAULT_VIDEO_ENABLED import org.pixeldroid.app.utils.normalizeDomain import java.lang.IllegalArgumentException @@ -33,13 +34,14 @@ fun addUser(db: AppDatabase, account: Account, instance_uri: String, activeUser: fun storeInstance(db: AppDatabase, nodeInfo: NodeInfo?, instance: Instance? = null) { val dbInstance: InstanceDatabaseEntity = nodeInfo?.run { InstanceDatabaseEntity( - uri = normalizeDomain(metadata?.config?.site?.url!!), - title = metadata.config.site.name!!, - maxStatusChars = metadata.config.uploader?.max_caption_length!!.toInt(), - maxPhotoSize = metadata.config.uploader.max_photo_size?.toIntOrNull() ?: DEFAULT_MAX_PHOTO_SIZE, - //Pixelfed doesn't distinguish between max photo and video size - maxVideoSize = metadata.config.uploader.max_photo_size?.toIntOrNull() ?: DEFAULT_MAX_VIDEO_SIZE, - albumLimit = metadata.config.uploader.album_limit?.toIntOrNull() ?: DEFAULT_ALBUM_LIMIT + uri = normalizeDomain(metadata?.config?.site?.url!!), + title = metadata.config.site.name!!, + maxStatusChars = metadata.config.uploader?.max_caption_length!!.toInt(), + maxPhotoSize = metadata.config.uploader.max_photo_size?.toIntOrNull() ?: DEFAULT_MAX_PHOTO_SIZE, + // Pixelfed doesn't distinguish between max photo and video size + maxVideoSize = metadata.config.uploader.max_photo_size?.toIntOrNull() ?: DEFAULT_MAX_VIDEO_SIZE, + albumLimit = metadata.config.uploader.album_limit?.toIntOrNull() ?: DEFAULT_ALBUM_LIMIT, + videoEnabled = metadata.config.features?.video ?: DEFAULT_VIDEO_ENABLED ) } ?: instance?.run { InstanceDatabaseEntity( diff --git a/app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt b/app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt index 59ee3771..3e51712c 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/dao/InstanceDao.kt @@ -8,6 +8,9 @@ interface InstanceDao { @Query("SELECT * FROM instances") fun getAll(): List + @Query("SELECT * FROM instances WHERE uri=:instanceUri LIMIT 1") + fun getInstance(instanceUri: String): InstanceDatabaseEntity + /** * Insert an instance, if it already exists return -1 */ diff --git a/app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt b/app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt index 58e71342..e387e02c 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/db/entities/InstanceDatabaseEntity.kt @@ -14,6 +14,8 @@ data class InstanceDatabaseEntity ( var maxVideoSize: Int = DEFAULT_MAX_VIDEO_SIZE, // How many photos can go into an album. Default limit for Pixelfed and Mastodon is 4 var albumLimit: Int = DEFAULT_ALBUM_LIMIT, + // Is video functionality enabled on this instance? + var videoEnabled: Boolean = DEFAULT_VIDEO_ENABLED, ) { companion object{ // Default max number of chars for Mastodon: used when their is no other value supplied by @@ -23,5 +25,6 @@ data class InstanceDatabaseEntity ( const val DEFAULT_MAX_PHOTO_SIZE = 8000 const val DEFAULT_MAX_VIDEO_SIZE = 40000 const val DEFAULT_ALBUM_LIMIT = 4 + const val DEFAULT_VIDEO_ENABLED = true } } \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt b/app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt index bc08dec5..4dd5c8c3 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/di/DatabaseModule.kt @@ -6,6 +6,7 @@ import org.pixeldroid.app.utils.db.AppDatabase import dagger.Module import dagger.Provides import org.pixeldroid.app.utils.db.MIGRATION_3_4 +import org.pixeldroid.app.utils.db.MIGRATION_4_5 import javax.inject.Singleton @Module @@ -17,6 +18,7 @@ class DatabaseModule(private val context: Context) { return Room.databaseBuilder( context, AppDatabase::class.java, "pixeldroid" - ).addMigrations(MIGRATION_3_4).allowMainThreadQueries().build() + ).addMigrations(MIGRATION_3_4).addMigrations(MIGRATION_4_5) + .allowMainThreadQueries().build() } } \ No newline at end of file diff --git a/app/src/main/res/drawable/play_circle_filled.xml b/app/src/main/res/drawable/play_circle_filled.xml new file mode 100644 index 00000000..4e719f75 --- /dev/null +++ b/app/src/main/res/drawable/play_circle_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_mediaviewer.xml b/app/src/main/res/layout/activity_mediaviewer.xml new file mode 100644 index 00000000..d28a8047 --- /dev/null +++ b/app/src/main/res/layout/activity_mediaviewer.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/add_more_album_creation.xml b/app/src/main/res/layout/add_more_album_creation.xml index 9b6b498d..65be5e0b 100644 --- a/app/src/main/res/layout/add_more_album_creation.xml +++ b/app/src/main/res/layout/add_more_album_creation.xml @@ -10,6 +10,7 @@ android:id="@+id/addPhotoSquare" android:layout_width="50dp" android:layout_height="50dp" + android:layout_gravity="center" android:layout_centerInParent="true" android:layout_centerVertical="true" android:background="@drawable/add_photo_button" diff --git a/app/src/main/res/layout/album_image_view.xml b/app/src/main/res/layout/album_image_view.xml index b4042911..462eab66 100644 --- a/app/src/main/res/layout/album_image_view.xml +++ b/app/src/main/res/layout/album_image_view.xml @@ -14,4 +14,15 @@ android:adjustViewBounds="true" tools:ignore="ContentDescription" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile_posts.xml b/app/src/main/res/layout/fragment_profile_posts.xml index 666365b5..9df72daa 100644 --- a/app/src/main/res/layout/fragment_profile_posts.xml +++ b/app/src/main/res/layout/fragment_profile_posts.xml @@ -38,9 +38,24 @@ android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:visibility="visible" + tools:visibility="gone" android:contentDescription="@string/post_is_album" /> + + diff --git a/app/src/main/res/layout/image_album_creation.xml b/app/src/main/res/layout/image_album_creation.xml index 1409a55e..974cfd55 100644 --- a/app/src/main/res/layout/image_album_creation.xml +++ b/app/src/main/res/layout/image_album_creation.xml @@ -1,15 +1,29 @@ + android:focusable="true" + android:foreground="?selectableItemBackground"> + + android:scaleType="centerCrop" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_carousel.xml b/app/src/main/res/layout/item_carousel.xml index 85b4fef0..04d83070 100644 --- a/app/src/main/res/layout/item_carousel.xml +++ b/app/src/main/res/layout/item_carousel.xml @@ -1,9 +1,28 @@ - + android:layout_height="match_parent"> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db4c064a..885c39c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -64,7 +64,7 @@ "Polls" "Other" - + "%d new notification" "%d new notifications" @@ -73,8 +73,6 @@ %1$s and %2$s - - "What's an instance?" "You might be confused by the text field asking for the domain of your 'instance'. @@ -116,6 +114,7 @@ For more info about Pixelfed, you can check here: https://pixelfed.org" Add a media description here… You chose more images than the maximum your server allows (%1$s). Images beyond the limit have been ignored. Size of image number %1$d in the album exceeds the maximum size allowed by the instance (%2$d kB but the limit is %3$d kB). You might not be able to upload it. + "The server you are using doesn't support video uploads, you might not be able to upload videos included in this post" Error code returned by server: %1$d @@ -174,6 +173,8 @@ For more info about Pixelfed, you can check here: https://pixelfed.org" Add a comment Submit comment This post is an album + This post is a video + "%d\nPost" @@ -259,4 +260,6 @@ For more info about Pixelfed, you can check here: https://pixelfed.org" Couldn\'t fetch latest notifications Camera permission not granted, grant the permission in settings if you want to let PixelDroid use the camera Storage permission not granted, grant the permission in settings if you want to let PixelDroid show the thumbnail + Play video + Video editing is not yet supported \ No newline at end of file