updated media picker style

2025-01-31 17:04:59 +01:00 · 2017-01-23 01:13:31 +08:00 · 2017-01-23 01:13:31 +08:00 · 4df9220e3b
commit 4df9220e3b
parent 6bd462225b
45 changed files with 117 additions and 103 deletions
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/TwidereConstants.java
@ -166,7 +166,7 @@ public interface TwidereConstants extends SharedPreferenceConstants, IntentConst
    String OAUTH_CALLBACK_URL = PROTOCOL_TWIDERE + "com.twitter.oauth/";

    int REQUEST_TAKE_PHOTO = 1;
-    int REQUEST_PICK_IMAGE = 2;
+    int REQUEST_PICK_MEDIA = 2;
    int REQUEST_SELECT_ACCOUNT = 3;
    int REQUEST_COMPOSE = 4;
    int REQUEST_EDIT_API = 5;
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@ -158,7 +158,7 @@ dependencies {
    compile 'com.bluelinelabs:logansquare:1.3.7'
    compile 'com.soundcloud.android:android-crop:1.0.1@aar'
    compile 'com.hannesdorfmann.parcelableplease:annotation:1.0.2'
-    compile 'com.github.mariotaku:PickNCrop:0.9.7'
+    compile 'com.github.mariotaku:PickNCrop:0.9.10'
    compile "com.github.mariotaku.RestFu:library:$mariotaku_restfu_version"
    compile "com.github.mariotaku.RestFu:okhttp3:$mariotaku_restfu_version"
    compile 'com.squareup.okhttp3:okhttp:3.5.0'
--- a/twidere/src/main/java/org/mariotaku/twidere/activity/ThemedMediaPickerActivity.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/activity/ThemedMediaPickerActivity.java
@ -1,9 +1,6 @@
 package org.mariotaku.twidere.activity;

 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.support.annotation.NonNull;

 import org.mariotaku.pickncrop.library.MediaPickerActivity;
 import org.mariotaku.twidere.util.RestFuNetworkStreamDownloader;
@ -11,16 +8,10 @@ import org.mariotaku.twidere.util.RestFuNetworkStreamDownloader;
 public class ThemedMediaPickerActivity extends MediaPickerActivity {

    public static IntentBuilder withThemed(Context context) {
-        final IntentBuilder builder = new IntentBuilder(context);
+        final IntentBuilder builder = new IntentBuilder(context, ThemedMediaPickerActivity.class);
        builder.cropImageActivityClass(ImageCropperActivity.class);
        builder.streamDownloaderClass(RestFuNetworkStreamDownloader.class);
        return builder;
    }

-    @Override
-    protected void onStart() {
-        super.onStart();
-        setVisible(true);
-    }
-
 }
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/ComposeActivity.kt
@ -32,6 +32,7 @@ import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Parcelable
 import android.provider.BaseColumns
+import android.support.v4.app.ActivityCompat
 import android.support.v4.app.DialogFragment
 import android.support.v7.app.AlertDialog
 import android.support.v7.view.SupportMenuInflater
@ -65,6 +66,7 @@ import org.mariotaku.kpreferences.get
 import org.mariotaku.ktextension.checkAnySelfPermissionsGranted
 import org.mariotaku.ktextension.setItemChecked
 import org.mariotaku.ktextension.toTypedArray
+import org.mariotaku.pickncrop.library.MediaPickerActivity
 import org.mariotaku.twidere.BuildConfig
 import org.mariotaku.twidere.Constants.*
 import org.mariotaku.twidere.R
@ -145,10 +147,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener

    public override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
        when (requestCode) {
-            REQUEST_TAKE_PHOTO, REQUEST_PICK_IMAGE, REQUEST_OPEN_DOCUMENT -> {
+            REQUEST_TAKE_PHOTO, REQUEST_PICK_MEDIA -> {
                if (resultCode == Activity.RESULT_OK && intent != null) {
-                    val src = arrayOf(intent.data)
-                    val dst = arrayOf(createTempImageUri(0))
+                    val src = MediaPickerActivity.getMediaUris(intent)
+                    val dst = Array(src.size) { createTempImageUri(it) }
                    currentTask = AsyncTaskUtils.executeTask(AddMediaTask(this, src, dst,
                            ParcelableMedia.Type.IMAGE, true))
                }
@ -328,11 +330,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener

    override fun onMenuItemClick(item: MenuItem): Boolean {
        when (item.itemId) {
-            R.id.take_photo -> {
-                takePhoto()
-            }
            R.id.add_image, R.id.add_image_sub_item -> {
-                pickImage()
+                requestOrPickMedia()
            }
            R.id.drafts -> {
                IntentUtils.openDrafts(this)
@ -366,19 +365,6 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                                intent.putExtra(EXTRA_IN_REPLY_TO_SCREEN_NAME, it.user_screen_name)
                            }
                            startActivityForResult(intent, REQUEST_EXTENSION_COMPOSE)
-                        } else if (INTENT_ACTION_EXTENSION_EDIT_IMAGE == action) {
-                            // final ComponentName cmp = intent.getComponent();
-                            // if (cmp == null || !hasMedia()) return false;
-                            // final String name = new
-                            // File(mMediaUri.getPath()).getName();
-                            // final Uri data =
-                            // Uri.withAppendedPath(CacheFiles.CONTENT_URI,
-                            // Uri.encode(name));
-                            // intent.setData(data);
-                            // grantUriPermission(cmp.getPackageName(), data,
-                            // Intent.FLAG_GRANT_READ_URI_PERMISSION);
-                            // startActivityForResult(intent,
-                            // REQUEST_EDIT_IMAGE);
                        } else {
                            startActivity(intent)
                        }
@ -700,8 +686,10 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                                Spanned.SPAN_INCLUSIVE_INCLUSIVE)
                    }
                    if (!imageSources.isEmpty()) {
-                        val intent = ThemedMediaPickerActivity.withThemed(this@ComposeActivity).getImage(Uri.parse(imageSources[0])).build()
-                        startActivityForResult(intent, REQUEST_PICK_IMAGE)
+                        val intent = ThemedMediaPickerActivity.withThemed(this@ComposeActivity)
+                                .getMedia(Uri.parse(imageSources[0]))
+                                .build()
+                        startActivityForResult(intent, REQUEST_PICK_MEDIA)
                    }
                }
            }
@ -950,10 +938,12 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                return handleReplyMultipleIntent(screenNames, accountKey, inReplyToStatus)
            }
            INTENT_ACTION_COMPOSE_TAKE_PHOTO -> {
-                return takePhoto()
+                requestOrTakePhoto()
+                return true
            }
            INTENT_ACTION_COMPOSE_PICK_IMAGE -> {
-                return pickImage()
+                requestOrPickMedia()
+                return true
            }
        }
        // Unknown action or no intent extras
