Mercurial > cgi-bin > hgweb.cgi > SimpleResizer

annotate app/src/main/java/com/bartsent/simpleresizer/EditImage.kt @ 10:5626557ac542 memo

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add progress bar and a worker thread. Still way slow.
author David Barts <n5jrn@me.com>
date Wed, 17 Feb 2021 13:39:50 -0800
parents e8059b166de1
children 678adef4774f
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
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
3 import android.content.ContentValues
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
4 import android.graphics.Bitmap
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
5 import android.graphics.BitmapFactory
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
6 import android.graphics.Canvas
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
7 import android.graphics.Matrix
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
8 import android.net.Uri
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
9 import android.os.Bundle
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
10 import android.os.Environment
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
11 import android.provider.MediaStore
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
12 import android.provider.OpenableColumns
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
13 import android.view.MenuItem
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
14 import android.view.View
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
15 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
16 import android.widget.ProgressBar
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
17 import androidx.appcompat.app.AlertDialog
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
18 import androidx.appcompat.app.AppCompatActivity
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
19 import androidx.appcompat.widget.PopupMenu
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
20 import com.bartsent.simpleresizer.databinding.ActivityEditImageBinding
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
21 import com.bartsent.simpleresizer.lib.getScaledInstance
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
22 import java.io.File
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
23 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
24 import kotlin.concurrent.thread
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
25 import kotlin.math.roundToInt
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
26
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
27 class EditImage : AppCompatActivity() {
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
28 private object State {
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
29 var uri: Uri? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
30 var bitmap: Bitmap? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
31 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
32
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
33 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
34 sort()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
35 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
36
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
37 private lateinit var binding: ActivityEditImageBinding
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
38
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
39 override fun onCreate(savedInstanceState: Bundle?) {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
40 super.onCreate(savedInstanceState)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
41 binding = ActivityEditImageBinding.inflate(layoutInflater)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
42 setContentView(binding.root)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
43 }
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
44
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
45 // 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
46 private fun getFileName(uri: Uri): String? {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
47 var result: String? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
48 if (uri.scheme == "content") {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
49 contentResolver.query(uri, null, null, null, null).use { cursor ->
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
50 if (cursor != null && cursor.moveToFirst())
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
51 result = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
52 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
53 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
54 if (result == null) {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
55 val uriPath = uri.path
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
56 result = uriPath?.substring(uriPath.lastIndexOf('/') + 1)
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
57 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
58 return result
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
59 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
60
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
61 private fun showError(message: String): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
62 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
63 it.setMessage(message)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
64 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
65 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
66 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
67 it.setOnDismissListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
68 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
69 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
70 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
71 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
72 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
73
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
74 override fun onResume() {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
75 super.onResume()
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
76
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
77 // 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
78 val imageUri = intent?.data
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
79 if (imageUri == null) {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
80 showError(getString(R.string.error_no_uri))
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
81 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
82 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
83
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
84 // Being stateful stops data loss when the phone gets rotated.
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
85 if (imageUri != State.uri) {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
86 State.uri = imageUri
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
87 State.bitmap = contentResolver.openInputStream(imageUri).use {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
88 BitmapFactory.decodeStream(it)
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
89 }
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
90 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
91 if (State.bitmap == null) {
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
92 showError(getString(R.string.error_bad_image))
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
93 return
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
94 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
95 setImage(State.bitmap!!)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
96 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
97
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
98 fun setImage(image: Bitmap): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
99 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
100 binding.image.setImageBitmap(image)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
101 State.bitmap = image
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
102 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
103
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
104 fun scaleClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
105 val maxSize = State.bitmap!!.run { maxOf(width, height) }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
106 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
107 menu.run {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
108 STDDIMS.filter { it < maxSize }.forEach { add(it.toString()) }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
109 add(getString(R.string.custom_text))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
110 add(getString(R.string.cancel_text))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
111 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
112 setOnMenuItemClickListener(::scaleMenuItemClicked)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
113 show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
114 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
115 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
116
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
117 fun scaleMenuItemClicked(item: MenuItem) : Boolean {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
118 val itString = item.title.toString()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
119 var itVal = itString.toIntOrNull()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
120 if (itVal == null) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
121 return when (itString) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
122 getString(R.string.cancel_text) -> true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
123 getString(R.string.custom_text) -> { showCustomScaleDialog(); true }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
124 else -> false
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
125 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
126 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
127 doScale(itVal)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
128 return true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
129 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
130
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
131 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
132 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
133 val oldColorSpace = old.colorSpace
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
134 if (oldColorSpace != null)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
135 new.setColorSpace(oldColorSpace)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
136 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
137 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
138
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
139 fun doScale(newMax: Int): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
140 val oldBitmap = State.bitmap!!
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
141 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
142 if (factor >= 1.0) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
143 throw IllegalArgumentException("can only scale down")
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
144 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
145 val newBitmap = Bitmap.createBitmap((oldBitmap.width * factor).roundToInt(), (oldBitmap.height * factor).roundToInt(), oldBitmap.config)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
146 copyColorSpace(oldBitmap, newBitmap)
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
147 binding.progressBar.visibility = ProgressBar.VISIBLE
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
148 thread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
149 val newBitmap = oldBitmap.getScaledInstance(
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
150 (oldBitmap.width.toDouble() * factor + 0.5).toInt(),
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
151 (oldBitmap.height.toDouble() * factor + 0.5).toInt())
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
152 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
153 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
154 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
155 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
156 }
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
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
159 // is there any way to remember the last scale value?
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
160 // if so: should we?
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
161
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
162 fun showCustomScaleDialog(): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
163 val image = State.bitmap!!
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
164 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
165 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
166 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
167 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
168 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
169 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
170 if (maxDim == null || maxDim < 8 || maxDim >= curMaxDim) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
171 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
172 it.setMessage(R.string.bad_scale)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
173 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
174 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
175 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
176 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
177 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
178 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
179 doScale(maxDim)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
180 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
181 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
182 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
183 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
184 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
185 it.setView(dialogView)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
186 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
187 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
188 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
189
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
190 fun rotateClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
191 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
192 setOnMenuItemClickListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
193 when(it.itemId) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
194 R.id.r_90_cw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
195 doRotate(90)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
196 true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
197 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
198 R.id.r_180 -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
199 doRotate(180)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
200 true
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 R.id.r_90_ccw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
203 doRotate(270)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
204 true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
205 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
206 R.id.r_cancel -> true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
207 else -> false
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
208 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
209 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
210 inflate(R.menu.rotate)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
211 show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
212 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
213 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
214
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
215 fun doRotate(deg: Int): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
216 val oldBitmap = State.bitmap!!
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
217 if (deg % 90 != 0) {
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
218 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
219 }
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
220 val (w, h) = if (deg % 180 == 0) Pair(oldBitmap.width, oldBitmap.height) else Pair(oldBitmap.height, oldBitmap.width)
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
221 val newBitmap = Bitmap.createBitmap(w, h, oldBitmap.config)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
222 copyColorSpace(oldBitmap, newBitmap)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
223 val rotater = Matrix().apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
224 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
225 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
226 }
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
227 binding.progressBar.visibility = ProgressBar.VISIBLE
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
228 thread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
229 Canvas(newBitmap).run {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
230 drawBitmap(oldBitmap, rotater, null)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
231 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
232 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
233 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
234 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
235 }
2
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 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
238
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
239 fun cancelClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
240 State.uri = null
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
241 State.bitmap = null
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
242 finish()
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 fun doneClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
246 val contentValues = ContentValues().apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
247 var fileName = getFileName(State.uri!!)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
248 if (fileName == null) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
249 val d = java.util.Date()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
250 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
251 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
252 val dot = fileName.lastIndexOf('.')
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
253 if (dot == -1) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
254 fileName = fileName + ".jpg"
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
255 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
256 val fileExt = fileName.substring(dot).toLowerCase()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
257 if (fileExt !in setOf(".jpg", ".jpeg"))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
258 fileName = fileName.substring(0..dot) + ".jpg"
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
259 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
260 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
261 put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
262 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
263 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
264 put(MediaStore.MediaColumns.RELATIVE_PATH,
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
265 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
266 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
267 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
268 try {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
269 val myUri = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
270 if (myUri == null) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
271 throw IOException(getString(R.string.error_create_mediastore))
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 val stream = contentResolver.openOutputStream(myUri)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
274 if (stream == null) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
275 throw IOException(getString(R.string.error_get_output))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
276 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
277 // fixme: use quality from settings
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
278 stream.use {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
279 if (!State.bitmap!!.compress(Bitmap.CompressFormat.JPEG, 85, it)) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
280 throw IOException(getString(R.string.error_save_bitmap))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
281 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
282 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
283 } catch (ioe: IOException) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
284 showError(ioe.message ?: getString(R.string.error_io))
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
285 }
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
286 finish()
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
287 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
288 }