Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24fb9c3236 | ||
| bc597cf69d | |||
| a4dfaf77a0 | |||
| 5ce746d5aa | |||
| 87fc4d302e | |||
| 2e7bf11055 | |||
| 514092a8bc | |||
| f25a3ddaa1 |
202
LICENSE
Normal file
@@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright 2026 Umbra Tools (umbratools.com)
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
2
NOTICE
Normal file
@@ -0,0 +1,2 @@
|
||||
Umbra Tools (https://umbratools.com)
|
||||
Copyright 2026 Umbra Tools (umbratools.com)
|
||||
50
README.md
@@ -120,15 +120,43 @@ on the NAS under the base directory (base → decade folders → a few year and
|
||||
subfolders). Use it to confirm the exact folder naming with an account that can
|
||||
reach the `photo` share.
|
||||
|
||||
### Serving the APK over the LAN
|
||||
### File browser
|
||||
|
||||
```bash
|
||||
cd app/build/outputs/apk/release
|
||||
python3 -m http.server 8080
|
||||
# on the phone's browser: http://<this-machine-ip>:8080/app-release.apk
|
||||
```
|
||||
Below **Test connection** are two side-by-side buttons — **Phone files** and
|
||||
**NAS files** — that open the same grid browser over two different sources:
|
||||
|
||||
Download it in the phone's browser, open it, and allow installs for the browser.
|
||||
- **Phone files** browses photos through MediaStore (`Phone storage` → `DCIM`,
|
||||
`Pictures`, …) with no `MANAGE_EXTERNAL_STORAGE` permission.
|
||||
- **NAS files** browses the share over SMB, starting at the configured base
|
||||
directory.
|
||||
|
||||
Folders come first, then files; thumbnails are decoded in two passes (bounds, then
|
||||
sampled) and cached. Tap a folder to descend, the up arrow / Back to ascend, and a
|
||||
photo to open it full-screen (tap to dismiss). If the server drops an idle SMB
|
||||
session, the browser reconnects automatically on the next tap.
|
||||
|
||||
### Download
|
||||
|
||||
The signed release APK is published on the local Gitea (public repo):
|
||||
|
||||
http://192.168.123.18:3001/umbragit/AndPictures/releases/download/v1.0/AndPictures-1.0-release.apk
|
||||
|
||||
Open that link in any phone's browser on the same LAN and install it, or scan
|
||||
`docs/download-qr.png`. The source lives at
|
||||
http://192.168.123.18:3001/umbragit/AndPictures
|
||||
|
||||
**If the browser says the site can't be reached** (Chrome's
|
||||
`ERR_LOCAL_NETWORK_PERMISSION_MISSING`): Android 16 and newer block apps from
|
||||
reaching LAN addresses unless the app holds the *local network* / "Nearby devices"
|
||||
permission. Tap **Allow** when the browser asks to "find, connect to, and determine
|
||||
the relative position of nearby devices" (if it was denied earlier, re-enable it
|
||||
under *Settings -> Apps -> Chrome -> Permissions -> Nearby devices*), then open the
|
||||
link again. Chrome also warns "File might be harmful" for a direct APK download -
|
||||
choose **Download anyway**.
|
||||
|
||||
### Installing
|
||||
|
||||
Download the APK in the phone's browser, open it, and allow installs for the browser.
|
||||
|
||||
Note: switching a device from the **debug** build to the **release** build requires
|
||||
uninstalling the debug app first (they are signed with different keys), which also
|
||||
@@ -144,7 +172,13 @@ clears its saved settings.
|
||||
| `WorkScheduler.kt` | WorkManager periodic + one-shot requests (network-constrained) |
|
||||
| `SyncWorker.kt` | CoroutineWorker: runs the engine, persists the cursor/status |
|
||||
| `SyncEngine.kt` | The job: MediaStore query → destination path → SMB upload |
|
||||
| `SmbUploader.kt` | smbj wrapper: connect, list folders, mkdir -p, stream a file |
|
||||
| `SmbUploader.kt` | smbj wrapper: connect, list folders, mkdir -p, stream a file (reconnects if the session drops) |
|
||||
| `FileBrowserActivity.kt` | Grid browser over a `FileSource`, used for both phone and NAS |
|
||||
| `PhotoViewActivity.kt` | Full-screen photo preview |
|
||||
| `FileSource.kt` | Browser model + `FileSource` interface (`list`, `parentOf`, `openStream`, `loadThumbnail`) |
|
||||
| `PhoneFileSource.kt` | `FileSource` backed by MediaStore |
|
||||
| `NasFileSource.kt` | `FileSource` backed by SMB |
|
||||
| `Bitmaps.kt` | Two-pass sampled decode + thumbnail `LruCache` |
|
||||
| `PhotoStore.kt` | MediaStore queries + permission helper |
|
||||
| `Prefs.kt` | Typed SharedPreferences incl. the sync cursor |
|
||||
| `Notifications.kt` | Result notification |
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import java.io.FileInputStream
|
||||
import java.util.Properties
|
||||
|
||||
|
||||
@@ -44,6 +44,10 @@
|
||||
android:name=".PhotoViewActivity"
|
||||
android:exported="false"
|
||||
android:label="@string/title_photo_view" />
|
||||
</application>
|
||||
<activity
|
||||
android:name=".AboutActivity"
|
||||
android:exported="false"
|
||||
android:theme="@style/Theme.AndPictures" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
||||
37
app/src/main/java/com/bm/andpictures/AboutActivity.kt
Normal file
@@ -0,0 +1,37 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.os.Bundle
|
||||
import android.widget.TextView
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.view.ViewCompat
|
||||
import androidx.core.view.WindowInsetsCompat
|
||||
|
||||
/** Shows the app icon, name and version. Reached from the main screen's hamburger. */
|
||||
class AboutActivity : AppCompatActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_about)
|
||||
|
||||
// The activity theme is DarkActionBar, so the built-in action bar is
|
||||
// already there — no second toolbar needed, just the up arrow.
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
|
||||
findViewById<TextView>(R.id.versionText).text =
|
||||
"Version " + BuildInfo.versionName(this)
|
||||
|
||||
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
|
||||
val bars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
|
||||
v.setPadding(bars.left, bars.top, bars.right, bars.bottom)
|
||||
insets
|
||||
}
|
||||
}
|
||||
|
||||
override fun onSupportNavigateUp(): Boolean {
|
||||
finish()
|
||||
return true
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.app.Application
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.graphics.Bitmap
|
||||
|
||||
16
app/src/main/java/com/bm/andpictures/BuildInfo.kt
Normal file
@@ -0,0 +1,16 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Context
|
||||
|
||||
/** Version string for the About screen, kept in one place. */
|
||||
object BuildInfo {
|
||||
fun versionName(context: Context): String = try {
|
||||
@Suppress("DEPRECATION")
|
||||
context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "unknown"
|
||||
} catch (e: Exception) {
|
||||
"unknown"
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Intent
|
||||
@@ -142,11 +145,26 @@ class FileBrowserActivity : AppCompatActivity() {
|
||||
currentDir = dirKey
|
||||
adapter.submit(entries)
|
||||
supportActionBar?.title = src.displayName(dirKey)
|
||||
supportActionBar?.subtitle = "${src.title} · ${entries.count { !it.isDirectory }} items"
|
||||
supportActionBar?.subtitle = browseSubtitle(src.title, entries)
|
||||
if (entries.isEmpty()) showMessage(getString(R.string.browse_empty)) else showGrid()
|
||||
}
|
||||
}
|
||||
|
||||
/** e.g. "Phone storage · 4 folders · 1 file" — folders and files counted separately. */
|
||||
private fun browseSubtitle(sourceTitle: String, entries: List<TileEntry>): String {
|
||||
val folders = entries.count { it.isDirectory }
|
||||
val files = entries.size - folders
|
||||
val parts = buildList {
|
||||
if (folders > 0) add("$folders ${if (folders == 1) "folder" else "folders"}")
|
||||
if (files > 0) add("$files ${if (files == 1) "file" else "files"}")
|
||||
}
|
||||
return if (parts.isEmpty()) {
|
||||
"$sourceTitle · empty"
|
||||
} else {
|
||||
(listOf(sourceTitle) + parts).joinToString(" · ")
|
||||
}
|
||||
}
|
||||
|
||||
private fun navigateUp() {
|
||||
val src = source
|
||||
val cur = currentDir
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.graphics.Bitmap
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.Manifest
|
||||
@@ -36,6 +39,12 @@ class MainActivity : AppCompatActivity() {
|
||||
private lateinit var etDecadeFormat: EditText
|
||||
private lateinit var etMonthFormat: EditText
|
||||
|
||||
/** True while a manual/one-shot sync is queued or running. */
|
||||
private var oneShotSyncActive = false
|
||||
|
||||
/** True only while the periodic safety-net worker is actually running. */
|
||||
private var periodicSyncRunning = false
|
||||
|
||||
private val mediaPermissionLauncher =
|
||||
registerForActivityResult(ActivityResultContracts.RequestPermission()) { }
|
||||
|
||||
@@ -46,6 +55,12 @@ class MainActivity : AppCompatActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_main)
|
||||
bindViews()
|
||||
|
||||
// Hamburger menu → About. The framework action bar is already present
|
||||
// (theme is DarkActionBar), so just dress it with the menu icon.
|
||||
supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_hamburger)
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
|
||||
populate()
|
||||
requestNotificationPermissionIfNeeded()
|
||||
|
||||
@@ -64,6 +79,12 @@ class MainActivity : AppCompatActivity() {
|
||||
refreshStatus()
|
||||
}
|
||||
|
||||
/** The hamburger is the action bar's "home" affordance: it opens About. */
|
||||
override fun onSupportNavigateUp(): Boolean {
|
||||
startActivity(Intent(this, AboutActivity::class.java))
|
||||
return true
|
||||
}
|
||||
|
||||
private fun bindViews() {
|
||||
statusText = findViewById(R.id.statusText)
|
||||
lastSyncText = findViewById(R.id.lastSyncText)
|
||||
@@ -212,6 +233,20 @@ class MainActivity : AppCompatActivity() {
|
||||
statusText.text = p.lastStatus.ifBlank { getString(R.string.status_idle) }
|
||||
}
|
||||
|
||||
/**
|
||||
* Repaints the status/cursor lines from whatever sync is in flight right now.
|
||||
* When nothing is running this delegates to [refreshStatus] so the cursor line
|
||||
* also refreshes while the app stays in the foreground (otherwise a completed
|
||||
* sync would leave a stale "Last sync cursor" until the next onResume).
|
||||
*/
|
||||
private fun renderStatus() {
|
||||
if (oneShotSyncActive || periodicSyncRunning) {
|
||||
statusText.text = "Syncing…"
|
||||
} else {
|
||||
refreshStatus()
|
||||
}
|
||||
}
|
||||
|
||||
private fun requestMediaPermission() {
|
||||
if (!PhotoStore.hasPermission(this)) {
|
||||
mediaPermissionLauncher.launch(PhotoStore.mediaPermission)
|
||||
@@ -241,15 +276,20 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
private fun observeWork() {
|
||||
val wm = WorkManager.getInstance(this)
|
||||
fun applyState(infos: List<WorkInfo>) {
|
||||
val latest = infos.lastOrNull() ?: return
|
||||
when (latest.state) {
|
||||
WorkInfo.State.ENQUEUED, WorkInfo.State.RUNNING ->
|
||||
statusText.text = "Syncing…"
|
||||
else -> refreshStatus()
|
||||
}
|
||||
|
||||
wm.getWorkInfosForUniqueWorkLiveData(Prefs.WORK_ONESHOT).observe(this) { infos ->
|
||||
// ENQUEUED means "queued, waiting for a network/slot", which is still
|
||||
// an active sync from the user's point of view.
|
||||
val state = infos.lastOrNull()?.state
|
||||
oneShotSyncActive =
|
||||
state == WorkInfo.State.ENQUEUED || state == WorkInfo.State.RUNNING
|
||||
renderStatus()
|
||||
}
|
||||
wm.getWorkInfosForUniqueWorkLiveData(Prefs.WORK_PERIODIC).observe(this) { infos ->
|
||||
// The periodic safety-net job sits in ENQUEUED while it waits for its
|
||||
// next window, so only a RUNNING job counts as a live sync.
|
||||
periodicSyncRunning = infos.lastOrNull()?.state == WorkInfo.State.RUNNING
|
||||
renderStatus()
|
||||
}
|
||||
wm.getWorkInfosForUniqueWorkLiveData(Prefs.WORK_ONESHOT).observe(this) { applyState(it) }
|
||||
wm.getWorkInfosForUniqueWorkLiveData(Prefs.WORK_PERIODIC).observe(this) { applyState(it) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import java.io.InputStream
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Context
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.app.NotificationChannel
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.ContentUris
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.Manifest
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.graphics.Bitmap
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Context
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import com.hierynomus.msdtyp.AccessMask
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Context
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Context
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package com.bm.andpictures
|
||||
|
||||
import android.content.Context
|
||||
|
||||
19
app/src/main/res/drawable/ic_hamburger.xml
Normal file
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Three bars, the conventional "menu" affordance. White so it reads on the
|
||||
brand-blue toolbar; drawn on a 24dp grid to match the other action icons. -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="@android:color/white">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M3,6h18v2h-18z" />
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M3,11h18v2h-18z" />
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M3,16h18v2h-18z" />
|
||||
</vector>
|
||||
55
app/src/main/res/layout/activity_about.xml
Normal file
@@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- No toolbar here: the activity theme (DarkActionBar) supplies the action bar,
|
||||
so the layout is just the content. -->
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center_horizontal"
|
||||
android:padding="32dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="120dp"
|
||||
android:layout_height="120dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:src="@mipmap/ic_launcher"
|
||||
android:contentDescription="@string/app_name" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="24dp"
|
||||
android:text="@string/app_name"
|
||||
android:textSize="24sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/versionText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="Version"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="32dp"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_blurb"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="32dp"
|
||||
android:text="@string/about_copyright"
|
||||
android:textSize="14sp" />
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
5
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@mipmap/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
||||
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 95 B |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 86 B |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 107 B |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 19 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 140 B |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 33 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
|
After Width: | Height: | Size: 16 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
Normal file
|
After Width: | Height: | Size: 187 B |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Normal file
|
After Width: | Height: | Size: 48 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
@@ -11,4 +11,7 @@
|
||||
<string name="title_file_browser">Files</string>
|
||||
<string name="title_photo_view">Photo</string>
|
||||
<string name="photo_view_failed">Could not load this photo.</string>
|
||||
<string name="about_title">About</string>
|
||||
<string name="about_copyright">© 2026 UmbraTools</string>
|
||||
<string name="about_blurb">Copies new photos from the phone to the NAS over SMB whenever you are on the home network, filed by decade / year / month.</string>
|
||||
</resources>
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Top-level build file. Plugin versions are declared here and applied in :app.
|
||||
plugins {
|
||||
id("com.android.application") version "8.13.2" apply false
|
||||
|
||||
BIN
docs/download-qr.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
@@ -1,3 +1,6 @@
|
||||
// Copyright 2026 Umbra Tools (umbratools.com)
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
pluginManagement {
|
||||
repositories {
|
||||
google()
|
||||
|
||||