Mercurial > cgi-bin > hgweb.cgi > SimpleResizer

annotate app/src/main/java/com/bartsent/simpleresizer/EditImage.kt @ 21:7e7e71724770

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
No longer breaks when phone rotated.
author David Barts <n5jrn@me.com>
date Mon, 22 Feb 2021 17:49:27 -0800
parents eedf995462d9
children c29f941d09cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
1 package com.bartsent.simpleresizer
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
2
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
3 import android.annotation.SuppressLint
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
4 import android.content.ContentValues
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
5 import android.content.Intent
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
6 import android.graphics.Bitmap
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
7 import android.graphics.BitmapFactory
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
8 import android.graphics.Canvas
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
9 import android.graphics.Matrix
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
10 import android.net.Uri
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
11 import android.os.Bundle
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
12 import android.os.Environment
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
13 import android.provider.MediaStore
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
14 import android.provider.OpenableColumns
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
15 import android.util.Log
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
16 import android.view.Menu
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
17 import android.view.MenuItem
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
18 import android.view.View
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
19 import android.widget.EditText
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
20 import android.widget.ProgressBar
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
21 import android.widget.Toast
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
22 import androidx.appcompat.app.AlertDialog
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
23 import androidx.appcompat.app.AppCompatActivity
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
24 import androidx.appcompat.widget.PopupMenu
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
25 import com.bartsent.simpleresizer.databinding.ActivityEditImageBinding
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
26 import com.bartsent.simpleresizer.lib.getScaledInstance
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
27 import java.io.File
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
28 import java.io.IOException
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
29 import kotlin.concurrent.thread
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
30 import androidx.preference.PreferenceManager
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
31 import com.bartsent.simpleresizer.lib.ThreadPools
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
32
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
33 class EditImage : AppCompatActivity() {
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
34 private object State {
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
35 var uri: Uri? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
36 var bitmap: Bitmap? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
37 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
38
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
39 private val STDDIMS = arrayOf<Int>(1600, 1280, 1024, 800, 640, 512, 400, 320).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
40 sort()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
41 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
42
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
43 private lateinit var binding: ActivityEditImageBinding
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
44
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
45 override fun onCreate(savedInstanceState: Bundle?) {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
46 super.onCreate(savedInstanceState)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
47 binding = ActivityEditImageBinding.inflate(layoutInflater)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
48 setContentView(binding.root)
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
49 PreferenceManager.setDefaultValues(applicationContext, R.xml.root_preferences, false)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
50 }
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
51
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
52 override fun onCreateOptionsMenu(menu: Menu?): Boolean {
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
53 menuInflater.inflate(R.menu.menu_edit, menu)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
54 return super.onCreateOptionsMenu(menu)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
55 }
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
56
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
57 override fun onOptionsItemSelected(item: MenuItem): Boolean {
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
58 if (item.itemId == R.id.settings_item) {
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
59 startActivity(
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
60 Intent(Intent.ACTION_APPLICATION_PREFERENCES, null, this,
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
61 SettingsActivity::class.java))
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
62 return true
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
63 }
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
64 return false
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
65 }
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
66
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
67 // Cribbed from: https://stackoverflow.com/questions/5568874/how-to-extract-the-file-name-from-uri-returned-from-intent-action-get-content
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
68 private fun getFileName(uri: Uri): String? {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
69 var result: String? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
70 if (uri.scheme == "content") {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
71 contentResolver.query(uri, null, null, null, null).use { cursor ->
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
72 if (cursor != null && cursor.moveToFirst())
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
73 result = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
74 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
75 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
76 if (result == null) {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
77 val uriPath = uri.path
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
78 result = uriPath?.substring(uriPath.lastIndexOf('/') + 1)
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
79 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
80 return result
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
81 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
82
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
83 private fun showFatalError(message: String): Unit {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
84 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
85 it.setMessage(message)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
86 it.setNeutralButton(R.string.ok_text) { dialog, _ ->
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
87 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
88 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
89 it.setOnDismissListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
90 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
91 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
92 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
93 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
94 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
95
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
96 override fun onResume() {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
97 super.onResume()
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
98
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
99 // Read the URI, die if we can't.
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
100 val imageUri = intent?.data
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
101 if (imageUri == null) {
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
102 if (State.bitmap == null)
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
103 showFatalError(getString(R.string.error_no_uri))
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
104 else
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
105 setImage(State.bitmap!!)
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
106 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
107 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
108
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
109 // User has opened a new image.
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
110 if (imageUri != State.uri) {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
111 State.uri = imageUri
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
112 binding.progressBar.visibility = ProgressBar.VISIBLE
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
113 ThreadPools.WORKERS.execute {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
114 State.bitmap = contentResolver.openInputStream(imageUri).use {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
115 BitmapFactory.decodeStream(it)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
116 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
117 runOnUiThread {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
118 binding.progressBar.visibility = ProgressBar.INVISIBLE
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
119 if (State.bitmap == null)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
120 showFatalError(getString(R.string.error_bad_image))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
121 else
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
122 setImage(State.bitmap!!)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
123 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
124 }
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
125 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
126 }
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
127
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
128 // Rotation (of the phone).
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
129 val oldBitmap = State.bitmap
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
130 if (oldBitmap != null)
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
131 setImage(oldBitmap)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
132 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
133
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
134 private fun setImage(image: Bitmap): Unit {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
135 binding.imageSize.text = getString(R.string.image_size_text, image.width, image.height)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
136 binding.image.setImageBitmap(image)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
137 State.bitmap = image
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
138 binding.root.invalidate()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
139 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
140
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
141 private val CUSTOM = 999998
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
142 private val CANCEL = 999999
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
143
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
144 fun scaleClicked(view: View): Unit {
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
145 val (maxSize, horizontal) = State.bitmap!!.run {
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
146 if (width > height) Pair(width, true) else Pair(height, false)
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
147 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
148 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
149 menu.run {
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
150 STDDIMS.filter { it < maxSize }.forEach { major ->
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
151 val minor = major * 3 / 4
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
152 add(Menu.NONE, major, Menu.NONE,
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
153 if (horizontal) "$major ✕ $minor" else "$minor ✕ $major")
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
154 }
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
155 add(Menu.NONE, CUSTOM, Menu.NONE, R.string.custom_text)
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
156 add(Menu.NONE, CANCEL, Menu.NONE, R.string.cancel_text)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
157 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
158 setOnMenuItemClickListener(::scaleMenuItemClicked)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
159 show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
160 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
161 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
162
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
163 private fun scaleMenuItemClicked(item: MenuItem) : Boolean =
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
164 when (item.itemId) {
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
165 CUSTOM -> { showCustomScaleDialog(); true }
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
166 CANCEL -> true
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
167 in STDDIMS -> { doScale(item.itemId); true }
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
168 else -> false
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
169 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
170
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
171 private fun copyColorSpace(old: Bitmap, new: Bitmap): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
172 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
173 val oldColorSpace = old.colorSpace
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
174 if (oldColorSpace != null)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
175 new.setColorSpace(oldColorSpace)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
176 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
177 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
178
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
179 private fun doScale(newMax: Int): Unit {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
180 val oldBitmap = State.bitmap!!
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
181 val factor = newMax.toDouble() / maxOf(oldBitmap.width, oldBitmap.height).toDouble()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
182 if (factor >= 1.0) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
183 throw IllegalArgumentException("can only scale down")
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
184 }
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
185 val scaleType = PreferenceManager.getDefaultSharedPreferences(applicationContext).getString(
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
186 "scale_type", "speed" )
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
187 Log.d("EditImage", "scaling, scale_type = $scaleType")
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
188 binding.progressBar.visibility = ProgressBar.VISIBLE
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
189 ThreadPools.WORKERS.execute {
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
190 val newWidth = (oldBitmap.width.toDouble() * factor + 0.5).toInt()
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
191 val newHeight = (oldBitmap.height.toDouble() * factor + 0.5).toInt()
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
192 val newBitmap = if (scaleType == "quality")
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
193 oldBitmap.getScaledInstance(newWidth, newHeight)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
194 else
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
195 Bitmap.createScaledBitmap(oldBitmap, newWidth, newHeight, true)
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
196 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
197 binding.progressBar.visibility = ProgressBar.INVISIBLE
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
198 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
199 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
200 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
201 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
202
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
203 private fun showCustomScaleDialog(): Unit {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
204 val image = State.bitmap!!
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
205 val curMaxDim = maxOf(image.width, image.height)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
206 val dialogView = layoutInflater.inflate(R.layout.dialog_custom_scale, null)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
207 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
208 it.setPositiveButton(R.string.ok_text) { dialog, _ ->
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
209 val maxDim = dialogView.findViewById<EditText>(R.id.custom_scale)?.text.toString().toIntOrNull()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
210 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
211 if (maxDim == null || maxDim < 8 || maxDim >= curMaxDim) {
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
212 Toast.makeText(applicationContext, R.string.bad_scale, Toast.LENGTH_LONG).show()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
213 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
214 doScale(maxDim)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
215 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
216 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
217 it.setNegativeButton(R.string.cancel_text) { dialog, _ ->
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
218 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
219 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
220 it.setView(dialogView)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
221 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
222 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
223 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
224
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
225 fun rotateClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
226 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
227 setOnMenuItemClickListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
228 when(it.itemId) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
229 R.id.r_90_cw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
230 doRotate(90)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
231 true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
232 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
233 R.id.r_180 -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
234 doRotate(180)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
235 true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
236 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
237 R.id.r_90_ccw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
238 doRotate(270)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
239 true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
240 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
241 R.id.r_cancel -> true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
242 else -> false
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
243 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
244 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
245 inflate(R.menu.rotate)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
246 show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
247 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
248 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
249
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
250 private fun doRotate(deg: Int): Unit {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
251 val oldBitmap = State.bitmap!!
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
252 if (deg % 90 != 0) {
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
253 throw IllegalArgumentException("$deg not a multiple of 90")
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
254 }
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
255 val (w, h) = if (deg % 180 == 0) Pair(oldBitmap.width, oldBitmap.height) else Pair(oldBitmap.height, oldBitmap.width)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
256 val rotater = Matrix().apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
257 setRotate(deg.toFloat(), oldBitmap.width.toFloat()/2.0f, oldBitmap.height.toFloat()/2.0f)
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
258 postTranslate((w - oldBitmap.width).toFloat()/2.0f, (h - oldBitmap.height).toFloat()/2.0f)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
259 }
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
260 binding.progressBar.visibility = ProgressBar.VISIBLE
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
261 ThreadPools.WORKERS.execute {
11
678adef4774f Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents: 10
diff changeset
262 val newBitmap = Bitmap.createBitmap(w, h, oldBitmap.config)
678adef4774f Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents: 10
diff changeset
263 copyColorSpace(oldBitmap, newBitmap)
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
264 Canvas(newBitmap).run {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
265 drawBitmap(oldBitmap, rotater, null)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
266 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
267 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
268 binding.progressBar.visibility = ProgressBar.INVISIBLE
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
269 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
270 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
271 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
272 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
273
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
274 fun cancelClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
275 State.uri = null
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
276 State.bitmap = null
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
277 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
278 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
279
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
280 fun doneClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
281 val contentValues = ContentValues().apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
282 var fileName = getFileName(State.uri!!)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
283 if (fileName == null) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
284 val d = java.util.Date()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
285 fileName = "IMG_%tY%tm%td_%tH%tM%tS.jpg".format(d, d, d, d, d, d)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
286 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
287 val dot = fileName.lastIndexOf('.')
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
288 if (dot == -1) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
289 fileName = fileName + ".jpg"
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
290 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
291 val fileExt = fileName.substring(dot).toLowerCase()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
292 if (fileExt !in setOf(".jpg", ".jpeg"))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
293 fileName = fileName.substring(0..dot) + ".jpg"
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
294 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
295 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
296 put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
297 put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
298 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
299 put(MediaStore.MediaColumns.RELATIVE_PATH,
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
300 File(Environment.DIRECTORY_PICTURES, getString(R.string.app_name)).getPath())
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
301 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
302 }
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
303 binding.progressBar.visibility = ProgressBar.VISIBLE
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
304 ThreadPools.WORKERS.execute {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
305 var errorMessage: String? = null
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
306 try {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
307 val myUri = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
308 if (myUri == null) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
309 throw IOException(getString(R.string.error_create_mediastore))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
310 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
311 val stream = contentResolver.openOutputStream(myUri)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
312 if (stream == null) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
313 throw IOException(getString(R.string.error_get_output))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
314 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
315 val quality = maxOf(0, minOf(100,
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
316 PreferenceManager.getDefaultSharedPreferences(applicationContext).getInt(
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
317 "jpeg_quality", 85)))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
318 Log.d("EditImage", "saving, jpeg_quality = $quality")
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
319 stream.use {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
320 if (!State.bitmap!!.compress(Bitmap.CompressFormat.JPEG, quality, it)) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
321 throw IOException(getString(R.string.error_save_bitmap))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
322 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
323 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
324 } catch (ioe: IOException) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
325 errorMessage = ioe.message ?: getString(R.string.error_io)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
326 }
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
327 runOnUiThread {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
328 binding.progressBar.visibility = ProgressBar.INVISIBLE
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
329 if (errorMessage == null)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
330 finish()
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
331 else
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
332 Toast.makeText(applicationContext, errorMessage, Toast.LENGTH_LONG).show()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
333 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
334 }
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
335 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
336 }