From 377af92a90b86c001640ba2b4e2cf581adca7f30 Mon Sep 17 00:00:00 2001
From: Malte Schmitz <m@mlte.de>
Date: Sat, 2 Sep 2017 18:43:37 +0200
Subject: [PATCH] Display current file name

---
 .../main/java/de/mlte/soundboard/EditActivity.kt   | 33 ++++++++++++++++++++++
 app/src/main/res/layout/activity_edit.xml          | 18 ++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index 7955a94..98ceba0 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -7,9 +7,16 @@ import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Button
 import android.widget.EditText
+import android.provider.OpenableColumns
+import android.widget.TextView
 
 class EditActivity : AppCompatActivity() {
 
+    private fun displayFile() {
+        val fileTextView = findViewById<TextView>(R.id.fileTextView)
+        currentUri?.let { uri -> fileTextView.setText(getFileName(uri)) }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_edit)
@@ -17,6 +24,9 @@ class EditActivity : AppCompatActivity() {
         val captionEditText = findViewById<EditText>(R.id.captionEditText)
         captionEditText.setText(intent.getStringExtra("caption"))
 
+        currentUri = intent.getParcelableExtra<Uri>("uri")
+        displayFile();
+
         val okButton = findViewById<Button>(R.id.okButton)
         okButton.setOnClickListener {
             val intent = Intent()
@@ -43,6 +53,29 @@ class EditActivity : AppCompatActivity() {
 
         if (requestCode == 123 && resultCode == Activity.RESULT_OK && data != null) {
             currentUri = data.data
+            displayFile()
+        }
+    }
+
+    fun getFileName(uri: Uri): String {
+        var result: String? = null
+        if (uri.scheme == "content") {
+            val cursor = contentResolver.query(uri, null, null, null, null)
+            try {
+                if (cursor != null && cursor.moveToFirst()) {
+                    result = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+                }
+            } finally {
+                cursor!!.close()
+            }
+        }
+        if (result == null) {
+            result = uri.path
+            val cut = result!!.lastIndexOf('/')
+            if (cut != -1) {
+                result = result.substring(cut + 1)
+            }
         }
+        return result
     }
 }
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 8ccf742..1f06649 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -53,6 +53,24 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.5"
         tools:layout_editor_absoluteX="94dp"
         tools:layout_editor_absoluteY="42dp" />
+
+    <TextView
+        android:id="@+id/fileTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="0dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="0dp"
+        android:layout_marginTop="0dp"
+        android:text="TextView"
+        app:layout_constraintBottom_toTopOf="@+id/selectButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0"
+        tools:layout_editor_absoluteX="148dp"
+        tools:layout_editor_absoluteY="30dp" />
 </android.support.constraint.ConstraintLayout>