empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix wallpaper gallery toolbar behaviour.

Browse source 
Fixes #11619
This commit is contained in:
Alex Hart 2021-09-20 10:12:59 -03:00
parent 318b4703f2
commit 07b19402e6
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
View file

@ -271,4 +271,9 @@ public class AvatarSelectionActivity extends AppCompatActivity implements Camera
public void onToolbarNavigationClicked() { public void onToolbarNavigationClicked() {
finish(); finish();
} }
@Override
public boolean isCameraEnabled() {
return true;
}
} }

17
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/gallery/MediaGalleryFragment.kt
View file

@ -75,13 +75,17 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
onBack() onBack()
} }
toolbar.setOnMenuItemClickListener { item -> if (callbacks.isCameraEnabled()) {
if (item.itemId == R.id.action_camera) { toolbar.setOnMenuItemClickListener { item ->
callbacks.onNavigateToCamera() if (item.itemId == R.id.action_camera) {
true callbacks.onNavigateToCamera()
} else { true
false } else {
false
}
} }
} else {
toolbar.menu.findItem(R.id.action_camera).isVisible = false
} }
countButton.setOnClickListener { countButton.setOnClickListener {
@ -171,6 +175,7 @@ class MediaGalleryFragment : Fragment(R.layout.v2_media_gallery_fragment) {
) )
interface Callbacks { interface Callbacks {
fun isCameraEnabled(): Boolean = true
fun isMultiselectEnabled(): Boolean = false fun isMultiselectEnabled(): Boolean = false
fun onMediaSelected(media: Media) fun onMediaSelected(media: Media)
fun onMediaUnselected(media: Media): Unit = throw UnsupportedOperationException() fun onMediaUnselected(media: Media): Unit = throw UnsupportedOperationException()

8
app/src/main/java/org/thoughtcrime/securesms/wallpaper/crop/WallpaperImageSelectionActivity.java
View file

@ -92,6 +92,12 @@ public final class WallpaperImageSelectionActivity extends AppCompatActivity
@Override @Override
public void onToolbarNavigationClicked() { public void onToolbarNavigationClicked() {
// TODO [alex] setResult(RESULT_CANCELED);
finish();
}
@Override
public boolean isCameraEnabled() {
return false;
} }
} }