浏览代码

Minor improvements

pull/1/head
Malte Schmitz 7 年前
父节点
当前提交
b19af93fb0
共有 3 个文件被更改,包括 10 次插入11 次删除
  1. +4
    -4
      app/src/main/java/de/mlte/soundboard/EditActivity.kt
  2. +5
    -6
      app/src/main/java/de/mlte/soundboard/MainActivity.kt
  3. +1
    -1
      app/src/main/java/de/mlte/soundboard/SoundButton.kt

+ 4
- 4
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)


+ 5
- 6
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() {
}
}
}


}

+ 1
- 1
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 ->


正在加载...
取消
保存