Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update dependencies and solve lint issues

Browse Source
This commit is contained in:
Matthieu 2024-08-30 18:29:42 +02:00
parent ff82e54f36
commit 1e4a7904f6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/pixeldroid/app/profile/EditProfileActivity.kt
View File

@ -42,14 +42,14 @@ class EditProfileActivity : BaseActivity() {
setMessage(getString(R.string.profile_save_changes)) setMessage(getString(R.string.profile_save_changes))
setNegativeButton(android.R.string.cancel) { _, _ -> } setNegativeButton(android.R.string.cancel) { _, _ -> }
setPositiveButton(android.R.string.ok) { _, _ -> setPositiveButton(android.R.string.ok) { _, _ ->
this@addCallback.isEnabled = false this@addCallback.remove()
super.onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
}.show() }.show()
} else { } else {
this.isEnabled = false this@addCallback.remove()
if (model.submittedChanges) setResult(RESULT_OK) if (model.submittedChanges) setResult(RESULT_OK)
super.onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
} }

2
app/src/main/res/layout/error_layout.xml
View File

@ -34,7 +34,7 @@
app:layout_constraintTop_toBottomOf="@+id/imageView4" /> app:layout_constraintTop_toBottomOf="@+id/imageView4" />
<TextView <TextView
android:id="@id/error_text" android:id="@+id/error_text2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/panda_pull_to_refresh_to_try_again" android:text="@string/panda_pull_to_refresh_to_try_again"

2
pixel_common

@ -1 +1 @@
Subproject commit def947b5b1392b3282174bebd0217037f66d0362 Subproject commit c03698e241de89725c5ded420da696f7961387d4

2
scrambler

@ -1 +1 @@
Subproject commit 23d4d94b45a848f0c64a042985eb03d0acc2f18b Subproject commit 1584ad2ac65e75a3fa53d71280d04d4ac015d39f