Make buttons prettier, defer uploading to when the image is posted, add remove button

app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt

@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Intent
-import android.graphics.Bitmap
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Build
@@ -13,17 +12,13 @@ import android.os.Environment
 import android.provider.MediaStore
 import android.provider.OpenableColumns
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.Button
+import android.widget.ImageButton
 import android.widget.Toast
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputLayout
 import com.h.pixeldroid.utils.BaseActivity
@@ -34,7 +29,6 @@ import com.h.pixeldroid.postCreation.camera.CameraActivity
 import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity
 import com.h.pixeldroid.utils.api.objects.Attachment
 import com.h.pixeldroid.utils.api.objects.Instance
-import com.h.pixeldroid.utils.api.objects.Status
 import com.h.pixeldroid.postCreation.photoEdit.PhotoEditActivity
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -44,10 +38,7 @@ import kotlinx.android.synthetic.main.image_album_creation.view.*
 import okhttp3.MultipartBody
 import org.imaginativeworld.whynotimagecarousel.CarouselItem
 import org.imaginativeworld.whynotimagecarousel.ImageCarousel
-import retrofit2.Call
-import retrofit2.Callback
 import retrofit2.HttpException
-import retrofit2.Response
 import java.io.File
 import java.io.IOException
 import java.io.OutputStream
@@ -58,20 +49,21 @@ import kotlin.collections.ArrayList
 private const val TAG = "Post Creation Activity"
 private const val MORE_PICTURES_REQUEST_CODE = 0xffff
 