@ -1112,9 +1102,37 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
        setMenu()
    }

-    private fun pickImage(): Boolean {
-        val intent = ThemedMediaPickerActivity.withThemed(this).pickImage().build()
-        startActivityForResult(intent, REQUEST_PICK_IMAGE)
+    private fun requestOrTakePhoto() {
+        if (checkAnySelfPermissionsGranted(AndroidPermission.WRITE_EXTERNAL_STORAGE)) {
+            takePhoto()
+            return
+        }
+        ActivityCompat.requestPermissions(this, arrayOf(AndroidPermission.WRITE_EXTERNAL_STORAGE),
+                REQUEST_TAKE_PHOTO_PERMISSION)
+    }
+
+    private fun takePhoto(): Boolean {
+        val intent = ThemedMediaPickerActivity.withThemed(this).takePhoto().build()
+        startActivityForResult(intent, REQUEST_TAKE_PHOTO)
+        return true
+    }
+
+    private fun requestOrPickMedia() {
+        if (checkAnySelfPermissionsGranted(AndroidPermission.WRITE_EXTERNAL_STORAGE)) {
+            pickMedia()
+            return
+        }
+        ActivityCompat.requestPermissions(this, arrayOf(AndroidPermission.WRITE_EXTERNAL_STORAGE),
+                REQUEST_PICK_MEDIA_PERMISSION)
+    }
+
+    private fun pickMedia(): Boolean {
+        val intent = ThemedMediaPickerActivity.withThemed(this)
+                .containsVideo(true)
+                .videoOnly(false)
+                .allowMultiple(true)
+                .build()
+        startActivityForResult(intent, REQUEST_PICK_MEDIA)
        return true
    }

@ -1181,7 +1199,6 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                    } catch (e: SecurityException) {
                        // That should not happen
                    }
