Mercurial > cgi-bin > hgweb.cgi > SimpleResizer
annotate app/src/main/java/com/bartsent/simpleresizer/EditImage.kt @ 37:0dbd924cb5e8
Explain why permission needed, per guidelines.
author | David Barts <n5jrn@me.com> |
---|---|
date | Tue, 23 Mar 2021 22:30:34 -0700 |
parents | 70f1d11d53ad |
children | cfb19d4ccf78 |
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 | 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 | 16 import android.util.Log |
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 | 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 | 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 | 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 | 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 | 57 } |
58 | |
59 override fun onCreateOptionsMenu(menu: Menu?): Boolean { | |
60 menuInflater.inflate(R.menu.menu_edit, menu) | |
61 return super.onCreateOptionsMenu(menu) | |
62 } | |
63 | |
64 override fun onOptionsItemSelected(item: MenuItem): Boolean { | |
65 if (item.itemId == R.id.settings_item) { | |
66 startActivity( | |
67 Intent(Intent.ACTION_APPLICATION_PREFERENCES, null, this, | |
68 SettingsActivity::class.java)) | |
69 return true | |
70 } | |
71 return false | |
0
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
72 } |
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
73 |
1
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
74 // 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
|
75 private fun getFileName(uri: Uri): String? { |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
76 var result: String? = null |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
77 if (uri.scheme == "content") { |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
78 contentResolver.query(uri, null, null, null, null).use { cursor -> |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
79 if (cursor != null && cursor.moveToFirst()) |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
80 result = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)) |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
81 } |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
82 } |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
83 if (result == null) { |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
84 val uriPath = uri.path |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
85 result = uriPath?.substring(uriPath.lastIndexOf('/') + 1) |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
86 } |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
87 return result |
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 |
16
3ed74dc0e34a
Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents:
15
diff
changeset
|
90 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
|
91 AlertDialog.Builder(this).also { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
92 it.setMessage(message) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
93 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
|
94 dialog.dismiss() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
95 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
96 it.setOnDismissListener { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
97 finish() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
98 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
99 it.create() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
100 }.show() |
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 |
36
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
103 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
|
104 AlertDialog.Builder(this).also { |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
105 it.setMessage(message) |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
106 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
|
107 dialog.dismiss() |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
108 } |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
109 it.create() |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
110 }.show() |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
111 } |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
112 |
0
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
113 override fun onResume() { |
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
114 super.onResume() |
1
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
115 |
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
116 // Read the URI, die if we can't. |
29 | 117 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
|
118 if (imageUri == null) { |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
119 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
|
120 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
|
121 else |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
122 setImage(viewModel.bitmap!!) |
1
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
123 return |
0
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
124 } |
1
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
125 |
21
7e7e71724770
No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
126 // User has opened a new image. |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
127 if (imageUri != viewModel.uri) { |
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
128 viewModel.uri = imageUri |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
129 binding.progressBar.visibility = ProgressBar.VISIBLE |
33
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
130 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
|
131 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
|
132 BitmapFactory.decodeStream(it) |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
133 } |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
134 runOnUiThread { |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
135 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
|
136 if (newBitmap == null) |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
137 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
|
138 else |
30
aacf7a856b5f
Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents:
29
diff
changeset
|
139 setImage(newBitmap) |
33
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
140 viewModel.reader = null |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
141 } |
33
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
142 }) |
21
7e7e71724770
No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
143 return |
0
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
144 } |
21
7e7e71724770
No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
145 |
7e7e71724770
No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
146 // Rotation (of the phone). |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
147 val oldBitmap = viewModel.bitmap |
21
7e7e71724770
No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
148 if (oldBitmap != null) |
7e7e71724770
No longer breaks when phone rotated.
David Barts <n5jrn@me.com>
parents:
18
diff
changeset
|
149 setImage(oldBitmap) |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
150 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
151 |
33
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
152 override fun onDestroy() { |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
153 // 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
|
154 // 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
|
155 // read task with extreme prejudice. |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
156 val reader = viewModel.reader |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
157 if (reader != null) { |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
158 reader.cancel(true) |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
159 viewModel.reader = null |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
160 } |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
161 super.onDestroy() |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
162 } |
bead5d7e8c69
Deal with constipated read tasks.
David Barts <n5jrn@me.com>
parents:
32
diff
changeset
|
163 |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
164 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
|
165 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
|
166 binding.image.setImageBitmap(image) |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
167 viewModel.bitmap = image |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
168 binding.root.invalidate() |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
169 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
170 |
30
aacf7a856b5f
Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents:
29
diff
changeset
|
171 private fun unsetImage(): Unit { |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
172 viewModel.uri = null |
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
173 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
|
174 } |
aacf7a856b5f
Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents:
29
diff
changeset
|
175 |
16
3ed74dc0e34a
Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents:
15
diff
changeset
|
176 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
|
177 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
|
178 |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
179 fun scaleClicked(view: View): Unit { |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
180 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
|
181 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
|
182 } |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
183 PopupMenu(this, view).apply { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
184 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
|
185 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
|
186 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
|
187 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
|
188 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
|
189 } |
3ed74dc0e34a
Fix error messages, make scaling menu more user-friendly, fix return from settings.
David Barts <n5jrn@me.com>
parents:
15
diff
changeset
|
190 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
|
191 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
|
192 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
193 setOnMenuItemClickListener(::scaleMenuItemClicked) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
194 show() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
195 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
196 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
197 |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
198 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
|
199 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
|
200 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
|
201 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
|
202 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
|
203 else -> false |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
204 } |
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 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
|
207 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
|
208 val oldColorSpace = old.colorSpace |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
209 if (oldColorSpace != null) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
210 new.setColorSpace(oldColorSpace) |
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 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
213 |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
214 private fun doScale(newMax: Int): Unit { |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
215 val oldBitmap = viewModel.bitmap!! |
6
e8059b166de1
Lanczos works, but is painfully slow.
David Barts <n5jrn@me.com>
parents:
5
diff
changeset
|
216 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
|
217 if (factor >= 1.0) { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
218 throw IllegalArgumentException("can only scale down") |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
219 } |
15 | 220 val scaleType = PreferenceManager.getDefaultSharedPreferences(applicationContext).getString( |
221 "scale_type", "speed" ) | |
222 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
|
223 binding.progressBar.visibility = ProgressBar.VISIBLE |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
224 ThreadPools.WORKERS.execute { |
15 | 225 val newWidth = (oldBitmap.width.toDouble() * factor + 0.5).toInt() |
226 val newHeight = (oldBitmap.height.toDouble() * factor + 0.5).toInt() | |
227 val newBitmap = if (scaleType == "quality") | |
228 oldBitmap.getScaledInstance(newWidth, newHeight) | |
229 else | |
230 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
|
231 runOnUiThread { |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
232 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
|
233 setImage(newBitmap) |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
234 } |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
235 } |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
236 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
237 |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
238 private fun showCustomScaleDialog(): Unit { |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
239 val image = viewModel.bitmap!! |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
240 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
|
241 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
|
242 AlertDialog.Builder(this).also { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
243 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
|
244 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
|
245 dialog.dismiss() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
246 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
|
247 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
|
248 } else { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
249 doScale(maxDim) |
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 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
252 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
|
253 dialog.dismiss() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
254 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
255 it.setView(dialogView) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
256 it.create() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
257 }.show() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
258 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
259 |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
260 fun rotateClicked(view: View): Unit { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
261 PopupMenu(this, view).apply { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
262 setOnMenuItemClickListener { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
263 when(it.itemId) { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
264 R.id.r_90_cw -> { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
265 doRotate(90) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
266 true |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
267 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
268 R.id.r_180 -> { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
269 doRotate(180) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
270 true |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
271 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
272 R.id.r_90_ccw -> { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
273 doRotate(270) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
274 true |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
275 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
276 R.id.r_cancel -> true |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
277 else -> false |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
278 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
279 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
280 inflate(R.menu.rotate) |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
281 show() |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
282 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
283 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
284 |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
285 private fun doRotate(deg: Int): Unit { |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
286 val oldBitmap = viewModel.bitmap!! |
5 | 287 if (deg % 90 != 0) { |
288 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
|
289 } |
5 | 290 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
|
291 val rotater = Matrix().apply { |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
292 setRotate(deg.toFloat(), oldBitmap.width.toFloat()/2.0f, oldBitmap.height.toFloat()/2.0f) |
5 | 293 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
|
294 } |
10
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
295 binding.progressBar.visibility = ProgressBar.VISIBLE |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
296 ThreadPools.WORKERS.execute { |
11
678adef4774f
Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents:
10
diff
changeset
|
297 val newBitmap = Bitmap.createBitmap(w, h, oldBitmap.config) |
678adef4774f
Move more stuff into worker threads.
David Barts <n5jrn@me.com>
parents:
10
diff
changeset
|
298 copyColorSpace(oldBitmap, newBitmap) |
10
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
299 Canvas(newBitmap).run { |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
300 drawBitmap(oldBitmap, rotater, null) |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
301 } |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
302 runOnUiThread { |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
303 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
|
304 setImage(newBitmap) |
5626557ac542
Add progress bar and a worker thread. Still way slow.
David Barts <n5jrn@me.com>
parents:
6
diff
changeset
|
305 } |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
306 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
307 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
308 |
30
aacf7a856b5f
Bug fixes, incl for getting "stuck" when file chooser backed out of.
David Barts <n5jrn@me.com>
parents:
29
diff
changeset
|
309 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
|
310 unsetImage() |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
311 finish() |
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 |
36
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
314 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
|
315 |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
316 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
|
317 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
|
318 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
|
319 return |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
320 } |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
321 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
|
322 doneClicked(null) |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
323 } else { |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
324 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
|
325 } |
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 |
37
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
328 fun requestWritePermission(): Unit { |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
329 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
|
330 } |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
331 |
36
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
332 fun doneClicked(view: View?): Unit { |
37
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
333 // 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
|
334 // (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
|
335 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
|
336 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
|
337 if (shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
338 AlertDialog.Builder(this).also { |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
339 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
|
340 it.setNeutralButton(R.string.ok_text) { dialog, _ -> |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
341 dialog.dismiss() |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
342 requestWritePermission() |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
343 } |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
344 it.create() |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
345 }.show() |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
346 else |
0dbd924cb5e8
Explain why permission needed, per guidelines.
David Barts <n5jrn@me.com>
parents:
36
diff
changeset
|
347 requestWritePermission() |
36
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
348 return |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
349 } |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
350 } |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
351 |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
352 // 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
|
353 val image = viewModel.bitmap!! |
25 | 354 binding.progressBar.visibility = ProgressBar.VISIBLE |
355 ThreadPools.WORKERS.execute { | |
356 val contentValues = ContentValues().apply { | |
32
be08576794af
Replace static object with ViewModel.
David Barts <n5jrn@me.com>
parents:
30
diff
changeset
|
357 var fileName = getFileName(viewModel.uri!!) |
25 | 358 if (fileName == null) { |
359 val d = java.util.Date() | |
360 fileName = "IMG_%tY%tm%td_%tH%tM%tS".format(d, d, d, d, d, d) | |
361 } | |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
362 val dot = fileName.lastIndexOf('.') |
25 | 363 if (dot != -1) |
364 fileName = fileName.substring(0, dot) | |
365 fileName = "${fileName}_${image.width}x${image.height}.jpg" | |
366 put(MediaStore.MediaColumns.DISPLAY_NAME, fileName) | |
367 put(MediaStore.MediaColumns.MIME_TYPE, "image/jpeg") | |
368 if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) { | |
369 put(MediaStore.MediaColumns.RELATIVE_PATH, | |
370 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
|
371 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
372 } |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
373 var errorMessage: String? = null |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
374 try { |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
375 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
|
376 if (myUri == null) { |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
377 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
|
378 } |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
379 val stream = contentResolver.openOutputStream(myUri) |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
380 if (stream == null) { |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
381 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
|
382 } |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
383 val quality = maxOf(0, minOf(100, |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
384 PreferenceManager.getDefaultSharedPreferences(applicationContext).getInt( |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
385 "jpeg_quality", 85))) |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
386 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
|
387 stream.use { |
25 | 388 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
|
389 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
|
390 } |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
391 } |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
392 } catch (ioe: IOException) { |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
393 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
|
394 } catch (se: SecurityException) { |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
395 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
|
396 } catch (e: Exception) { |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
397 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
|
398 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
|
399 } |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
400 runOnUiThread { |
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
401 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
|
402 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
|
403 unsetImage() |
18
eedf995462d9
Parallalized, but ConstraintLayout started hosing the edit window.
David Barts <n5jrn@me.com>
parents:
16
diff
changeset
|
404 finish() |
36
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
405 } else { |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
406 showError(errorMessage) |
70f1d11d53ad
Attempt to make it work on Android 9 and earlier.
David Barts <n5jrn@me.com>
parents:
33
diff
changeset
|
407 } |
2
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
408 } |
06825e49f7aa
Got it scaling and rotating, needs settings, etc.
David Barts <n5jrn@me.com>
parents:
1
diff
changeset
|
409 } |
0
13935000c2d9
Stuff Andriod Studio ignored for some reason.
David Barts <n5jrn@me.com>
parents:
diff
changeset
|
410 } |
1
f26f61a8a9ad
Make the EditImage activity stateful.
David Barts <n5jrn@me.com>
parents:
0
diff
changeset
|
411 } |