+data class PhotoData(
+        var imageUri: Uri,
+        var uploadId: String? = null,
+        var progress: Int? = null
+)
 
 class PostCreationActivity : BaseActivity() {
 
     private lateinit var accessToken: String
     private lateinit var pixelfedAPI: PixelfedAPI
 
-    private var muListOfIds: MutableList<String> = mutableListOf()
-    private var progressList: ArrayList<Int> = arrayListOf()
-
-
     private var positionResult = 0
     private var user: UserDatabaseEntity? = null
 
-    private var posts: ArrayList<String> = ArrayList()
+    private val photoData: ArrayList<PhotoData> = ArrayList()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -81,8 +73,9 @@ class PostCreationActivity : BaseActivity() {
         if(intent.clipData != null) {
             val count = intent.clipData!!.itemCount
             for (i in 0 until count) {
-                val imageUri: String = intent.clipData!!.getItemAt(i).uri.toString()
+                intent.clipData!!.getItemAt(i).uri.let {
-                posts.add(imageUri)
+                    photoData.add(PhotoData(it))
+                }
             }
         }
 
@@ -105,76 +98,84 @@ class PostCreationActivity : BaseActivity() {
         accessToken = user?.accessToken.orEmpty()
         pixelfedAPI = apiHolder.api ?: apiHolder.setDomainToCurrentUser(db)
 
-        // check if the pictures are alright
-        // TODO
-
-        //upload the picture and display progress while doing so
-        muListOfIds = posts.map { "" }.toMutableList()
-        progressList = posts.map { 0 } as ArrayList<Int>
-        upload()
-
-
         val carousel: ImageCarousel = findViewById(R.id.carousel)
-        carousel.addData(posts.map { CarouselItem(it) })
+        carousel.addData(photoData.map { CarouselItem(it.imageUri.toString()) })
 
         // get the description and send the post
         findViewById<Button>(R.id.post_creation_send_button).setOnClickListener {
-            if (validateDescription() && muListOfIds.isNotEmpty()) post()
+            if (validateDescription() && photoData.isNotEmpty()) upload()
         }
 
         // Button to retry image upload when it fails
         findViewById<Button>(R.id.retry_upload_button).setOnClickListener {
             upload_error.visibility = View.GONE
-            muListOfIds = posts.map { "" }.toMutableList()
+            photoData.forEach {
-            progressList = posts.map { 0 } as ArrayList<Int>
+                it.uploadId = null
+                it.progress = null
+            }
             upload()
         }
 
-        findViewById<Button>(R.id.editPhotoButton).setOnClickListener {
+        findViewById<ImageButton>(R.id.editPhotoButton).setOnClickListener {
-            onClick(carousel.currentPosition)
+            carousel.currentPosition.takeIf { it != -1 }?.let { currentPosition ->
+                edit(currentPosition)
+            }
         }
 
-        findViewById<Button>(R.id.addPhotoButton).setOnClickListener {
+        findViewById<ImageButton>(R.id.addPhotoButton).setOnClickListener {
             val intent = Intent(it.context, CameraActivity::class.java)
             this@PostCreationActivity.startActivityForResult(intent, MORE_PICTURES_REQUEST_CODE)
         }
 
-        findViewById<Button>(R.id.savePhotoButton).setOnClickListener {
+        findViewById<ImageButton>(R.id.savePhotoButton).setOnClickListener {
-
+            carousel.currentPosition.takeIf { it != -1 }?.let { currentPosition ->
-            val name = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS", Locale.US)
+                savePicture(it, currentPosition)
-                .format(System.currentTimeMillis()) + ".png"
-            val pair = getOutputFile(name)
-            val outputStream: OutputStream = pair.first
-            val path: String = pair.second
-
-            contentResolver.openInputStream(posts[carousel.currentPosition].toUri())!!.use { input ->
-                outputStream.use { output ->
-                    input.copyTo(output)
-                }
             }
-
-            if(path.startsWith("file")) {
-                MediaScannerConnection.scanFile(
-                    this,
-                    arrayOf(path.toUri().toFile().absolutePath),
-                    null
-                ) { path, uri ->
-                    if (uri == null) {
-                        Log.e(
-                            "NEW IMAGE SCAN FAILED",
-                            "Tried to scan $path, but it failed"
-                        )
-                    }
-                }
-            }
-            Snackbar.make(
-                it, getString(R.string.save_image_success),
-                Snackbar.LENGTH_LONG
-            ).show()
-
         }
 
+
+        findViewById<ImageButton>(R.id.removePhotoButton).setOnClickListener {
+            carousel.currentPosition.takeIf { it != -1 }?.let { currentPosition ->
+                photoData.removeAt(currentPosition)
+                carousel.addData(photoData.map { CarouselItem(it.imageUri.toString()) })
+            }
+            //TODO("have to fix upload to allow deleting!")
+        }
     }
+
+    private fun savePicture(button: View, currentPosition: Int) {
+        val name = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss-SSS", Locale.US)
+            .format(System.currentTimeMillis()) + ".png"
+        val pair = getOutputFile(name)
+        val outputStream: OutputStream = pair.first
+        val path: String = pair.second
+
+        contentResolver.openInputStream(photoData[currentPosition].imageUri)!!.use { input ->
+            outputStream.use { output ->
+                input.copyTo(output)
+            }
+        }
+
+        if(path.startsWith("file")) {
+            MediaScannerConnection.scanFile(
+                this,
+                arrayOf(path.toUri().toFile().absolutePath),
+                null
+            ) { path, uri ->
+                if (uri == null) {
+                    Log.e(
+                        "NEW IMAGE SCAN FAILED",
+                        "Tried to scan $path, but it failed"
+                    )
+                }
+            }
+        }
+        Snackbar.make(
+            button, getString(R.string.save_image_success),
+            Snackbar.LENGTH_LONG
+        ).show()
+    }
+
     private fun getOutputFile(name: String): Pair<OutputStream, String> {
         val outputStream: OutputStream
         val path: String
@@ -223,17 +224,16 @@ class PostCreationActivity : BaseActivity() {
      * @param editedImage contains the index of the image that was edited. If set, other images are
      * not uploaded again: they should already be uploading, or be done uploading, from before.
      */
-    private fun upload(newImagesStartingIndex: Int = 0, editedImage: Int? = null) {
+    private fun upload() {
         enableButton(false)
         uploadProgressBar.visibility = View.VISIBLE
         upload_completed_textview.visibility = View.INVISIBLE
+        removePhotoButton.isEnabled = false
+        editPhotoButton.isEnabled = false
+        addPhotoButton.isEnabled = false
 
-        val range: IntRange = if(editedImage == null){
+        for (data in photoData) {
-            newImagesStartingIndex until posts.size
+            val imageUri = data.imageUri
-        } else IntRange(editedImage, editedImage)
-
-        for (index in range) {
-            val imageUri = Uri.parse(posts[index])
             val imageInputStream = contentResolver.openInputStream(imageUri)!!
 
             val size =
@@ -261,9 +261,9 @@ class PostCreationActivity : BaseActivity() {
             val sub = imagePart.progressSubject
                 .subscribeOn(Schedulers.io())
                 .subscribe { percentage ->
-                    progressList[index] = percentage.toInt()
+                    data.progress = percentage.toInt()
                     uploadProgressBar.progress =
-                        progressList.sum() / progressList.size
+                        photoData.sumBy { it.progress ?: 0 } / photoData.size
                 }
 
             var postSub: Disposable? = null
@@ -274,8 +274,8 @@ class PostCreationActivity : BaseActivity() {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                     { attachment: Attachment ->
-                        progressList[index] = 0
+                        data.progress = 0
-                        muListOfIds[index] = attachment.id!!
+                        data.uploadId = attachment.id!!
                     },
                     { e ->
                         upload_error.visibility = View.VISIBLE
@@ -284,11 +284,11 @@ class PostCreationActivity : BaseActivity() {
                         sub.dispose()
                     },
                     {
-                        progressList[index] = 100
+                        data.progress = 100
-                        if(progressList.all{it == 100}){
+                        if(photoData.all{it.progress == 100}){
-                            enableButton(true)
                             uploadProgressBar.visibility = View.GONE
                             upload_completed_textview.visibility = View.VISIBLE
+                            post()
                         }
                         postSub?.dispose()
                         sub.dispose()
@@ -305,7 +305,7 @@ class PostCreationActivity : BaseActivity() {
                 pixelfedAPI.postStatus(
                     authorization = "Bearer $accessToken",
                     statusText = description,
-                    media_ids = muListOfIds.toList()
+                    media_ids = photoData.mapNotNull { it.uploadId }.toList()
                 )
                 Toast.makeText(applicationContext,getString(R.string.upload_post_success),
                     Toast.LENGTH_SHORT).show()
@@ -338,11 +338,11 @@ class PostCreationActivity : BaseActivity() {
 
     }
 
-    fun onClick(position: Int) {
+    private fun edit(position: Int) {
         positionResult = position
 
         val intent = Intent(this, PhotoEditActivity::class.java)
-            .putExtra("picture_uri", Uri.parse(posts[position]))
+            .putExtra("picture_uri", photoData[position].imageUri)
             .putExtra("no upload", false)
         startActivityForResult(intent, positionResult)
     }
@@ -351,13 +351,12 @@ class PostCreationActivity : BaseActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == positionResult) {
             if (resultCode == Activity.RESULT_OK && data != null) {
-                posts[positionResult] = data.getStringExtra("result")!!
+                photoData[positionResult].imageUri = data.getStringExtra("result")!!.toUri()
 
-                carousel.addData(posts.map { CarouselItem(it) })
+                carousel.addData(photoData.map { CarouselItem(it.imageUri.toString()) })
 
-                muListOfIds[positionResult] = ""
+                photoData[positionResult].progress = null
-                progressList[positionResult] = 0
+                photoData[positionResult].uploadId = null
-                upload(editedImage = positionResult)
             } else if(resultCode != Activity.RESULT_CANCELED){
                 Toast.makeText(applicationContext, "Error while editing", Toast.LENGTH_SHORT).show()
             }
@@ -366,15 +365,11 @@ class PostCreationActivity : BaseActivity() {
 
                 val count = data.clipData!!.itemCount
                 for (i in 0 until count) {
-                    val imageUri: String = data.clipData!!.getItemAt(i).uri.toString()
+                    val imageUri: Uri = data.clipData!!.getItemAt(i).uri
-                    posts.add(imageUri)
+                    photoData.add(PhotoData(imageUri))
-                    progressList.add(0)
-                    muListOfIds.add("")
                 }
 
-                carousel.addData(posts.map { CarouselItem(it) })
+                carousel.addData(photoData.map { CarouselItem(it.imageUri.toString()) })
-
-                upload(newImagesStartingIndex = posts.size - count)
             } else if(resultCode != Activity.RESULT_CANCELED){
                 Toast.makeText(applicationContext, "Error while adding images", Toast.LENGTH_SHORT).show()
             }

app/src/main/res/drawable/add_photo_alternate_white_30dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="30dp"
-    android:height="24dp"
+    android:height="30dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
       android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"
-      android:fillColor="@color/colorDrawing"/>
+      android:fillColor="#FFFFFF"/>
 </vector>

app/src/main/res/drawable/delete_30dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"
+      android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/drawable/download_file_30dp.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="30dp"
-    android:height="24dp"
+    android:height="30dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
       android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"
-      android:fillColor="@color/colorDrawing"/>
+      android:fillColor="#FFFFFF"/>
 </vector>

app/src/main/res/drawable/ic_baseline_edit_30.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="30dp"
-    android:height="24dp"
+    android:height="30dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/colorDrawing"
+      android:fillColor="#FFFFFF"
       android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

app/src/main/res/layout/activity_post_creation.xml

@@ -42,6 +42,12 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <org.imaginativeworld.whynotimagecarousel.ImageCarousel
+        android:id="@+id/carousel"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="@+id/uploadProgressBar"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <com.mikepenz.iconics.view.IconicsTextView
         android:id="@+id/upload_completed_textview"
@@ -53,16 +59,7 @@
         android:textSize="16sp"
         android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageButton" />
+        app:layout_constraintTop_toBottomOf="@+id/toolbar3" />
-
-    <org.imaginativeworld.whynotimagecarousel.ImageCarousel
-        android:id="@+id/carousel"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/postTextInputLayout"
-        app:layout_constraintTop_toBottomOf="@id/upload_completed_textview">
-
-    </org.imaginativeworld.whynotimagecarousel.ImageCarousel>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/buttonConstraints"
@@ -78,10 +75,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:backgroundTint="@color/colorButtonBg"
-            android:enabled="false"
+            android:enabled="true"
-            android:visibility="gone"
             android:text="@string/post"
             android:textColor="@color/colorButtonText"
+            android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -92,10 +89,11 @@
             style="?android:attr/progressBarStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <ProgressBar
@@ -103,6 +101,7 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="@id/postTextInputLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -132,43 +131,65 @@
 
     </com.google.android.material.textfield.TextInputLayout>
 
-    <Button
+
-        android:id="@+id/addPhotoButton"
+    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:id="@+id/toolbar3"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:background="#40000000"
-        android:layout_marginEnd="8dp"
+        android:minHeight="?attr/actionBarSize"
-        android:contentDescription="TODO"
-        app:icon="@drawable/add_photo_alternate_black_24dp"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/savePhotoButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:contentDescription="TODO"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:layout_constraintBottom_toBottomOf="@+id/addPhotoButton"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/addPhotoButton"
+        app:layout_constraintTop_toTopOf="parent">
-        app:icon="@drawable/download_file_24dp" />
 
-    <Button
+        <ImageButton
-        android:id="@+id/editPhotoButton"
+            android:id="@+id/savePhotoButton"
-        android:layout_width="wrap_content"
+            android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+            android:layout_marginStart="30dp"
-        android:contentDescription="TODO"
+            android:background="?attr/selectableItemBackgroundBorderless"
-        app:iconGravity="textStart"
+            android:contentDescription="TODO"
-        app:iconPadding="0dp"
+            android:src="@drawable/download_file_30dp"
-        app:layout_constraintBottom_toBottomOf="@+id/addPhotoButton"
+            app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/addPhotoButton"
+            app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/addPhotoButton"
+            app:layout_constraintTop_toTopOf="parent" />
-        app:icon="@drawable/ic_baseline_edit_24" />
+
+        <ImageButton
+            android:id="@+id/removePhotoButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="TODO"
+            android:src="@drawable/delete_30dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/savePhotoButton"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:id="@+id/editPhotoButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="TODO"
+            android:src="@drawable/ic_baseline_edit_30"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/removePhotoButton"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <ImageButton
+            android:id="@+id/addPhotoButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="30dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="TODO"
+            android:src="@drawable/add_photo_alternate_white_30dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/add_more_album_creation.xml

@@ -11,6 +11,6 @@
         android:layout_height="50dp"
         android:layout_centerInParent="true"
         android:layout_centerVertical="true"
-        android:background="@drawable/add_photo_alternate_black_24dp"
+        android:background="@drawable/add_photo_alternate_white_30dp"
         android:contentDescription="@string/add_photo" />
 </com.h.pixeldroid.postCreation.SquareLayout>

app/src/main/res/layout/image_album_creation.xml

@@ -26,7 +26,7 @@
             android:layout_marginTop="16dp"
             android:background="@drawable/circle_black_24dp"
             android:backgroundTint="#7A3E3C3C"
-            android:foreground="@drawable/ic_baseline_edit_24"
+            android:foreground="@drawable/ic_baseline_edit_30"
             android:foregroundGravity="center"
             android:foregroundTint="#FFFFFF"
             app:layout_constraintStart_toStartOf="parent"