chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

get rid of jcenter (#2163)

Browse source 
* get rid of jcenter

* fix BottomSheetActivityTest

* update Android Image Cropper license
This commit is contained in:
Konrad Pozniak 2021-05-21 17:51:47 +02:00 • committed by GitHub
commit 387e62ea4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -123,7 +123,7 @@
<activity android:name=".AboutActivity" />
<activity android:name=".TabPreferenceActivity" />
<activity
android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
android:name="com.canhub.cropper.CropImageActivity"
android:theme="@style/Base.Theme.AppCompat" />
<activity
android:name=".components.search.SearchActivity"

12
app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
View file

@ -47,7 +47,7 @@ import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
import com.mikepenz.iconics.utils.colorInt
import com.mikepenz.iconics.utils.sizeDp
import com.theartofdev.edmodo.cropper.CropImage
import com.canhub.cropper.CropImage
import javax.inject.Inject
class EditProfileActivity : BaseActivity(), Injectable {
@ -374,7 +374,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE -> {
val result = CropImage.getActivityResult(data)
when (resultCode) {
Activity.RESULT_OK -> beginResize(result.uri)
Activity.RESULT_OK -> beginResize(result?.uriContent)
CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE -> onResizeFailure()
else -> endMediaPicking()
}
@ -382,7 +382,12 @@ class EditProfileActivity : BaseActivity(), Injectable {
}
}
private fun beginResize(uri: Uri) {
private fun beginResize(uri: Uri?) {
if(uri == null) {
currentlyPicking = PickType.NOTHING
return
}
beginMediaPicking()
when (currentlyPicking) {
@ -398,7 +403,6 @@ class EditProfileActivity : BaseActivity(), Injectable {
}
currentlyPicking = PickType.NOTHING
}
private fun onResizeFailure() {

2
app/src/main/res/layout/activity_license.xml
View file

@ -171,7 +171,7 @@
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
license:license="@string/license_apache_2"
license:link="https://github.com/ArthurHub/Android-Image-Cropper"
license:link="https://github.com/CanHub/Android-Image-Cropper"
license:name="Android Image Cropper" />
<com.keylesspalace.tusky.view.LicenseCard