Mercurial > cgi-bin > hgweb.cgi > SimpleResizer

annotate app/src/main/java/com/bartsent/simpleresizer/EditImage.kt @ 40:cfb19d4ccf78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
About screen (but it has broken Edit screen).
author David Barts <n5jrn@me.com>
date Mon, 05 Apr 2021 09:08:31 -0700
parents 0dbd924cb5e8
children 45e4df5226c0
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
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
3 import android.Manifest
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
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
6 import android.content.pm.PackageManager
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
7 import android.graphics.Bitmap
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
8 import android.graphics.BitmapFactory
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
9 import android.graphics.Canvas
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
10 import android.graphics.Matrix
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
11 import android.net.Uri
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
12 import android.os.Bundle
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
13 import android.os.Environment
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
14 import android.provider.MediaStore
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
15 import android.provider.OpenableColumns
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
16 import android.util.Log
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
17 import android.view.Menu
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
18 import android.view.MenuItem
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
19 import android.view.View
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
20 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
21 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
22 import android.widget.Toast
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
23 import androidx.appcompat.app.AlertDialog
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
24 import androidx.appcompat.app.AppCompatActivity
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
25 import androidx.appcompat.widget.PopupMenu
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
26 import androidx.lifecycle.ViewModel
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
27 import androidx.lifecycle.ViewModelProvider
22
c29f941d09cd Add landscape mode.
David Barts <n5jrn@me.com>
parents: 21
diff changeset
28 import androidx.preference.PreferenceManager
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
29 import com.bartsent.simpleresizer.databinding.ActivityEditImageBinding
22
c29f941d09cd Add landscape mode.
David Barts <n5jrn@me.com>
parents: 21
diff changeset
30 import com.bartsent.simpleresizer.lib.ThreadPools
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
31 import com.bartsent.simpleresizer.lib.getScaledInstance
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
32 import java.io.File
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
33 import java.io.IOException
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
34 import java.util.concurrent.Callable
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
35 import java.util.concurrent.Future
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
36
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
37 class EditImage : AppCompatActivity() {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
38 class State: ViewModel() {
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
39 var uri: Uri? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
40 var bitmap: Bitmap? = null
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
41 var reader: Future<Unit>? = null
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
42 }
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
43 private lateinit var viewModel: State
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
44
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
45 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
46 sort()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
47 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
48
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
49 private lateinit var binding: ActivityEditImageBinding
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
50
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
51 override fun onCreate(savedInstanceState: Bundle?) {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
52 super.onCreate(savedInstanceState)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
53 binding = ActivityEditImageBinding.inflate(layoutInflater)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
54 setContentView(binding.root)
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
55 PreferenceManager.setDefaultValues(applicationContext, R.xml.root_preferences, false)
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
56 viewModel = ViewModelProvider(this).get(State::class.java)
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
57 }
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
58
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
59 override fun onCreateOptionsMenu(menu: Menu?): Boolean {
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
60 menuInflater.inflate(R.menu.menu_edit, menu)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
61 return super.onCreateOptionsMenu(menu)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
62 }
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 override fun onOptionsItemSelected(item: MenuItem): Boolean {
40
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
65 when (item.itemId) {
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
66 R.id.settings_item -> {
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
67 startActivity(
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
68 Intent(Intent.ACTION_APPLICATION_PREFERENCES, null, this,
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
69 SettingsActivity::class.java))
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
70 return true
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
71 }
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
72 R.id.about_item -> {
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
73 startActivity(Intent(this, About::class.java ))
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
74 return true
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
75 }
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
76 else -> return false
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
77 }
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
78 }
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
79
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
80 // 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
81 private fun getFileName(uri: Uri): String? {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
82 var result: String? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
83 if (uri.scheme == "content") {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
84 contentResolver.query(uri, null, null, null, null).use { cursor ->
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
85 if (cursor != null && cursor.moveToFirst())
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
86 result = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
87 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
88 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
89 if (result == null) {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
90 val uriPath = uri.path
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
91 result = uriPath?.substring(uriPath.lastIndexOf('/') + 1)
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
92 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
93 return result
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
94 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
95
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
96 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
97 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
98 it.setMessage(message)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
99 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
100 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
101 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
102 it.setOnDismissListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
103 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
104 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
105 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
106 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
107 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
108
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
109 fun showError(message: String): Unit {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
110 AlertDialog.Builder(this).also {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
111 it.setMessage(message)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
112 it.setNeutralButton(R.string.ok_text) { dialog, _ ->
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
113 dialog.dismiss()
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
114 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
115 it.create()
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
116 }.show()
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
117 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
118
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
119 override fun onResume() {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
120 super.onResume()
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
121
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
122 // Read the URI, die if we can't.
29
eec88eba58e9 Fix receiving from another app.
David Barts <n5jrn@me.com>
parents: 25
diff changeset
123 val imageUri = intent?.data ?: intent?.extras?.get(Intent.EXTRA_STREAM) as? Uri
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
124 if (imageUri == null) {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
125 if (viewModel.bitmap == 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
126 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
127 else
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
128 setImage(viewModel.bitmap!!)
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
129 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
130 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
131
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
132 // User has opened a new image.
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
133 if (imageUri != viewModel.uri) {
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
134 viewModel.uri = imageUri
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
135 binding.progressBar.visibility = ProgressBar.VISIBLE
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
136 viewModel.reader = ThreadPools.WORKERS.submit(Callable<Unit> {
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
137 val newBitmap = contentResolver.openInputStream(imageUri).use {
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
138 BitmapFactory.decodeStream(it)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
139 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
140 runOnUiThread {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
141 binding.progressBar.visibility = ProgressBar.INVISIBLE
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
142 if (newBitmap == null)
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
143 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
144 else
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
145 setImage(newBitmap)
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
146 viewModel.reader = null
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
147 }
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
148 })
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
149 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
150 }
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
151
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
152 // Rotation (of the phone).
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
153 val oldBitmap = viewModel.bitmap
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
154 if (oldBitmap != null)
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
155 setImage(oldBitmap)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
156 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
157
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
158 override fun onDestroy() {
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
159 // Read tasks may get badly constipated, since the image may well be on
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
160 // cloud server like Google Pictures. So be sure to terminate any active
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
161 // read task with extreme prejudice.
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
162 val reader = viewModel.reader
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
163 if (reader != null) {
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
164 reader.cancel(true)
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
165 viewModel.reader = null
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
166 }
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
167 super.onDestroy()
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
168 }
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
169
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
170 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
171 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
172 binding.image.setImageBitmap(image)
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
173 viewModel.bitmap = image
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
174 binding.root.invalidate()
2
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
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
177 private fun unsetImage(): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
178 viewModel.uri = null
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
179 viewModel.bitmap = null
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
180 }
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
181
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
182 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
183 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
184
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
185 fun scaleClicked(view: View): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
186 val (maxSize, horizontal) = viewModel.bitmap!!.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
187 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
188 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
189 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
190 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
191 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
192 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
193 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
194 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
195 }
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
196 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
197 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
198 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
199 setOnMenuItemClickListener(::scaleMenuItemClicked)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
200 show()
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 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
203
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
204 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
205 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
206 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
207 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
208 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
209 else -> false
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
210 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
211
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
212 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
213 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
214 val oldColorSpace = old.colorSpace
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
215 if (oldColorSpace != null)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
216 new.setColorSpace(oldColorSpace)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
217 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
218 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
219
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
220 private fun doScale(newMax: Int): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
221 val oldBitmap = viewModel.bitmap!!
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
222 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
223 if (factor >= 1.0) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
224 throw IllegalArgumentException("can only scale down")
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
225 }
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
226 val scaleType = PreferenceManager.getDefaultSharedPreferences(applicationContext).getString(
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
227 "scale_type", "speed" )
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
228 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
229 binding.progressBar.visibility = ProgressBar.VISIBLE
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
230 ThreadPools.WORKERS.execute {
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
231 val newWidth = (oldBitmap.width.toDouble() * factor + 0.5).toInt()
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
232 val newHeight = (oldBitmap.height.toDouble() * factor + 0.5).toInt()
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
233 val newBitmap = if (scaleType == "quality")
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
234 oldBitmap.getScaledInstance(newWidth, newHeight)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
235 else
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
236 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
237 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
238 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
239 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
240 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
241 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
242 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
243
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
244 private fun showCustomScaleDialog(): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
245 val image = viewModel.bitmap!!
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
246 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
247 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
248 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
249 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
250 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
251 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
252 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
253 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
254 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
255 doScale(maxDim)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
256 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
257 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
258 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
259 dialog.dismiss()
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 it.setView(dialogView)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
262 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
263 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
264 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
265
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
266 fun rotateClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
267 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
268 setOnMenuItemClickListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
269 when(it.itemId) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
270 R.id.r_90_cw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
271 doRotate(90)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
272 true
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 R.id.r_180 -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
275 doRotate(180)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
276 true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
277 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
278 R.id.r_90_ccw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
279 doRotate(270)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
280 true
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 R.id.r_cancel -> true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
283 else -> false
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
284 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
285 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
286 inflate(R.menu.rotate)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
287 show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
288 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
289 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
290
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
291 private fun doRotate(deg: Int): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
292 val oldBitmap = viewModel.bitmap!!
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
293 if (deg % 90 != 0) {
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
294 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
295 }
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
296 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
297 val rotater = Matrix().apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
298 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
299 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
300 }
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
301 binding.progressBar.visibility = ProgressBar.VISIBLE
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
302 ThreadPools.WORKERS.execute {
11
678adef4774f Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents: 10
diff changeset
303 val newBitmap = Bitmap.createBitmap(w, h, oldBitmap.config)
678adef4774f Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents: 10
diff changeset
304 copyColorSpace(oldBitmap, newBitmap)
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
305 Canvas(newBitmap).run {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
306 drawBitmap(oldBitmap, rotater, null)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
307 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
308 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
309 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
310 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
311 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
312 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
313 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
314
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
315 fun cancelClicked(view: View): Unit {
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
316 unsetImage()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
317 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
318 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
319
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
320 private val REQUEST_WRITE_EXTERNAL = 42
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
321
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
322 override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray): Unit {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
323 if (requestCode != REQUEST_WRITE_EXTERNAL) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
324 Log.e("EditImage", "unexpected request code in onRequestPermissionsResult!")
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
325 return
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
326 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
327 if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
328 doneClicked(null)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
329 } else {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
330 showError(getString(R.string.error_unable_no_permissions))
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
331 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
332 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
333
37
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
334 fun requestWritePermission(): Unit {
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
335 requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), REQUEST_WRITE_EXTERNAL)
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
336 }
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
337
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
338 fun doneClicked(view: View?): Unit {
37
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
339 // If we need WRITE_EXTERNAL_STORAGE, request it and bail. We will be called again
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
340 // (with the permission) if it is granted.
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
341 if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.Q) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
342 if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
37
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
343 if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE))
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
344 AlertDialog.Builder(this).also {
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
345 it.setMessage(getString(R.string.permission_needed, getString(R.string.app_name)))
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
346 it.setNeutralButton(R.string.ok_text) { dialog, _ ->
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
347 dialog.dismiss()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
348 requestWritePermission()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
349 }
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
350 it.create()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
351 }.show()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
352 else
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
353 requestWritePermission()
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
354 return
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
355 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
356 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
357
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
358 // If we get here, we have permission to save (if we need it).
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
359 val image = viewModel.bitmap!!
25
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
360 binding.progressBar.visibility = ProgressBar.VISIBLE
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
361 ThreadPools.WORKERS.execute {
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
362 val contentValues = ContentValues().apply {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
363 var fileName = getFileName(viewModel.uri!!)
25
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
364 if (fileName == null) {
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
365 val d = java.util.Date()
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
366 fileName = "IMG_%tY%tm%td_%tH%tM%tS".format(d, d, d, d, d, d)
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
367 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
368 val dot = fileName.lastIndexOf('.')
25
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
369 if (dot != -1)
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
370 fileName = fileName.substring(0, dot)
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
371 fileName = "${fileName}_${image.width}x${image.height}.jpg"
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
372 put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
373 put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
374 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
375 put(MediaStore.MediaColumns.RELATIVE_PATH,
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
376 File(Environment.DIRECTORY_PICTURES, getString(R.string.app_name)).path)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
377 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
378 }
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
379 var errorMessage: String? = null
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
380 try {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
381 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
382 if (myUri == null) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
383 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
384 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
385 val stream = contentResolver.openOutputStream(myUri)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
386 if (stream == null) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
387 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
388 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
389 val quality = maxOf(0, minOf(100,
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
390 PreferenceManager.getDefaultSharedPreferences(applicationContext).getInt(
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
391 "jpeg_quality", 85)))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
392 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
393 stream.use {
25
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
394 if (!image.compress(Bitmap.CompressFormat.JPEG, quality, it)) {
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
395 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
396 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
397 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
398 } catch (ioe: IOException) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
399 errorMessage = ioe.message ?: getString(R.string.error_io)
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
400 } catch (se: SecurityException) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
401 errorMessage = se.message ?: getString(R.string.error_security)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
402 } catch (e: Exception) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
403 Log.e("EditImage", "unexpected exception when saving!", e)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
404 errorMessage = e.message ?: getString(R.string.error_unexpected, e::class.qualifiedName)
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
405 }
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
406 runOnUiThread {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
407 binding.progressBar.visibility = ProgressBar.INVISIBLE
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
408 if (errorMessage == null) {
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
409 unsetImage()
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
410 finish()
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
411 } else {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
412 showError(errorMessage)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
413 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
414 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
415 }
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
416 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
417 }