Update dependency on media_editor

app/build.gradle

@@ -141,18 +141,18 @@ dependencies {
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'
     implementation 'androidx.paging:paging-runtime-ktx:3.2.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.7.0"
     implementation "androidx.annotation:annotation:1.7.1"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.activity:activity-ktx:1.8.2"
     implementation 'androidx.fragment:fragment-ktx:1.6.2'
     implementation 'androidx.work:work-runtime-ktx:2.9.0'
-    implementation 'androidx.media2:media2-widget:1.2.1'
+    implementation 'androidx.media2:media2-widget:1.3.0'
-    implementation 'androidx.media2:media2-player:1.2.1'
+    implementation 'androidx.media2:media2-player:1.3.0'
 
 
     // Use the most recent version of CameraX
@@ -181,18 +181,18 @@ dependencies {
     implementation 'com.google.android.material:material:1.11.0'
 
     //Dagger (dependency injection)
-    implementation 'com.google.dagger:dagger:2.48'
+    implementation 'com.google.dagger:dagger:2.50'
-    ksp 'com.google.dagger:dagger-compiler:2.48'
+    ksp 'com.google.dagger:dagger-compiler:2.50'
 
-    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
-    implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
+    implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
     implementation 'com.github.connyduck:sparkbutton:4.1.0'
 
-    implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.5'
+    implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.6'
     implementation project(path: ':scrambler')
     implementation project(path: ':pixel_common')
 
@@ -200,24 +200,24 @@ dependencies {
         exclude group: "com.android.support"
     }
 
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.14.2'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0'
-    implementation('com.github.bumptech.glide:recyclerview-integration:4.14.2') {
+    implementation('com.github.bumptech.glide:recyclerview-integration:4.16.0') {
         // Excludes the support library because it's already included by Glide.
         transitive = false
     }
     implementation 'com.github.bumptech.glide:annotations:4.16.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
-    ksp 'com.github.bumptech.glide:ksp:4.14.2'
+    ksp 'com.github.bumptech.glide:ksp:4.16.0'
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    implementation 'com.mikepenz:materialdrawer:9.0.1'
+    implementation 'com.mikepenz:materialdrawer:9.0.2'
     // Add for NavController support
-    implementation 'com.mikepenz:materialdrawer-nav:9.0.1'
+    implementation 'com.mikepenz:materialdrawer-nav:9.0.2'
 
     //iconics
     implementation 'com.mikepenz:iconics-core:5.4.0'
-    implementation 'com.mikepenz:materialdrawer-iconics:9.0.1'
+    implementation 'com.mikepenz:materialdrawer-iconics:9.0.2'
     implementation 'com.mikepenz:iconics-views:5.4.0'
     implementation 'com.mikepenz:google-material-typeface:4.0.0.2-kotlin@aar'
 
@@ -251,7 +251,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.9.2'
+    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0'
 
 }
 

app/src/main/java/org/pixeldroid/app/postCreation/PostCreationFragment.kt

@@ -42,7 +42,7 @@ import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
 import org.pixeldroid.app.utils.fileExtension
 import org.pixeldroid.app.utils.getMimeType
 import org.pixeldroid.media_editor.photoEdit.PhotoEditActivity
-import org.pixeldroid.media_editor.photoEdit.VideoEditActivity
+import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
 import java.io.File
 import java.io.OutputStream
 import java.text.SimpleDateFormat

app/src/main/java/org/pixeldroid/app/postCreation/PostCreationViewModel.kt

@@ -40,7 +40,7 @@ import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
 import org.pixeldroid.app.utils.di.PixelfedAPIHolder
 import org.pixeldroid.app.utils.fileExtension
 import org.pixeldroid.app.utils.getMimeType
-import org.pixeldroid.media_editor.photoEdit.VideoEditActivity
+import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
 import retrofit2.HttpException
 import java.io.File
 import java.io.FileNotFoundException

app/src/main/java/org/pixeldroid/app/postCreation/camera/CameraFragment.kt

@@ -39,7 +39,6 @@ import kotlinx.coroutines.launch
 import org.pixeldroid.app.databinding.FragmentCameraBinding
 import org.pixeldroid.app.postCreation.PostCreationActivity
 import org.pixeldroid.app.utils.BaseFragment
-import org.pixeldroid.app.utils.bindingLifecycleAware
 import java.io.File
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -60,7 +59,7 @@ class CameraFragment : BaseFragment() {
 
     private val cameraLifecycleOwner = CameraLifecycleOwner()
 
-    private var binding: FragmentCameraBinding by bindingLifecycleAware()
+    private lateinit var binding: FragmentCameraBinding
 
     private var displayId: Int = -1
     private var lensFacing: Int = CameraSelector.LENS_FACING_BACK

app/src/main/java/org/pixeldroid/app/utils/Utils.kt

@@ -1,28 +1,25 @@
 package org.pixeldroid.app.utils
 
-import android.content.*
+import android.content.ActivityNotFoundException
+import android.content.ContentResolver
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
 import android.content.res.Resources
-import android.graphics.Bitmap
 import android.graphics.Color
-import android.graphics.ImageDecoder
-import android.graphics.Matrix
 import android.net.ConnectivityManager
 import android.net.Uri
 import android.os.Build
-import android.provider.MediaStore
 import android.util.DisplayMetrics
 import android.view.WindowManager
 import android.webkit.MimeTypeMap
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
-import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.browser.customtabs.CustomTabsIntent
-import androidx.exifinterface.media.ExifInterface
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.color.MaterialColors
@@ -34,7 +31,7 @@ import okhttp3.HttpUrl
 import org.pixeldroid.app.R
 import java.time.Instant
 import java.time.format.DateTimeFormatter
-import java.util.*
+import java.util.Locale
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -23,15 +23,6 @@ allprojects {
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
-        //noinspection JcenterRepositoryObsolete
-        jcenter {
-            content {
-                // info.androidhive:imagefilters is only available in JCenter
-                //TODO remove JCenter repo:
-                // see issue https://gitlab.shinice.net/pixeldroid/PixelDroid/-/issues/278
-                includeGroup("info.androidhive")
-            }
-        }
     }
 }
 

gradle.properties

@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 org.gradle.daemon=true

settings.gradle

@@ -2,4 +2,4 @@ rootProject.name='PixelDroid'
 include ':app'
 include ':scrambler'
 project(':scrambler').projectDir = new File(rootDir, 'scrambler/scrambler/')
-include ':pixel_common'
+include ':pixel_common'