Update dependencies
This commit is contained in:
parent
a7feab380b
commit
73f08e5a5f
|
@ -223,21 +223,21 @@ dependencies {
|
||||||
implementation 'com.google.android.material:material:1.11.0'
|
implementation 'com.google.android.material:material:1.11.0'
|
||||||
|
|
||||||
//Dagger (dependency injection)
|
//Dagger (dependency injection)
|
||||||
implementation 'com.google.dagger:dagger:2.50'
|
implementation 'com.google.dagger:dagger:2.51'
|
||||||
ksp 'com.google.dagger:dagger-compiler:2.50'
|
ksp 'com.google.dagger:dagger-compiler:2.51'
|
||||||
|
|
||||||
implementation("com.google.dagger:hilt-android:2.50")
|
implementation('com.google.dagger:hilt-android:2.51')
|
||||||
ksp "com.google.dagger:hilt-compiler:2.50"
|
ksp 'com.google.dagger:hilt-compiler:2.51'
|
||||||
|
|
||||||
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
|
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
|
||||||
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
|
implementation 'com.squareup.retrofit2:retrofit:2.10.0'
|
||||||
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
|
implementation 'com.squareup.retrofit2:converter-gson:2.10.0'
|
||||||
implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
|
implementation 'com.squareup.retrofit2:adapter-rxjava3:2.10.0'
|
||||||
implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
|
implementation 'io.reactivex.rxjava3:rxjava:3.1.8'
|
||||||
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
|
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
|
||||||
implementation 'com.github.connyduck:sparkbutton:4.1.0'
|
implementation 'com.github.connyduck:sparkbutton:4.1.0'
|
||||||
|
|
||||||
implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.7'
|
implementation 'org.pixeldroid.pixeldroid:android-media-editor:2.0'
|
||||||
implementation project(path: ':scrambler')
|
implementation project(path: ':scrambler')
|
||||||
implementation project(path: ':pixel_common')
|
implementation project(path: ':pixel_common')
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,8 @@ import org.pixeldroid.app.utils.bindingLifecycleAware
|
||||||
import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity
|
import org.pixeldroid.app.utils.db.entities.InstanceDatabaseEntity
|
||||||
import org.pixeldroid.app.utils.fileExtension
|
import org.pixeldroid.app.utils.fileExtension
|
||||||
import org.pixeldroid.app.utils.getMimeType
|
import org.pixeldroid.app.utils.getMimeType
|
||||||
|
import org.pixeldroid.media_editor.common.PICTURE_POSITION
|
||||||
|
import org.pixeldroid.media_editor.common.PICTURE_URI
|
||||||
import org.pixeldroid.media_editor.photoEdit.PhotoEditActivity
|
import org.pixeldroid.media_editor.photoEdit.PhotoEditActivity
|
||||||
import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
|
import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
@ -47,7 +49,6 @@ import java.text.SimpleDateFormat
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
class PostCreationFragment : BaseFragment() {
|
class PostCreationFragment : BaseFragment() {
|
||||||
|
|
||||||
private var binding: FragmentPostCreationBinding by bindingLifecycleAware()
|
private var binding: FragmentPostCreationBinding by bindingLifecycleAware()
|
||||||
private val model: PostCreationViewModel by activityViewModels()
|
private val model: PostCreationViewModel by activityViewModels()
|
||||||
|
|
||||||
|
@ -307,7 +308,7 @@ class PostCreationFragment : BaseFragment() {
|
||||||
ActivityResultContracts.StartActivityForResult()){
|
ActivityResultContracts.StartActivityForResult()){
|
||||||
result: ActivityResult? ->
|
result: ActivityResult? ->
|
||||||
if (result?.resultCode == Activity.RESULT_OK && result.data != null) {
|
if (result?.resultCode == Activity.RESULT_OK && result.data != null) {
|
||||||
val position: Int = result.data!!.getIntExtra(PhotoEditActivity.PICTURE_POSITION, 0)
|
val position: Int = result.data!!.getIntExtra(PICTURE_POSITION, 0)
|
||||||
model.modifyAt(position, result.data!!)
|
model.modifyAt(position, result.data!!)
|
||||||
?: Toast.makeText(requireActivity(), R.string.error_editing, Toast.LENGTH_SHORT).show()
|
?: Toast.makeText(requireActivity(), R.string.error_editing, Toast.LENGTH_SHORT).show()
|
||||||
} else if(result?.resultCode != Activity.RESULT_CANCELED){
|
} else if(result?.resultCode != Activity.RESULT_CANCELED){
|
||||||
|
@ -320,8 +321,8 @@ class PostCreationFragment : BaseFragment() {
|
||||||
requireActivity(),
|
requireActivity(),
|
||||||
if (model.getPhotoData().value!![position].video) VideoEditActivity::class.java else PhotoEditActivity::class.java
|
if (model.getPhotoData().value!![position].video) VideoEditActivity::class.java else PhotoEditActivity::class.java
|
||||||
)
|
)
|
||||||
.putExtra(PhotoEditActivity.PICTURE_URI, model.getPhotoData().value!![position].imageUri)
|
.putExtra(PICTURE_URI, model.getPhotoData().value!![position].imageUri)
|
||||||
.putExtra(PhotoEditActivity.PICTURE_POSITION, position)
|
.putExtra(PICTURE_POSITION, position)
|
||||||
|
|
||||||
editResultContract.launch(intent)
|
editResultContract.launch(intent)
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,7 @@ import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity
|
||||||
import org.pixeldroid.app.utils.di.PixelfedAPIHolder
|
import org.pixeldroid.app.utils.di.PixelfedAPIHolder
|
||||||
import org.pixeldroid.app.utils.fileExtension
|
import org.pixeldroid.app.utils.fileExtension
|
||||||
import org.pixeldroid.app.utils.getMimeType
|
import org.pixeldroid.app.utils.getMimeType
|
||||||
|
import org.pixeldroid.media_editor.common.PICTURE_URI
|
||||||
import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
|
import org.pixeldroid.media_editor.videoEdit.VideoEditActivity
|
||||||
import retrofit2.HttpException
|
import retrofit2.HttpException
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
@ -299,7 +300,7 @@ class PostCreationViewModel @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
imageUri = data.getStringExtra(org.pixeldroid.media_editor.photoEdit.PhotoEditActivity.PICTURE_URI)!!.toUri()
|
imageUri = data.getStringExtra(PICTURE_URI)!!.toUri()
|
||||||
val (imageSize, imageVideo) = getSizeAndVideoValidate(imageUri, position)
|
val (imageSize, imageVideo) = getSizeAndVideoValidate(imageUri, position)
|
||||||
size = imageSize
|
size = imageSize
|
||||||
video = imageVideo
|
video = imageVideo
|
||||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:8.2.2'
|
classpath 'com.android.tools.build:gradle:8.3.1'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 956bd5f88d6189009f2ba0a8cb2860a1bfee0ee6
|
Subproject commit 702d14fe701343958337efa1b4eb31f0250849f6
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7c67b911930b4344a2917f2944493e08fdd04b57
|
Subproject commit 23d4d94b45a848f0c64a042985eb03d0acc2f18b
|
Loading…
Reference in New Issue