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