-
                } else {
                    Toast.makeText(this, R.string.cannot_get_location, Toast.LENGTH_SHORT).show()
                    kPreferences.edit {
@ -1191,6 +1208,18 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
                    locationSwitch.checkedPosition = LOCATION_OPTIONS.indexOf(LOCATION_VALUE_NONE)
                }
            }
+            REQUEST_TAKE_PHOTO_PERMISSION -> {
+                if (!checkAnySelfPermissionsGranted(AndroidPermission.WRITE_EXTERNAL_STORAGE)) {
+                    Toast.makeText(this, R.string.message_compose_write_storage_permission_not_granted, Toast.LENGTH_SHORT).show()
+                }
+                takePhoto()
+            }
+            REQUEST_PICK_MEDIA_PERMISSION -> {
+                if (!checkAnySelfPermissionsGranted(AndroidPermission.WRITE_EXTERNAL_STORAGE)) {
+                    Toast.makeText(this, R.string.message_compose_write_storage_permission_not_granted, Toast.LENGTH_SHORT).show()
+                }
+                pickMedia()
+            }
        }
    }

@ -1255,12 +1284,6 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
        return provider != null
    }

-    private fun takePhoto(): Boolean {
-        val intent = ThemedMediaPickerActivity.withThemed(this).takePhoto().build()
-        startActivityForResult(intent, REQUEST_TAKE_PHOTO)
-        return true
-    }
-
    private fun requestOrUpdateLocation() {
        if (checkAnySelfPermissionsGranted(AndroidPermission.ACCESS_COARSE_LOCATION, AndroidPermission.ACCESS_FINE_LOCATION)) {
            try {
@ -1931,7 +1954,8 @@ class ComposeActivity : BaseActivity(), OnMenuItemClickListener, OnClickListener
        private val LOCATION_OPTIONS = arrayOf(LOCATION_VALUE_NONE, LOCATION_VALUE_PLACE, LOCATION_VALUE_COORDINATE)

        private const val REQUEST_ATTACH_LOCATION_PERMISSION = 301
-        private const val REQUEST_ATTACH_MEDIA_PERMISSION = 302
+        private const val REQUEST_PICK_MEDIA_PERMISSION = 302
+        private const val REQUEST_TAKE_PHOTO_PERMISSION = 303

        internal fun getDraftAction(intentAction: String?): String {
            if (intentAction == null) {
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/MessagesConversationFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/MessagesConversationFragment.kt
@ -145,7 +145,7 @@ class MessagesConversationFragment : BaseFragment(), LoaderCallbacks<Cursor?>, O

    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
        when (requestCode) {
-            REQUEST_PICK_IMAGE -> {
+            REQUEST_PICK_MEDIA -> {
                if (resultCode == Activity.RESULT_OK && data!!.dataString != null) {
                    imageUri = data.dataString
                    updateAddImageButton()
@ -367,7 +367,7 @@ class MessagesConversationFragment : BaseFragment(), LoaderCallbacks<Cursor?>, O
            }
            addImage -> {
                val intent = ThemedMediaPickerActivity.withThemed(activity).build()
-                startActivityForResult(intent, REQUEST_PICK_IMAGE)
+                startActivityForResult(intent, REQUEST_PICK_MEDIA)
            }
            actionBarCustomView.queryButton -> {
                val account = actionBarCustomView.accountSpinner.selectedItem as AccountDetails
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserProfileEditorFragment.kt
@ -95,6 +95,7 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, TextWat
                val intent = ThemedMediaPickerActivity.withThemed(activity)
                        .aspectRatio(1, 1)
                        .maximumSize(512, 512)
+                        .containsVideo(false)
                        .build()
                startActivityForResult(intent, REQUEST_UPLOAD_PROFILE_IMAGE)
            }
@ -102,13 +103,14 @@ class UserProfileEditorFragment : BaseFragment(), OnSizeChangedListener, TextWat
                val intent = ThemedMediaPickerActivity.withThemed(activity)
                        .aspectRatio(3, 1)
                        .maximumSize(1500, 500)
+                        .containsVideo(false)
                        .addEntry(getString(R.string.remove), "remove_banner", RESULT_REMOVE_BANNER)
                        .build()
                startActivityForResult(intent, REQUEST_UPLOAD_PROFILE_BANNER_IMAGE)
            }
            R.id.editProfileBackground -> {
                val intent = ThemedMediaPickerActivity.withThemed(activity)
-                        .pickMedia(false, false, false)
+                        .containsVideo(false)
                        .build()
                startActivityForResult(intent, REQUEST_UPLOAD_PROFILE_BACKGROUND_IMAGE)
            }
--- a/twidere/src/main/res-localized/values-ar/strings.xml
+++ b/twidere/src/main/res-localized/values-ar/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">إرسال</string>
  <string name="add_image">إضافة صورة</string>
-  <string name="take_photo">أخذ صورة</string>
+  <string name="action_take_photo">أخذ صورة</string>
  <string name="status_hint">ما الذي يحدث؟</string>
  <string name="sign_up">التسجيل</string>
  <string name="sign_in">تسجيل الدخول</string>
--- a/twidere/src/main/res-localized/values-ast/strings.xml
+++ b/twidere/src/main/res-localized/values-ast/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Univar</string>
  <string name="add_image">Amestar imaxe</string>
-  <string name="take_photo">Facer semeya</string>
+  <string name="action_take_photo">Facer semeya</string>
  <string name="status_hint">¿Qué ta asocediendo?</string>
  <string name="sign_up">Rexistrase</string>
  <string name="sign_in">Aniciar sesión</string>
--- a/twidere/src/main/res-localized/values-ca/strings.xml
+++ b/twidere/src/main/res-localized/values-ca/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Envia</string>
  <string name="add_image">Afegeix una imatge</string>
-  <string name="take_photo">Fes una foto</string>
+  <string name="action_take_photo">Fes una foto</string>
  <string name="status_hint">Què està passant?</string>
  <string name="sign_up">Registreu-me</string>
  <string name="sign_in">Inicia la sessió</string>
--- a/twidere/src/main/res-localized/values-cs/strings.xml
+++ b/twidere/src/main/res-localized/values-cs/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Poslat</string>
  <string name="add_image">Přidat obrázek</string>
-  <string name="take_photo">Vyfotit</string>
+  <string name="action_take_photo">Vyfotit</string>
  <string name="status_hint">Co se děje?</string>
  <string name="sign_up">Zaregistrovat se</string>
  <string name="sign_in">Přihlásit se</string>
--- a/twidere/src/main/res-localized/values-da/strings.xml
+++ b/twidere/src/main/res-localized/values-da/strings.xml
@ -9,7 +9,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Send</string>
  <string name="add_image">Tilføj billede</string>
-  <string name="take_photo">Tag billede</string>
+  <string name="action_take_photo">Tag billede</string>
  <string name="status_hint">Hvad sker der?</string>
  <string name="sign_up">Tilmeld</string>
  <string name="sign_in">Log ind</string>
--- a/twidere/src/main/res-localized/values-de/strings.xml
+++ b/twidere/src/main/res-localized/values-de/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Senden</string>
  <string name="add_image">Bild hinzufügen</string>
-  <string name="take_photo">Foto aufnehmen</string>
+  <string name="action_take_photo">Foto aufnehmen</string>
  <string name="status_hint">Was passiert gerade?</string>
  <string name="sign_up">Registrieren</string>
  <string name="sign_in">Einloggen</string>
--- a/twidere/src/main/res-localized/values-el/strings.xml
+++ b/twidere/src/main/res-localized/values-el/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Αποστολή</string>
  <string name="add_image">Προσθήκη εικόνας</string>
-  <string name="take_photo">Τραβήξτε φωτογραφία</string>
+  <string name="action_take_photo">Τραβήξτε φωτογραφία</string>
  <string name="status_hint">Τι συμβαίνει;</string>
  <string name="sign_up">Εγγραφή</string>
  <string name="sign_in">Σύνδεση</string>
--- a/twidere/src/main/res-localized/values-en-rGB/strings.xml
+++ b/twidere/src/main/res-localized/values-en-rGB/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Send</string>
  <string name="add_image">Add image</string>
-  <string name="take_photo">Take photo</string>
+  <string name="action_take_photo">Take photo</string>
  <string name="status_hint">What\'s happening?</string>
  <string name="sign_up">Sign up</string>
  <string name="sign_in">Sign in</string>
--- a/twidere/src/main/res-localized/values-es/strings.xml
+++ b/twidere/src/main/res-localized/values-es/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Enviar</string>
  <string name="add_image">Añadir imagen</string>
-  <string name="take_photo">Tomar foto</string>
+  <string name="action_take_photo">Tomar foto</string>
  <string name="status_hint">¿Qué esta sucediendo?</string>
  <string name="sign_up">Únete</string>
  <string name="sign_in">Inicia sesión</string>
--- a/twidere/src/main/res-localized/values-fa/strings.xml
+++ b/twidere/src/main/res-localized/values-fa/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">ارسال</string>
  <string name="add_image">افزودن تصویر</string>
-  <string name="take_photo">عکس گرفتن</string>
+  <string name="action_take_photo">عکس گرفتن</string>
  <string name="status_hint">چه خبر؟</string>
  <string name="sign_up">ثبت‌نام</string>
  <string name="sign_in">ورود</string>
--- a/twidere/src/main/res-localized/values-fi/strings.xml
+++ b/twidere/src/main/res-localized/values-fi/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Lähetä</string>
  <string name="add_image">Lisää kuva</string>
-  <string name="take_photo">Ota valokuva</string>
+  <string name="action_take_photo">Ota valokuva</string>
  <string name="status_hint">Mitä tapahtuu?</string>
  <string name="sign_up">Rekisteröidy</string>
  <string name="sign_in">Kirjaudu</string>
--- a/twidere/src/main/res-localized/values-fr/strings.xml
+++ b/twidere/src/main/res-localized/values-fr/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Envoyer</string>
  <string name="add_image">Ajouter une image</string>
-  <string name="take_photo">Prendre une photo</string>
+  <string name="action_take_photo">Prendre une photo</string>
  <string name="status_hint">Quoi de neuf?</string>
  <string name="sign_up">S\'inscrire</string>
  <string name="sign_in">Se connecter</string>
--- a/twidere/src/main/res-localized/values-gl/strings.xml
+++ b/twidere/src/main/res-localized/values-gl/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Chiar</string>
  <string name="add_image">Engadir imaxe</string>
-  <string name="take_photo">Tirar foto</string>
+  <string name="action_take_photo">Tirar foto</string>
  <string name="status_hint">O que acontece?</string>
  <string name="sign_up">Rexistrar</string>
  <string name="sign_in">Entrar</string>
--- a/twidere/src/main/res-localized/values-hi/strings.xml
+++ b/twidere/src/main/res-localized/values-hi/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">भेजें</string>
  <string name="add_image">छवि जोड़ें</string>
-  <string name="take_photo">तस्वीर लो</string>
+  <string name="action_take_photo">तस्वीर लो</string>
  <string name="status_hint">क्या हो रहा है</string>
  <string name="sign_up">साइन अप करें</string>
  <string name="sign_in">साइन इन करें</string>
--- a/twidere/src/main/res-localized/values-hr/strings.xml
+++ b/twidere/src/main/res-localized/values-hr/strings.xml
@ -9,7 +9,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Pošalji</string>
  <string name="add_image">Dodaj sliku</string>
-  <string name="take_photo">Uslikaj fotografiju</string>
+  <string name="action_take_photo">Uslikaj fotografiju</string>
  <string name="status_hint">Što se događa?</string>
  <string name="sign_up">Registracija</string>
  <string name="sign_in">Prijava</string>
--- a/twidere/src/main/res-localized/values-hu/strings.xml
+++ b/twidere/src/main/res-localized/values-hu/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Elküld</string>
  <string name="add_image">Kép hozzáadása</string>
-  <string name="take_photo">Fotó készítése</string>
+  <string name="action_take_photo">Fotó készítése</string>
  <string name="status_hint">Mi történik?</string>
  <string name="sign_up">Feliratkozás</string>
  <string name="sign_in">Bejelentkezés</string>
--- a/twidere/src/main/res-localized/values-in/strings.xml
+++ b/twidere/src/main/res-localized/values-in/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Kirim</string>
  <string name="add_image">Tambahkan gambar</string>
-  <string name="take_photo">Ambil gambar</string>
+  <string name="action_take_photo">Ambil gambar</string>
  <string name="status_hint">Apa yang terjadi ?</string>
  <string name="sign_up">Daftar</string>
  <string name="sign_in">Masuk</string>
--- a/twidere/src/main/res-localized/values-it/strings.xml
+++ b/twidere/src/main/res-localized/values-it/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Invia</string>
  <string name="add_image">Aggiungi immagine</string>
-  <string name="take_photo">Scatta una foto</string>
+  <string name="action_take_photo">Scatta una foto</string>
  <string name="status_hint">Che sta succedendo?</string>
  <string name="sign_up">Registrati</string>
  <string name="sign_in">Accedi</string>
--- a/twidere/src/main/res-localized/values-iw/strings.xml
+++ b/twidere/src/main/res-localized/values-iw/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">שלח</string>
  <string name="add_image">הוסף תמונה</string>
-  <string name="take_photo">צלם תמונה</string>
+  <string name="action_take_photo">צלם תמונה</string>
  <string name="status_hint">מה קורה?</string>
  <string name="sign_up">הרשם</string>
  <string name="sign_in">היכנס</string>
--- a/twidere/src/main/res-localized/values-ja/strings.xml
+++ b/twidere/src/main/res-localized/values-ja/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">送信</string>
  <string name="add_image">画像を追加</string>
-  <string name="take_photo">写真を撮る</string>
+  <string name="action_take_photo">写真を撮る</string>
  <string name="status_hint">いまどうしてる？</string>
  <string name="sign_up">新規登録</string>
  <string name="sign_in">ログイン</string>
--- a/twidere/src/main/res-localized/values-ko/strings.xml
+++ b/twidere/src/main/res-localized/values-ko/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">보내기</string>
  <string name="add_image">이미지 추가</string>
-  <string name="take_photo">사진 촬영</string>
+  <string name="action_take_photo">사진 촬영</string>
  <string name="status_hint">무슨 일이 일어나고 있나요?</string>
  <string name="sign_up">가입</string>
  <string name="sign_in">로그인</string>
--- a/twidere/src/main/res-localized/values-ms/strings.xml
+++ b/twidere/src/main/res-localized/values-ms/strings.xml
@ -10,7 +10,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Hantar</string>
  <string name="add_image">Tambah gambar</string>
-  <string name="take_photo">Tangkap gambar</string>
+  <string name="action_take_photo">Tangkap gambar</string>
  <!-- [verb] Save settings/files etc. -->
  <!-- [verb] Edit image/settings etc. -->
  <string name="edit_api">Olah API</string>
--- a/twidere/src/main/res-localized/values-nl/strings.xml
+++ b/twidere/src/main/res-localized/values-nl/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Verzenden</string>
  <string name="add_image">Afbeelding toevoegen</string>
-  <string name="take_photo">Maak een foto</string>
+  <string name="action_take_photo">Maak een foto</string>
  <string name="status_hint">Wat gebeurt er?</string>
  <string name="sign_up">Aanmelden</string>
  <string name="sign_in">Inloggen</string>
--- a/twidere/src/main/res-localized/values-no/strings.xml
+++ b/twidere/src/main/res-localized/values-no/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Send</string>
  <string name="add_image">Legg til bilde</string>
-  <string name="take_photo">Ta bilde</string>
+  <string name="action_take_photo">Ta bilde</string>
  <string name="status_hint">Hva skjer?</string>
  <string name="sign_up">Registrer deg</string>
  <string name="sign_in">Logg inn</string>
--- a/twidere/src/main/res-localized/values-pl/strings.xml
+++ b/twidere/src/main/res-localized/values-pl/strings.xml
@ -10,7 +10,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Wyślij</string>
  <string name="add_image">Dodaj obraz</string>
-  <string name="take_photo">Zrób zdjęcie</string>
+  <string name="action_take_photo">Zrób zdjęcie</string>
  <string name="status_hint">Co się dzieje?</string>
  <string name="sign_up">Zarejestruj się</string>
  <string name="sign_in">Zaloguj się</string>
--- a/twidere/src/main/res-localized/values-pt/strings.xml
+++ b/twidere/src/main/res-localized/values-pt/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Enviar</string>
  <string name="add_image">Adicionar imagem</string>
-  <string name="take_photo">Tirar uma foto</string>
+  <string name="action_take_photo">Tirar uma foto</string>
  <string name="status_hint">O que está acontecendo?</string>
  <string name="sign_up">Registrar</string>
  <string name="sign_in">Fazer Login</string>
--- a/twidere/src/main/res-localized/values-ro/strings.xml
+++ b/twidere/src/main/res-localized/values-ro/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Trimite</string>
  <string name="add_image">Adauga imagine</string>
-  <string name="take_photo">Faceti o fotografie</string>
+  <string name="action_take_photo">Faceti o fotografie</string>
  <string name="status_hint">Ce se intampla?</string>
  <string name="sign_up">Inregistrare</string>
  <string name="sign_in">Autentificare</string>
--- a/twidere/src/main/res-localized/values-ru/strings.xml
+++ b/twidere/src/main/res-localized/values-ru/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Отправить</string>
  <string name="add_image">Добавить изображение</string>
-  <string name="take_photo">Сделать фото</string>
+  <string name="action_take_photo">Сделать фото</string>
  <string name="status_hint">Что происходит?</string>
  <string name="sign_up">Регистрация</string>
  <string name="sign_in">Войти</string>
--- a/twidere/src/main/res-localized/values-sv/strings.xml
+++ b/twidere/src/main/res-localized/values-sv/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Skicka</string>
  <string name="add_image">Lägg till bild</string>
-  <string name="take_photo">Ta foto</string>
+  <string name="action_take_photo">Ta foto</string>
  <string name="status_hint">Vad händer?</string>
  <string name="sign_up">Registrera</string>
  <string name="sign_in">Logga in</string>
--- a/twidere/src/main/res-localized/values-th/strings.xml
+++ b/twidere/src/main/res-localized/values-th/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">ส่ง</string>
  <string name="add_image">เพิ่มรูปภาพ</string>
-  <string name="take_photo">ถ่ายรูป</string>
+  <string name="action_take_photo">ถ่ายรูป</string>
  <string name="status_hint">มีอะไรเกิดขึ้นบ้าง?</string>
  <string name="sign_up">สมัครสมาชิก</string>
  <string name="sign_in">เข้าสู่ระบบ</string>
--- a/twidere/src/main/res-localized/values-tr/strings.xml
+++ b/twidere/src/main/res-localized/values-tr/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Gönder</string>
  <string name="add_image">Resim ekle</string>
-  <string name="take_photo">Fotoğraf çek</string>
+  <string name="action_take_photo">Fotoğraf çek</string>
  <string name="status_hint">Neler oluyor?</string>
  <string name="sign_up">Kaydol</string>
  <string name="sign_in">Giriş yap</string>
--- a/twidere/src/main/res-localized/values-uk/strings.xml
+++ b/twidere/src/main/res-localized/values-uk/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Надіслати</string>
  <string name="add_image">Додати зображення</string>
-  <string name="take_photo">Зробити світлину</string>
+  <string name="action_take_photo">Зробити світлину</string>
  <string name="status_hint">Що трапилося?</string>
  <string name="sign_up">Реєстрація</string>
  <string name="sign_in">Увійти</string>
--- a/twidere/src/main/res-localized/values-vi/strings.xml
+++ b/twidere/src/main/res-localized/values-vi/strings.xml
@ -9,7 +9,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">Gửi</string>
  <string name="add_image">Thêm ảnh</string>
-  <string name="take_photo">Chụp ảnh</string>
+  <string name="action_take_photo">Chụp ảnh</string>
  <string name="sign_up">Đăng ký</string>
  <string name="sign_in">Đăng nhập</string>
  <!-- [verb] Save settings/files etc. -->
--- a/twidere/src/main/res-localized/values-zh-rCN/strings.xml
+++ b/twidere/src/main/res-localized/values-zh-rCN/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">发送</string>
  <string name="add_image">添加图片</string>
-  <string name="take_photo">拍照</string>
+  <string name="action_take_photo">拍照</string>
  <string name="status_hint">你在做什么？</string>
  <string name="sign_up">注册</string>
  <string name="sign_in">登录</string>
--- a/twidere/src/main/res-localized/values-zh/strings.xml
+++ b/twidere/src/main/res-localized/values-zh/strings.xml
@ -11,7 +11,7 @@
  <!-- [verb] Send tweet/message -->
  <string name="action_send">發送</string>
  <string name="add_image">新增圖片</string>
-  <string name="take_photo">拍照</string>
+  <string name="action_take_photo">拍照</string>
  <string name="status_hint">您在做什麼？</string>
  <string name="sign_up">註冊</string>
  <string name="sign_in">登入</string>
--- a/twidere/src/main/res/menu/menu_compose.xml
+++ b/twidere/src/main/res/menu/menu_compose.xml
@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto"
-      xmlns:tools="http://schemas.android.com/tools">
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">

-    <item
-        android:id="@id/take_photo"
-        android:icon="@drawable/ic_action_camera"
-        android:title="@string/take_photo"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction"/>
    <item
        android:id="@id/add_image"
        android:icon="@drawable/ic_action_gallery"
        android:title="@string/add_image"
        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction"/>
+        tools:ignore="AlwaysShowAction" />
    <item
        android:id="@+id/media_menu"
        android:icon="@drawable/ic_action_gallery"
@ -26,12 +21,12 @@
            <item
                android:id="@+id/add_image_sub_item"
                android:icon="@drawable/ic_action_gallery"
-                android:title="@string/add_image"/>
+                android:title="@string/add_image" />
            <item
                android:id="@id/toggle_sensitive"
                android:checkable="true"
                android:icon="@drawable/ic_action_warning"
-                android:title="@string/mark_as_sensitive"/>
+                android:title="@string/mark_as_sensitive" />
        </menu>
    </item>
    <item
@ -39,11 +34,11 @@
        android:icon="@drawable/ic_action_draft"
        android:title="@string/title_drafts"
        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction"/>
+        tools:ignore="AlwaysShowAction" />
    <item
        android:id="@+id/schedule"
        android:icon="@drawable/ic_action_time"
        android:title="@string/send_at"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />

 </menu>
--- a/twidere/src/main/res/values/arrays.xml
+++ b/twidere/src/main/res/values/arrays.xml
@ -59,7 +59,7 @@
    </string-array>
    <string-array name="entries_compose_now_action">
        <item>@string/action_compose</item>
-        <item>@string/take_photo</item>
+        <item>@string/action_take_photo</item>
        <item>@string/add_image</item>
    </string-array>
    <string-array name="entries_media_preview_style">
--- a/twidere/src/main/res/values/strings.xml
+++ b/twidere/src/main/res/values/strings.xml
@ -11,7 +11,8 @@
    <!-- [verb] Send tweet/message -->
    <string name="action_send">Send</string>
    <string name="add_image">Add image</string>
-    <string name="take_photo">Take photo</string>
+    <string name="action_take_photo">Take photo</string>
+    <string name="action_record_video">Record video</string>
    <string name="status_hint">What\'s happening?</string>
    <string name="sign_up">Sign up</string>
    <string name="sign_in">Sign in</string>
@ -906,4 +907,5 @@
    <string name="label_filters_subscription">Subscription</string>
    <string name="summary_interactions_not_available">Only available with official keys</string>
    <string name="label_password_sign_in">Password sign in</string>
+    <string name="message_compose_write_storage_permission_not_granted">Permission is required to delete taken photo/video</string>
 </resources>
--- a/twidere/src/main/res/xml/compose_shortcuts.xml
+++ b/twidere/src/main/res/xml/compose_shortcuts.xml
@ -18,8 +18,8 @@
        android:enabled="true"
        android:icon="@drawable/ic_app_shortcut_camera"
        android:shortcutId="compose-take-photo"
-        android:shortcutLongLabel="@string/take_photo"
-        android:shortcutShortLabel="@string/take_photo">
+        android:shortcutLongLabel="@string/action_take_photo"
+        android:shortcutShortLabel="@string/action_take_photo">
        <intent
            android:action="org.mariotaku.twidere.COMPOSE_TAKE_PHOTO"
            android:targetClass="org.mariotaku.twidere.activity.ComposeActivity"