Mercurial > cgi-bin > hgweb.cgi > SimpleResizer

annotate app/src/main/java/com/bartsent/simpleresizer/EditImage.kt @ 42:45e4df5226c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Shares, but creates multiple versions of cruft file.
author David Barts <n5jrn@me.com>
date Sat, 10 Apr 2021 09:02:44 -0700
parents cfb19d4ccf78
children 9cb9bb5da247
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
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
32 import com.google.android.material.floatingactionbutton.FloatingActionButton
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
33 import java.io.File
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
34 import java.io.IOException
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
35 import java.util.concurrent.Callable
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
36 import java.util.concurrent.Future
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
37
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
38 class EditImage : AppCompatActivity() {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
39 class State: ViewModel() {
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
40 var uri: Uri? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
41 var bitmap: Bitmap? = null
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
42 var reader: Future<Unit>? = null
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
43 var permissionsCallback: (() -> Unit)? = null
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
44 var sharable: Boolean = false
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
45 }
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
46 private lateinit var viewModel: State
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
47
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
48 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
49 sort()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
50 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
51
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
52 private val IMAGE_TO_SEND = "sent_image.jpg"
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
53
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
54 private lateinit var binding: ActivityEditImageBinding
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
55
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
56 override fun onCreate(savedInstanceState: Bundle?) {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
57 super.onCreate(savedInstanceState)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
58 binding = ActivityEditImageBinding.inflate(layoutInflater)
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
59 setContentView(binding.root)
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
60 PreferenceManager.setDefaultValues(applicationContext, R.xml.root_preferences, false)
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
61 viewModel = ViewModelProvider(this).get(State::class.java)
15
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 onCreateOptionsMenu(menu: Menu?): Boolean {
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
65 menuInflater.inflate(R.menu.menu_edit, menu)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
66 return super.onCreateOptionsMenu(menu)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
67 }
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
68
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
69 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
70 when (item.itemId) {
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
71 R.id.settings_item -> {
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
72 startActivity(
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
73 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
74 SettingsActivity::class.java))
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
75 return true
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
76 }
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
77 R.id.about_item -> {
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
78 startActivity(Intent(this, About::class.java ))
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
79 return true
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
80 }
cfb19d4ccf78 About screen (but it has broken Edit screen).
David Barts <n5jrn@me.com>
parents: 37
diff changeset
81 else -> return false
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
82 }
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
83 }
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
84
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
85 // 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
86 private fun getFileName(uri: Uri): String? {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
87 var result: String? = null
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
88 if (uri.scheme == "content") {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
89 contentResolver.query(uri, null, null, null, null).use { cursor ->
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
90 if (cursor != null && cursor.moveToFirst())
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
91 result = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
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 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
94 if (result == null) {
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
95 val uriPath = uri.path
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
96 result = uriPath?.substring(uriPath.lastIndexOf('/') + 1)
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
97 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
98 return result
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
99 }
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
100
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
101 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
102 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
103 it.setMessage(message)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
104 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
105 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
106 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
107 it.setOnDismissListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
108 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
109 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
110 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
111 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
112 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
113
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
114 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
115 AlertDialog.Builder(this).also {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
116 it.setMessage(message)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
117 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
118 dialog.dismiss()
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
119 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
120 it.create()
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
121 }.show()
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
122 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
123
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
124 override fun onResume() {
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
125 super.onResume()
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
126
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
127 // Read the URI, die if we can't.
29
eec88eba58e9 Fix receiving from another app.
David Barts <n5jrn@me.com>
parents: 25
diff changeset
128 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
129 if (imageUri == null) {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
130 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
131 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
132 else
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
133 setImage(viewModel.bitmap!!)
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
134 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
135 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
136
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
137 // User has opened a new image.
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
138 if (imageUri != viewModel.uri) {
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
139 viewModel.uri = imageUri
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
140 makeMundane()
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
141 binding.progressBar.visibility = ProgressBar.VISIBLE
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
142 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
143 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
144 BitmapFactory.decodeStream(it)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
145 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
146 runOnUiThread {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
147 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
148 if (newBitmap == null)
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
149 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
150 else
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
151 setImage(newBitmap)
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
152 viewModel.reader = null
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
153 }
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
154 })
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
155 return
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
156 }
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
157
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
158 // Rotation (of the phone).
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
159 val oldBitmap = viewModel.bitmap
21
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
160 if (oldBitmap != null)
7e7e71724770 No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents: 18
diff changeset
161 setImage(oldBitmap)
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
162 binding.fabulous.visibility = if (viewModel.sharable) FloatingActionButton.VISIBLE else FloatingActionButton.GONE
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
163 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
164
33
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
165 override fun onDestroy() {
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
166 // 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
167 // 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
168 // read task with extreme prejudice.
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
169 val reader = viewModel.reader
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
170 if (reader != null) {
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
171 reader.cancel(true)
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
172 viewModel.reader = null
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
173 }
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
174 super.onDestroy()
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
175 }
bead5d7e8c69 Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents: 32
diff changeset
176
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
177 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
178 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
179 binding.image.setImageBitmap(image)
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
180 viewModel.bitmap = image
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
181 binding.root.invalidate()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
182 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
183
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
184 private fun unsetImage(): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
185 viewModel.uri = null
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
186 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
187 }
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
188
16
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
189 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
190 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
191
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
192 fun scaleClicked(view: View): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
193 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
194 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
195 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
196 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
197 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
198 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
199 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
200 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
201 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
202 }
3ed74dc0e34a Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents: 15
diff changeset
203 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
204 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
205 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
206 setOnMenuItemClickListener(::scaleMenuItemClicked)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
207 show()
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
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
211 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
212 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
213 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
214 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
215 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
216 else -> false
2
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 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
220 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
221 val oldColorSpace = old.colorSpace
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
222 if (oldColorSpace != null)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
223 new.setColorSpace(oldColorSpace)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
224 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
225 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
226
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
227 private fun doScale(newMax: Int): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
228 val oldBitmap = viewModel.bitmap!!
6
e8059b166de1 Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents: 5
diff changeset
229 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
230 if (factor >= 1.0) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
231 throw IllegalArgumentException("can only scale down")
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
232 }
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
233 val scaleType = PreferenceManager.getDefaultSharedPreferences(applicationContext).getString(
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
234 "scale_type", "speed" )
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
235 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
236 binding.progressBar.visibility = ProgressBar.VISIBLE
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
237 ThreadPools.WORKERS.execute {
15
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
238 val newWidth = (oldBitmap.width.toDouble() * factor + 0.5).toInt()
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
239 val newHeight = (oldBitmap.height.toDouble() * factor + 0.5).toInt()
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
240 val newBitmap = if (scaleType == "quality")
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
241 oldBitmap.getScaledInstance(newWidth, newHeight)
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
242 else
20da616dcda0 Add preferences.
David Barts <n5jrn@me.com>
parents: 11
diff changeset
243 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
244 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
245 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
246 setImage(newBitmap)
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
247 makeFabulous()
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
248 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
249 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
250 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
251
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
252 private fun showCustomScaleDialog(): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
253 val image = viewModel.bitmap!!
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
254 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
255 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
256 AlertDialog.Builder(this).also {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
257 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
258 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
259 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
260 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
261 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
262 } else {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
263 doScale(maxDim)
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 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
267 dialog.dismiss()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
268 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
269 it.setView(dialogView)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
270 it.create()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
271 }.show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
272 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
273
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
274 fun rotateClicked(view: View): Unit {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
275 PopupMenu(this, view).apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
276 setOnMenuItemClickListener {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
277 when(it.itemId) {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
278 R.id.r_90_cw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
279 doRotate(90)
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_180 -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
283 doRotate(180)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
284 true
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 R.id.r_90_ccw -> {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
287 doRotate(270)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
288 true
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 R.id.r_cancel -> true
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
291 else -> false
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
292 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
293 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
294 inflate(R.menu.rotate)
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
295 show()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
296 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
297 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
298
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
299 private fun doRotate(deg: Int): Unit {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
300 val oldBitmap = viewModel.bitmap!!
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
301 if (deg % 90 != 0) {
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
302 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
303 }
5
247e03baf77c Fix rotation.
David Barts <n5jrn@me.com>
parents: 4
diff changeset
304 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
305 val rotater = Matrix().apply {
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
306 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
307 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
308 }
10
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.VISIBLE
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
310 ThreadPools.WORKERS.execute {
11
678adef4774f Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents: 10
diff changeset
311 val newBitmap = Bitmap.createBitmap(w, h, oldBitmap.config)
678adef4774f Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents: 10
diff changeset
312 copyColorSpace(oldBitmap, newBitmap)
10
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
313 Canvas(newBitmap).run {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
314 drawBitmap(oldBitmap, rotater, null)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
315 }
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
316 runOnUiThread {
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
317 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
318 setImage(newBitmap)
5626557ac542 Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents: 6
diff changeset
319 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
320 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
321 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
322
30
aacf7a856b5f Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents: 29
diff changeset
323 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
324 unsetImage()
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
325 makeMundane()
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
326 finish()
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
327 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
328
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
329 private fun makeFabulous(): Unit {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
330 binding.fabulous.visibility = FloatingActionButton.VISIBLE
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
331 viewModel.sharable = true
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
332 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
333
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
334 private fun makeMundane(): Unit {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
335 binding.fabulous.visibility = FloatingActionButton.GONE
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
336 viewModel.sharable = false
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
337 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
338
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
339 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
340
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
341 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
342 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
343 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
344 return
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
345 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
346 if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
347 val cb = viewModel.permissionsCallback
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
348 if (cb != null) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
349 viewModel.permissionsCallback = null
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
350 cb()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
351 }
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
352 } else {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
353 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
354 }
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
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
357 private fun requestWritePermission(): Unit {
37
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
358 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
359 }
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
360
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
361 private fun needsWritePermission(callback: () -> Unit): Boolean {
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
362 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
363 if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED) {
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
364 viewModel.permissionsCallback = callback
37
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
365 if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE))
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
366 AlertDialog.Builder(this).also {
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
367 it.setMessage(
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
368 getString(
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
369 R.string.permission_needed,
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
370 getString(R.string.app_name)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
371 )
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
372 )
37
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
373 it.setNeutralButton(R.string.ok_text) { dialog, _ ->
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
374 dialog.dismiss()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
375 requestWritePermission()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
376 }
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
377 it.create()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
378 }.show()
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
379 else
0dbd924cb5e8 Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents: 36
diff changeset
380 requestWritePermission()
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
381 return true
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
382 }
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
383 }
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
384 return false
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
385 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
386
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
387 fun shareClicked(view: View): Unit {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
388 // If we need WRITE_EXTERNAL_STORAGE, request it and bail. We will be called again
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
389 // (with the permission) if it is granted.
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
390 if (needsWritePermission({ shareClicked(view) }))
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
391 return
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
392
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
393 // If we get here, we have permission to save (if we need it).
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
394 val contentValues = makeContentValues(IMAGE_TO_SEND)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
395
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
396 // Delete any old file(s)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
397 val cols = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
398 arrayOf<String>(MediaStore.MediaColumns.DISPLAY_NAME, MediaStore.MediaColumns.MIME_TYPE, MediaStore.MediaColumns.RELATIVE_PATH)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
399 else
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
400 arrayOf<String>(MediaStore.MediaColumns.DISPLAY_NAME, MediaStore.MediaColumns.MIME_TYPE)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
401 val query = StringBuilder()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
402 for (col in cols) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
403 if (query.isNotEmpty())
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
404 query.append(" and ")
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
405 query.append(col)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
406 query.append(" = ?")
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
407 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
408 try {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
409 contentResolver.delete(
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
410 MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
411 query.toString(),
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
412 cols.map { contentValues.getAsString(it) }.toTypedArray()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
413 )
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
414 } catch (e: Exception) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
415 Log.e("EditImage", "unexpected exception when sharing!", e)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
416 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
417
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
418 // Save new file, use it to share data.
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
419 saveAs(contentValues) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
420 val shareIntent: Intent = Intent().apply {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
421 action = Intent.ACTION_SEND
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
422 putExtra(Intent.EXTRA_STREAM, it)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
423 type = "image/jpeg"
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
424 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
425 startActivity(Intent.createChooser(shareIntent, resources.getText(R.string.share_text)))
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
426 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
427 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
428
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
429 fun doneClicked(view: View): Unit {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
430 // If we need WRITE_EXTERNAL_STORAGE, request it and bail. We will be called again
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
431 // (with the permission) if it is granted.
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
432 if (needsWritePermission({ doneClicked(view) }))
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
433 return
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
434
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
435 // If we get here, we have permission to save (if we need it).
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
436 val image = viewModel.bitmap!!
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
437 var fileName = getFileName(viewModel.uri!!)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
438 if (fileName == null) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
439 val d = java.util.Date()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
440 fileName = "IMG_%tY%tm%td_%tH%tM%tS".format(d, d, d, d, d, d)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
441 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
442 val dot = fileName.lastIndexOf('.')
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
443 if (dot != -1)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
444 fileName = fileName.substring(0, dot)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
445 fileName = "${fileName}_${image.width}x${image.height}.jpg"
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
446 saveAs(makeContentValues(fileName)) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
447 unsetImage()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
448 makeMundane()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
449 finish()
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
450 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
451 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
452
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
453 private fun makeContentValues(fileName: String): ContentValues = ContentValues().apply {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
454 put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
455 put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg")
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
456 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
457 put(MediaStore.MediaColumns.RELATIVE_PATH,
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
458 File(Environment.DIRECTORY_PICTURES, getString(R.string.app_name)).path)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
459 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
460 }
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
461
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
462 private fun saveAs(contentValues: ContentValues, callback: (Uri) -> Unit) {
32
be08576794af Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents: 30
diff changeset
463 val image = viewModel.bitmap!!
25
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
464 binding.progressBar.visibility = ProgressBar.VISIBLE
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
465 ThreadPools.WORKERS.execute {
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
466 var errorMessage: String? = null
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
467 val myUri = try {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
468 contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
469 } catch(e: Exception) {
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
470 Log.e("EditImage", "unexpected exception when saving!", e)
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
471 null
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
472 }
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
473 try {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
474 if (myUri == null) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
475 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
476 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
477 val stream = contentResolver.openOutputStream(myUri)
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
478 if (stream == null) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
479 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
480 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
481 val quality = maxOf(0, minOf(100,
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
482 PreferenceManager.getDefaultSharedPreferences(applicationContext).getInt(
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
483 "jpeg_quality", 85)))
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
484 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
485 stream.use {
25
648908f492c0 Fix output file names.
David Barts <n5jrn@me.com>
parents: 22
diff changeset
486 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
487 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
488 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
489 }
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
490 } catch (ioe: IOException) {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
491 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
492 } catch (se: SecurityException) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
493 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
494 } catch (e: Exception) {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
495 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
496 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
497 }
18
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
498 runOnUiThread {
eedf995462d9 Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents: 16
diff changeset
499 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
500 if (errorMessage == null) {
42
45e4df5226c0 Shares, but creates multiple versions of cruft file.
David Barts <n5jrn@me.com>
parents: 40
diff changeset
501 callback(myUri!!)
36
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
502 } else {
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
503 showError(errorMessage)
70f1d11d53ad Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents: 33
diff changeset
504 }
2
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
505 }
06825e49f7aa Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents: 1
diff changeset
506 }
0
13935000c2d9 Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff changeset
507 }
1
f26f61a8a9ad Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents: 0
diff changeset
508 }