From b19af93fb05d5257f652db29dc3bb09667e20a93 Mon Sep 17 00:00:00 2001
From: Malte Schmitz <m@mlte.de>
Date: Sat, 17 Feb 2018 17:21:54 +0100
Subject: [PATCH] Minor improvements

---
 app/src/main/java/de/mlte/soundboard/EditActivity.kt |  8 ++++----
 app/src/main/java/de/mlte/soundboard/MainActivity.kt | 11 +++++------
 app/src/main/java/de/mlte/soundboard/SoundButton.kt  |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/de/mlte/soundboard/EditActivity.kt b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
index 45da1bb..78fa6a2 100644
--- a/app/src/main/java/de/mlte/soundboard/EditActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/EditActivity.kt
@@ -16,7 +16,7 @@ class EditActivity : AppCompatActivity() {
     private fun displayFile() {
         val fileTextView = findViewById<TextView>(R.id.fileTextView)
         currentUri?.let { uri ->
-            fileTextView.setText(getFileName(uri))
+            fileTextView.text = getFileName(uri)
             if (captionEditText.text.isBlank()) {
                 captionEditText.setText(fileTextView.text)
             }
@@ -30,7 +30,7 @@ class EditActivity : AppCompatActivity() {
         val captionEditText = findViewById<EditText>(R.id.captionEditText)
         captionEditText.setText(intent.getStringExtra("caption"))
 
-        fileTextView.setText(intent.getStringExtra("fileName"))
+        fileTextView.text = intent.getStringExtra("fileName")
 
         val okButton = findViewById<Button>(R.id.okButton)
         okButton.setOnClickListener {
@@ -64,7 +64,7 @@ class EditActivity : AppCompatActivity() {
         }
     }
 
-    var currentUri: Uri? = null
+    private var currentUri: Uri? = null
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
@@ -75,7 +75,7 @@ class EditActivity : AppCompatActivity() {
         }
     }
 
-    fun getFileName(uri: Uri): String {
+    private fun getFileName(uri: Uri): String {
         var result: String? = null
         if (uri.scheme == "content") {
             val cursor = contentResolver.query(uri, null, null, null, null)
diff --git a/app/src/main/java/de/mlte/soundboard/MainActivity.kt b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
index b24b185..44af2cd 100644
--- a/app/src/main/java/de/mlte/soundboard/MainActivity.kt
+++ b/app/src/main/java/de/mlte/soundboard/MainActivity.kt
@@ -132,7 +132,7 @@ class MainActivity : AppCompatActivity() {
 
         val preferences = getPreferences(Context.MODE_PRIVATE)
         val numButtons = preferences.getInt("numButtons", 0)
-        for (index in 0..numButtons - 1) {
+        for (index in 0 until numButtons) {
             val soundButton = SoundButton(this)
             addButton(soundButton)
             val caption = preferences.getString("caption" + index, "")
@@ -162,7 +162,7 @@ class MainActivity : AppCompatActivity() {
                 } else {
                     val caption = data.getStringExtra("caption")
                     if (caption != null) {
-                        textView.setText(caption)
+                        textView.text = caption
                     }
                     val uri = data.getParcelableExtra<Uri>("uri")
                     val fileName = data.getStringExtra("fileName")
@@ -190,9 +190,9 @@ class MainActivity : AppCompatActivity() {
                 buttons[index].soundId = newSoundId
                 editor.putLong("soundId" + index, newSoundId)
                 editor.commit()
-                grantUriPermission(getPackageName(), uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 val output = BufferedOutputStream(openFileOutput("audio" + newSoundId, Context.MODE_PRIVATE))
-                val input = BufferedInputStream(getContentResolver().openInputStream(uri))
+                val input = BufferedInputStream(contentResolver.openInputStream(uri))
                 try {
                     val buf = ByteArray(1024)
                     input.read(buf)
@@ -206,6 +206,5 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
-
-
+    
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/mlte/soundboard/SoundButton.kt b/app/src/main/java/de/mlte/soundboard/SoundButton.kt
index 99e0706..970698b 100644
--- a/app/src/main/java/de/mlte/soundboard/SoundButton.kt
+++ b/app/src/main/java/de/mlte/soundboard/SoundButton.kt
@@ -22,7 +22,7 @@ class SoundButton : FrameLayout {
         progressBar = findViewById<ProgressBar>(R.id.progress_bar)
         textView = findViewById<TextView>(R.id.text_view_button)
 
-        objectAnimator = ObjectAnimator.ofInt(progressBar, "progress", progressBar.getProgress(), 1000)
+        objectAnimator = ObjectAnimator.ofInt(progressBar, "progress", progressBar.progress, 1000)
         objectAnimator.interpolator = LinearInterpolator()
         progressBar.max = 1000
         objectAnimator.addUpdateListener({ valueAnimator ->