Compare commits

...
169 Commits
Author SHA1 Message Date
Markus Fisch ecccf34418 Advance version number to 1.68.7 2026-03-20 21:56:20 +01:00
Markus Fisch 4027ce2cc6 Reformat new code 2026-03-20 21:56:07 +01:00
Markus Fisch 209e6c5c30 Add icons to preferences screen
Assign existing action icons to preference rows in the settings
screen so related options are easier to scan.
2026-03-20 21:55:37 +01:00
Markus Fisch 5e29f3fbe9 Update kotlin version 2026-03-20 21:26:05 +01:00
Markus Fisch ba3d63277a Update gradle wrapper 2026-03-20 21:15:56 +01:00
Markus Fisch fe34b7209d Fix quiet zone for recreated barcodes
Older history entries can miss the stored symbol matrix and
therefore fall back to re-encoding the barcode content.

After the ZXingCpp 3 migration, that fallback used a zero margin,
so recreated barcodes from those records lost their quiet zone.
2026-03-20 21:08:20 +01:00
Markus Fisch 0efdca7b4a Remove unnecessary null checking of error message
Because it's always non-null now.
2026-03-20 15:46:38 +01:00
Markus Fisch 827fbedc1f Fix automatic screen brightening
And remove lateinit from `brightenScreenItem` to check
if it's null or not.

Also delay automatic brightening to give Android a bit
more time to sort things out.
2026-03-20 15:46:38 +01:00
Markus Fisch 107b5bafd4 Update history listing on resume
To immediately show label changes, for example.
2026-03-20 15:46:38 +01:00
Markus Fisch 19a71480fa Update tools version 2026-03-20 15:46:38 +01:00
Markus Fisch 909e97a591 Map zoom bar to zoom ratio instead of linear zoom
Linear zoom 0 switches to the ultra-wide lens on devices
that support it, causing blurry images. Mapping to zoom ratios
from 1.0x to maxZoomRatio keeps the main lens in use.
2026-03-17 21:54:34 +01:00
Markus Fisch bc2be96871 Simplify updating the flash FAB
It's much simpler if we invert the availability parameter.
2026-03-20 10:53:39 +01:00
Markus Fisch d834621d99 Reset stored zoom level and always start at 0
Because the previous zoom levels were for the legacy camera API
and they don't carry over to CameraX.

With CameraX, it's also better to start with no zoom.
2026-03-20 10:53:39 +01:00
Markus Fisch ad83be1a60 Use ResolutionStrategy.HIGHEST_AVAILABLE_STRATEGY
Which greatly improves the initial sharpness of the camera image.

Without this, despite autofocus, the initial camera frame can be
a bit blurry on some devices.
2026-03-20 10:53:39 +01:00
Markus Fisch d65ea02b49 Focus on taps but not on swipes 2026-03-20 10:53:32 +01:00
Markus Fisch c8d1357ceb Use CONTINUOUS_PICTURE AF
CameraX defaults to CONTINUOUS_VIDEO autofocus, which trades
focus accuracy for smooth transitions. For barcode scanning we
need the sharpest possible lock, so switch to CONTINUOUS_PICTURE.

But this still isn't enough to have the same quick autofocus the
legacy API had.
2026-03-20 10:52:44 +01:00
Markus Fisch 4c05d046e6 Set CONTROL_SCENE_MODE_BARCODE
To configure the camera for barcode reading (macro focus range,
disabled stabilisation). Same way the legacy Camera API's
SCENE_MODE_BARCODE did.

Unfortunately, this mode isn't supported by some camera drivers
and it doesn't really improve focusing near barcodes on my test
devices.
2026-03-20 10:52:44 +01:00
Markus Fisch 4423ee62c8 Migrate to CameraX
Since the app is on minSDK 21 now, and because some camera
drivers apparently don't support the torch feature through
the legacy API.
2026-03-20 10:52:21 +01:00
Markus Fisch bc69f99f8b Advance version number to 1.68.6 2026-03-14 14:53:30 +01:00
Markus Fisch 6b088031fd Remove unused plural quantities
Delete plural forms that Android never selects for the affected
locales, based on the lint report.
2026-03-13 22:43:31 +01:00
Markus Fisch b27d03e9c0 Ask for confirmation before deleting a scan
From the decode view.
2026-03-13 22:37:43 +01:00
Markus Fisch 9a13838f28 Fix RTL hardcoded layout attributes
Remove redundant left/right layout attributes and keep the
start/end variants that match RTL-aware behavior.
2026-03-13 22:34:08 +01:00
Markus Fisch cce2a460f6 Update material library 2026-03-12 23:34:05 +01:00
Markus Fisch 36352ecde2 Apply KTX extensions from lint
Replace lint-flagged platform calls with their Kotlin extension
equivalents and add the core-ktx dependency they rely on.
2026-03-13 16:33:54 +01:00
Markus Fisch 9a0bc324cb Migrate support libraries to AndroidX
Replace legacy support dependencies and namespaces with AndroidX and
Material equivalents so the app builds on the modern stack again.

Update Kotlin imports, XML widget class names, and manifest provider
references, then fix AndroidX nullability fallout and missing lifecycle
super calls reported by lint.
2026-03-12 23:19:02 +01:00
Markus Fisch 6dabafd6a3 Replace fragments with standalone activities
Remove MainActivity as a single fragment host and convert each
fragment (Barcode, Decode, Encode, History, Profiles, Automated
Actions, Network Suggestions) into its own Activity.

Update CameraActivity to launch each Activity directly instead of
routing through MainActivity intent factories.
2026-03-12 23:10:18 +01:00
Markus Fisch dde4b1e0bd Update gradle wrapper 2026-03-12 22:58:58 +01:00
Markus Fisch 8a8c7bd1ff Remove values-v21 for minSDK is 21 now
No longer required. Merged the Button style with
`res/values/styles.xml`.
2026-03-12 22:16:02 +01:00
Markus Fisch a2aed42e25 Remove Scan parcel compatibility code
Stop transporting Scan as a Parcelable and keep only the
bundle-based handoff for decoded results.

This removes version-sensitive parcel decoding entirely and makes
scan navigation stable across app updates.
2026-03-12 21:51:55 +01:00
Markus Fisch a38b7b647f Use bundles for decoded scan handoff
Replace Scan parcelables in the decode navigation flow with plain
Bundle data.

This avoids BadParcelableException when Android lazily unparcels a
Scan written with a different layout or legacy ZXingCpp format names.
A bundle of primitives is stable across app updates and does not depend
on custom parcel compatibility.
2026-03-12 21:44:57 +01:00
Markus Fisch 76e82ed842 Migrate to ZXingCpp 3.x and raise minSdk to 21
Which is required (to build and run) version 3 of ZXingCpp,
because ZXingCpp requires C++20, which in turn requires an
NDK with minSdk 21.

So to use the new version, we need to raise the minSdk
and cut off old devices just because C++17 didn't cut the
mustard anymore. Well, I guess this had to happen at some
point, and because SDK 21 is 12 years old now, it's probably
even reasonable to raise the bar.
2026-03-12 20:53:23 +01:00
Markus Fisch fd54bc604e Advance version number to 1.68.5 2026-03-02 19:07:06 +01:00
Markus Fisch 59b62ecbc4 Revert ZXingC++ to v2.3.0.4
Because 3.x requires C++20, what requires minSdk 21.

While ZXingC++ 3.x compiles and runs on some devices (with the
current minSdk), the library does crash on other devices.

So updating to ZXingC++ 3.x requires more work, unfortunately.

This reverts commit
a90bdad117
4b2eb80612
7a59126312
2026-03-02 18:59:41 +01:00
Markus Fisch de6a2863f3 Advance version number to 1.68.4 2026-02-24 23:57:27 +01:00
Markus Fisch 4b2eb80612 Fix margin for 1D barcodes
Since ZXingCpp v3.0.0+ changed the default from -1 to 0.

Using -1 results in an exception in `BitMatrix::setRegion()`
because of invalid top/left coordinates.
2026-02-24 23:52:04 +01:00
Markus Fisch 2de40d2277 Advance version number to 1.68.3 2026-02-23 23:13:10 +01:00
Markus Fisch 7673b7cb0d Fallback to getParcelableExtra(name)
When getting the DECODE extra.

`getParcelableExtra(name, Class)` can throw on some versions
of Android when the ClassLoader associated with the Bundle's
lazy-decoded value is null in certain scenarios (e.g., after
an activity restart where the system re-delivers the intent).
Simply fallback to the "deprecated" `getParcelableExtra(name)`
which works in this case, because it doesn't verify the
parcelable's class against Scan::class.java.
2026-02-23 21:00:30 +01:00
Markus Fisch 097c5e4453 Improve getting fragment for MainActivity
And properly finish the MainActivity for malformed intents.
2026-02-23 17:21:30 +01:00
Markus Fisch 1fab30089e Advance version number to 1.68.2 2026-02-22 21:15:25 +01:00
Markus Fisch f9bf16dd47 Update ZXingCpp 2026-02-22 21:03:20 +01:00
Markus Fisch 7a59126312 Use 1 as the new default for margin/quiet zone
Since ZXingCpp v3.0.0+ changed the default from -1 to 0.

Using -1 results in an exception in `BitMatrix::setRegion()`
because of invalid top/left coordinates.
2026-02-22 20:58:24 +01:00
Markus Fisch 694c854650 Advance version number to 1.68.1 2026-02-21 21:50:51 +01:00
Markus Fisch b1cd12ec77 Validate frame data before giving it to ZXing
And refactor preview callback to use an early exit for clarity.

According to Vitals, `frameData` can apparently be `null` on
some devices sometimes.
2026-02-21 21:40:38 +01:00
Markus Fisch 0c27b15025 Check if fragment is still added
Before setting brightness, which may happen later because
it's called from the queue.
2026-02-21 21:20:31 +01:00
Markus Fisch 5de950bdbf Update tools version 2026-02-21 19:14:54 +01:00
Markus Fisch ae9e304ef6 Handle bad decoded intent parcelables safely
Guard reading the `decoded` Scan extra in MainActivity against
framework unparcel exceptions. Some external or malformed intents can
trigger a NullPointerException in Parcel before app-level checks run.

Return null when unparceling fails so the app falls back to the default
DecodeFragment path instead of crashing on launch.
2026-02-21 19:13:47 +01:00
Dominik StadlerandMarkus Fisch c4cc14554b Clear search-term on empty input, not on "Cancel"
Clearing search-term on cancel and not on empty input is
unexpected. "Cancel" usually does not change the state.

Rather clear the searchTerm on empty input and do not
handle the "Cancel"-button at all.
2026-02-20 13:52:50 +01:00
Dominik StadlerandMarkus Fisch d6afccf562 Apply some IDE suggestions 2026-02-20 13:52:50 +01:00
Markus Fisch a90bdad117 Update ZXingCpp
And remove the now missing `returnCodabarStartEnd` feature.
2026-02-13 19:05:35 +01:00
solokotandGitHub 52d4f082f2 Update Russian translation
Small Improvements
2026-02-12 19:45:38 +01:00
Markus Fisch 1c63f5b3ac Advance version number to 1.68.0 2026-02-07 20:18:43 +01:00
Markus Fisch 21985b4533 Remove deprecated flags from gradle.properties
Stuff only added because Google deemed it necessary.
Now the Google propeller caps have apparently changed
their minds. Don't care.
2026-02-07 20:15:41 +01:00
bovirusandGitHub 012ac644aa Italian language update 2026-02-07 12:21:26 +01:00
Markus Fisch 19f19739fd Fix up navigation for setting fragments 2026-02-06 17:42:18 +01:00
Markus Fisch f01f9fcd91 Add a dedicated fragement for managing profiles
And the missing option to remove profiles.
2026-02-06 17:42:18 +01:00
Markus Fisch 4177b248c3 Clean up AutomatedActionsFragment 2026-02-06 17:42:18 +01:00
Markus Fisch e4182a265b Add a ViewHolder to ActionsAdapter 2026-02-06 17:42:18 +01:00
Markus Fisch 98df5a447c Move adding an action into its own function
For readability.
2026-02-06 17:42:18 +01:00
Markus Fisch a0a1405359 Allow alphanumeric profile names only
Since a profile name is also used as a preference name,
it cannot contain path separators or anything like that.
So keep names alphanumeric for robustness.
2026-02-06 17:42:18 +01:00
bovirusandGitHub 76922c421c Italian language update 2026-02-06 17:41:42 +01:00
Markus Fisch cac9dd16da Add automated actions
To automatically execute actions when certain barcodes
are scanned.
2026-02-04 22:40:39 +01:00
Markus Fisch a1f9ba1056 Update gradle wrapper 2026-02-04 21:45:58 +01:00
Markus Fisch 0b67c272b6 Update robolectric to latest version 2026-02-03 19:16:54 +01:00
Markus Fisch 9b8be5305d Update tools and gradle wrapper to Gradle 9
And remove the now unnecessary kotlin-android plugin.
2026-02-03 18:15:33 +01:00
Markus Fisch a026ade13b Remove own toHexString() implementation
In favor of the new Kotlin API.
2026-01-26 20:31:07 +01:00
Markus Fisch b1771bc5ea Advance version number to 1.67.1 2026-01-14 23:19:07 +01:00
Markus Fisch 5199460669 Open file:// Uris as documents from Android N+
Because file:// can't be used with Scoped Storage anymore.
2026-01-14 23:16:05 +01:00
Markus Fisch fd040e1660 Remove lateinit from PickActivity members
Because `onCreate()` may return before the `lateinit`
members have been initialized, which would raise a
`kotlin.UninitializedPropertyAccessException`.
2026-01-13 14:53:27 +01:00
Markus Fisch 2e1528364e Fix auto closing of DecodeFragment
Some actions require the `Activity` object to stay alive, e.g.
`OpenOrSearchAction` or `WifiAction` may show a dialog first and
only then may trigger `startActivity`.

Before this commit, with the preferences `openImmediately` or
`closeAutomatically` enabled, the app crashed for content that
would show a dialog through `DecodeFragment.executeAction()`.
2026-01-13 21:20:35 +01:00
KamaleiZestriandGitHub d21af142bb Catch all exceptions for socket.connect()
`socket.connect()` can throw `IOException`s, too.

Occurs with Windows when the bluetooth service gets killed and
restarted in the background.
2026-01-13 09:52:50 +01:00
Markus Fisch 8395e135f9 Update Kotlin version 2025-12-11 20:04:25 +01:00
Markus Fisch c0caa0ce44 Update tools version 2025-12-11 20:03:10 +01:00
Markus Fisch 96927ef9b2 Add line breaks in README 2025-11-14 19:11:18 +01:00
TheRedCyclopsandGitHub 84d9a3b55a Remove double "at" in README 2025-11-14 11:14:34 +01:00
Markus Fisch ffe8e4c5ba Advance version number to 1.67.0 2025-10-10 20:06:03 +02:00
Markus Fisch bc7c5dca97 Fix restoring crop and zoom on profile changes 2025-10-09 20:45:52 +02:00
Markus Fisch d9737f4df1 Store crop handle position per view size
So we have a crop handle configuration for each view size.
2025-10-05 22:42:00 +02:00
Markus Fisch 0e8147713a Use default preferences for welcome screen marker
Since the welcome screen is intended to be shown for the first
start only.
2025-10-05 22:39:54 +02:00
Markus Fisch 3d425a097a Update robolectric version 2025-09-30 23:24:26 +02:00
Markus Fisch c26765cc63 Update Kotlin version 2025-09-30 23:22:15 +02:00
Markus Fisch fb6dc8ba55 Update kotlinx coroutines library 2025-09-30 23:21:54 +02:00
Markus Fisch 70f4d166a0 Support having multiple preference profiles
Requested in #558.
2025-09-30 23:20:30 +02:00
Markus Fisch 6c136ce719 Support regex when searching for a barcode 2025-09-30 16:36:14 +02:00
Markus Fisch c6dee80c0a Quote search term and remove comma
Between search term and barcode restriction.

Cleaner and less irritating.
2025-09-29 22:24:54 +02:00
Markus Fisch 1f43dd4827 Refactor scan_format to scan_for
Since this label is used for barcode formats and search terms.
2025-09-29 22:19:56 +02:00
Markus Fisch a366157977 Fix setting title with format and search term 2025-09-29 22:18:30 +02:00
Markus Fisch 6bb72672a3 Show a message for unmatching barcodes
So it's clear that the app recognized the barcode, but it's
not the one we're looking for.
2025-09-29 22:12:26 +02:00
Markus Fisch 04774527a0 Fix string capitalization for consistency 2025-09-29 21:36:44 +02:00
Markus Fisch 6f3e644aa8 Update tools version 2025-09-23 21:48:02 +02:00
Markus Fisch 5e3176b703 Update ZXingC++ for 16 KB ELF alignment
Because starting November 1st, 2025, all new apps and updates to
existing apps submitted to Google Play and targeting Android 15+
devices must support 16 KB page sizes on 64-bit devices.
2025-09-23 21:38:46 +02:00
zicaandGitHub 0f0aaff284 Improve zh-tw and ja translations 2025-09-12 18:39:29 +02:00
Markus Fisch f0d09e81b4 Advance version number to 1.66.2 2025-08-26 21:16:08 +02:00
Markus Fisch 771258cb5c Update tools version 2025-08-18 20:33:59 +02:00
Markus Fisch 9482086666 Reformat code 2025-08-18 20:33:21 +02:00
CertainBotandGitHub bcad50c3e8 Update Spanish translation
Few corrections over the AI translations.
2025-08-08 09:45:07 +02:00
Markus Fisch dbd055699e Remove adding ?content= to forward URL
When no other query was given.

This was meant to make it clear that the scanned content will
just be added to the given URL. But it's too restrictive as
there can be URLs without query strings.
2025-08-04 21:52:05 +02:00
Markus Fisch d67f8273d6 Update to target SDK 36 2025-07-30 21:03:48 +02:00
Markus Fisch 649be0ceb6 Update Kotlin version 2025-07-30 20:59:22 +02:00
Markus Fisch f5eb5dd8d2 Update gradle wrapper 2025-07-30 20:52:46 +02:00
Markus Fisch eb805dad2f Update tools version and gradle wrapper 2025-06-11 17:44:40 +02:00
Markus Fisch 202bb32b29 Advance version number to 1.66.1 2025-05-28 18:33:03 +02:00
Markus Fisch 50b8a4d329 Add missing curly braces
We always use curly braces around here.

When in doubt, google for "Apple's SSL Bug".
2025-05-28 18:27:26 +02:00
Markus Fisch fa15478fb4 Remove unused parameter from Bluetooth send method 2025-05-28 18:26:51 +02:00
Markus Fisch 20c2a5a8aa Catch Bluetooth SecurityExceptions explicitly
These are thrown when the user denies access to Bluetooth,
and `$ ./gradlew lintDebug` complains rightly about this.
2025-05-28 18:25:10 +02:00
Markus Fisch 00b95678ed Remove now unnecessary cast 2025-05-19 21:31:39 +02:00
Markus Fisch 5df3517563 Use an underscore for unused exception parameters
To get rid of the warnings.
2025-05-19 21:29:02 +02:00
Markus Fisch fd6946d2c2 Fix checking scan.id instead of fragment id 2025-05-19 21:05:22 +02:00
Markus Fisch c74d229e1f Update tools and gradle wrapper 2025-05-19 21:04:33 +02:00
Unknownman820andGitHub fa99a19db5 Update chinese translation 2025-05-07 19:07:44 +02:00
Markus Fisch b083fcf213 Show elements of invalid Wifi configurations too
So users can still access the elements even when the configuration
is invalid.
2025-05-07 18:47:34 +02:00
Markus Fisch 46930ddea6 Unescape Wifi elements in parseMap()
Instead of unescaping elements selectively in `SimpleDataAccessor`.

This is much simpler and this way the `Map` `parseMap()` returns has
always unescaped values. This `Map` is also layed out in the
`DecodeFragment`, which still displayed the escaped values before
this commit.
2025-05-07 18:47:34 +02:00
Markus Fisch 7bef77b96e Add test for unescaping emojis in Wifi credentials
Because of #544.
2025-05-07 18:47:34 +02:00
NathanandGitHub c5f4c088b4 Update french locale
Correction of automatic translations.
2025-05-01 21:58:36 +02:00
Yurt PageandGitHub 73f7210e18 Update translations from Toolate 2025-04-25 23:50:20 +02:00
Markus Fisch 469429e663 Advance version number to 1.66.0 2025-04-25 23:49:16 +02:00
Markus Fisch 1a7ac59740 Refactor BinaryEyeDeeplink to just Deeplink 2025-04-25 12:54:50 +02:00
Markus Fisch c13c59e728 Refactor IDLParser/ElementMap to use camel case
And match these names with other symbols in this code base
that don't use all caps for abbreviations like `Url` or
`UrlDialogFragment` and so on.
2025-04-25 12:51:30 +02:00
Markus Fisch bc17e25717 Reformat with Android Studio 2025-04-25 12:48:51 +02:00
Yurt PageandGitHub 5017bd4c8d fastlane: simplify short description
And add "QR code" to make it easier to find.
2025-04-25 12:43:58 +02:00
Anton SerebryakovandGitHub a44a913eca Support deep links to encode content via web links
To open barcode://encode via a HTTP deep link.

Also adds actions to copy the deep link to the clipboard.
2025-04-25 12:42:42 +02:00
Yurt PageandGitHub 007e83e243 fastlane: merge summary.txt into short_description.txt
summary.txt was used by Tripple-T but the default Fastlane file name is short_description.txt. It supports the summary.txt too but we have a duplication problem and some languages has both.
So I removed the duplicated summary.txt and renamed existing summary.txt into short_description.txt.
2025-04-23 21:43:47 +02:00
Markus Fisch de8f97c246 Parse International Driver Licenses
Usually from PDF417 barcodes.
2025-04-06 15:10:36 +02:00
Markus Fisch 1287591e53 Clean up Bluetooth instructions
Use proper bold syntax instead of making things headlines that
aren't headlines. Markdown is not source code for HTML but a human
readable document format. So semantics are important.

Also removes detailed install instructions for the companion apps.
These should be in the README of the corresponding application.
2025-04-03 21:44:40 +02:00
Markus Fisch 8c17238572 Only show clipboard toast before Android 13
Because there is a clipboard popup from Android 13 on.
2025-04-03 09:17:12 +02:00
Curious, aren't we?andGitHub 5dbb36e6a9 Add Bluetooth howto to the README 2025-04-02 23:33:14 +02:00
Markus Fisch ca7dfb3a33 Add new WiFi's via Settings intent
From API level 30, Android R, on.

This has the advantage that Binary Eye doesn't take ownership of
the newly added WiFi. See #482
2025-03-30 19:53:12 +02:00
Markus Fisch 419b7d5765 Give share file its own icon
So that we can clearly distinguish this action from the share
action when all actions are layed out next to each other.
2025-03-16 21:20:23 +01:00
Markus Fisch fa38866669 Update missing string resources
With a little help from the OpenAI API ;)
2025-03-27 14:19:44 +01:00
bovirusandGitHub 19ca521f59 Italian language update 2025-03-16 11:43:37 +01:00
Markus Fisch be657d86cf Show parsed data for MatMsgAction and WebAction 2025-03-14 12:27:06 +01:00
Markus Fisch 5199a4a526 Remove log messages
From debugging.
2025-03-14 12:27:06 +01:00
Markus Fisch ff48a543c9 Show parsed VType items in data view 2025-03-14 12:27:06 +01:00
Markus Fisch 2eadd01a87 Use apply scope function initialize valueView
Removes repetitions.
2025-03-14 12:27:06 +01:00
Markus Fisch dd2abe7d89 Copy password as every other content
And remove the corresponding special message.

It's probably clear enough with the generic message.
2025-03-14 12:27:06 +01:00
Markus Fisch 8e05caac70 Add click listener to copy data items
Into the clipboard for easy access.

Now, the data items should be bigger and also have some click feedback.
2025-03-14 12:27:06 +01:00
Markus Fisch 46aeced09f Separate Deep Links from Intents in README
And add some links on how to integrate a barcode scanner in an app.
2025-03-14 12:27:06 +01:00
NathanandGitHub 3681c5d011 Update french translation
Added strings for latest features.
2025-03-14 12:23:53 +01:00
Markus Fisch 20b4f7aac5 Advance version number to 1.65.2 2025-03-12 18:55:50 +01:00
Markus Fisch bc6e350271 Sanity check view, ROI and frame metrics
Because `roundToInt` in `Rect.setFrameRoi()` throws an
`IllegalArgumentException: Cannot round NaN value` for
some people out there.
2025-03-12 18:52:27 +01:00
Markus Fisch c9c1b2f5bf Advance version number to 1.65.1 2025-03-12 12:23:43 +01:00
Markus Fisch 1dbc0f0fa1 Fix fastlane changelogs
And insert the missing log for version code 141.
2025-03-12 12:20:20 +01:00
solokotandGitHub ab8170ee72 Update Russian translation
Fix machine translation
2025-03-12 12:11:05 +01:00
Markus Fisch 551464dc6f Refactor for an early return when content is empty
Easier to read and less indent.
2025-03-12 00:54:59 +01:00
Markus Fisch c3aac0a1e1 Set a default search URL for simple mode
So any (otherwise unregistered) content is always redirected to
the browser.
2025-03-12 00:53:37 +01:00
Markus Fisch d678e1cfd0 Hide keyboard when expanding recreated barcode
So the layout of `BarcodeFragment` isn't affected by it.
2025-03-12 00:49:30 +01:00
Markus Fisch a445ade877 Reduce height for 1D barcodes
1D barcodes don't need as much vertical space.
2025-03-12 00:48:20 +01:00
Markus Fisch 1fd0b7637f Add execute argument for binaryeye://encode
For immediate code generation.
2025-03-12 00:37:47 +01:00
Markus Fisch fdc88df897 Remember quiet zone settings
And use a quiet zone by default because it's recommended.
2025-03-12 00:19:41 +01:00
Markus Fisch d0f133ae00 Fix showing a scan from history
When `openImmediately` is `true`.

Of course, the action should only be executed when we're coming
from the scanner, not the history.
2025-03-12 00:11:14 +01:00
Markus Fisch 67646261e7 Remove unnecessary id field 2025-03-12 00:08:11 +01:00
Markus Fisch faeae9e904 Advance version number to 1.65.0 2025-03-11 23:23:55 +01:00
Markus Fisch 77b21a9e83 Add a welcome screen to choose a mode
To address these bad reviews when people don't understand that
they have to press this little green button.
2025-03-11 23:17:36 +01:00
Markus Fisch cbe7860a3d Add a deep link to encode a barcode 2025-03-11 22:58:45 +01:00
Markus Fisch fc29267d3d Update ZXing-C++ library 2025-03-11 22:58:10 +01:00
Markus Fisch 890506328b Fix show crop handle setting
This switch isn't part of the crop configuration, but controls if
the crop handle is actually visible or not.
2025-03-11 22:58:10 +01:00
Markus Fisch 04036b6cd6 Use apply scope function to initialize views
And remove all this repetition of names.
2025-03-11 22:58:10 +01:00
Markus Fisch 2602021c1c Remove unused import from PickActivity 2025-03-11 22:58:10 +01:00
Markus Fisch 17a0bdc0a9 Allow shrinking of image samples too
So they can fit in the crop window.
2025-03-11 22:58:10 +01:00
Markus Fisch d71a220eca Remember zoom level of barcodes in view
Solves #490.
2025-03-11 22:58:10 +01:00
Markus Fisch 0c2e711d79 Add a comment why Scan.text can be an empty string
So it's immediately clear why `Scan.text` can be empty.
2025-03-11 22:58:10 +01:00
Markus Fisch ca342a83d3 Configure ZXingCpp to return plain text only
And remove the HRI decoration because it's confusing people and
doesn't work well when the barcode is re-generated from this
content.

Alternatively, we could filter the HRI decoration for generation,
but that's probably overkill.

Solves #506.
2025-03-11 22:58:10 +01:00
Markus Fisch 3c44ff56eb Refactor SCAN_CONTENT to SCAN_TEXT
To match the refactoring of `Scan.text` in 5189fc.
2025-03-11 22:58:10 +01:00
bovirusandGitHub bcae64c0d0 Italian language update 2025-03-11 22:57:50 +01:00
Markus Fisch c2f673729b Advance version number to 1.64.2 2025-03-10 21:23:52 +01:00
Markus Fisch 2043e0f349 Use separate crop handle config for image scanning
These are two different use cases.
2025-03-10 21:11:41 +01:00
Markus Fisch b93eb5963e Use raw content for Barcode<*> when text is empty
So binary content is supported here, too.
2025-03-10 11:01:15 +01:00
Markus Fisch 5189fc9c5a Refactor Scan.content to Scan.text
Because `text` is more specific, and the term `content` is often
used for generics.
2025-03-10 10:54:44 +01:00
Markus Fisch 2d311ff92a Fix initializing dataMask
And show this item for QR Codes only.
2025-03-10 19:50:19 +01:00
solokotandGitHub 14bb08003d Update Russian translation 2025-03-10 10:31:50 +01:00
195 changed files with 6255 additions and 2770 deletions
+81
View File
@@ -1,5 +1,86 @@
# Change Log
## 1.68.7
* Add icons to preferences screen
* Update history listing on resume
* Fix quiet zone for recreated barcodes
* Fix automatic screen brightening
* Migrate to CameraX
## 1.68.6
* Update ZXingCpp
* Ask for confirmation before deleting a scan from the result screen
## 1.68.5
* Downgrade ZXingCpp for compatibilty
## 1.68.4
* Fix generating 1D barcodes
## 1.68.3
* Stability improvement
## 1.68.2
* Fix barcode regeneration
## 1.68.1
* Improve UI of search barcode dialog
* Stability improvements
* Update ZXingCpp
* Update Russian translation
## 1.68.0
* Add automated actions
* Improve managing profiles
## 1.67.1
* Fix opening file:// Uris
* Fix auto-return/immediate opening
* Improve Bluetooth stability
## 1.67.0
* Add preference profiles
* Support regex when searching for a barcode
* Improve feedback when searching for a barcode
* Update translations
## 1.66.2
* Remove forcing `?content=` on forwarding URL
* Update Spanish translation
## 1.66.1
* Show elements of invalid Wifi configurations too
* Update translations
## 1.66.0
* Support deep links to encode content via web links
* Parse International Driver Licenses (IDL) in PDF417 barcodes
* Add WiFis from system settings
* Show parsed data items
* Update translations
## 1.65.2
* Sanity check ROI metrics
## 1.65.1
* Improve simple mode
* Remember quiet zone settings
* Reduce height for 1D barcodes
* Add execute argument for binaryeye://encode
* Update Russian translation
## 1.65.0
* Add a welcome screen to choose a mode
* Add a deep link to encode a barcode
* Remember zoom level of generated barcodes
* Remove Human Readable Interpretation (HRI) decoration
* Update Italian translation
## 1.64.2
* Separate crop window settings for image scanning
* Fix initializing dataMask
* Update Russian translation
## 1.64.1
* Handle empty input for recreation
* Fix setting up database
+20
View File
@@ -28,6 +28,26 @@ testscan:
-c android.intent.category.BROWSABLE \
-d 'binaryeye://scan/?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
testencode:
adb shell am start -a android.intent.action.VIEW \
-c android.intent.category.BROWSABLE \
-d 'binaryeye://encode?content=Test\&format=QR_CODE'
testencodenotqr:
adb shell am start -a android.intent.action.VIEW \
-c android.intent.category.BROWSABLE \
-d 'binaryeye://encode?content=Test\&format=DATA_MATRIX'
testencodeexec:
adb shell am start -a android.intent.action.VIEW \
-c android.intent.category.BROWSABLE \
-d 'binaryeye://encode?content=Test\&format=QR_CODE\&execute'
testencodeurl:
adb shell am start -a android.intent.action.VIEW \
-c android.intent.category.BROWSABLE \
-d 'http://markusfisch.de/encode?content=Test\&format=QR_CODE'
testurl:
adb shell am start -a android.intent.action.VIEW \
-c android.intent.category.BROWSABLE \
+47 -7
View File
@@ -83,14 +83,14 @@ ZXing can generate the following barcode formats:
* [QR CODE][qr_code]
* [UPC A][upc_a]
## Deep Links and Intents
### Deep Links
## Deep Links
You can invoke Binary Eye with a web URI intent from anything that can
open URIs. There are two options:
open URIs.
1. [binaryeye://scan](binaryeye://scan) (note: Github Markdown does not render this as clickable link)
### Decoding
1. [binaryeye://scan](binaryeye://scan) (note: GitHub does not render this as clickable link)
2. [http(s)://markusfisch.de/BinaryEye](http://markusfisch.de/BinaryEye)
If you want to get the scanned contents, you can add a `ret` query
@@ -104,10 +104,32 @@ Supported symbols are:
* `RESULT_BYTES` - raw result as a hex string
* `FORMAT` - barcode format
### Encoding
1. [binaryeye://encode](binaryeye://encode)
You can use the URL arguments `content` and `format` to automatically
preset this data. For example:
1. [binaryeye://encode?content=Test&format=QR_CODE](binaryeye://encode?content=Test&format=QR_CODE)
2. [http(s)://markusfisch.de/encode?content=Test&format=QR_CODE](http://markusfisch.de/encode?content=Test&format=QR_CODE)
3. [http(s)://markusfisch.de/encode?content=Test&format=DATA_MATRIX](http://markusfisch.de/encode?content=Test2&format=DATA_MATRIX&execute)
If you want the code to be generated immediately, add `execute=true` (or
just `execute`).
## Intents
You can also use Binary Eye from other apps by using an [Intent][intent].
If you prefer to integrate a barcode scanner into your app, take a look at
[BarcodeScannerView][barcode_scanner_view] (if you also want to use
[ZXing-C++][zxing_cpp]) or read how to
[scan barcodes with ML Kit on Android][mlkit_barcode_scanning].
### SCAN Intent
You can also use Binary Eye from other apps by using the
`com.google.zxing.client.android.SCAN` Intent with
Use the `com.google.zxing.client.android.SCAN` `Intent` with
[startActivityForResult()][start_activity] like this:
```kotlin
@@ -155,6 +177,21 @@ class YourActivity : AppCompatActivity() {
}
```
## Forwarding scans via Bluetooth
**Note:** The companion apps aren't developed nor maintained by the
author of Binary Eye.
In order to set up Bluetooth forwarding to a computer:
1. Pair your devices (phone and pc) if not paired already
2. Download and run a companion app:
- Windows: https://github.com/KamaleiZestri/BinaryReceptorWindows
- Linux: https://github.com/sean666888/bin_eye_bt_receiver
3. In the settings of Binary Eye, enable "Forward scans with Bluetooth"
and select the appropriate target host device that is running the
companion application.
[play]: https://play.google.com/store/search?q=barcode%20scanner&c=apps
[zxing_cpp]: https://github.com/zxing-cpp/zxing-cpp
[kotlin]: http://kotlinlang.org/
@@ -177,6 +214,9 @@ class YourActivity : AppCompatActivity() {
[upc_a]: https://en.wikipedia.org/wiki/Universal_Product_Code
[upc_e]: https://en.wikipedia.org/wiki/Universal_Product_Code#UPC-E
[upc_ean]: https://en.wikipedia.org/wiki/Universal_Product_Code#EAN-13
[intent]: https://developer.android.com/reference/android/content/Intent
[barcode_scanner_view]: https://github.com/markusfisch/BarcodeScannerView
[mlkit_barcode_scanning]: https://developers.google.com/ml-kit/vision/barcode-scanning/android
[start_activity]: https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int)
[on_activity_result]: https://developer.android.com/reference/android/app/Activity#onActivityResult(int,%20int,%20android.content.Intent)
[intent_result]: https://developer.android.com/training/basics/intents/result
+16 -16
View File
@@ -1,16 +1,15 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
namespace "de.markusfisch.android.binaryeye"
compileSdk sdk_version
defaultConfig {
minSdk 9
minSdk 21
targetSdk sdk_version
versionCode 143
versionName '1.64.1'
versionCode 161
versionName '1.68.7'
}
signingConfigs {
@@ -35,7 +34,7 @@ android {
}
release {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
minifyEnabled true
shrinkResources true
signingConfig signingConfigs.release
@@ -63,27 +62,28 @@ android {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
}
dependencies {
// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
implementation "androidx.core:core-ktx:1.17.0"
// Support
implementation "com.android.support:appcompat-v7:$support_version"
implementation "com.android.support:design:$support_version"
implementation "com.android.support:preference-v7:$support_version"
implementation "com.android.support:preference-v14:$support_version"
implementation "androidx.appcompat:appcompat:1.7.1"
implementation "com.google.android.material:material:1.13.0"
implementation "androidx.preference:preference:1.2.1"
// External
implementation 'com.github.markusfisch:CameraView:1.10.0'
implementation 'com.github.markusfisch:ScalingImageView:1.4.1'
implementation 'com.github.markusfisch:zxing-cpp:v2.3.0.2'
implementation 'androidx.camera:camera-core:1.4.2'
implementation 'androidx.camera:camera-camera2:1.4.2'
implementation 'androidx.camera:camera-lifecycle:1.4.2'
implementation 'androidx.camera:camera-view:1.4.2'
implementation 'com.github.markusfisch:ScalingImageView:1.4.3'
implementation 'com.github.markusfisch:zxing-cpp:v3.0.2.1'
// Testing
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.16.1'
}
Binary file not shown.
+43 -3
View File
@@ -21,7 +21,7 @@
<uses-feature android:name="android.hardware.camera"/>
<uses-feature android:name="android.hardware.camera.autofocus"
android:required="false" />
<uses-sdk tools:overrideLibrary="android.support.v14.preference"/>
<uses-sdk tools:overrideLibrary="androidx.preference"/>
<queries>
<intent>
<action android:name="android.intent.action.VIEW"/>
@@ -109,8 +109,48 @@
</intent-filter>
</activity>
<activity
android:name=".activity.MainActivity"
android:name=".activity.WelcomeActivity"
android:exported="true"/>
<activity
android:name=".activity.PreferencesActivity"
android:exported="true"/>
<activity
android:name=".activity.HistoryActivity"
android:exported="true"/>
<activity
android:name=".activity.EncodeActivity"
android:exported="true">
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:host="markusfisch.de"/>
<data android:pathPrefix="/encode"/>
<data android:scheme="http"/>
<data android:scheme="https"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="binaryeye" android:host="encode"/>
</intent-filter>
</activity>
<activity
android:name=".activity.DecodeActivity"
android:exported="false"/>
<activity
android:name=".activity.BarcodeActivity"
android:exported="false"/>
<activity
android:name=".activity.ProfilesActivity"
android:exported="false"/>
<activity
android:name=".activity.AutomatedActionsActivity"
android:exported="false"/>
<activity
android:name=".activity.NetworkSuggestionsActivity"
android:exported="false"/>
<service
android:name=".service.ScanTileService"
android:icon="@drawable/ic_action_scan"
@@ -123,7 +163,7 @@
</intent-filter>
</service>
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
@@ -6,15 +6,17 @@ import de.markusfisch.android.binaryeye.content.execShareIntent
import de.markusfisch.android.binaryeye.content.openUrl
import de.markusfisch.android.binaryeye.widget.toast
interface IAction {
val iconResId: Int
val titleResId: Int
abstract class Action {
abstract val iconResId: Int
abstract val titleResId: Int
fun canExecuteOn(data: ByteArray): Boolean
suspend fun execute(context: Context, data: ByteArray)
var fired: Boolean = false
abstract fun canExecuteOn(data: ByteArray): Boolean
abstract suspend fun execute(context: Context, data: ByteArray)
}
abstract class IntentAction : IAction {
abstract class IntentAction : Action() {
abstract val errorMsg: Int
final override suspend fun execute(context: Context, data: ByteArray) {
@@ -22,7 +24,7 @@ abstract class IntentAction : IAction {
if (intent == null) {
context.toast(errorMsg)
} else {
context.execShareIntent(intent)
fired = context.execShareIntent(intent)
}
}
@@ -32,7 +34,7 @@ abstract class IntentAction : IAction {
): Intent?
}
abstract class SchemeAction : IAction {
abstract class SchemeAction : Action() {
abstract val scheme: String
open val buildRegex: Boolean = false
@@ -50,6 +52,6 @@ abstract class SchemeAction : IAction {
}
final override suspend fun execute(context: Context, data: ByteArray) {
context.openUrl(String(data))
fired = context.openUrl(String(data))
}
}
@@ -12,9 +12,9 @@ import de.markusfisch.android.binaryeye.actions.web.WebAction
import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
object ActionRegistry {
val DEFAULT_ACTION: IAction = OpenOrSearchAction
val DEFAULT_ACTION: Action = OpenOrSearchAction
private val REGISTRY: Set<IAction> = setOf(
private val REGISTRY: Set<Action> = setOf(
MailAction,
MatMsgAction,
OtpauthAction,
@@ -28,7 +28,7 @@ object ActionRegistry {
WebAction
)
fun getAction(data: ByteArray): IAction = REGISTRY.find {
fun getAction(data: ByteArray): Action = REGISTRY.find {
it.canExecuteOn(data)
} ?: DEFAULT_ACTION
}
@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.actions.mail
import android.content.Context
import android.content.Intent
import android.net.Uri
import androidx.core.net.toUri
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IntentAction
@@ -24,7 +24,7 @@ object MailAction : IntentAction() {
)?.groupValues?.get(1) ?: return null
return Intent(
Intent.ACTION_SENDTO,
Uri.parse("mailto:$mailWithMessage")
"mailto:$mailWithMessage".toUri()
)
}
}
@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.actions.mail
import android.content.Context
import android.content.Intent
import android.net.Uri
import androidx.core.net.toUri
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IntentAction
@@ -26,7 +26,7 @@ object MatMsgAction : IntentAction() {
}
return Intent(
Intent.ACTION_SENDTO,
Uri.parse("mailto:")
"mailto:".toUri()
).apply {
mm.to?.let {
putExtra(Intent.EXTRA_EMAIL, arrayOf(mm.to))
@@ -2,62 +2,65 @@ package de.markusfisch.android.binaryeye.actions.search
import android.content.Context
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IAction
import de.markusfisch.android.binaryeye.actions.Action
import de.markusfisch.android.binaryeye.app.alertDialog
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.content.openUrl
import de.markusfisch.android.binaryeye.net.urlEncode
object OpenOrSearchAction : IAction {
object OpenOrSearchAction : Action() {
override val iconResId: Int = R.drawable.ic_action_search
override val titleResId: Int = R.string.search_web
override fun canExecuteOn(data: ByteArray): Boolean = false
override suspend fun execute(context: Context, data: ByteArray) {
view(context, String(data), true)
}
private suspend fun view(
context: Context,
url: String,
search: Boolean
) {
if (!context.openUrl(url, silent = true) && search) {
openSearch(context, url)
}
}
private suspend fun openSearch(context: Context, query: String) {
val defaultSearchUrl = prefs.defaultSearchUrl
if (defaultSearchUrl.isNotEmpty()) {
view(
context,
defaultSearchUrl + query.urlEncode(),
false
)
return
}
val names = context.resources.getStringArray(
R.array.search_engines_names
).toMutableList()
val urls = context.resources.getStringArray(
R.array.search_engines_values
).toMutableList()
// Remove the "Always ask" entry. The arrays search_engines_*
// are used in the preferences too.
names.removeAt(0)
urls.removeAt(0)
if (prefs.openWithUrl.isNotEmpty()) {
names.add(prefs.openWithUrl)
urls.add(prefs.openWithUrl)
}
val queryUri = alertDialog<String>(context) { resume ->
setTitle(R.string.pick_search_engine)
setItems(names.toTypedArray()) { _, which ->
resume(urls[which] + query.urlEncode())
}
} ?: return
view(context, queryUri, false)
fired = openUrlOrSearch(context, String(data))
}
}
private suspend fun openUrlOrSearch(
context: Context,
url: String,
search: Boolean = true
): Boolean {
if (context.openUrl(url, silent = true)) {
return true
}
if (search) {
return prependSearchUrl(context, url)?.let {
openUrlOrSearch(context, it, false)
} ?: false
}
return false
}
private suspend fun prependSearchUrl(
context: Context,
query: String
): String? {
val defaultSearchUrl = prefs.defaultSearchUrl
if (defaultSearchUrl.isNotEmpty()) {
return defaultSearchUrl + query.urlEncode()
}
val names = context.resources.getStringArray(
R.array.search_engines_names
).toMutableList()
val urls = context.resources.getStringArray(
R.array.search_engines_values
).toMutableList()
// Remove the "Always ask" entry. The arrays search_engines_*
// are used in the preferences too.
names.removeAt(0)
urls.removeAt(0)
if (prefs.openWithUrl.isNotEmpty()) {
names.add(prefs.openWithUrl)
urls.add(prefs.openWithUrl)
}
return alertDialog(context) { resume ->
setTitle(R.string.pick_search_engine)
setItems(names.toTypedArray()) { _, which ->
resume(urls[which] + query.urlEncode())
}
}
}
@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.actions.sms
import android.content.Context
import android.content.Intent
import android.net.Uri
import androidx.core.net.toUri
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IntentAction
@@ -27,7 +27,7 @@ object SmsAction : IntentAction() {
} ?: return null
return Intent(
Intent.ACTION_SENDTO,
Uri.parse("smsto:$number")
"smsto:$number".toUri()
).apply {
if (message.isNotEmpty()) {
putExtra("sms_body", message)
@@ -3,7 +3,6 @@ package de.markusfisch.android.binaryeye.actions.vtype.vcard
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.os.Build
import android.provider.ContactsContract
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IntentAction
@@ -98,38 +97,36 @@ object VCardAction : IntentAction() {
}
putExtra(ContactsContract.Intents.Insert.POSTAL, addr.value.locationFormat)
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
val urls = info["URL"]?.mapNotNull {
it.value.takeIf { url -> url.isNotBlank() }?.let { url ->
ContentValues(2).apply {
put(
ContactsContract.Data.MIMETYPE,
ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE
)
put(ContactsContract.CommonDataKinds.Website.URL, url)
}
val urls = info["URL"]?.mapNotNull {
it.value.takeIf { url -> url.isNotBlank() }?.let { url ->
ContentValues(2).apply {
put(
ContactsContract.Data.MIMETYPE,
ContactsContract.CommonDataKinds.Website.CONTENT_ITEM_TYPE
)
put(ContactsContract.CommonDataKinds.Website.URL, url)
}
}
val bDays = info["BDAY"]?.mapNotNull {
it.value.takeIf { day -> day.isNotBlank() }?.let { day ->
ContentValues(3).apply {
put(
ContactsContract.Data.MIMETYPE,
ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE
)
put(
ContactsContract.CommonDataKinds.Event.TYPE,
ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY
)
put(ContactsContract.CommonDataKinds.Event.START_DATE, day)
}
}
}
putParcelableArrayListExtra(
ContactsContract.Intents.Insert.DATA,
ArrayList(listOfNotNull(urls, bDays).flatten())
)
}
val bDays = info["BDAY"]?.mapNotNull {
it.value.takeIf { day -> day.isNotBlank() }?.let { day ->
ContentValues(3).apply {
put(
ContactsContract.Data.MIMETYPE,
ContactsContract.CommonDataKinds.Event.CONTENT_ITEM_TYPE
)
put(
ContactsContract.CommonDataKinds.Event.TYPE,
ContactsContract.CommonDataKinds.Event.TYPE_BIRTHDAY
)
put(ContactsContract.CommonDataKinds.Event.START_DATE, day)
}
}
}
putParcelableArrayListExtra(
ContactsContract.Intents.Insert.DATA,
ArrayList(listOfNotNull(urls, bDays).flatten())
)
}
}
@@ -2,9 +2,7 @@ package de.markusfisch.android.binaryeye.actions.vtype.vevent
import android.content.Context
import android.content.Intent
import android.os.Build
import android.provider.CalendarContract
import android.support.annotation.RequiresApi
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IntentAction
import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
@@ -21,14 +19,10 @@ object VEventAction : IntentAction() {
get() = R.string.vevent_failed
override fun canExecuteOn(data: ByteArray): Boolean {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
return false
}
val type = VTypeParser.parseVType(String(data))
return type == "VEVENT" || type == "VCALENDAR"
}
@RequiresApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
override suspend fun createIntent(context: Context, data: ByteArray): Intent? {
val info = VTypeParser.parseMap(String(data))
@@ -88,6 +82,6 @@ private fun List<String>.simpleFindParse(date: String): Date? {
private fun SimpleDateFormat.simpleParse(date: String): Date? = try {
parse(date)
} catch (e: Exception) {
} catch (_: Exception) {
null
}
@@ -2,10 +2,10 @@ package de.markusfisch.android.binaryeye.actions.web
import android.content.Context
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IAction
import de.markusfisch.android.binaryeye.actions.Action
import de.markusfisch.android.binaryeye.content.openUrl
object WebAction : IAction {
object WebAction : Action() {
private val colloquialRegex =
"^(URL:[ ]*)*(http[s]*://)*[A-Za-z0-9-]{3,}\\.[A-Za-z]{2,}[^ \t\r\n]*$".toRegex()
@@ -24,6 +24,6 @@ object WebAction : IAction {
if (!url.startsWith("http") && !url.startsWith("ftp")) {
url = "http://${url}"
}
context.openUrl(url)
fired = context.openUrl(url)
}
}
@@ -2,31 +2,39 @@ package de.markusfisch.android.binaryeye.actions.wifi
import android.content.Context
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.IAction
import de.markusfisch.android.binaryeye.actions.Action
import de.markusfisch.android.binaryeye.widget.toast
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
object WifiAction : IAction {
object WifiAction : Action() {
override val iconResId = R.drawable.ic_action_wifi
override val titleResId = R.string.connect_to_wifi
var password: String? = null
override fun canExecuteOn(data: ByteArray): Boolean =
WifiConnector.parse(String(data)) {
password = it
} != null
override fun canExecuteOn(data: ByteArray): Boolean {
// Just check if the data can be parsed as the app should also
// show invalid configurations so users can still access them.
val inputMap = WifiConnector.parseMap(String(data)) ?: return false
password = inputMap["P"]
return !inputMap["S"].isNullOrEmpty()
}
override suspend fun execute(
context: Context,
data: ByteArray
) = withContext(Dispatchers.IO) {
val message = WifiConnector.parse(String(data))?.let {
WifiConnector.addNetwork(context, it)
} ?: R.string.wifi_config_failed
withContext(Dispatchers.Main) {
context.toast(message)
override suspend fun execute(context: Context, data: ByteArray) {
withContext(Dispatchers.IO) {
fired = WifiConnector.parse(String(data))?.let {
WifiConnector.addNetwork(context, it)
} ?: false
withContext(Dispatchers.Main) {
context.toast(
if (fired) {
R.string.wifi_added
} else {
R.string.wifi_config_failed
}
)
}
}
}
}
@@ -1,14 +1,15 @@
package de.markusfisch.android.binaryeye.actions.wifi
import android.content.Context
import android.content.Intent
import android.net.wifi.WifiConfiguration
import android.net.wifi.WifiEnterpriseConfig
import android.net.wifi.WifiManager
import android.net.wifi.WifiNetworkSuggestion
import android.os.Build
import android.support.annotation.RequiresApi
import de.markusfisch.android.binaryeye.R
import java.util.*
import android.provider.Settings
import androidx.annotation.RequiresApi
import java.util.Locale
/**
* Normal:
@@ -35,15 +36,9 @@ import java.util.*
* The fields can appear in any order. Only "S:" is required.
*/
object WifiConnector {
fun parse(
input: String,
passwordBlock: ((password: String?) -> Unit)? = null
): Any? {
fun parse(input: String): Any? {
val inputMap = parseMap(input) ?: return null
val parsedData = SimpleDataAccessor.of(inputMap) ?: return null
passwordBlock?.apply {
invoke(parsedData.password)
}
return try {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
// WifiConfiguration is deprecated in Android Q but
@@ -54,7 +49,7 @@ object WifiConnector {
} else {
WifiNetworkSuggestion.Builder().apply(parsedData)
}
} catch (e: IllegalArgumentException) {
} catch (_: IllegalArgumentException) {
// Some arguments may be out of range, e.g. SSIDs cannot
// be longer than 32 characters in some versions of Android.
// See: https://github.com/markusfisch/BinaryEye/issues/402
@@ -62,24 +57,26 @@ object WifiConnector {
}
}
fun addNetwork(context: Context, config: Any): Int {
fun addNetwork(context: Context, config: Any): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
config is WifiNetworkSuggestion.Builder
) {
context.suggestNetworkFromBuilder(config)
return true
}
val wifiManager = context.applicationContext.getSystemService(
Context.WIFI_SERVICE
) as WifiManager
// WifiConfiguration is deprecated in Android Q.
@Suppress("DEPRECATION")
return if ((config is WifiConfiguration &&
wifiManager.enableWifi() &&
wifiManager.removeOldNetwork(config) &&
wifiManager.enableNewNetwork(config)) ||
(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
config is WifiNetworkSuggestion.Builder &&
wifiManager.addNetworkFromBuilder(config))
) {
R.string.wifi_added
} else {
R.string.wifi_config_failed
}
return (config is WifiConfiguration &&
wifiManager.enableWifi() &&
wifiManager.removeOldNetwork(config) &&
wifiManager.enableNewNetwork(config)) ||
(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
config is WifiNetworkSuggestion.Builder &&
wifiManager.addNetworkFromBuilder(config))
}
internal fun parseMap(input: String): Map<String, String>? {
@@ -93,7 +90,7 @@ object WifiConnector {
input.trimAndTerminate()
)?.groupValues?.get(1)?.let { pairs ->
pairRegex.findAll(pairs).map { pair ->
pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2]
pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2].unescape
}.toMap()
}
}
@@ -103,47 +100,43 @@ object WifiConnector {
) {
// This should be private but because of testing it isn't possible.
internal val ssid: String
get() = inputMap.getValue("S").unescape
get() = inputMap.getValue("S")
internal val securityType: String
get() = inputMap["T"]?.unescape ?: ""
get() = inputMap["T"] ?: ""
internal val password: String?
get() = inputMap["P"]?.unescape
get() = inputMap["P"]
internal val hidden: Boolean
get() = inputMap["H"]?.unescape == "true"
get() = inputMap["H"] == "true"
internal val anonymousIdentity: String
get() = inputMap["AI"]?.unescape ?: inputMap["A"]?.unescape ?: ""
get() = inputMap["AI"] ?: inputMap["A"] ?: ""
internal val identity: String
get() = inputMap["I"]?.unescape ?: ""
get() = inputMap["I"] ?: ""
internal val eapMethod: Int?
get() = if (inputMap["E"].isNullOrEmpty()) {
requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
WifiEnterpriseConfig.Eap.NONE
}
WifiEnterpriseConfig.Eap.NONE
} else when (inputMap["E"]?.uppercase()) {
"AKA" -> requireSdk(Build.VERSION_CODES.LOLLIPOP) { WifiEnterpriseConfig.Eap.AKA }
"AKA" -> WifiEnterpriseConfig.Eap.AKA
"AKA_PRIME" -> requireSdk(Build.VERSION_CODES.M) { WifiEnterpriseConfig.Eap.AKA_PRIME }
"NONE" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.NONE }
"PEAP" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.PEAP }
"PWD" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.PWD }
"SIM" -> requireSdk(Build.VERSION_CODES.LOLLIPOP) { WifiEnterpriseConfig.Eap.SIM }
"TLS" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.TLS }
"TTLS" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.TTLS }
"NONE" -> WifiEnterpriseConfig.Eap.NONE
"PEAP" -> WifiEnterpriseConfig.Eap.PEAP
"PWD" -> WifiEnterpriseConfig.Eap.PWD
"SIM" -> WifiEnterpriseConfig.Eap.SIM
"TLS" -> WifiEnterpriseConfig.Eap.TLS
"TTLS" -> WifiEnterpriseConfig.Eap.TTLS
"UNAUTH_TLS" -> requireSdk(Build.VERSION_CODES.N) { WifiEnterpriseConfig.Eap.UNAUTH_TLS }
else -> null
}
internal val phase2Method: Int?
get() = if (inputMap["PH2"].isNullOrEmpty()) {
requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
WifiEnterpriseConfig.Phase2.NONE
}
WifiEnterpriseConfig.Phase2.NONE
} else when (inputMap["PH2"]?.uppercase()) {
"AKA" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.AKA }
"AKA_PRIME" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.AKA_PRIME }
"GTC" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.GTC }
"MSCHAP" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.MSCHAP }
"MSCHAPV2" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.MSCHAPV2 }
"NONE" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.NONE }
"PAP" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.PAP }
"GTC" -> WifiEnterpriseConfig.Phase2.GTC
"MSCHAP" -> WifiEnterpriseConfig.Phase2.MSCHAP
"MSCHAPV2" -> WifiEnterpriseConfig.Phase2.MSCHAPV2
"NONE" -> WifiEnterpriseConfig.Phase2.NONE
"PAP" -> WifiEnterpriseConfig.Phase2.PAP
"SIM" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.SIM }
else -> null
}
@@ -201,7 +194,7 @@ object WifiConnector {
})
}
}
} catch (e: IllegalArgumentException) {
} catch (_: IllegalArgumentException) {
// Don't accept passphrases that aren't ASCII encodeable.
return null
}
@@ -268,7 +261,7 @@ object WifiConnector {
allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP)
}
"WPA2-EAP" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
"WPA2-EAP" -> {
passwordWithQuotes?.let {
preSharedKey = it
} ?: return null
@@ -288,7 +281,7 @@ object WifiConnector {
data.eapMethod ?: return null // non valid eapMethod
enterpriseConfig.phase2Method =
data.phase2Method ?: return null // non valid phase2Method
} ?: return null // api isn't high enough
}
}
return this
}
@@ -313,6 +306,21 @@ private fun WifiManager.addNetworkFromBuilder(
return result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
}
@RequiresApi(Build.VERSION_CODES.R)
private fun Context.suggestNetworkFromBuilder(
builder: WifiNetworkSuggestion.Builder
) {
val suggestion = builder.build()
startActivity(
Intent(Settings.ACTION_WIFI_ADD_NETWORKS).apply {
putParcelableArrayListExtra(
Settings.EXTRA_WIFI_NETWORK_LIST,
arrayListOf(suggestion)
)
}
)
}
// Make sure the string ends with a semicolon.
private fun String.trimAndTerminate(): String {
var trimmed = trim()
@@ -366,7 +374,7 @@ private fun WifiManager.removeOldNetwork(
}?.networkId?.also {
removeNetwork(it)
}
} catch (e: SecurityException) {
} catch (_: SecurityException) {
// The user didn't allow ACCESS_FINE_LOCATION which is
// required to access configuredNetworks and that's fine.
}
@@ -0,0 +1,271 @@
package de.markusfisch.android.binaryeye.activity
import android.app.AlertDialog
import android.app.Dialog
import android.content.Context
import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.EditText
import android.widget.ListView
import android.widget.RadioGroup
import android.widget.TextView
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.automation.AutomatedAction
import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
import de.markusfisch.android.binaryeye.view.systemBarListViewScrollListener
class AutomatedActionsActivity : ScreenActivity() {
private val actions = ArrayList<AutomatedAction>()
private lateinit var adapter: ActionsAdapter
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setTitle(R.string.automated_actions)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(
R.layout.fragment_automated_actions,
frame,
false
)
frame.addView(view)
actions.clear()
actions.addAll(prefs.automatedActions)
val listView = view.findViewById<ListView>(R.id.actions)
listView.emptyView = view.findViewById(R.id.no_actions)
adapter = ActionsAdapter(this, actions)
listView.adapter = adapter
listView.setOnScrollListener(systemBarListViewScrollListener)
listView.setOnItemClickListener { _, _, position, _ ->
editAction(position)
}
listView.setOnItemLongClickListener { _, _, position, _ ->
confirmRemoveAction(position)
true
}
view.findViewById<View>(R.id.add).setOnClickListener {
editAction(null)
}
view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
listView.setPaddingFromWindowInsets()
}
private fun editAction(position: Int?) {
val action = position?.let { actions[it] }
val view = layoutInflater.inflate(
R.layout.dialog_automated_action,
null
)
val regexView = view.findViewById<EditText>(R.id.regex)
val urlView = view.findViewById<EditText>(R.id.url_template)
val typeGroup = view.findViewById<RadioGroup>(R.id.action_type)
val urlSection = view.findViewById<View>(R.id.url_section)
val intentSection = view.findViewById<View>(R.id.intent_section)
val intentUriView = view.findViewById<EditText>(
R.id.intent_uri_template
)
if (action != null) {
regexView.setText(action.pattern)
when (action.type) {
AutomatedAction.Type.Intent -> {
urlView.setText(action.urlTemplate ?: "")
}
AutomatedAction.Type.CustomIntent -> {
intentUriView.setText(action.intentUriTemplate ?: "")
}
}
}
fun updateTypeSections(checkedId: Int) {
val isIntent = checkedId == R.id.action_type_intent
urlSection.visibility = if (isIntent) View.VISIBLE else View.GONE
intentSection.visibility = if (isIntent) View.GONE else View.VISIBLE
}
typeGroup.setOnCheckedChangeListener { _, checkedId ->
updateTypeSections(checkedId)
}
val initialTypeId = if (
action?.type == AutomatedAction.Type.CustomIntent
) {
R.id.action_type_custom_intent
} else {
R.id.action_type_intent
}
typeGroup.check(initialTypeId)
updateTypeSections(initialTypeId)
val dialog = AlertDialog.Builder(this)
.setTitle(
if (action == null) {
R.string.automated_action_add
} else {
R.string.automated_action_edit
}
)
.setView(view)
.setPositiveButton(android.R.string.ok, null)
.setNegativeButton(android.R.string.cancel) { _, _ -> }
.create()
dialog.setOnShowListener {
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
addOrUpdateAction(
position,
regexView,
urlView,
typeGroup,
intentUriView,
dialog
)
}
}
dialog.show()
}
private fun addOrUpdateAction(
position: Int?,
regexView: EditText,
urlView: EditText,
typeGroup: RadioGroup,
intentUriView: EditText,
dialog: Dialog,
) {
val pattern = regexView.text.toString().trim()
if (pattern.isEmpty()) {
regexView.error = getString(R.string.automated_action_regex_required)
return
}
try {
Regex(pattern)
} catch (_: Exception) {
regexView.error = getString(R.string.automated_action_regex_invalid)
return
}
val isIntent = typeGroup.checkedRadioButtonId == R.id.action_type_intent
val newAction = if (isIntent) {
val urlTemplate = urlView.text.toString().trim()
if (urlTemplate.isEmpty()) {
urlView.error = getString(R.string.automated_action_url_required)
return
}
AutomatedAction(
pattern = pattern,
type = AutomatedAction.Type.Intent,
urlTemplate = urlTemplate
)
} else {
val intentUriTemplate = intentUriView.text.toString().trim()
if (intentUriTemplate.isEmpty()) {
intentUriView.error = getString(
R.string.automated_action_intent_uri_required
)
return
}
if (!intentUriTemplate.startsWith(
"intent:",
ignoreCase = true
)
) {
intentUriView.error = getString(
R.string.automated_action_intent_uri_invalid
)
return
}
AutomatedAction(
pattern = pattern,
type = AutomatedAction.Type.CustomIntent,
intentUriTemplate = intentUriTemplate
)
}
if (position == null) {
actions.add(newAction)
} else {
actions[position] = newAction
}
prefs.setAutomatedActions(actions)
adapter.notifyDataSetChanged()
dialog.dismiss()
}
private fun confirmRemoveAction(position: Int) {
AlertDialog.Builder(this)
.setMessage(R.string.automated_action_remove_confirm)
.setPositiveButton(android.R.string.ok) { _, _ ->
actions.removeAt(position)
prefs.setAutomatedActions(actions)
adapter.notifyDataSetChanged()
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
.show()
}
private class ActionsAdapter(
context: Context,
private val items: List<AutomatedAction>
) : ArrayAdapter<AutomatedAction>(
context,
android.R.layout.simple_list_item_2,
android.R.id.text1,
items
) {
override fun getView(
position: Int,
convertView: View?,
parent: ViewGroup
): View {
val view = super.getView(position, convertView, parent)
val action = items[position]
getViewHolder(view).apply {
title.text = action.pattern
subtitle.text = when (action.type) {
AutomatedAction.Type.Intent -> if (!action.urlTemplate.isNullOrEmpty()) {
context.getString(
R.string.automated_action_list_intent,
action.urlTemplate
)
} else {
context.getString(R.string.automated_action_list_intent_empty)
}
AutomatedAction.Type.CustomIntent ->
if (!action.intentUriTemplate.isNullOrEmpty()) {
context.getString(
R.string.automated_action_list_custom_intent,
action.intentUriTemplate
)
} else {
context.getString(
R.string.automated_action_list_custom_intent_empty
)
}
}
}
return view
}
private fun getViewHolder(
view: View
): ViewHolder = view.tag as ViewHolder? ?: ViewHolder(
view.findViewById(android.R.id.text1),
view.findViewById(android.R.id.text2),
).also {
view.tag = it
}
private data class ViewHolder(
val title: TextView,
val subtitle: TextView,
)
}
}
@@ -1,19 +1,20 @@
package de.markusfisch.android.binaryeye.fragment
package de.markusfisch.android.binaryeye.activity
import android.annotation.SuppressLint
import android.app.AlertDialog
import android.content.Context
import android.content.Intent
import android.graphics.Bitmap
import android.graphics.Matrix
import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import android.widget.ImageView
import android.widget.SeekBar
import android.widget.TextView
import de.markusfisch.android.binaryeye.R
@@ -21,8 +22,8 @@ import de.markusfisch.android.binaryeye.app.db
import de.markusfisch.android.binaryeye.app.hasWritePermission
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.content.Barcode
import de.markusfisch.android.binaryeye.content.BitMatrixBarcode
import de.markusfisch.android.binaryeye.content.BarcodeColors
import de.markusfisch.android.binaryeye.content.BitMatrixBarcode
import de.markusfisch.android.binaryeye.content.ContentBarcode
import de.markusfisch.android.binaryeye.content.copyToClipboard
import de.markusfisch.android.binaryeye.content.shareFile
@@ -31,6 +32,7 @@ import de.markusfisch.android.binaryeye.database.toScan
import de.markusfisch.android.binaryeye.io.addSuffixIfNotGiven
import de.markusfisch.android.binaryeye.io.toSaveResult
import de.markusfisch.android.binaryeye.io.writeExternalFile
import de.markusfisch.android.binaryeye.net.createEncodeDeeplink
import de.markusfisch.android.binaryeye.os.getScreenBrightness
import de.markusfisch.android.binaryeye.os.setScreenBrightness
import de.markusfisch.android.binaryeye.view.doOnApplyWindowInsets
@@ -52,7 +54,7 @@ import java.util.Locale
import kotlin.math.max
import kotlin.math.min
class BarcodeFragment : Fragment() {
class BarcodeActivity : ScreenActivity() {
private enum class FileType {
PNG, JPG, SVG, TXT
}
@@ -60,34 +62,32 @@ class BarcodeFragment : Fragment() {
private val parentJob = Job()
private val scope = CoroutineScope(Dispatchers.IO + parentJob)
private lateinit var imageView: ConfinedScalingImageView
private lateinit var barcode: Barcode<*>
private lateinit var addToHistoryItem: MenuItem
private lateinit var brightenScreenItem: MenuItem
private var contentView: View? = null
private var addToHistoryItem: MenuItem? = null
private var brightenScreenItem: MenuItem? = null
private var currentBrightness = -1f
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setHasOptionsMenu(true)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
state: Bundle?
): View? {
val ac = activity ?: return null
ac.setTitle(R.string.view_barcode)
val view = inflater.inflate(
setTitle(R.string.view_barcode)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(
R.layout.fragment_barcode,
container,
frame,
false
)
frame.addView(view)
contentView = view
// Make `imageView` available for `onPause()`.
imageView = view.findViewById(R.id.barcode)
val bitmap: Bitmap
try {
barcode = arguments?.toBarcode() ?: throw IllegalArgumentException(
barcode = intent?.extras?.toBarcode() ?: throw IllegalArgumentException(
"Illegal arguments"
)
// Catch exceptions from encoding.
@@ -97,19 +97,22 @@ class BarcodeFragment : Fragment() {
if (message.isNullOrEmpty()) {
message = getString(R.string.error_encoding_barcode)
}
message?.let {
ac.toast(message)
}
fragmentManager.popBackStack()
return null
toast(message)
finish()
return
}
val imageView = view.findViewById<ConfinedScalingImageView>(
R.id.barcode
)
imageView.setImageBitmap(bitmap)
imageView.post {
// Make sure to invoke this after ScalingImageView.onLayout().
imageView.runAfterLayout = {
val scale = prefs.previewScale
if (scale > 0) {
imageView.setScale(
scale,
bitmap.width / 2f,
bitmap.height / 2f
)
}
imageView.minWidth = min(
imageView.minWidth / 2f,
max(bitmap.width, bitmap.height).toFloat()
@@ -125,11 +128,9 @@ class BarcodeFragment : Fragment() {
}
view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
imageView.doOnApplyWindowInsets { v, insets ->
(v as ConfinedScalingImageView).insets.set(insets)
imageView.doOnApplyWindowInsets { _, insets ->
imageView.insets.set(insets)
}
return view
}
private fun Bundle.toBarcode(): Barcode<*> {
@@ -170,9 +171,9 @@ class BarcodeFragment : Fragment() {
super.onResume()
if (prefs.brightenScreen) {
// Post to make sure brightenScreenItem is initialized.
view?.post {
contentView?.postDelayed({
brightenScreen()
}
}, 500)
}
}
@@ -181,10 +182,13 @@ class BarcodeFragment : Fragment() {
if (currentBrightness > -1f) {
restoreScreenBrightness()
}
if (imageView.isInBounds()) {
prefs.previewScale = imageView.getScale()
}
}
override fun onDestroyView() {
super.onDestroyView()
override fun onDestroy() {
super.onDestroy()
parentJob.cancel()
}
@@ -201,21 +205,23 @@ class BarcodeFragment : Fragment() {
barcode.bitmap(),
barcode.format
)
addToHistoryItem.isVisible = false
context.toast(R.string.added_to_history)
addToHistoryItem?.isVisible = false
toast(R.string.added_to_history)
true
}
R.id.copy_to_clipboard -> {
context.apply {
copyToClipboard(barcode.text())
toast(R.string.copied_to_clipboard)
}
copyToClipboard(barcode.text())
true
}
R.id.copy_as_deeplink -> {
copyToClipboard(deeplinkToCopy())
true
}
R.id.export_to_file -> {
context.pickFileType(R.string.export_as) { fileType ->
pickFileType(R.string.export_as) { fileType ->
when (fileType) {
FileType.PNG,
FileType.JPG -> askForSize { size ->
@@ -243,6 +249,16 @@ class BarcodeFragment : Fragment() {
}
}
private fun copyToClipboard(text: String, isSensitive: Boolean = false) {
(this as android.content.Context).copyToClipboard(text, isSensitive)
toast(R.string.copied_to_clipboard)
}
private fun deeplinkToCopy() = createEncodeDeeplink(
format = barcode.format.name,
content = barcode.textOrHex(),
)
private fun Context.pickFileType(
title: Int,
action: (FileType) -> Unit
@@ -259,21 +275,20 @@ class BarcodeFragment : Fragment() {
// Dialogs do not have a parent view.
@SuppressLint("InflateParams")
private fun askForFileNameAndSave(fileType: FileType, bitmapSize: Int) {
val ac = activity ?: return
// Write permission is only required before Android Q.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
!ac.hasWritePermission {
!hasWritePermission {
askForFileNameAndSave(fileType, bitmapSize)
}
) {
return
}
val view = ac.layoutInflater.inflate(R.layout.dialog_save_file, null)
val view = layoutInflater.inflate(R.layout.dialog_save_file, null)
val editText = view.findViewById<EditText>(R.id.file_name)
editText.setText(
encodeFileName("${barcode.format}_${barcode.content}")
)
AlertDialog.Builder(ac)
AlertDialog.Builder(this)
.setView(view)
.setPositiveButton(android.R.string.ok) { _, _ ->
val fileName = editText.text.toString()
@@ -315,12 +330,11 @@ class BarcodeFragment : Fragment() {
// Dialogs do not have a parent view.
@SuppressLint("InflateParams")
private fun askForSize(write: (size: Int) -> Unit) {
val ac = activity ?: return
val view = ac.layoutInflater.inflate(R.layout.dialog_size, null)
val view = layoutInflater.inflate(R.layout.dialog_size, null)
val sizeView = view.findViewById<TextView>(R.id.size_display)
val sizeBarView = view.findViewById<SeekBar>(R.id.size_bar)
sizeBarView.initSizeBar(sizeView)
AlertDialog.Builder(ac)
AlertDialog.Builder(this)
.setView(view)
.setPositiveButton(android.R.string.ok) { _, _ ->
write(getSize(sizeBarView.progress))
@@ -363,11 +377,12 @@ class BarcodeFragment : Fragment() {
mimeType: String,
write: (outputStream: OutputStream) -> Unit
) {
val ac = activity ?: return
scope.launch(Dispatchers.IO) {
val message = ac.writeExternalFile(fileName, mimeType, write).toSaveResult()
val message = writeExternalFile(
fileName, mimeType, write
).toSaveResult()
withContext(Dispatchers.Main) {
ac.toast(message)
toast(message)
}
}
}
@@ -404,7 +419,7 @@ class BarcodeFragment : Fragment() {
}
}
true
} catch (e: IOException) {
} catch (_: IOException) {
false
}
withContext(Dispatchers.Main) {
@@ -418,18 +433,19 @@ class BarcodeFragment : Fragment() {
}
private fun brightenScreen() {
activity?.let {
currentBrightness = it.getScreenBrightness()
it.setScreenBrightness(1f)
brightenScreenItem.isChecked = true
if (isFinishing || isDestroyed) {
return
}
currentBrightness = getScreenBrightness()
setScreenBrightness(1f)
brightenScreenItem?.isChecked = true
}
private fun restoreScreenBrightness() {
if (currentBrightness > -1f) {
activity?.setScreenBrightness(currentBrightness)
setScreenBrightness(currentBrightness)
currentBrightness = -1f
brightenScreenItem.isChecked = false
brightenScreenItem?.isChecked = false
}
}
@@ -448,10 +464,11 @@ class BarcodeFragment : Fragment() {
private const val MIME_SVG = "image/svg+xmg"
private const val MIME_TXT = "text/plain"
fun newInstance(
fun newIntent(
context: Context,
barcode: Barcode<*>,
colors: Int = 0
): Fragment {
): Intent {
val args = Bundle()
when (barcode) {
is ContentBarcode -> args.putEcLevelMargin(
@@ -464,32 +481,31 @@ class BarcodeFragment : Fragment() {
args.putInt(BIT_MATRIX_HEIGHT, barcode.bitMatrix.height)
args.putByteArray(BIT_MATRIX_DATA, barcode.bitMatrix.data)
}
else -> throw IllegalArgumentException("unknown barcode")
}
args.putContentFormatColors(
barcode.content,
barcode.format,
colors
)
val fragment = BarcodeFragment()
fragment.arguments = args
return fragment
return Intent(context, BarcodeActivity::class.java).apply {
putExtras(args)
}
}
fun <T> newInstance(
fun <T> newIntent(
context: Context,
content: T,
format: BarcodeFormat,
ecLevel: Int = -1,
margin: Int = -1,
margin: Int = 0,
colors: Int = 0
): Fragment {
): Intent {
val args = Bundle()
args.putContentFormatColors(content, format, colors)
args.putEcLevelMargin(ecLevel, margin)
val fragment = BarcodeFragment()
fragment.arguments = args
return fragment
return Intent(context, BarcodeActivity::class.java).apply {
putExtras(args)
}
}
private fun <T> Bundle.putContentFormatColors(
@@ -526,6 +542,20 @@ class BarcodeFragment : Fragment() {
}
}
private fun ImageView.setScale(scale: Float, x: Float, y: Float) {
imageMatrix = Matrix().apply {
setTranslate(-x, -y)
postScale(scale, scale)
postTranslate(x, y)
}
}
private fun ImageView.getScale(): Float {
val values = FloatArray(9)
imageMatrix.getValues(values)
return values[Matrix.MSCALE_X]
}
private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) =
compress(Bitmap.CompressFormat.PNG, quality, outputStream)
File diff suppressed because it is too large Load Diff
@@ -1,9 +1,14 @@
package de.markusfisch.android.binaryeye.fragment
package de.markusfisch.android.binaryeye.activity
import android.app.Activity
import android.app.AlertDialog
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.design.widget.FloatingActionButton
import android.support.v4.app.Fragment
import android.os.Environment
import android.provider.DocumentsContract
import android.text.Editable
import android.text.Html
import android.text.Spannable
@@ -11,7 +16,6 @@ import android.text.SpannableString
import android.text.TextWatcher
import android.text.method.LinkMovementMethod
import android.text.style.TypefaceSpan
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
@@ -22,40 +26,53 @@ import android.widget.ImageView
import android.widget.TableLayout
import android.widget.TableRow
import android.widget.TextView
import androidx.core.net.toUri
import com.google.android.material.floatingactionbutton.FloatingActionButton
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.actions.ActionRegistry
import de.markusfisch.android.binaryeye.actions.mail.MatMsg
import de.markusfisch.android.binaryeye.actions.mail.MatMsgAction
import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
import de.markusfisch.android.binaryeye.actions.vtype.vcard.VCardAction
import de.markusfisch.android.binaryeye.actions.vtype.vevent.VEventAction
import de.markusfisch.android.binaryeye.actions.web.WebAction
import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
import de.markusfisch.android.binaryeye.actions.wifi.WifiConnector
import de.markusfisch.android.binaryeye.activity.MainActivity
import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
import de.markusfisch.android.binaryeye.app.addFragment
import de.markusfisch.android.binaryeye.app.db
import de.markusfisch.android.binaryeye.app.hasLocationPermission
import de.markusfisch.android.binaryeye.app.hasWritePermission
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.content.ContentBarcode
import de.markusfisch.android.binaryeye.content.IdlParser
import de.markusfisch.android.binaryeye.content.copyToClipboard
import de.markusfisch.android.binaryeye.content.idlToRes
import de.markusfisch.android.binaryeye.content.shareAsFile
import de.markusfisch.android.binaryeye.content.shareText
import de.markusfisch.android.binaryeye.content.toBarcode
import de.markusfisch.android.binaryeye.content.toErrorCorrectionInt
import de.markusfisch.android.binaryeye.content.toHexString
import de.markusfisch.android.binaryeye.content.wipeLastShareFile
import de.markusfisch.android.binaryeye.database.Scan
import de.markusfisch.android.binaryeye.database.toBundle
import de.markusfisch.android.binaryeye.database.toScan
import de.markusfisch.android.binaryeye.io.askForFileName
import de.markusfisch.android.binaryeye.io.toSaveResult
import de.markusfisch.android.binaryeye.io.writeExternalFile
import de.markusfisch.android.binaryeye.net.createEncodeDeeplink
import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
import de.markusfisch.android.binaryeye.widget.toast
import de.markusfisch.android.zxingcpp.ZxingCpp
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.io.File
import java.security.MessageDigest
import kotlin.math.roundToInt
class DecodeFragment : Fragment() {
class DecodeActivity : ScreenActivity() {
private lateinit var contentView: EditText
private lateinit var formatView: TextView
private lateinit var dataView: TableLayout
@@ -69,7 +86,9 @@ class DecodeFragment : Fragment() {
private lateinit var format: String
private val parentJob = Job()
private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main + parentJob)
private val scope: CoroutineScope = CoroutineScope(
Dispatchers.Main + parentJob
)
private val dp: Float
get() = resources.displayMetrics.density
private val content: String
@@ -79,42 +98,45 @@ class DecodeFragment : Fragment() {
private var action = ActionRegistry.DEFAULT_ACTION
private var isBinary = false
private var originalBytes: ByteArray = ByteArray(0)
private var id = 0L
private var label: String? = null
private var recreationSize = 0
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setHasOptionsMenu(true)
override fun onActivityResult(
requestCode: Int,
resultCode: Int,
resultData: Intent?
) {
super.onActivityResult(requestCode, resultCode, resultData)
when (requestCode) {
OPEN_DOCUMENT -> {
if (resultCode == Activity.RESULT_OK) {
val uri = resultData?.data ?: return
openPickedFile(uri)
}
}
}
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
state: Bundle?
): View {
activity?.setTitle(R.string.content)
val view = inflater.inflate(
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setTitle(R.string.content)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(
R.layout.fragment_decode,
container,
frame,
false
)
frame.addView(view)
closeAutomatically = prefs.closeAutomatically &&
activity?.intent?.hasExtra(MainActivity.DECODED) == true
val justScanned = intent.hasExtra(DECODED) || intent.hasExtra(DECODED_SCAN)
closeAutomatically = prefs.closeAutomatically && justScanned
scan = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
arguments?.getParcelable(SCAN, Scan::class.java)
} else {
@Suppress("DEPRECATION")
arguments?.getParcelable(SCAN) as Scan?
} ?: throw IllegalArgumentException("DecodeFragment needs a Scan")
scan = intent?.extras?.getBundle(SCAN_BUNDLE)?.toScan()
?: throw IllegalArgumentException("DecodeActivity needs a Scan")
isBinary = scan.content.isEmpty()
originalBytes = scan.raw ?: scan.content.toByteArray()
isBinary = scan.text.isEmpty()
originalBytes = scan.raw ?: scan.text.toByteArray()
format = scan.format.name
id = scan.id
recreationSize = (200f * dp).roundToInt()
contentView = view.findViewById(R.id.content)
@@ -127,14 +149,13 @@ class DecodeFragment : Fragment() {
labelView = view.findViewById(R.id.label)
fab = view.findViewById(R.id.open)
initContentAndFab()
if (prefs.showMetaData) {
metaView.fillMetaView(scan)
} else {
metaView.visibility = View.GONE
}
if (id > 0) {
if (scan.id > 0) {
scan.label?.let {
labelView.setText(it)
label = it
@@ -143,16 +164,16 @@ class DecodeFragment : Fragment() {
labelView.visibility = View.GONE
}
updateViewsAndFab(scan.content, originalBytes)
view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
view.findViewById<View>(R.id.scroll_view).setPaddingFromWindowInsets()
return view
initContentAndFab(justScanned)
updateViewsAndFab(scan.text, originalBytes)
}
override fun onPause() {
super.onPause()
val id = scan.id
if (id > 0) {
val newLabel = labelView.text.toString().trim()
if (newLabel != (label ?: "")) {
@@ -160,6 +181,9 @@ class DecodeFragment : Fragment() {
label = newLabel
}
}
if (action.fired) {
maybeBackOrFinish()
}
}
override fun onDestroy() {
@@ -168,7 +192,7 @@ class DecodeFragment : Fragment() {
wipeLastShareFile()
}
private fun initContentAndFab() {
private fun initContentAndFab(justScanned: Boolean) {
if (isBinary) {
contentView.setText(String(originalBytes).foldNonAlNum())
contentView.isEnabled = false
@@ -177,7 +201,7 @@ class DecodeFragment : Fragment() {
askForFileNameAndSave(originalBytes)
}
} else {
contentView.setText(scan.content)
contentView.setText(scan.text)
contentView.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(s: Editable?) {
updateViewsAndFab(s?.toString() ?: "")
@@ -198,10 +222,11 @@ class DecodeFragment : Fragment() {
) = Unit
})
fab.setOnClickListener {
executeAction(this.content)
executeAction(content)
}
if (prefs.openImmediately) {
executeAction(this.content)
if (justScanned && prefs.openImmediately) {
closeAutomatically = true
executeAction(content)
}
}
}
@@ -213,12 +238,14 @@ class DecodeFragment : Fragment() {
}
private fun resolveActionAndUpdateFab(bytes: ByteArray) {
val prevAction = action
if (!prevAction.canExecuteOn(bytes)) {
action = ActionRegistry.getAction(bytes)
}
if (prevAction !== action) {
fab.setImageResource(action.iconResId)
if (!isBinary) {
val prevAction = action
if (!prevAction.canExecuteOn(bytes)) {
action = ActionRegistry.getAction(bytes)
}
if (prevAction !== action) {
fab.setImageResource(action.iconResId)
}
}
// Run this for the initial action too.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
@@ -235,7 +262,7 @@ class DecodeFragment : Fragment() {
formatView.text = resources.getQuantityString(
R.plurals.barcode_info,
bytes.size,
prettifyFormatName(format),
format.prettifyFormatName(),
bytes.size
)
hexView.showIf(prefs.showHexDump) { v ->
@@ -255,7 +282,7 @@ class DecodeFragment : Fragment() {
clearRecreation()
return@showIf
}
unmodified = text == scan.content
unmodified = text == scan.text
text
}
val barcode = if (unmodified) {
@@ -264,17 +291,21 @@ class DecodeFragment : Fragment() {
ContentBarcode(
content,
scan.format,
scan.errorCorrectionLevel.toErrorCorrectionInt()
scan.errorCorrectionLevel.toErrorCorrectionInt(),
margin = 1
)
}
try {
v.setImageBitmap(barcode.bitmap(recreationSize))
v.setOnClickListener {
fragmentManager?.addFragment(
BarcodeFragment.newInstance(barcode)
)
v.context.hideSoftKeyboard(contentView)
v.post {
startActivity(
BarcodeActivity.newIntent(this, barcode)
)
}
}
} catch (e: RuntimeException) {
} catch (_: RuntimeException) {
clearRecreation()
}
}
@@ -290,16 +321,61 @@ class DecodeFragment : Fragment() {
}
private fun TableLayout.fillDataView(text: String, bytes: ByteArray) {
val items = LinkedHashMap<Int, CharSequence?>()
val items = LinkedHashMap<Any, CharSequence?>()
when (prefs.showChecksum) {
"CRC4" -> items[R.string.crc4] = String.format("%X", crc4(bytes))
"MD5" -> items[R.string.md5] = bytes.md5().toHexString().fold()
"SHA1" -> items[R.string.sha1] = bytes.sha1().toHexString().fold()
"SHA256" -> items[R.string.sha256] = bytes.sha256().toHexString().fold()
"SHA256" -> items[R.string.sha256] =
bytes.sha256().toHexString().fold()
else -> Unit
}
if (action is WifiAction) {
WifiConnector.parseMap(text)?.let { wifiData ->
IdlParser.parse(String(bytes))?.let {
items.putAll(mapOf("IIN" to it.iin))
items.putAll(
it.elements.entries.associate { (id, value) ->
context.idlToRes(id) to value
}
)
}
when (action) {
is MatMsgAction -> items.putAll(
MatMsg(text).run {
mapOf(
R.string.email_to to to,
R.string.email_subject to sub,
R.string.email_body to body
)
}
)
is VCardAction,
is VEventAction -> VTypeParser.parseMap(text).let { vData ->
items.putAll(
vData.map { item ->
item.key to item.value.joinToString("\n") {
it.value
}
}.toMap()
)
}
is WebAction -> try {
items.putAll(
text.toUri().run {
mapOf(
R.string.scheme to scheme,
R.string.host to host,
R.string.query to query
)
}
)
} catch (_: Exception) {
// Ignore
}
is WifiAction -> WifiConnector.parseMap(text)?.let { wifiData ->
items.putAll(
linkedMapOf(
R.string.entry_type to getString(R.string.wifi_network),
@@ -319,7 +395,7 @@ class DecodeFragment : Fragment() {
}
private fun TableLayout.fillMetaView(scan: Scan) {
val items = linkedMapOf<Int, CharSequence?>(
val items = linkedMapOf<Any, CharSequence?>(
R.string.error_correction_level to scan.errorCorrectionLevel,
R.string.sequence_size to scan.sequenceSize.positiveToString(),
R.string.sequence_index to scan.sequenceIndex.positiveToString(),
@@ -330,7 +406,7 @@ class DecodeFragment : Fragment() {
R.string.gtin_issue_number to scan.issueNumber,
)
if (!scan.version.isNullOrBlank()) {
val versionString = if (scan.format.name == "QR_CODE") {
val versionString = if (scan.format == ZxingCpp.BarcodeFormat.QRCode) {
getString(
R.string.qr_version_and_modules,
scan.version,
@@ -345,7 +421,9 @@ class DecodeFragment : Fragment() {
)
)
}
if (scan.dataMask > -1) {
if (scan.format == ZxingCpp.BarcodeFormat.QRCode &&
scan.dataMask > -1
) {
items.putAll(
linkedMapOf(
R.string.qr_data_mask to scan.dataMask.toString()
@@ -356,7 +434,7 @@ class DecodeFragment : Fragment() {
}
private fun TableLayout.fill(
items: LinkedHashMap<Int, CharSequence?>
items: LinkedHashMap<Any, CharSequence?>
) {
removeAllViews()
visibility = if (items.isEmpty()) View.GONE else {
@@ -367,10 +445,18 @@ class DecodeFragment : Fragment() {
if (!text.isNullOrBlank()) {
val tr = TableRow(ctx)
val keyView = TextView(ctx)
keyView.setText(item.key)
val valueView = TextView(ctx)
valueView.setPadding(spaceBetween, 0, 0, 0)
valueView.text = text
when (val key = item.key) {
is Int -> keyView.setText(key)
is String -> keyView.text = key
else -> keyView.text = key.toString()
}
val valueView = TextView(ctx).apply {
setPadding(spaceBetween, 0, 0, 0)
this.text = text
setOnClickListener {
copyToClipboard(text.toString())
}
}
tr.addView(keyView)
tr.addView(valueView)
addView(tr)
@@ -382,7 +468,7 @@ class DecodeFragment : Fragment() {
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.fragment_decode, menu)
if (id > 0L) {
if (scan.id > 0L) {
menu.findItem(R.id.remove).isVisible = true
}
if (action is WifiAction) {
@@ -404,30 +490,33 @@ class DecodeFragment : Fragment() {
true
}
R.id.copy_as_deeplink -> {
copyToClipboard(deeplinkToCopy())
maybeBackOrFinish()
true
}
R.id.share -> {
context?.apply {
shareText(textOrHex())
maybeBackOrFinish()
}
shareText(textOrHex())
maybeBackOrFinish()
true
}
R.id.share_file -> {
context?.apply {
val (data, name) = if (isBinary) {
Pair(originalBytes, "barcode_content.bin")
} else {
Pair(content, "barcode_content.txt")
}
shareAsFile(data, name)
maybeBackOrFinish()
val (data, name) = if (isBinary) {
Pair(originalBytes, "barcode_content.bin")
} else {
Pair(content, "barcode_content.txt")
}
shareAsFile(data, name)
maybeBackOrFinish()
true
}
R.id.create -> {
fragmentManager?.addFragment(
EncodeFragment.newInstance(
startActivity(
EncodeActivity.newIntent(
this,
if (isBinary) originalBytes else content,
format
)
@@ -436,8 +525,7 @@ class DecodeFragment : Fragment() {
}
R.id.remove -> {
db.removeScan(id)
backOrFinish()
askToRemoveScan(scan.id)
true
}
@@ -445,27 +533,42 @@ class DecodeFragment : Fragment() {
}
}
private fun askToRemoveScan(id: Long) {
AlertDialog.Builder(this)
.setMessage(R.string.really_remove_scan)
.setPositiveButton(android.R.string.ok) { _, _ ->
db.removeScan(id)
backOrFinish()
}
.setNegativeButton(android.R.string.cancel) { _, _ ->
}
.show()
}
private fun textOrHex() = if (isBinary) {
originalBytes.toHexString()
} else {
content
}
private fun deeplinkToCopy() = createEncodeDeeplink(
format = format,
content = textOrHex(),
)
private fun copyPasswordToClipboard() {
val ac = action
if (ac is WifiAction) {
ac.password?.let { password ->
activity?.apply {
copyToClipboard(password, isSensitive = true)
toast(R.string.copied_password_to_clipboard)
}
copyToClipboard(password, isSensitive = true)
}
}
}
private fun copyToClipboard(text: String, isSensitive: Boolean = false) {
activity?.apply {
copyToClipboard(text, isSensitive)
(this as android.content.Context).copyToClipboard(text, isSensitive)
// There's a clipboard popup from Android 13 on.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
toast(R.string.copied_to_clipboard)
}
}
@@ -477,63 +580,92 @@ class DecodeFragment : Fragment() {
}
private fun backOrFinish() {
val fm = fragmentManager
if (fm != null && fm.backStackEntryCount > 0) {
fm.popBackStack()
} else {
activity?.finish()
finish()
}
private fun executeAction(str: String) {
if (str.isEmpty() || openLocalDocument(str)) {
return
}
if (action is WifiAction &&
Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
!hasLocationPermission { executeAction(str) }
) {
return
}
scope.launch {
action.execute(this@DecodeActivity, str.toByteArray())
}
}
private fun executeAction(content: String) {
val ac = activity ?: return
if (content.isNotEmpty()) {
if (action is WifiAction &&
Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
!ac.hasLocationPermission { executeAction(content) }
) {
return
}
scope.launch {
action.execute(ac, content.toByteArray())
maybeBackOrFinish()
}
private fun openLocalDocument(str: String): Boolean {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N ||
!str.startsWith(SCHEME_FILE)
) {
return false
}
// Needs to be disabled so we get the result.
closeAutomatically = false
// file:// can't be used with Scoped Storage anymore.
startActivityForResult(
Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = "*/*"
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val primary = str.substring(
SCHEME_FILE.length
).localDirName() ?: Environment.getExternalStorageDirectory().path
putExtra(
DocumentsContract.EXTRA_INITIAL_URI,
DocumentsContract.buildDocumentUri(
"com.android.externalstorage.documents",
"primary:$primary"
)
)
}
},
OPEN_DOCUMENT
)
return true
}
private fun askForFileNameAndSave(raw: ByteArray) {
val ac = activity ?: return
// Write permission is only required before Android Q.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
!ac.hasWritePermission { askForFileNameAndSave(raw) }
!hasWritePermission { askForFileNameAndSave(raw) }
) {
return
}
scope.launch(Dispatchers.Main) {
val name = ac.askForFileName() ?: return@launch
val name = askForFileName() ?: return@launch
withContext(Dispatchers.IO) {
val message = ac.writeExternalFile(
val message = writeExternalFile(
name,
"application/octet-stream"
) {
it.write(raw)
}.toSaveResult()
withContext(Dispatchers.Main) {
ac.toast(message)
toast(message)
}
}
}
}
companion object {
private const val SCAN = "scan"
const val DECODED_SCAN = "decoded_scan"
const val DECODED = "decoded"
private const val SCAN_BUNDLE = "scan_bundle"
private const val OPEN_DOCUMENT = 1
private const val SCHEME_FILE = "file://"
fun newInstance(scan: Scan): Fragment {
fun newIntent(context: Context, scan: Scan): Intent {
val args = Bundle()
args.putParcelable(SCAN, scan)
val fragment = DecodeFragment()
fragment.arguments = args
return fragment
args.putBundle(SCAN_BUNDLE, scan.toBundle())
return Intent(context, DecodeActivity::class.java).apply {
putExtra(DECODED_SCAN, true)
putExtras(args)
}
}
}
}
@@ -611,7 +743,7 @@ private fun generateDpTrackingLink(bytes: ByteArray, format: String): String? {
// Check for Deutsche Post Matrixcode stamp.
var isStamp = false
var rawData = bytes
if (format == "DATA_MATRIX" &&
if (format == ZxingCpp.BarcodeFormat.DataMatrix.name &&
bytes.toString(Charsets.ISO_8859_1).startsWith("DEA5")
) {
if (bytes.size == 47) {
@@ -683,17 +815,23 @@ private fun String.fromHtml() = if (
Html.fromHtml(this)
}
private fun ByteArray.md5(): ByteArray = MessageDigest.getInstance("MD5").run {
private fun ByteArray.md5(): ByteArray = MessageDigest.getInstance(
"MD5"
).run {
update(this@md5)
digest()
}
private fun ByteArray.sha1(): ByteArray = MessageDigest.getInstance("SHA-1").run {
private fun ByteArray.sha1(): ByteArray = MessageDigest.getInstance(
"SHA-1"
).run {
update(this@sha1)
digest()
}
private fun ByteArray.sha256(): ByteArray = MessageDigest.getInstance("SHA-256").run {
private fun ByteArray.sha256(): ByteArray = MessageDigest.getInstance(
"SHA-256"
).run {
update(this@sha256)
digest()
}
@@ -714,3 +852,22 @@ private fun String.fold(): CharSequence {
this
}
}
private fun String.localDirName(): String? = when {
endsWith("/") -> this
else -> File(this).parentFile?.absolutePath
}?.replaceFirst(Regex("^/storage/emulated/0/"), "")
?.replaceFirst(Regex("^/sdcard/"), "")
?.trim('/')
private fun Activity.openPickedFile(uri: Uri) {
startActivity(
Intent.createChooser(
Intent(Intent.ACTION_VIEW).apply {
setDataAndType(uri, contentResolver.getType(uri) ?: "*/*")
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
},
getString(R.string.open_url)
)
)
}
@@ -1,12 +1,9 @@
package de.markusfisch.android.binaryeye.fragment
package de.markusfisch.android.binaryeye.activity
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.SwitchCompat
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
@@ -18,10 +15,12 @@ import android.widget.CheckBox
import android.widget.EditText
import android.widget.Spinner
import android.widget.TextView
import androidx.appcompat.widget.SwitchCompat
import androidx.core.net.toUri
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
import de.markusfisch.android.binaryeye.app.addFragment
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.net.isEncodeDeeplink
import de.markusfisch.android.binaryeye.text.unescape
import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
@@ -30,7 +29,8 @@ import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
import java.io.InputStream
import kotlin.math.min
class EncodeFragment : Fragment() {
class EncodeActivity : ScreenActivity() {
private lateinit var formatView: Spinner
private lateinit var ecLabel: TextView
private lateinit var ecSpinner: Spinner
@@ -40,21 +40,35 @@ class EncodeFragment : Fragment() {
private lateinit var contentView: EditText
private lateinit var unescapeCheckBox: CheckBox
private val formats = arrayListOf(
BarcodeFormat.AZTEC,
BarcodeFormat.CODABAR,
BarcodeFormat.CODE_39,
BarcodeFormat.CODE_128,
BarcodeFormat.DATA_MATRIX,
BarcodeFormat.EAN_8,
BarcodeFormat.EAN_13,
private val writeableFormats = arrayListOf(
BarcodeFormat.Aztec,
BarcodeFormat.Codabar,
BarcodeFormat.Code39,
BarcodeFormat.Code39Ext,
BarcodeFormat.Code32,
BarcodeFormat.PZN,
BarcodeFormat.Code93,
BarcodeFormat.Code128,
BarcodeFormat.DataBar,
BarcodeFormat.DataBarOmni,
BarcodeFormat.DataBarStk,
BarcodeFormat.DataBarLtd,
BarcodeFormat.DataBarExp,
BarcodeFormat.DataBarExpStk,
BarcodeFormat.DataMatrix,
BarcodeFormat.DXFilmEdge,
BarcodeFormat.EAN8,
BarcodeFormat.EAN13,
BarcodeFormat.ITF,
BarcodeFormat.PDF_417,
BarcodeFormat.QR_CODE,
BarcodeFormat.UPC_A
BarcodeFormat.MaxiCode,
BarcodeFormat.PDF417,
BarcodeFormat.QRCode,
BarcodeFormat.MicroQRCode,
BarcodeFormat.RMQRCode,
BarcodeFormat.UPCA,
BarcodeFormat.UPCE,
)
private var minMargin = 0
private var bytes: ByteArray? = null
override fun onActivityResult(
@@ -62,16 +76,16 @@ class EncodeFragment : Fragment() {
resultCode: Int,
resultData: Intent?
) {
super.onActivityResult(requestCode, resultCode, resultData)
when (requestCode) {
PICK_FILE_RESULT_CODE -> {
if (resultCode == Activity.RESULT_OK &&
resultData != null &&
resultData.data != null
) {
val ac = activity ?: return
ac.hideSoftKeyboard(contentView)
hideSoftKeyboard(contentView)
val uri = resultData.data ?: return
bytes = ac.contentResolver?.openInputStream(uri)?.use {
bytes = contentResolver?.openInputStream(uri)?.use {
it.readBytesMax(4096)
} ?: return
setEncodeByteArray()
@@ -82,28 +96,20 @@ class EncodeFragment : Fragment() {
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setHasOptionsMenu(true)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
state: Bundle?
): View? {
val ac = activity ?: return null
ac.setTitle(R.string.compose_barcode)
val view = inflater.inflate(
setTitle(R.string.compose_barcode)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(
R.layout.fragment_encode,
container,
frame,
false
)
frame.addView(view)
formatView = view.findViewById(R.id.format)
val formatAdapter = ArrayAdapter(
ac,
this,
android.R.layout.simple_spinner_item,
formats.map { prettifyFormatName(it.name) }
writeableFormats.map { it.name.prettifyFormatName() }
)
formatAdapter.setDropDownViewResource(
android.R.layout.simple_spinner_dropdown_item
@@ -116,11 +122,13 @@ class EncodeFragment : Fragment() {
position: Int,
id: Long
) {
val format = formats[position]
val format = writeableFormats[position]
val arrayId = when (format) {
BarcodeFormat.AZTEC -> R.array.aztec_error_correction_levels
BarcodeFormat.QR_CODE -> R.array.qr_error_correction_levels
BarcodeFormat.PDF_417 -> R.array.pdf417_error_correction_levels
BarcodeFormat.Aztec -> R.array.aztec_error_correction_levels
BarcodeFormat.QRCode -> R.array.qr_error_correction_levels
BarcodeFormat.MicroQRCode -> R.array.mqr_error_correction_levels
BarcodeFormat.RMQRCode -> R.array.rmqr_error_correction_levels
BarcodeFormat.PDF417 -> R.array.pdf417_error_correction_levels
else -> 0
}
if (arrayId > 0) {
@@ -138,14 +146,6 @@ class EncodeFragment : Fragment() {
format.canBeInverted().setVisibilityFor(
colorsLabel, colorsSpinner
)
when (format) {
BarcodeFormat.AZTEC,
BarcodeFormat.DATA_MATRIX,
BarcodeFormat.QR_CODE,
BarcodeFormat.PDF_417 -> true
else -> false
}.setVisibilityFor(addQuietZoneSwitch)
}
override fun onNothingSelected(parentView: AdapterView<*>?) {}
@@ -160,7 +160,7 @@ class EncodeFragment : Fragment() {
position: Int,
id: Long
) {
val format = formats[formatView.selectedItemPosition]
val format = writeableFormats[formatView.selectedItemPosition]
prefs.indexOfLastSelectedEcLevel = format.packEcLevel(
prefs.indexOfLastSelectedEcLevel,
position
@@ -173,24 +173,28 @@ class EncodeFragment : Fragment() {
colorsLabel = view.findViewById(R.id.colors_label)
colorsSpinner = view.findViewById(R.id.colors)
addQuietZoneSwitch = view.findViewById(R.id.add_quiet_zone)
addQuietZoneSwitch.isChecked = prefs.addQuietZone
contentView = view.findViewById(R.id.content)
unescapeCheckBox = view.findViewById(R.id.unescape)
unescapeCheckBox.isChecked = prefs.expandEscapeSequences
val args = arguments
var complete = false
val args = intent?.extras ?: getExtrasFromDeeplink()
args?.getString(CONTENT_TEXT)?.let {
contentView.setText(it)
complete = it.isNotEmpty()
}
args?.getByteArray(CONTENT_RAW)?.let {
bytes = it
complete = it.isNotEmpty()
setEncodeByteArray()
}
val barcodeFormat = args?.getString(FORMAT)
if (barcodeFormat != null) {
formatView.setSelection(
formats.indexOf(barcodeFormat.toFormat())
writeableFormats.indexOf(barcodeFormat.toFormat())
)
} else if (state == null) {
formatView.post {
@@ -205,7 +209,15 @@ class EncodeFragment : Fragment() {
view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
view.findViewById<View>(R.id.scroll_view).setPaddingFromWindowInsets()
return view
if (complete &&
args?.getBoolean(EXECUTE, false) == true
) {
view.post {
val content = view.context.getContent() ?: return@post
startActivity(newBarcodeIntent(content))
finish()
}
}
}
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -235,31 +247,32 @@ class EncodeFragment : Fragment() {
super.onPause()
prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
prefs.expandEscapeSequences = unescapeCheckBox.isChecked
prefs.addQuietZone = addQuietZoneSwitch.isChecked
}
private fun Context.encode() {
hideSoftKeyboard(contentView)
val content = getContent() ?: return
val format = formats[formatView.selectedItemPosition]
fragmentManager?.addFragment(
BarcodeFragment.newInstance(
content,
format,
format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
when (format) {
BarcodeFormat.AZTEC,
BarcodeFormat.DATA_MATRIX,
BarcodeFormat.QR_CODE,
BarcodeFormat.PDF_417 -> if (
addQuietZoneSwitch.isChecked
) 1 else 0
contentView.post {
startActivity(newBarcodeIntent(content))
}
}
else -> -1
},
if (format.canBeInverted()) {
colorsSpinner.selectedItemPosition
} else 0
)
private fun newBarcodeIntent(content: Any): Intent {
val format = writeableFormats[formatView.selectedItemPosition]
return BarcodeActivity.newIntent(
this,
content,
format,
format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
if (addQuietZoneSwitch.isChecked) {
1
} else {
0
},
if (format.canBeInverted()) {
colorsSpinner.selectedItemPosition
} else 0
)
}
@@ -298,16 +311,41 @@ class EncodeFragment : Fragment() {
unescapeCheckBox.isEnabled = false
}
private fun getExtrasFromDeeplink(): Bundle? {
val data = intent?.dataString ?: return null
if (!isEncodeDeeplink(data)) {
return null
}
val uri = data.toUri()
return Bundle().apply {
uri.getQueryParameter("content")?.let {
putString(CONTENT_TEXT, it)
}
uri.getQueryParameter("format")?.let {
putString(FORMAT, it)
}
putBoolean(
EXECUTE,
uri.getQueryParameter("execute").let {
it == "" || it?.toBoolean() == true
}
)
}
}
companion object {
private const val CONTENT_TEXT = "content_text"
private const val CONTENT_RAW = "content_raw"
private const val FORMAT = "format"
private const val EXECUTE = "execute"
private const val PICK_FILE_RESULT_CODE = 1
fun <T> newInstance(
fun <T> newIntent(
context: Context,
content: T? = null,
format: String? = null
): Fragment {
format: String? = null,
execute: Boolean = false
): Intent {
val args = Bundle()
content?.let {
when (content) {
@@ -317,11 +355,12 @@ class EncodeFragment : Fragment() {
"content must be a String or a ByteArray"
)
}
args.putBoolean(EXECUTE, execute)
}
format?.let { args.putString(FORMAT, it) }
val fragment = EncodeFragment()
fragment.arguments = args
return fragment
return Intent(context, EncodeActivity::class.java).apply {
putExtras(args)
}
}
}
}
@@ -342,30 +381,39 @@ private fun BarcodeFormat.unpackEcLevel(packed: Int) =
(packed shr ecLevelShift()) and 15
private fun BarcodeFormat.ecLevelShift() = when (this) {
BarcodeFormat.AZTEC -> 0
BarcodeFormat.QR_CODE -> 4
BarcodeFormat.PDF_417 -> 8
BarcodeFormat.Aztec -> 0
BarcodeFormat.QRCode -> 4
BarcodeFormat.MicroQRCode -> 3
BarcodeFormat.RMQRCode -> 2
BarcodeFormat.PDF417 -> 8
else -> throw IllegalArgumentException("$this does not have error levels")
}
private fun BarcodeFormat.canBeInverted() = when (this) {
BarcodeFormat.AZTEC,
BarcodeFormat.DATA_MATRIX,
BarcodeFormat.QR_CODE -> true
BarcodeFormat.Aztec,
BarcodeFormat.DataMatrix,
BarcodeFormat.QRCode,
BarcodeFormat.MicroQRCode,
BarcodeFormat.RMQRCode -> true
else -> false
}
private fun String.toFormat(default: BarcodeFormat = BarcodeFormat.QR_CODE): BarcodeFormat = try {
private fun String.toFormat(
default: BarcodeFormat = BarcodeFormat.QRCode
): BarcodeFormat = try {
BarcodeFormat.valueOf(this)
} catch (_: IllegalArgumentException) {
default
}
private fun BarcodeFormat.getErrorCorrectionLevel(position: Int) = when (this) {
BarcodeFormat.AZTEC -> position
BarcodeFormat.QR_CODE -> (position + 1) * 2
BarcodeFormat.PDF_417 -> position
BarcodeFormat.Aztec -> position
BarcodeFormat.QRCode,
BarcodeFormat.MicroQRCode -> (position + 1) * 2
BarcodeFormat.RMQRCode -> (position + 1) * 4
BarcodeFormat.PDF417 -> position
else -> 0
}.coerceIn(0, 8)
@@ -1,4 +1,4 @@
package de.markusfisch.android.binaryeye.fragment
package de.markusfisch.android.binaryeye.activity
import android.annotation.SuppressLint
import android.app.AlertDialog
@@ -8,13 +8,6 @@ import android.database.Cursor
import android.os.Build
import android.os.Bundle
import android.os.Parcelable
import android.support.v4.app.ActivityCompat
import android.support.v4.app.Fragment
import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity
import android.support.v7.view.ActionMode
import android.support.v7.widget.SearchView
import android.support.v7.widget.SwitchCompat
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
@@ -23,9 +16,12 @@ import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import android.widget.ListView
import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.SwitchCompat
import androidx.core.content.ContextCompat
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.adapter.ScansAdapter
import de.markusfisch.android.binaryeye.app.addFragment
import de.markusfisch.android.binaryeye.app.alertDialog
import de.markusfisch.android.binaryeye.app.db
import de.markusfisch.android.binaryeye.app.hasWritePermission
@@ -38,7 +34,6 @@ import de.markusfisch.android.binaryeye.database.Database
import de.markusfisch.android.binaryeye.database.exportCsv
import de.markusfisch.android.binaryeye.database.exportDatabase
import de.markusfisch.android.binaryeye.database.exportJson
import de.markusfisch.android.binaryeye.database.use
import de.markusfisch.android.binaryeye.io.askForFileName
import de.markusfisch.android.binaryeye.io.toSaveResult
import de.markusfisch.android.binaryeye.view.lockStatusBarColor
@@ -53,7 +48,7 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
class HistoryFragment : Fragment() {
class HistoryActivity : ScreenActivity() {
private lateinit var useHistorySwitch: SwitchCompat
private lateinit var listView: ListView
private lateinit var fab: View
@@ -70,12 +65,10 @@ class HistoryFragment : Fragment() {
R.menu.fragment_history_edit,
menu
)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
// SDK35+ doesn't draw a status bar background anymore.
Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM
) {
// SDK35+ doesn't draw a status bar background anymore.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
lockStatusBarColor()
val ac = activity ?: return false
val ac = this@HistoryActivity
@Suppress("DEPRECATION")
ac.window.statusBarColor = ContextCompat.getColor(
ac,
@@ -96,7 +89,7 @@ class HistoryFragment : Fragment() {
mode: ActionMode,
item: MenuItem
): Boolean {
val ac = activity ?: return false
val ac = this@HistoryActivity
return when (item.itemId) {
R.id.copy_scan -> {
scansAdapter?.getSelectedContent("\n")?.let {
@@ -148,22 +141,10 @@ class HistoryFragment : Fragment() {
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setHasOptionsMenu(true)
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
state: Bundle?
): View? {
val ac = activity ?: return null
ac.setTitle(R.string.history)
val view = inflater.inflate(
R.layout.fragment_history,
container,
false
)
setTitle(R.string.history)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(R.layout.fragment_history, frame, false)
frame.addView(view)
useHistorySwitch = view.findViewById(
R.id.use_history
@@ -180,8 +161,8 @@ class HistoryFragment : Fragment() {
}
listView.setOnItemLongClickListener { _, v, position, id ->
scansAdapter?.select(v, id, position)
if (actionMode == null && ac is AppCompatActivity) {
actionMode = ac.delegate.startSupportActionMode(
if (actionMode == null) {
actionMode = delegate.startSupportActionMode(
actionModeCallback
)
}
@@ -198,10 +179,6 @@ class HistoryFragment : Fragment() {
view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
listView.setPaddingFromWindowInsets()
update()
return view
}
override fun onDestroy() {
@@ -211,6 +188,11 @@ class HistoryFragment : Fragment() {
wipeLastShareFile()
}
override fun onResume() {
super.onResume()
update()
}
override fun onPause() {
super.onPause()
listViewState = listView.onSaveInstanceState()
@@ -235,35 +217,31 @@ class HistoryFragment : Fragment() {
private fun initSearchView(item: MenuItem?) {
item ?: return
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
item.isVisible = false
} else {
val ac = activity ?: return
val searchView = item.actionView as SearchView
val searchManager = ac.getSystemService(
Context.SEARCH_SERVICE
) as SearchManager
searchView.setSearchableInfo(
searchManager.getSearchableInfo(ac.componentName)
)
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String): Boolean {
update(query)
return false
}
val ac = this
val searchView = item.actionView as SearchView
val searchManager = ac.getSystemService(
Context.SEARCH_SERVICE
) as SearchManager
searchView.setSearchableInfo(
searchManager.getSearchableInfo(ac.componentName)
)
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String): Boolean {
update(query)
return false
}
override fun onQueryTextChange(query: String): Boolean {
update(query)
return false
}
})
}
override fun onQueryTextChange(query: String): Boolean {
update(query)
return false
}
})
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.clear -> {
context.askToRemoveScans()
this.askToRemoveScans()
true
}
@@ -273,7 +251,7 @@ class HistoryFragment : Fragment() {
}
R.id.share_as_file -> {
context.pickListSeparatorAndShare(true)
this.pickListSeparatorAndShare(true)
true
}
@@ -300,13 +278,13 @@ class HistoryFragment : Fragment() {
scope.launch {
val cursor = db.getScans(filter)
withContext(Dispatchers.Main) {
val ac = activity ?: return@withContext
val ac = this@HistoryActivity
val hasScans = cursor.count > 0
if (filter == null) {
if (!hasScans) {
listView.emptyView = useHistorySwitch
}
ActivityCompat.invalidateOptionsMenu(ac)
ac.invalidateOptionsMenu()
}
enableMenuItems(hasScans)
fab.visibility = if (hasScans) {
@@ -344,8 +322,8 @@ class HistoryFragment : Fragment() {
private fun showScan(id: Long) = db.getScan(id)?.also { scan ->
closeActionMode()
try {
fragmentManager?.addFragment(DecodeFragment.newInstance(scan))
} catch (e: IllegalArgumentException) {
startActivity(DecodeActivity.newIntent(this, scan))
} catch (_: IllegalArgumentException) {
// Ignore, can never happen.
}
}
@@ -418,7 +396,7 @@ class HistoryFragment : Fragment() {
private fun askToExportToFile() {
scope.launch {
val ac = activity ?: return@launch
val ac = this@HistoryActivity
progressView.useVisibility {
// Write permission is only required before Android Q.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
@@ -490,12 +468,12 @@ class HistoryFragment : Fragment() {
text?.let {
withContext(Dispatchers.Main) {
if (asFile) {
context.shareAsFile(
this@HistoryActivity.shareAsFile(
it,
String.format("scans.%s", ext)
)
} else {
context.shareText(it)
this@HistoryActivity.shareText(it)
}
}
}
@@ -506,7 +484,7 @@ class HistoryFragment : Fragment() {
private fun Cursor.exportText(separator: String): String {
val sb = StringBuilder()
val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
val contentIndex = getColumnIndex(Database.SCANS_TEXT)
if (contentIndex > -1 && moveToFirst()) {
do {
val content = getString(contentIndex)
@@ -1,143 +0,0 @@
package de.markusfisch.android.binaryeye.activity
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.app.AppCompatActivity
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.PERMISSION_LOCATION
import de.markusfisch.android.binaryeye.app.PERMISSION_WRITE
import de.markusfisch.android.binaryeye.app.applyLocale
import de.markusfisch.android.binaryeye.app.permissionGrantedCallback
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.app.setFragment
import de.markusfisch.android.binaryeye.database.Scan
import de.markusfisch.android.binaryeye.fragment.DecodeFragment
import de.markusfisch.android.binaryeye.fragment.EncodeFragment
import de.markusfisch.android.binaryeye.fragment.HistoryFragment
import de.markusfisch.android.binaryeye.fragment.PreferencesFragment
import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
import de.markusfisch.android.binaryeye.view.initBars
class MainActivity : AppCompatActivity() {
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<String>,
grantResults: IntArray
) {
when (requestCode) {
PERMISSION_LOCATION, PERMISSION_WRITE -> if (grantResults.isNotEmpty() &&
grantResults[0] == PackageManager.PERMISSION_GRANTED
) {
permissionGrantedCallback?.invoke()
permissionGrantedCallback = null
}
}
}
override fun onSupportNavigateUp(): Boolean {
val fm = supportFragmentManager
if (fm != null && fm.backStackEntryCount > 0) {
fm.popBackStack()
} else {
finish()
}
return true
}
override fun attachBaseContext(base: Context?) {
base?.applyLocale(prefs.customLocale)
super.attachBaseContext(base)
}
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setContentView(R.layout.activity_main)
initBars()
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportFragmentManager.addOnBackStackChangedListener {
colorSystemAndToolBars(this@MainActivity)
}
if (state == null) {
supportFragmentManager?.setFragment(getFragmentForIntent(intent))
}
}
companion object {
private const val PREFERENCES = "preferences"
private const val HISTORY = "history"
private const val ENCODE = "encode"
const val DECODED = "decoded"
private fun getFragmentForIntent(intent: Intent?): Fragment {
intent ?: return PreferencesFragment()
return when {
intent.hasExtra(PREFERENCES) -> PreferencesFragment()
intent.hasExtra(HISTORY) -> HistoryFragment()
intent.hasExtra(ENCODE) -> EncodeFragment.newInstance(
intent.getStringExtra(ENCODE)
)
intent.hasExtra(DECODED) -> intent.getScanExtra(DECODED)?.let {
DecodeFragment.newInstance(it)
} ?: DecodeFragment()
else -> PreferencesFragment()
}
}
fun getPreferencesIntent(context: Context): Intent {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra(PREFERENCES, true)
return intent
}
fun getHistoryIntent(context: Context): Intent {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra(HISTORY, true)
return intent
}
fun getEncodeIntent(
context: Context,
text: String? = "",
isExternal: Boolean = false
): Intent {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra(ENCODE, text)
if (isExternal) {
val flagActivityClearTask =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
Intent.FLAG_ACTIVITY_CLEAR_TASK
} else 0
intent.addFlags(
Intent.FLAG_ACTIVITY_NO_HISTORY or
flagActivityClearTask or
Intent.FLAG_ACTIVITY_NEW_TASK
)
}
return intent
}
fun getDecodeIntent(context: Context, scan: Scan): Intent {
val intent = Intent(context, MainActivity::class.java)
intent.putExtra(DECODED, scan)
return intent
}
}
}
private fun Intent.getScanExtra(name: String): Scan? = if (
Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
) {
@Suppress("DEPRECATION")
getParcelableExtra(name)
} else {
getParcelableExtra(name, Scan::class.java)
}
@@ -1,43 +1,39 @@
package de.markusfisch.android.binaryeye.fragment
package de.markusfisch.android.binaryeye.activity
import android.content.Context
import android.net.wifi.WifiManager
import android.net.wifi.WifiNetworkSuggestion
import android.os.Build
import android.os.Bundle
import android.support.annotation.RequiresApi
import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.ListView
import androidx.annotation.RequiresApi
import androidx.core.util.size
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
import de.markusfisch.android.binaryeye.view.systemBarListViewScrollListener
import de.markusfisch.android.binaryeye.widget.toast
class NetworkSuggestionsFragment : Fragment() {
class NetworkSuggestionsActivity : ScreenActivity() {
@RequiresApi(Build.VERSION_CODES.R)
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
state: Bundle?
): View? {
val ac = activity ?: return null
ac.setTitle(R.string.network_suggestions)
val view = inflater.inflate(
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setTitle(R.string.network_suggestions)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(
R.layout.fragment_network_suggestions,
container,
frame,
false
)
frame.addView(view)
val wm = ac.applicationContext.getSystemService(
val wm = applicationContext.getSystemService(
Context.WIFI_SERVICE
) as WifiManager
val suggestionArrayAdapter = ArrayAdapter(
ac,
this,
android.R.layout.simple_list_item_checked,
wm.networkSuggestions.map {
Suggestion(
@@ -58,7 +54,7 @@ class NetworkSuggestionsFragment : Fragment() {
val removeList = ArrayList<WifiNetworkSuggestion>()
val removeFromAdapter = ArrayList<Suggestion>()
val checked = listView.checkedItemPositions
val size = checked.size()
val size = checked.size
for (i in 0 until size) {
if (checked.valueAt(i)) {
val pos = checked.keyAt(i)
@@ -76,13 +72,11 @@ class NetworkSuggestionsFragment : Fragment() {
}
wm.removeNetworkSuggestions(removeList)
} else {
ac.toast(
toast(
R.string.clear_network_suggestions_nothing_to_remove
)
}
}
return view
}
}
@@ -9,9 +9,10 @@ import android.graphics.RectF
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.applyLocale
import de.markusfisch.android.binaryeye.app.prefs
@@ -49,15 +50,13 @@ class PickActivity : AppCompatActivity() {
tryRotate = true,
tryInvert = true,
tryDownscale = true,
returnCodabarStartEnd = true,
maxNumberOfSymbols = 1,
formats = prefs.barcodeFormats.toFormatSet()
)
private lateinit var cropImageView: CropImageView
private lateinit var detectorView: DetectorView
private lateinit var freeRotationItem: MenuItem
private var cropImageView: CropImageView? = null
private var detectorView: DetectorView? = null
private var freeRotationItem: MenuItem? = null
private var result: Result? = null
override fun attachBaseContext(base: Context?) {
@@ -74,7 +73,6 @@ class PickActivity : AppCompatActivity() {
setTitle(R.string.pick_code_to_scan)
initBars()
supportFragmentManager.addOnBackStackChangedListener {
colorSystemAndToolBars(this@PickActivity)
}
@@ -83,25 +81,36 @@ class PickActivity : AppCompatActivity() {
if (bitmap == null) {
applicationContext.toast(R.string.error_no_content)
finish()
// This is why cropImageView and detectorView aren't lateinit.
// If they were, a kotlin.UninitializedPropertyAccessException
// would happen here.
return
}
cropImageView = findViewById(R.id.image) as CropImageView
cropImageView.restrictTranslation = false
cropImageView.freeRotation = prefs.freeRotation
cropImageView.setImageBitmap(bitmap)
cropImageView.onScan = {
scanWithinBounds(bitmap)
cropImageView = (findViewById(R.id.image) as CropImageView).apply {
restrictTranslation = false
freeRotation = prefs.freeRotation
setImageBitmap(bitmap)
onScan = {
scanWithinBounds(bitmap)
}
runAfterLayout = {
minWidth = min(
minWidth / 2f,
max(bitmap.width, bitmap.height).toFloat()
)
}
}
detectorView = findViewById(R.id.detector_view) as DetectorView
detectorView.onRoiChanged = {
scanWithinBounds(bitmap)
detectorView = (findViewById(R.id.detector_view) as DetectorView).apply {
onRoiChanged = {
scanWithinBounds(bitmap)
}
setPaddingFromWindowInsets()
cropHandleName = "picker_crop_handle"
}
detectorView.setPaddingFromWindowInsets()
detectorView.restoreCropHandlePos()
findViewById(R.id.scan).setOnClickListener {
findViewById<View>(R.id.scan).setOnClickListener {
showResult()
}
}
@@ -121,17 +130,19 @@ class PickActivity : AppCompatActivity() {
}
private fun scanWithinBounds(bitmap: Bitmap) {
val dv = detectorView ?: return
val civ = cropImageView ?: return
val viewRoi = Rect(
if (detectorView.roi.width() < 1) {
cropImageView.getBoundsRect()
if (dv.roi.width() < 1) {
civ.getBoundsRect()
} else {
detectorView.roi
dv.roi
}
)
val mappedRect = RectF(cropImageView.mappedRect)
val imageRotation = cropImageView.imageRotation
val pivotX = cropImageView.pivotX
val pivotY = cropImageView.pivotY
val mappedRect = RectF(civ.mappedRect)
val imageRotation = civ.imageRotation
val pivotX = civ.pivotX
val pivotY = civ.pivotY
scope.launch {
val cropped = bitmap.crop(
getNormalizedRoi(mappedRect, viewRoi),
@@ -162,10 +173,10 @@ class PickActivity : AppCompatActivity() {
}
result = it
scanFeedback()
detectorView.update(
dv.update(
matrix.mapPosition(
it.position,
detectorView.coordinates
dv.coordinates
)
)
}
@@ -195,7 +206,7 @@ class PickActivity : AppCompatActivity() {
override fun onDestroy() {
super.onDestroy()
detectorView.saveCropHandlePos()
detectorView?.storeCropHandlePos()
parentJob.cancel()
releaseToneGenerators()
}
@@ -217,8 +228,8 @@ class PickActivity : AppCompatActivity() {
R.id.toggle_free -> {
prefs.freeRotation = prefs.freeRotation xor true
cropImageView.freeRotation = prefs.freeRotation
freeRotationItem.updateFreeRotationIcon()
cropImageView?.freeRotation = prefs.freeRotation
freeRotationItem?.updateFreeRotationIcon()
true
}
@@ -237,7 +248,8 @@ class PickActivity : AppCompatActivity() {
}
private fun rotateClockwise() {
cropImageView.imageRotation = (cropImageView.imageRotation + 90) % 360
val civ = cropImageView ?: return
civ.imageRotation = (civ.imageRotation + 90) % 360
}
private fun loadSentImage(intent: Intent): Bitmap? {
@@ -0,0 +1,34 @@
package de.markusfisch.android.binaryeye.activity
import android.content.Context
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.applyLocale
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.fragment.PreferencesFragment
import de.markusfisch.android.binaryeye.view.initBars
class PreferencesActivity : AppCompatActivity() {
override fun attachBaseContext(base: Context?) {
base?.applyLocale(prefs.customLocale)
super.attachBaseContext(base)
}
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setContentView(R.layout.activity_main)
initBars()
supportActionBar?.setDisplayHomeAsUpEnabled(true)
if (state == null) {
supportFragmentManager.beginTransaction()
.replace(R.id.content_frame, PreferencesFragment())
.commit()
}
}
override fun onSupportNavigateUp(): Boolean {
finish()
return true
}
}
@@ -0,0 +1,169 @@
package de.markusfisch.android.binaryeye.activity
import android.app.AlertDialog
import android.content.Context
import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import android.widget.ArrayAdapter
import android.widget.EditText
import android.widget.ListView
import android.widget.TextView
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
import de.markusfisch.android.binaryeye.view.systemBarListViewScrollListener
import de.markusfisch.android.binaryeye.widget.toast
class ProfilesActivity : ScreenActivity() {
private val profiles = ArrayList<ProfileItem>()
private lateinit var adapter: ProfilesAdapter
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setTitle(R.string.profile)
val frame = findViewById(R.id.content_frame) as ViewGroup
val view = layoutInflater.inflate(
R.layout.fragment_profiles,
frame,
false
)
frame.addView(view)
refreshProfiles()
val listView = view.findViewById<ListView>(R.id.profiles)
listView.emptyView = view.findViewById(R.id.no_profiles)
adapter = ProfilesAdapter(this, profiles)
listView.adapter = adapter
listView.setOnScrollListener(systemBarListViewScrollListener)
listView.setOnItemClickListener { _, _, position, _ ->
selectProfile(position)
}
listView.setOnItemLongClickListener { _, _, position, _ ->
confirmRemoveProfile(position)
true
}
view.findViewById<View>(R.id.add).setOnClickListener {
addProfile()
}
view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
listView.setPaddingFromWindowInsets()
}
private fun refreshProfiles() {
profiles.clear()
profiles.add(
ProfileItem(
null,
getString(R.string.profile_default)
)
)
prefs.profiles.forEach { name ->
profiles.add(ProfileItem(name, name))
}
if (this::adapter.isInitialized) {
adapter.notifyDataSetChanged()
}
}
private fun selectProfile(position: Int) {
val profile = profiles[position].name
if (prefs.profile == profile) {
return
}
prefs.load(this, profile)
adapter.notifyDataSetChanged()
}
// Dialogs do not have a parent view.
@Suppress("InflateParams")
private fun addProfile() {
val view = layoutInflater.inflate(
R.layout.dialog_profile_name, null
)
val editText = view.findViewById<EditText>(R.id.name)
AlertDialog.Builder(this)
.setView(view)
.setPositiveButton(android.R.string.ok) { _, _ ->
val name = editText.text.toString().trim()
if (name.isNotEmpty() && prefs.addProfile(name)) {
prefs.load(this, name)
refreshProfiles()
} else {
toast(R.string.profile_invalid_name)
}
}
.show()
}
private fun confirmRemoveProfile(position: Int) {
val profile = profiles[position]
val profileName = profile.name ?: return
AlertDialog.Builder(this)
.setMessage(R.string.profile_remove_confirm)
.setPositiveButton(android.R.string.ok) { _, _ ->
val isCurrent = prefs.profile == profileName
prefs.removeProfile(profileName)
if (isCurrent) {
prefs.load(this, null)
}
refreshProfiles()
}
.setNegativeButton(android.R.string.cancel) { _, _ -> }
.show()
}
private class ProfilesAdapter(
context: Context,
private val items: List<ProfileItem>
) : ArrayAdapter<ProfileItem>(
context,
android.R.layout.simple_list_item_2,
android.R.id.text1,
items
) {
override fun getView(
position: Int,
convertView: View?,
parent: ViewGroup
): View {
val view = super.getView(position, convertView, parent)
val item = items[position]
val isCurrent = item.name == prefs.profile
getViewHolder(view).apply {
title.text = item.label
if (isCurrent) {
subtitle.text = context.getString(R.string.profile_current)
subtitle.visibility = View.VISIBLE
} else {
subtitle.text = ""
subtitle.visibility = View.GONE
}
}
return view
}
private fun getViewHolder(
view: View
): ViewHolder = view.tag as ViewHolder? ?: ViewHolder(
view.findViewById(android.R.id.text1),
view.findViewById(android.R.id.text2),
).also {
view.tag = it
}
private data class ViewHolder(
val title: TextView,
val subtitle: TextView,
)
}
}
private data class ProfileItem(
val name: String?,
val label: String
)
@@ -0,0 +1,68 @@
package de.markusfisch.android.binaryeye.activity
import android.content.Context
import android.content.pm.PackageManager
import android.os.Bundle
import android.view.Menu
import android.view.MenuInflater
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.isNotEmpty
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.PERMISSION_LOCATION
import de.markusfisch.android.binaryeye.app.PERMISSION_WRITE
import de.markusfisch.android.binaryeye.app.applyLocale
import de.markusfisch.android.binaryeye.app.permissionGrantedCallback
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.view.initBars
abstract class ScreenActivity : AppCompatActivity() {
override fun attachBaseContext(base: Context?) {
base?.applyLocale(prefs.customLocale)
super.attachBaseContext(base)
}
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setContentView(R.layout.activity_main)
initBars()
supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
override fun onSupportNavigateUp(): Boolean {
finish()
return true
}
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<String>,
grantResults: IntArray
) {
super.onRequestPermissionsResult(
requestCode,
permissions,
grantResults
)
when (requestCode) {
PERMISSION_LOCATION, PERMISSION_WRITE -> {
if (grantResults.isNotEmpty() &&
grantResults[0] == PackageManager.PERMISSION_GRANTED
) {
permissionGrantedCallback?.invoke()
permissionGrantedCallback = null
}
}
}
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
onCreateOptionsMenu(menu, menuInflater)
return menu.isNotEmpty() || super.onCreateOptionsMenu(menu)
}
protected open fun onCreateOptionsMenu(
menu: Menu,
inflater: MenuInflater
) {
}
}
@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.activity
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
class SplashActivity : AppCompatActivity() {
override fun onCreate(state: Bundle?) {
@@ -0,0 +1,33 @@
package de.markusfisch.android.binaryeye.activity
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.prefs
class WelcomeActivity : AppCompatActivity() {
override fun onCreate(state: Bundle?) {
super.onCreate(state)
setContentView(R.layout.activity_welcome)
findViewById<View>(R.id.expert).setOnClickListener {
finish()
}
findViewById<View>(R.id.simple).setOnClickListener {
prefs.apply {
showCropHandle = false
zoomBySwiping = false
beep = true
copyImmediately = true
openImmediately = true
showMetaData = false
showHexDump = false
defaultSearchUrl = "https://www.google.com/search?q="
openWithUrl = defaultSearchUrl
expandEscapeSequences = false
brightenScreen = true
}
finish()
}
}
}
@@ -2,12 +2,12 @@ package de.markusfisch.android.binaryeye.adapter
import android.content.Context
import android.database.Cursor
import android.support.v4.content.ContextCompat
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.CursorAdapter
import android.widget.TextView
import androidx.core.content.ContextCompat
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.database.Database
import java.text.DateFormat
@@ -20,7 +20,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
private val idIndex = cursor.getColumnIndex(Database.SCANS_ID)
private val timeIndex = cursor.getColumnIndex(Database.SCANS_DATETIME)
private val nameIndex = cursor.getColumnIndex(Database.SCANS_NAME)
private val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
private val textIndex = cursor.getColumnIndex(Database.SCANS_TEXT)
private val formatIndex = cursor.getColumnIndex(Database.SCANS_FORMAT)
private val selections = mutableMapOf<Long, Int>()
private val selectedColor = ContextCompat.getColor(
@@ -74,7 +74,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
fun getContent(
position: Int
) = (getItem(position) as Cursor?)?.getString(contentIndex)
) = (getItem(position) as Cursor?)?.getString(textIndex)
override fun newView(
context: Context,
@@ -92,7 +92,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
getViewHolder(view).apply {
timeView.text = formatDateTime(cursor.getString(timeIndex))
val name = cursor.getString(nameIndex)
val content = cursor.getString(contentIndex)
val text = cursor.getString(textIndex)
var icon = 0
contentView.text = when {
name?.isNotEmpty() == true -> {
@@ -100,16 +100,16 @@ class ScansAdapter(context: Context, cursor: Cursor) :
name
}
content.isNullOrEmpty() -> context.getString(
text.isNullOrEmpty() -> context.getString(
R.string.binary_data
)
else -> content
else -> text
}
contentView.setCompoundDrawablesWithIntrinsicBounds(
icon, 0, 0, 0
)
formatView.text = prettifyFormatName(cursor.getString(formatIndex))
formatView.text = cursor.getString(formatIndex).prettifyFormatName()
}
val selected = selections[cursor.getLong(idIndex)] != null
view.post {
@@ -139,7 +139,11 @@ class ScansAdapter(context: Context, cursor: Cursor) :
)
}
fun prettifyFormatName(format: String) = format.replace("_", " ")
private val formatWordBoundary =
"(?<=[a-z0-9])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])|(?<=[A-Za-z])(?=\\d)|(?<=\\d)(?=[A-Za-z])".toRegex()
fun String.prettifyFormatName() = replace("_", " ")
.replace(formatWordBoundary, " ")
private fun formatDateTime(rfc: String): String {
try {
@@ -149,7 +153,7 @@ private fun formatDateTime(rfc: String): String {
DateFormat.SHORT
).format(it)
}
} catch (e: ParseException) {
} catch (_: ParseException) {
// Ignore and fall through.
}
return rfc
@@ -1,19 +0,0 @@
package de.markusfisch.android.binaryeye.app
import android.annotation.SuppressLint
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import de.markusfisch.android.binaryeye.R
fun FragmentManager.setFragment(fragment: Fragment) {
getTransaction(fragment).commit()
}
fun FragmentManager.addFragment(fragment: Fragment) {
getTransaction(fragment).addToBackStack(null).commit()
}
@SuppressLint("CommitTransaction")
private fun FragmentManager.getTransaction(
fragment: Fragment
) = beginTransaction().replace(R.id.content_frame, fragment)
@@ -4,8 +4,8 @@ import android.Manifest
import android.app.Activity
import android.content.pm.PackageManager
import android.os.Build
import android.support.v4.app.ActivityCompat
import android.support.v4.content.ContextCompat
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
var permissionGrantedCallback: (() -> Any)? = null
@@ -0,0 +1,105 @@
package de.markusfisch.android.binaryeye.automation
import de.markusfisch.android.binaryeye.database.Scan
import de.markusfisch.android.binaryeye.net.urlEncode
import org.json.JSONArray
import org.json.JSONObject
import java.util.Locale
data class AutomatedAction(
val pattern: String,
val type: Type,
val urlTemplate: String? = null,
val intentUriTemplate: String? = null
) {
enum class Type {
Intent, CustomIntent
}
fun matches(content: String): Boolean = try {
Regex(pattern).matches(content)
} catch (_: Exception) {
false
}
fun toJson(): JSONObject = JSONObject().apply {
put(KEY_PATTERN, pattern)
put(KEY_TYPE, type.name.lowercase(Locale.ROOT))
put(KEY_URL_TEMPLATE, urlTemplate ?: "")
put(KEY_INTENT_URI_TEMPLATE, intentUriTemplate ?: "")
}
companion object {
private const val KEY_PATTERN = "pattern"
private const val KEY_TYPE = "type"
private const val KEY_URL_TEMPLATE = "url_template"
private const val KEY_INTENT_URI_TEMPLATE = "intent_uri_template"
fun fromJson(obj: JSONObject): AutomatedAction? {
val pattern = obj.optString(KEY_PATTERN, "").trim()
if (pattern.isEmpty()) {
return null
}
val type = when (obj.optString(KEY_TYPE, "")) {
"custom_intent" -> Type.CustomIntent
"intent" -> Type.Intent
"html" -> return null
else -> Type.Intent
}
val urlTemplate = obj.optString(KEY_URL_TEMPLATE, "").trim()
val intentUriTemplate = obj.optString(
KEY_INTENT_URI_TEMPLATE,
""
).trim()
return AutomatedAction(
pattern = pattern,
type = type,
urlTemplate = urlTemplate.ifEmpty { null },
intentUriTemplate = intentUriTemplate.ifEmpty { null }
)
}
fun fromJsonArray(json: String): MutableList<AutomatedAction> {
val actions = ArrayList<AutomatedAction>()
val array = try {
JSONArray(json)
} catch (_: Exception) {
JSONArray()
}
for (i in 0 until array.length()) {
val obj = array.optJSONObject(i) ?: continue
fromJson(obj)?.let { actions.add(it) }
}
return actions
}
fun toJsonArray(actions: List<AutomatedAction>): String {
val array = JSONArray()
actions.forEach { array.put(it.toJson()) }
return array.toString()
}
}
}
fun String.buildUrl(scan: Scan): String {
return buildTemplate(scan, encodeResult = true)
}
fun String.buildTemplate(scan: Scan, encodeResult: Boolean): String {
val text = scan.text
val raw = scan.raw ?: text.toByteArray()
val result = if (encodeResult) {
text.urlEncode()
} else {
text
}
val format = if (encodeResult) {
scan.format.name.urlEncode()
} else {
scan.format.name
}
return this
.replace("{RESULT}", result)
.replace("{RESULT_BYTES}", raw.toHexString())
.replace("{FORMAT}", format)
}
@@ -0,0 +1,59 @@
package de.markusfisch.android.binaryeye.automation
import android.content.Context
import android.content.Intent
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.content.execShareIntent
import de.markusfisch.android.binaryeye.content.openUrl
import de.markusfisch.android.binaryeye.database.Scan
import de.markusfisch.android.binaryeye.widget.toast
fun Context.runAutomatedActions(scan: Scan): Boolean {
val content = scan.text
if (content.isEmpty()) {
return false
}
val actions = prefs.automatedActions
if (actions.isEmpty()) {
return false
}
for (action in actions) {
if (action.matches(content)) {
return when (action.type) {
AutomatedAction.Type.Intent -> {
val url = action.urlTemplate?.buildUrl(scan)
if (url.isNullOrEmpty()) {
toast(R.string.automated_action_invalid_url)
false
} else {
openUrl(url)
}
}
AutomatedAction.Type.CustomIntent ->
execCustomIntent(action, scan)
}
}
}
return false
}
private fun Context.execCustomIntent(
action: AutomatedAction,
scan: Scan
): Boolean {
val template = action.intentUriTemplate
if (template.isNullOrEmpty()) {
toast(R.string.automated_action_intent_uri_required)
return false
}
val intentUri = template.buildTemplate(scan, encodeResult = false)
val intent = try {
Intent.parseUri(intentUri, Intent.URI_INTENT_SCHEME)
} catch (_: Exception) {
toast(R.string.automated_action_intent_uri_invalid)
return false
}
return execShareIntent(intent)
}
@@ -3,7 +3,7 @@ package de.markusfisch.android.binaryeye.bluetooth
import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothSocket
import android.support.v7.preference.ListPreference
import androidx.preference.ListPreference
import de.markusfisch.android.binaryeye.database.Scan
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -24,7 +24,7 @@ fun Scan.sendBluetoothAsync(
connect(host, true)
}
val sent = if (connected) {
send(content, host, true)
send(text, host)
} else {
false
}
@@ -35,21 +35,20 @@ fun Scan.sendBluetoothAsync(
}
fun setBluetoothHosts(listPref: ListPreference) {
val devices = try {
BluetoothAdapter.getDefaultAdapter().bondedDevices
} catch (e: SecurityException) {
try {
val devices = blue.bondedDevices ?: return
listPref.entries = devices.map {
it.name
}.toTypedArray()
listPref.entryValues = devices.map {
it.address
}.toTypedArray()
listPref.callChangeListener(listPref.value)
} catch (_: SecurityException) {
// Do nothing, either the user has denied Bluetooth access
// or the permission was removed by the system. We're catching
// the exception to keep the app from crashing.
null
} ?: return
listPref.entries = devices.map {
it.name
}.toTypedArray()
listPref.entryValues = devices.map {
it.address
}.toTypedArray()
listPref.callChangeListener(listPref.value)
}
}
private var socket: BluetoothSocket? = null
@@ -71,39 +70,41 @@ private fun connect(deviceName: String, onceMore: Boolean): Boolean = try {
writer = socket?.outputStream?.writer()
isConnected = true
true
} catch (e: Exception) {
if (onceMore)
} catch (_: Exception) {
if (onceMore) {
connect(deviceName, false)
else
} else {
close()
}
false
}
private fun send(message: String, host: String, onceMore: Boolean): Boolean = try {
private fun send(message: String, host: String): Boolean = try {
writer?.apply {
write(message)
write("\n")
flush()
}
true
} catch (e: Exception) {
} catch (_: Exception) {
close()
if (connect(host, false))
send(message, host, false)
else
if (connect(host, false)) {
send(message, host)
} else {
false
}
}
private fun close() {
try {
writer?.close()
} catch (e: IOException) {
} catch (_: IOException) {
// Catch exception if writer wasn't initialized.
}
try {
socket?.close()
} catch (e: IOException) {
} catch (_: IOException) {
// Nothing we can do about this but keep
// the app from crashing.
}
@@ -113,11 +114,15 @@ private fun close() {
}
private fun findByName(findableName: String): BluetoothDevice? {
val deviceList = blue.bondedDevices
for (device in deviceList) {
if (device.address == findableName) {
return device
try {
val deviceList = blue.bondedDevices
for (device in deviceList) {
if (device.address == findableName) {
return device
}
}
} catch (_: SecurityException) {
// Fall through.
}
return null
}
@@ -34,18 +34,24 @@ enum class BarcodeColors {
}
}
fun Scan.toBarcode() = if (symbol != null) {
BitMatrixBarcode(
symbol,
content,
format
)
} else {
ContentBarcode(
content,
format,
errorCorrectionLevel.toErrorCorrectionInt()
)
fun Scan.toBarcode(): Barcode<*> {
val content = text.ifEmpty {
raw
}
return if (symbol != null) {
BitMatrixBarcode(
symbol,
content,
format
)
} else {
ContentBarcode(
content,
format,
errorCorrectionLevel.toErrorCorrectionInt(),
margin = 1
)
}
}
fun String?.toErrorCorrectionInt() = when (this) {
@@ -56,7 +62,7 @@ fun String?.toErrorCorrectionInt() = when (this) {
else -> -1
}
abstract class Barcode<T>(
sealed class Barcode<T>(
val content: T,
val format: BarcodeFormat,
val colors: BarcodeColors
@@ -91,17 +97,23 @@ abstract class Barcode<T>(
}
protected abstract fun toText(): String
fun textOrHex(): String = when (content) {
is String -> content
is ByteArray -> content.toHexString()
else -> throw IllegalArgumentException("Illegal arguments")
}
}
class ContentBarcode<T>(
content: T,
format: BarcodeFormat,
val ecLevel: Int = -1,
val margin: Int = -1,
val margin: Int = 0,
colors: BarcodeColors = BarcodeColors.BLACK_ON_WHITE
) : Barcode<T>(content, format, colors) {
override fun toBitmap(size: Int) = ZxingCpp.encodeAsBitmap(
content, format, size, size, margin, ecLevel,
content, format, size, format.height(size), margin, ecLevel,
setColor = colors.foregroundColor(),
unsetColor = colors.backgroundColor()
)
@@ -172,3 +184,27 @@ private fun BitMatrix.inflate(
}
return scaled
}
private fun BarcodeFormat.height(size: Int) = when (this) {
// 1D barcodes don't need as much vertical space.
BarcodeFormat.Codabar,
BarcodeFormat.Code39,
BarcodeFormat.Code39Ext,
BarcodeFormat.Code32,
BarcodeFormat.PZN,
BarcodeFormat.Code93,
BarcodeFormat.Code128,
BarcodeFormat.DataBarOmni,
BarcodeFormat.DataBarStk,
BarcodeFormat.DataBarLtd,
BarcodeFormat.DataBarExp,
BarcodeFormat.DataBarExpStk,
BarcodeFormat.DXFilmEdge,
BarcodeFormat.EAN8,
BarcodeFormat.EAN13,
BarcodeFormat.ITF,
BarcodeFormat.UPCA,
BarcodeFormat.UPCE -> size / 3
else -> size
}
@@ -8,16 +8,11 @@ import android.os.PersistableBundle
fun Context.copyToClipboard(text: String, isSensitive: Boolean = false) {
val service = getSystemService(Context.CLIPBOARD_SERVICE)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
@Suppress("DEPRECATION")
(service as android.text.ClipboardManager).text = text
} else {
(service as android.content.ClipboardManager).setPrimaryClip(
ClipData.newPlainText("plain text", text).apply {
setSensitive(isSensitive)
}
)
}
(service as android.content.ClipboardManager).setPrimaryClip(
ClipData.newPlainText("plain text", text).apply {
setSensitive(isSensitive)
}
)
}
private fun ClipData.setSensitive(isSensitive: Boolean) {
@@ -1,3 +0,0 @@
package de.markusfisch.android.binaryeye.content
fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }
@@ -0,0 +1,67 @@
package de.markusfisch.android.binaryeye.content
import android.content.Context
import de.markusfisch.android.binaryeye.R
private val idToLabel = hashMapOf(
"DCA" to R.string.idl_vehicle_class,
"DCB" to R.string.idl_restriction_codes,
"DCD" to R.string.idl_endorsement_codes,
"DBA" to R.string.idl_date_of_expiry,
"DCS" to R.string.idl_customer_family_name,
"DAC" to R.string.idl_customer_first_name,
"DCT" to R.string.idl_customer_first_name_alt,
"DAD" to R.string.idl_customer_middle_name,
"DBD" to R.string.idl_date_of_issue,
"DBB" to R.string.idl_date_of_birth,
"DBC" to R.string.idl_sex,
"DAY" to R.string.idl_eye_color,
"DAU" to R.string.idl_body_height,
"DAG" to R.string.idl_address_street,
"DAI" to R.string.idl_address_city,
"DAJ" to R.string.idl_address_jurisdiction_code,
"DAK" to R.string.idl_address_postal_code,
"DAQ" to R.string.idl_customer_id_number,
"DCF" to R.string.idl_document_discriminator,
"DCG" to R.string.idl_country,
"DDE" to R.string.idl_family_name_truncation,
"DDF" to R.string.idl_first_name_truncation,
"DDG" to R.string.idl_middle_name_truncation,
"DAH" to R.string.idl_address_street_2,
"DAZ" to R.string.idl_hair_color,
"DCI" to R.string.idl_place_of_birth,
"DCJ" to R.string.idl_audit_information,
"DCK" to R.string.idl_inventory_control_number,
"DBN" to R.string.idl_alias_family_name,
"DBG" to R.string.idl_alias_given_name,
"DBS" to R.string.idl_alias_suffix_name,
"DCU" to R.string.idl_name_suffix,
"DCE" to R.string.idl_weight_range,
"DCL" to R.string.idl_ethnicity,
"DCM" to R.string.idl_standard_vehicle_classification,
"DCN" to R.string.idl_standard_endorsement_code,
"DCO" to R.string.idl_standard_restriction_code,
"DCP" to R.string.idl_vehicle_classification_description,
"DCQ" to R.string.idl_endorsement_code_description,
"DCR" to R.string.idl_restriction_code_description,
"DDA" to R.string.idl_compliance_type,
"DDB" to R.string.idl_card_revision_date,
"DDC" to R.string.idl_hazmat_endorsement_expiration_date,
"DDD" to R.string.idl_limited_duration_document_indicator,
"DAW" to R.string.idl_weight_pounds,
"DAX" to R.string.idl_weight_kilograms,
"DDH" to R.string.idl_under_18_until_date,
"DDI" to R.string.idl_under_19_until_date,
"DDJ" to R.string.idl_under_21_until_date,
"DDK" to R.string.idl_organ_donor_indicator,
"DDL" to R.string.idl_veteran_indicator
)
fun Context.idlToRes(id: String): String {
val resId = idToLabel[id]
return if (resId != null) {
getString(resId)
} else {
id
}
}
@@ -0,0 +1,122 @@
package de.markusfisch.android.binaryeye.content
data class IdlInfo(
var iin: String? = null,
val elements: MutableMap<String, String> = linkedMapOf()
)
object IdlParser {
private fun resolveSex(value: String): String = when (value.firstOrNull()) {
'1' -> "M"
'2' -> "F"
'9' -> "X"
else -> value
}
private fun skipWhitespace(s: String, p: Int): Int {
var i = p
while (i < s.length && s[i].isWhitespace()) {
++i;
}
return i
}
private fun findSubType(s: String, idlInfo: IdlInfo): String {
val len = s.length
var p = skipWhitespace(s, 0)
if (p < len && s[p] == '@') {
while (p < len) {
if (!s[p].isDigit()) {
++p
continue
}
var d = p
while (d < len && s[d].isDigit()) {
++d
}
if (d - p < 8 || len - d < 3) {
p = d
continue
}
val code = s.substring(d, d + 2)
if (code != "DL" && code != "ID") {
p = d + 2
continue
}
idlInfo.elements["DL"] = code
d += 2
while (d < len) {
while (d < len && s[d] !in "DI") {
++d
}
if (len - d < 2) break
val sec = s.substring(d, d + 2)
if (sec == "DL" || sec == "ID") {
return s.substring(d + 2)
}
++d
}
break
}
}
return s
}
private fun findIIN(s: String): String? {
val ansi = s.indexOf("ANSI").takeIf { it >= 0 } ?: return null
var p = ansi + 4
val len = s.length
val whitespaceSkipped = skipWhitespace(s, p)
if (whitespaceSkipped == p) {
return null
}
p = whitespaceSkipped
val iinStart = p
var digits = 0
while (digits < 6 && p < len && s[p].isDigit()) {
++p
++digits
}
return s.substring(iinStart, p)
}
fun parse(s: String?): IdlInfo? {
if (s.isNullOrEmpty()) {
return null
}
val idlInfo = IdlInfo().apply {
iin = findIIN(s)
}
val data = findSubType(s, idlInfo)
val len = data.length
var start = 0
for (p in 0..len) {
if (p < len && data[p] > '\u001f') {
continue
}
if (p - start > 3) {
val vp = start + 3
val key = data.substring(start, vp)
if (key.matches(Regex("[DZ][A-Z]{2}"))) {
var value = data.substring(vp, p)
if (key == "DBC") {
value = resolveSex(value)
}
idlInfo.elements[key] = value.trim()
}
}
start = p + 1
}
return if (idlInfo.elements.isEmpty()) null else idlInfo
}
}
@@ -5,7 +5,8 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import android.support.v4.content.FileProvider
import androidx.core.content.FileProvider
import androidx.core.net.toUri
import de.markusfisch.android.binaryeye.BuildConfig
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.widget.toast
@@ -33,12 +34,20 @@ fun Context.startIntent(intent: Intent): Boolean = try {
// necessary.
startActivity(intent)
true
} catch (e: ActivityNotFoundException) {
} catch (_: ActivityNotFoundException) {
false
}
fun Context.openUrl(url: String, silent: Boolean = false): Boolean {
val intent = Intent(Intent.ACTION_VIEW, url.parseAndNormalizeUri())
return openUri(url.parseAndNormalizeUri(), silent)
}
fun Context.openUri(uri: Uri, silent: Boolean = false): Boolean {
val intent = Intent(Intent.ACTION_VIEW, uri).apply {
if (uri.scheme == "content") {
addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
}
}
return if (silent) {
startIntent(intent)
} else {
@@ -46,12 +55,8 @@ fun Context.openUrl(url: String, silent: Boolean = false): Boolean {
}
}
fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
it.normalizeScheme()
} else {
it
}
fun String.parseAndNormalizeUri(): Uri = toUri().let {
it.normalizeScheme()
}
fun Context.shareText(text: String, mimeType: String = "text/plain") {
@@ -91,7 +96,7 @@ fun <T> Context.shareAsFile(content: T, fileName: String) {
FileOutputStream(file).use {
it.write(bytes)
}
} catch (e: IOException) {
} catch (_: IOException) {
toast(R.string.error_saving_file)
return
}
@@ -2,7 +2,6 @@ package de.markusfisch.android.binaryeye.database
import android.content.Context
import android.database.Cursor
import de.markusfisch.android.binaryeye.content.toHexString
import de.markusfisch.android.binaryeye.io.writeExternalFile
import java.io.ByteArrayOutputStream
import java.io.OutputStream
@@ -33,7 +32,7 @@ private fun exportCsv(
Database.SCANS_DATETIME,
Database.SCANS_FORMAT,
Database.SCANS_NAME,
Database.SCANS_CONTENT,
Database.SCANS_TEXT,
Database.SCANS_ERROR_CORRECTION_LEVEL,
Database.SCANS_VERSION,
Database.SCANS_SEQUENCE_SIZE,
@@ -47,7 +46,7 @@ private fun exportCsv(
val indices = columns.map {
cursor.getColumnIndex(it)
}
val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
val contentIndex = cursor.getColumnIndex(Database.SCANS_TEXT)
val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
outputStream.write(
columns.joinToString(
@@ -3,15 +3,6 @@ package de.markusfisch.android.binaryeye.database
import android.database.Cursor
import de.markusfisch.android.zxingcpp.ZxingCpp
// Overwrite Kotlin's ".use" function for Cursor because Cursor cannot
// be cast to Closeable below API level 16. This should be removed when
// the minSDK is increased to at least JELLY_BEAN (16).
inline fun <R> Cursor.use(block: (Cursor) -> R): R = try {
block.invoke(this)
} finally {
close()
}
fun Cursor.getInt(name: String): Int {
val idx = getColumnIndex(name)
return if (idx < 0) 0 else getInt(idx)
@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteOpenHelper
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.preference.Preferences
import de.markusfisch.android.binaryeye.zxingcpp.migrateBarcodeFormatName
import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
class Database {
@@ -21,7 +22,7 @@ class Database {
$SCANS_ID,
$SCANS_DATETIME,
$SCANS_NAME,
$SCANS_CONTENT,
$SCANS_TEXT,
$SCANS_FORMAT
FROM $SCANS
${getWhereClause(query)}
@@ -34,7 +35,7 @@ class Database {
$SCANS_ID,
$SCANS_DATETIME,
$SCANS_NAME,
$SCANS_CONTENT,
$SCANS_TEXT,
$SCANS_RAW,
$SCANS_FORMAT,
$SCANS_ERROR_CORRECTION_LEVEL,
@@ -56,7 +57,7 @@ class Database {
query: String?,
prefix: String = "WHERE"
) = if (query?.isNotEmpty() == true) {
"""$prefix $SCANS_CONTENT LIKE ?
"""$prefix $SCANS_TEXT LIKE ?
OR $SCANS_NAME LIKE ?"""
} else {
""
@@ -76,7 +77,7 @@ class Database {
$SCANS_ID,
$SCANS_DATETIME,
$SCANS_NAME,
$SCANS_CONTENT,
$SCANS_TEXT,
$SCANS_RAW,
$SCANS_FORMAT,
$SCANS_ERROR_CORRECTION_LEVEL,
@@ -99,7 +100,7 @@ class Database {
$SCANS_ID,
$SCANS_DATETIME,
$SCANS_NAME,
$SCANS_CONTENT,
$SCANS_TEXT,
$SCANS_RAW,
$SCANS_FORMAT,
$SCANS_ERROR_CORRECTION_LEVEL,
@@ -121,9 +122,11 @@ class Database {
).use {
if (it.moveToFirst()) {
Scan(
it.getString(SCANS_CONTENT),
it.getString(SCANS_TEXT),
it.getBlob(SCANS_RAW),
BarcodeFormat.valueOf(it.getString(SCANS_FORMAT)),
BarcodeFormat.valueOf(
it.getString(SCANS_FORMAT).migrateBarcodeFormatName()
),
it.getString(SCANS_ERROR_CORRECTION_LEVEL),
it.getString(SCANS_VERSION),
it.getInt(SCANS_DATA_MASK),
@@ -152,7 +155,7 @@ class Database {
when (prefs.ignoreDuplicates()) {
Preferences.Companion.IgnoreDuplicates.Consecutive -> {
val id = getIdOfLastScan(
scan.content,
scan.text,
scan.raw,
scan.format
)
@@ -162,7 +165,7 @@ class Database {
}
Preferences.Companion.IgnoreDuplicates.Any -> {
val id = getIdOfScanByContent(scan.content, scan.format)
val id = getIdOfScanByContent(scan.text, scan.format)
if (id > 0L) {
return id
}
@@ -175,7 +178,7 @@ class Database {
null,
ContentValues().apply {
put(SCANS_DATETIME, scan.dateTime)
put(SCANS_CONTENT, scan.content)
put(SCANS_TEXT, scan.text)
if (scan.raw != null) {
put(SCANS_RAW, scan.raw)
}
@@ -208,7 +211,7 @@ class Database {
): Long = db.rawQuery(
"""SELECT
$SCANS_ID,
$SCANS_CONTENT,
$SCANS_TEXT,
$SCANS_RAW,
$SCANS_FORMAT
FROM $SCANS
@@ -218,7 +221,7 @@ class Database {
).use {
if (it.count > 0 &&
it.moveToFirst() &&
it.getString(SCANS_CONTENT) == content &&
it.getString(SCANS_TEXT) == content &&
(raw == null || it.getBlob(SCANS_RAW)
?.contentEquals(raw) == true) &&
it.getString(SCANS_FORMAT) == format.name
@@ -236,7 +239,7 @@ class Database {
"""SELECT
$SCANS_ID
FROM $SCANS
WHERE $SCANS_CONTENT = ?
WHERE $SCANS_TEXT = ?
AND $SCANS_FORMAT = ?
LIMIT 1
""".trimMargin(), arrayOf(content, format.name)
@@ -263,7 +266,7 @@ class Database {
}
private class OpenHelper(context: Context) :
SQLiteOpenHelper(context, FILE_NAME, null, 8) {
SQLiteOpenHelper(context, FILE_NAME, null, 9) {
override fun onCreate(db: SQLiteDatabase) {
db.createScans()
}
@@ -294,6 +297,9 @@ class Database {
if (oldVersion < 8) {
db.addSymbolColumns()
}
if (oldVersion < 9) {
db.migrateToNativeFormatNames()
}
}
}
@@ -303,7 +309,7 @@ class Database {
const val SCANS_ID = "_id"
const val SCANS_DATETIME = "_datetime"
const val SCANS_NAME = "name"
const val SCANS_CONTENT = "content"
const val SCANS_TEXT = "content"
const val SCANS_RAW = "raw"
const val SCANS_FORMAT = "format"
const val SCANS_ERROR_CORRECTION_LEVEL = "error_correction_level"
@@ -335,7 +341,7 @@ class Database {
$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
$SCANS_DATETIME DATETIME NOT NULL,
$SCANS_NAME TEXT,
$SCANS_CONTENT TEXT NOT NULL,
$SCANS_TEXT TEXT NOT NULL,
$SCANS_RAW BLOB,
$SCANS_FORMAT TEXT NOT NULL,
$SCANS_ERROR_CORRECTION_LEVEL TEXT,
@@ -391,6 +397,43 @@ class Database {
execSQL("UPDATE $SCANS SET $SCANS_GTIN_ISSUE_NUMBER = $SCANS_ISSUE_NUMBER")
}
private fun SQLiteDatabase.migrateToNativeFormatNames() {
val mappings = listOf(
"NONE" to "None",
"AZTEC" to "Aztec",
"CODABAR" to "Codabar",
"CODE_39" to "Code39",
"CODE_39_EXT" to "Code39Ext",
"CODE_32" to "Code32",
"PZN" to "PZN",
"CODE_93" to "Code93",
"CODE_128" to "Code128",
"DATA_BAR_OMNI" to "DataBarOmni",
"DATA_BAR_STK" to "DataBarStk",
"DATA_BAR_LTD" to "DataBarLtd",
"DATA_BAR_EXPANDED" to "DataBarExp",
"DATA_BAR_EXP_STK" to "DataBarExpStk",
"DATA_MATRIX" to "DataMatrix",
"DX_FILM_EDGE" to "DXFilmEdge",
"EAN_8" to "EAN8",
"EAN_13" to "EAN13",
"ITF" to "ITF",
"MAXICODE" to "MaxiCode",
"PDF_417" to "PDF417",
"QR_CODE" to "QRCode",
"MICRO_QR_CODE" to "MicroQRCode",
"RMQR_CODE" to "RMQRCode",
"UPC_A" to "UPCA",
"UPC_E" to "UPCE"
)
for ((oldName, newName) in mappings) {
execSQL(
"UPDATE $SCANS SET $SCANS_FORMAT = ? WHERE $SCANS_FORMAT = ?",
arrayOf(newName, oldName)
)
}
}
private fun SQLiteDatabase.migrateToVersionString() {
execSQL("ALTER TABLE $SCANS ADD $SCANS_VERSION TEXT")
execSQL("UPDATE $SCANS SET $SCANS_VERSION = $SCANS_VERSION_NUMBER")
@@ -398,6 +441,7 @@ class Database {
private fun SQLiteDatabase.addDataMaskColumn() {
execSQL("ALTER TABLE $SCANS ADD $SCANS_DATA_MASK INTEGER")
execSQL("UPDATE $SCANS SET $SCANS_DATA_MASK = -1")
}
private fun SQLiteDatabase.addSymbolColumns() {
@@ -2,7 +2,6 @@ package de.markusfisch.android.binaryeye.database
import android.content.Context
import android.database.Cursor
import de.markusfisch.android.binaryeye.content.toHexString
import de.markusfisch.android.binaryeye.io.writeExternalFile
import org.json.JSONArray
import org.json.JSONException
@@ -25,7 +24,7 @@ fun Cursor.exportJson(): String? {
Database.SCANS_DATETIME,
Database.SCANS_FORMAT,
Database.SCANS_NAME,
Database.SCANS_CONTENT,
Database.SCANS_TEXT,
Database.SCANS_ERROR_CORRECTION_LEVEL,
Database.SCANS_VERSION,
Database.SCANS_SEQUENCE_SIZE,
@@ -39,7 +38,7 @@ fun Cursor.exportJson(): String? {
val indices = columns.map {
Pair(getColumnIndex(it), it)
}
val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
val contentIndex = getColumnIndex(Database.SCANS_TEXT)
val rawIndex = getColumnIndex(Database.SCANS_RAW)
val root = JSONArray()
do {
@@ -70,7 +69,7 @@ private fun Cursor.toJsonObject(
obj.put(it.second, value ?: "")
}
obj
} catch (e: JSONException) {
} catch (_: JSONException) {
obj
}
}
@@ -1,9 +1,8 @@
package de.markusfisch.android.binaryeye.database
import android.os.Build
import android.os.Parcel
import android.os.Parcelable
import android.os.Bundle
import android.text.format.DateFormat
import de.markusfisch.android.binaryeye.zxingcpp.migrateBarcodeFormatName
import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
import de.markusfisch.android.zxingcpp.ZxingCpp.BitMatrix
import de.markusfisch.android.zxingcpp.ZxingCpp.ContentType
@@ -11,12 +10,12 @@ import de.markusfisch.android.zxingcpp.ZxingCpp.Result
import java.util.Locale
data class Scan(
val content: String,
val text: String,
val raw: ByteArray?,
val format: BarcodeFormat,
val errorCorrectionLevel: String? = null,
val version: String? = null,
val dataMask: Int = 0,
val dataMask: Int = -1,
val symbol: BitMatrix? = null,
val sequenceSize: Int = -1,
val sequenceIndex: Int = -1,
@@ -28,7 +27,7 @@ data class Scan(
val dateTime: String = getDateTime(),
var id: Long = 0L,
val label: String? = null
) : Parcelable {
) {
// Needs to be overwritten manually, as ByteArray is an array and
// this isn't handled well by Kotlin.
override fun equals(other: Any?): Boolean {
@@ -43,9 +42,10 @@ data class Scan(
return id == other.id &&
dateTime == other.dateTime &&
content == other.content &&
text == other.text &&
((raw == null && other.raw == null) ||
(raw != null && other.raw != null && raw.contentEquals(other.raw))) &&
(raw != null && other.raw != null &&
raw.contentEquals(other.raw))) &&
format == other.format &&
errorCorrectionLevel == other.errorCorrectionLevel &&
version == other.version &&
@@ -64,7 +64,7 @@ data class Scan(
override fun hashCode(): Int {
var result = id.hashCode()
result = 31 * result + dateTime.hashCode()
result = 31 * result + content.hashCode()
result = 31 * result + text.hashCode()
result = 31 * result + (raw?.contentHashCode() ?: 0)
result = 31 * result + format.hashCode()
result = 31 * result + (errorCorrectionLevel?.hashCode() ?: 0)
@@ -80,57 +80,6 @@ data class Scan(
return result
}
private constructor(parcel: Parcel) : this(
content = parcel.readString() ?: "",
raw = parcel.readSizedByteArray(),
format = BarcodeFormat.valueOf(parcel.readString() ?: ""),
errorCorrectionLevel = parcel.readString(),
version = parcel.readString(),
dataMask = parcel.readInt(),
symbol = parcel.readBitMatrix(),
sequenceSize = parcel.readInt(),
sequenceIndex = parcel.readInt(),
sequenceId = parcel.readString() ?: "",
country = parcel.readString(),
addOn = parcel.readString(),
price = parcel.readString(),
issueNumber = parcel.readString(),
dateTime = parcel.readString() ?: "",
id = parcel.readLong(),
label = parcel.readString()
)
override fun writeToParcel(parcel: Parcel, flags: Int) {
parcel.apply {
writeString(content)
writeSizedByteArray(raw)
writeString(format.name)
writeString(errorCorrectionLevel)
writeString(version)
writeInt(dataMask)
writeBitMatrix(symbol)
writeInt(sequenceSize)
writeInt(sequenceIndex)
writeString(sequenceId)
writeString(country)
writeString(addOn)
writeString(price)
writeString(issueNumber)
writeString(dateTime)
writeLong(id)
writeString(label)
}
}
override fun describeContents() = 0
companion object {
@JvmField
val CREATOR = object : Parcelable.Creator<Scan> {
override fun createFromParcel(parcel: Parcel) = Scan(parcel)
override fun newArray(size: Int) = arrayOfNulls<Scan>(size)
}
}
}
fun Result.toScan(): Scan {
@@ -140,7 +89,7 @@ fun Result.toScan(): Scan {
ContentType.ISO15434,
ContentType.TEXT -> text
else -> ""
else -> "" // Show as binary.
},
rawBytes,
format,
@@ -158,16 +107,62 @@ fun Result.toScan(): Scan {
)
}
fun Scan.toBundle() = Bundle().apply {
putString(SCAN_TEXT, text)
putByteArray(SCAN_RAW, raw)
putString(SCAN_FORMAT, format.name)
putString(SCAN_ERROR_CORRECTION_LEVEL, errorCorrectionLevel)
putString(SCAN_VERSION, version)
putInt(SCAN_DATA_MASK, dataMask)
putInt(SCAN_SYMBOL_WIDTH, symbol?.width ?: 0)
putInt(SCAN_SYMBOL_HEIGHT, symbol?.height ?: 0)
putByteArray(SCAN_SYMBOL_DATA, symbol?.data)
putInt(SCAN_SEQUENCE_SIZE, sequenceSize)
putInt(SCAN_SEQUENCE_INDEX, sequenceIndex)
putString(SCAN_SEQUENCE_ID, sequenceId)
putString(SCAN_COUNTRY, country)
putString(SCAN_ADD_ON, addOn)
putString(SCAN_PRICE, price)
putString(SCAN_ISSUE_NUMBER, issueNumber)
putString(SCAN_DATE_TIME, dateTime)
putLong(SCAN_ID, id)
putString(SCAN_LABEL, label)
}
fun Bundle.toScan(): Scan? {
val formatName = getString(SCAN_FORMAT)?.migrateBarcodeFormatName()
if (formatName.isNullOrEmpty()) {
return null
}
return try {
Scan(
text = getString(SCAN_TEXT) ?: "",
raw = getByteArray(SCAN_RAW),
format = BarcodeFormat.valueOf(formatName),
errorCorrectionLevel = getString(SCAN_ERROR_CORRECTION_LEVEL),
version = getString(SCAN_VERSION),
dataMask = getInt(SCAN_DATA_MASK, -1),
symbol = getBitMatrix(),
sequenceSize = getInt(SCAN_SEQUENCE_SIZE, -1),
sequenceIndex = getInt(SCAN_SEQUENCE_INDEX, -1),
sequenceId = getString(SCAN_SEQUENCE_ID) ?: "",
country = getString(SCAN_COUNTRY),
addOn = getString(SCAN_ADD_ON),
price = getString(SCAN_PRICE),
issueNumber = getString(SCAN_ISSUE_NUMBER),
dateTime = getString(SCAN_DATE_TIME) ?: getDateTime(),
id = getLong(SCAN_ID, 0L),
label = getString(SCAN_LABEL)
)
} catch (_: IllegalArgumentException) {
null
}
}
private fun getDateTime(
time: Long = System.currentTimeMillis()
) = DateFormat.format(
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
// Up to API level 17, 'k' was interpreted as 'H', which wasn't
// implemented until API level 18.
"yyyy-MM-dd kk:mm:ss"
} else {
"yyyy-MM-dd HH:mm:ss"
},
"yyyy-MM-dd HH:mm:ss",
time
).toString() + String.format(
Locale.getDefault(),
@@ -175,39 +170,32 @@ private fun getDateTime(
time % 1000
)
private fun Parcel.writeSizedByteArray(array: ByteArray?) {
val size = array?.size ?: 0
writeInt(size)
if (size > 0) {
writeByteArray(array)
}
}
private fun Parcel.readSizedByteArray(): ByteArray? {
val size = readInt()
return if (size > 0) {
val array = ByteArray(size)
readByteArray(array)
array
} else {
null
}
}
private fun Parcel.writeBitMatrix(bm: BitMatrix?) {
writeInt(bm?.width ?: 0)
bm?.let {
writeInt(bm.height)
writeSizedByteArray(bm.data)
}
}
private fun Parcel.readBitMatrix(): BitMatrix? {
val width = readInt()
if (width < 1) {
private fun Bundle.getBitMatrix(): BitMatrix? {
val width = getInt(SCAN_SYMBOL_WIDTH, 0)
val height = getInt(SCAN_SYMBOL_HEIGHT, 0)
val data = getByteArray(SCAN_SYMBOL_DATA)
if (width < 1 || height < 1 || data == null) {
return null
}
val height = readInt()
val data = readSizedByteArray() ?: return null
return BitMatrix(width, height, data)
}
private const val SCAN_TEXT = "text"
private const val SCAN_RAW = "raw"
private const val SCAN_FORMAT = "format"
private const val SCAN_ERROR_CORRECTION_LEVEL = "error_correction_level"
private const val SCAN_VERSION = "version"
private const val SCAN_DATA_MASK = "data_mask"
private const val SCAN_SYMBOL_WIDTH = "symbol_width"
private const val SCAN_SYMBOL_HEIGHT = "symbol_height"
private const val SCAN_SYMBOL_DATA = "symbol_data"
private const val SCAN_SEQUENCE_SIZE = "sequence_size"
private const val SCAN_SEQUENCE_INDEX = "sequence_index"
private const val SCAN_SEQUENCE_ID = "sequence_id"
private const val SCAN_COUNTRY = "country"
private const val SCAN_ADD_ON = "add_on"
private const val SCAN_PRICE = "price"
private const val SCAN_ISSUE_NUMBER = "issue_number"
private const val SCAN_DATE_TIME = "date_time"
private const val SCAN_ID = "id"
private const val SCAN_LABEL = "label"
@@ -9,15 +9,17 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener
import android.net.wifi.WifiManager
import android.os.Build
import android.os.Bundle
import android.support.annotation.RequiresApi
import android.support.v14.preference.MultiSelectListPreference
import android.support.v7.preference.ListPreference
import android.support.v7.preference.Preference
import android.support.v7.preference.PreferenceFragmentCompat
import android.support.v7.preference.PreferenceGroup
import androidx.annotation.RequiresApi
import androidx.preference.ListPreference
import androidx.preference.MultiSelectListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceGroup
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.activity.AutomatedActionsActivity
import de.markusfisch.android.binaryeye.activity.NetworkSuggestionsActivity
import de.markusfisch.android.binaryeye.activity.ProfilesActivity
import de.markusfisch.android.binaryeye.activity.SplashActivity
import de.markusfisch.android.binaryeye.app.addFragment
import de.markusfisch.android.binaryeye.app.hasBluetoothPermission
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.bluetooth.setBluetoothHosts
@@ -28,58 +30,105 @@ import de.markusfisch.android.binaryeye.view.systemBarRecyclerViewScrollListener
import de.markusfisch.android.binaryeye.widget.toast
class PreferencesFragment : PreferenceFragmentCompat() {
private var lastProfile: String? = null
private val changeListener = object : OnSharedPreferenceChangeListener {
override fun onSharedPreferenceChanged(
sharedPreferences: SharedPreferences?,
key: String?
) {
key ?: return
val preference = findPreference(key) ?: return
prefs.update()
when (preference.key) {
"custom_locale" -> activity?.restartApp()
"beep_tone_name" -> {
beepConfirm()
setSummary(preference)
}
"send_scan_bluetooth" -> {
if (prefs.sendScanBluetooth &&
activity?.hasBluetoothPermission() == false
) {
prefs.sendScanBluetooth = false
}
setSummary(preference)
}
else -> setSummary(preference)
val preference = findPreference<Preference>(key) ?: return
if (preference.key != PROFILE) {
prefs.update()
}
when (preference.key) {
"custom_locale" -> {
activity?.restartApp()
return
}
"beep_tone_name" -> beepConfirm()
"send_scan_bluetooth" -> if (
prefs.sendScanBluetooth &&
activity?.hasBluetoothPermission() == false
) {
prefs.sendScanBluetooth = false
}
}
setSummary(preference)
}
}
override fun onCreatePreferences(state: Bundle?, rootKey: String?) {
addPreferencesFromResource(R.xml.preferences)
loadPreferences(rootKey)
}
private fun loadPreferences(rootKey: String? = null) {
preferenceScreen?.sharedPreferences
?.unregisterOnSharedPreferenceChangeListener(changeListener)
preferenceManager.apply {
sharedPreferencesName = prefs.profile ?: "${context.packageName}_preferences"
sharedPreferencesMode = Context.MODE_PRIVATE
}
// Refresh the preferences.
preferenceScreen = null
setPreferencesFromResource(R.xml.preferences, rootKey)
preferenceScreen.sharedPreferences
?.registerOnSharedPreferenceChangeListener(changeListener)
setSummaries(preferenceScreen)
setIcons()
wireProfiles()
wireAutomatedActions()
setBluetoothResources()
wireClearNetworkPreferences()
}
private fun wireProfiles() {
findPreference<Preference>(PROFILE)?.apply {
updateProfileSummary(this)
onPreferenceClickListener = Preference.OnPreferenceClickListener {
startActivity(Intent(activity, ProfilesActivity::class.java))
true
}
}
}
private fun wireAutomatedActions() {
findPreference<Preference>(AUTOMATED_ACTIONS)?.apply {
updateAutomatedActionsSummary(this)
onPreferenceClickListener = Preference.OnPreferenceClickListener {
startActivity(
Intent(activity, AutomatedActionsActivity::class.java)
)
true
}
}
}
private fun setBluetoothResources() {
if (prefs.sendScanBluetooth &&
activity?.hasBluetoothPermission() == true
) {
setBluetoothHosts(
findPreference("send_scan_bluetooth_host") as ListPreference
)
findPreference<ListPreference>("send_scan_bluetooth_host")?.let {
setBluetoothHosts(it)
}
}
}
private fun wireClearNetworkPreferences() {
findPreference("clear_network_suggestions").apply {
findPreference<Preference>("clear_network_suggestions")?.apply {
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
// From R+ we can query past network suggestions and
// make them editable.
setOnPreferenceClickListener {
fragmentManager.addFragment(NetworkSuggestionsFragment())
startActivity(
Intent(activity, NetworkSuggestionsActivity::class.java)
)
true
}
} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
@@ -87,10 +136,10 @@ class PreferencesFragment : PreferenceFragmentCompat() {
// Note that previous versions of this app allowed
// adding network suggestions on Q as well, so we
// need to keep this option.
setOnPreferenceClickListener {
context.askToClearNetworkSuggestions()
true
}
setOnPreferenceClickListener {
context?.askToClearNetworkSuggestions()
true
}
} else {
// There are no network suggestions below Q.
isVisible = false
@@ -124,24 +173,30 @@ class PreferencesFragment : PreferenceFragmentCompat() {
override fun onResume() {
super.onResume()
if (lastProfile != prefs.profile) {
loadPreferences()
}
activity?.setTitle(R.string.preferences)
findPreference<Preference>(AUTOMATED_ACTIONS)?.let {
updateAutomatedActionsSummary(it)
}
findPreference<Preference>(PROFILE)?.let {
updateProfileSummary(it)
}
listView.setPaddingFromWindowInsets()
listView.removeOnScrollListener(systemBarRecyclerViewScrollListener)
listView.addOnScrollListener(systemBarRecyclerViewScrollListener)
preferenceScreen.sharedPreferences
.registerOnSharedPreferenceChangeListener(changeListener)
setSummaries(preferenceScreen)
}
override fun onPause() {
super.onPause()
preferenceScreen.sharedPreferences
.unregisterOnSharedPreferenceChangeListener(changeListener)
?.unregisterOnSharedPreferenceChangeListener(changeListener)
}
override fun onDisplayPreferenceDialog(preference: Preference) {
if (preference is UrlPreference) {
val fm = fragmentManager
val fm = parentFragmentManager
UrlDialogFragment.newInstance(preference.key).apply {
setTargetFragment(this@PreferencesFragment, 0)
show(fm, null)
@@ -165,9 +220,13 @@ class PreferencesFragment : PreferenceFragmentCompat() {
}
private fun setSummary(preference: Preference) {
if (preference.key == AUTOMATED_ACTIONS) {
updateAutomatedActionsSummary(preference)
return
}
when (preference) {
is UrlPreference -> {
preference.setSummary(preference.getUrl())
preference.summary = preference.getUrl()
}
is ListPreference -> {
@@ -175,11 +234,9 @@ class PreferencesFragment : PreferenceFragmentCompat() {
}
is MultiSelectListPreference -> {
preference.setSummary(
preference.values.joinToString(", ") {
it.replace(Regex("_"), " ")
}
)
preference.summary = preference.values.joinToString(", ") {
it.replace(Regex("_"), " ")
}
}
is PreferenceGroup -> {
@@ -187,16 +244,76 @@ class PreferencesFragment : PreferenceFragmentCompat() {
}
}
}
private fun setIcons() {
setIcon(PROFILE, R.drawable.ic_action_profile)
setIcon("formats", R.drawable.ic_action_restrict_format)
setIcon("show_crop_handle", R.drawable.ic_action_scan)
setIcon("zoom_by_swiping", R.drawable.ic_action_search)
setIcon("auto_rotate", R.drawable.ic_action_rotation_unlocked)
setIcon("try_harder", R.drawable.ic_action_search)
setIcon("bulk_mode", R.drawable.ic_action_bulk_mode)
setIcon("bulk_mode_delay", R.drawable.ic_action_bulk_mode)
setIcon("show_toast_in_bulk_mode", R.drawable.ic_action_bulk_mode)
setIcon("vibrate", R.drawable.ic_action_info)
setIcon("beep", R.drawable.ic_action_info)
setIcon("beep_tone_name", R.drawable.ic_action_info)
setIcon("use_history", R.drawable.ic_action_history)
setIcon("ignore_duplicates_name", R.drawable.ic_action_remove)
setIcon("copy_immediately", R.drawable.ic_action_copy)
setIcon("send_scan_active", R.drawable.ic_action_share)
setIcon("send_scan_url", R.drawable.ic_action_link)
setIcon("send_scan_type", R.drawable.ic_action_share)
setIcon("send_scan_bluetooth", R.drawable.ic_action_wifi)
setIcon("send_scan_bluetooth_host", R.drawable.ic_action_wifi)
setIcon("open_immediately", R.drawable.ic_action_open)
setIcon("show_meta_data", R.drawable.ic_action_info)
setIcon("show_hex_dump", R.drawable.ic_action_info)
setIcon("show_checksum", R.drawable.ic_action_info)
setIcon("show_recreation", R.drawable.ic_action_create)
setIcon("close_automatically", R.drawable.ic_action_remove)
setIcon("default_search_url", R.drawable.ic_action_search)
setIcon("open_with_url", R.drawable.ic_action_link)
setIcon(AUTOMATED_ACTIONS, R.drawable.ic_action_create)
setIcon("clear_network_suggestions", R.drawable.ic_action_wifi)
setIcon("brighten_screen", R.drawable.ic_action_bright)
setIcon("custom_locale", R.drawable.ic_action_preferences)
}
private fun setIcon(key: String, iconResId: Int) {
findPreference<Preference>(key)?.setIcon(iconResId)
}
private fun updateAutomatedActionsSummary(preference: Preference) {
val count = prefs.automatedActions.size
preference.summary = if (count == 0) {
getString(R.string.automated_actions_none)
} else {
resources.getQuantityString(
R.plurals.automated_actions_count,
count,
count
)
}
}
private fun updateProfileSummary(preference: Preference) {
preference.summary = prefs.profile ?: getString(R.string.profile_default)
lastProfile = prefs.profile
}
companion object {
private const val PROFILE = "profile"
private const val AUTOMATED_ACTIONS = "automated_actions"
}
}
private fun Activity.restartApp() {
val intent = Intent(this, SplashActivity::class.java)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
intent.addFlags(
Intent.FLAG_ACTIVITY_NEW_TASK or
Intent.FLAG_ACTIVITY_CLEAR_TASK
)
}
intent.addFlags(
Intent.FLAG_ACTIVITY_NEW_TASK or
Intent.FLAG_ACTIVITY_CLEAR_TASK
)
startActivity(intent)
finish()
// Restart to begin with an unmodified Locale to follow system settings.
@@ -1,9 +1,9 @@
package de.markusfisch.android.binaryeye.fragment
import android.os.Bundle
import android.support.v7.preference.PreferenceDialogFragmentCompat
import android.view.View
import android.widget.TextView
import androidx.preference.PreferenceDialogFragmentCompat
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.database.Scan
@@ -15,10 +15,10 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
private var urlView: TextView? = null
private var testButton: TextView? = null
override fun onBindDialogView(view: View?) {
override fun onBindDialogView(view: View) {
super.onBindDialogView(view)
urlView = view?.findViewById(R.id.url)
testButton = view?.findViewById(R.id.test_url)
urlView = view.findViewById(R.id.url)
testButton = view.findViewById(R.id.test_url)
testButton?.setOnClickListener {
testUrl(testButton)
}
@@ -51,7 +51,7 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
Scan(
"test",
null,
BarcodeFormat.NONE
BarcodeFormat.None
).sendAsync(url, prefs.sendScanType) { code, body ->
textView.text = when {
code != null -> "$code"
@@ -80,10 +80,5 @@ private fun completeUrl(template: String): String {
if (!s.startsWith("http")) {
s = "http://${s}"
}
if (prefs.sendScanType == "0" &&
!s.matches(".*/[a-zA-Z._-]*\\?[a-zA-Z0-9&=_-]+=$".toRegex())
) {
s = "${s}?content="
}
return s
}
@@ -25,7 +25,7 @@ fun ContentResolver.loadImageUri(uri: Uri): Bitmap? = try {
openInputStream(uri)?.use {
BitmapFactory.decodeStream(it, null, options)
}
} catch (e: IOException) {
} catch (_: IOException) {
null
}
@@ -3,7 +3,7 @@ package de.markusfisch.android.binaryeye.graphics
import android.content.Context
import android.graphics.DashPathEffect
import android.graphics.Paint
import android.support.v4.content.ContextCompat
import androidx.core.content.ContextCompat
import de.markusfisch.android.binaryeye.R
fun Context.getDashedBorderPaint() = Paint(Paint.ANTI_ALIAS_FLAG).apply {
@@ -5,26 +5,22 @@ import android.graphics.Bitmap
import android.graphics.Canvas
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import android.os.Build
import androidx.core.content.res.ResourcesCompat
import androidx.core.graphics.createBitmap
fun Resources.getBitmapFromDrawable(
resId: Int
): Bitmap = getBitmapFromDrawable(getDrawableCompat(resId))
fun Resources.getDrawableCompat(
resId: Int
): Drawable = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
getDrawable(resId, null)
} else {
@Suppress("DEPRECATION")
getDrawable(resId)
}
): Bitmap = getBitmapFromDrawable(
ResourcesCompat.getDrawable(this, resId, null) ?: throw Resources.NotFoundException(
"Drawable resource ID #0x${resId.toString(16)}"
)
)
private fun getBitmapFromDrawable(drawable: Drawable): Bitmap {
if (drawable is BitmapDrawable) {
return drawable.bitmap
}
val bitmap = Bitmap.createBitmap(
val bitmap = createBitmap(
drawable.intrinsicWidth,
drawable.intrinsicHeight,
Bitmap.Config.ARGB_8888
@@ -10,7 +10,9 @@ data class FrameMetrics(
var width: Int = 0,
var height: Int = 0,
var orientation: Int = 0
)
) {
fun isValid() = width > 0 && height > 0
}
fun Rect.setFrameRoi(
frameMetrics: FrameMetrics,
@@ -2,12 +2,13 @@ package de.markusfisch.android.binaryeye.graphics
import android.graphics.Bitmap
import android.graphics.Canvas
import androidx.core.graphics.createBitmap
fun Bitmap.fixTransparency(): Bitmap {
val result = analyzeTransparency()
val cfg = config
return if (cfg != null && result.hasTransparentPixels) {
val copy = Bitmap.createBitmap(
val copy = createBitmap(
width,
height,
cfg
@@ -6,8 +6,8 @@ import android.content.Context
import android.os.Build
import android.os.Environment
import android.provider.MediaStore
import android.support.annotation.MainThread
import android.widget.EditText
import androidx.annotation.MainThread
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.alertDialog
import java.io.File
@@ -53,7 +53,7 @@ fun Context.writeExternalFile(
): Boolean = try {
openExternalOutputStream(fileName, mimeType).use { write(it) }
true
} catch (e: IOException) {
} catch (_: IOException) {
false
}
@@ -0,0 +1,30 @@
package de.markusfisch.android.binaryeye.net
import android.net.Uri
private const val SCHEME = "binaryeye"
private const val HOSTNAME = "markusfisch.de"
private const val ENCODE_PATH = "encode"
fun isScanDeeplink(text: String) = listOf(
"$SCHEME://scan",
"http://$HOSTNAME/BinaryEye",
"https://$HOSTNAME/BinaryEye"
).any { text.startsWith(it) }
fun isEncodeDeeplink(text: String) = listOf(
"$SCHEME://$ENCODE_PATH",
"http://$HOSTNAME/$ENCODE_PATH",
"https://$HOSTNAME/$ENCODE_PATH"
).any { text.startsWith(it) }
fun createEncodeDeeplink(format: String, content: String): String {
return Uri.Builder()
.scheme("https")
.authority(HOSTNAME)
.appendPath(ENCODE_PATH)
.appendQueryParameter("format", format)
.appendQueryParameter("content", content)
.build()
.toString()
}
@@ -1,6 +1,5 @@
package de.markusfisch.android.binaryeye.net
import de.markusfisch.android.binaryeye.content.toHexString
import de.markusfisch.android.binaryeye.database.Scan
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -36,7 +35,10 @@ private fun Scan.send(url: String, type: String): Response {
"2" -> request(url) { con ->
con.requestMethod = "POST"
con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
con.setRequestProperty(
"Content-Type",
"application/x-www-form-urlencoded"
)
con.outputStream.apply {
write(asUrlArguments().toByteArray())
close()
@@ -53,7 +55,7 @@ private fun Scan.send(url: String, type: String): Response {
}
else -> request(
url + content.urlEncode()
url + text.urlEncode()
)
}
}
@@ -67,7 +69,7 @@ private fun Scan.asJson() = JSONObject().apply {
}
private fun Scan.getMap(): Map<String, String> = mapOf(
"content" to content,
"content" to text,
"raw" to raw?.toHexString(),
"format" to format.name,
"errorCorrectionLevel" to errorCorrectionLevel,
@@ -5,6 +5,6 @@ import java.net.URLEncoder
fun String.urlEncode(): String = try {
URLEncoder.encode(this, "UTF-8")
} catch (e: UnsupportedEncodingException) {
} catch (_: UnsupportedEncodingException) {
this
}
}
@@ -5,7 +5,9 @@ import android.view.WindowManager
fun Activity.getScreenBrightness(): Float {
val layoutParams = window.attributes
return if (layoutParams.screenBrightness == WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE) {
return if (layoutParams.screenBrightness ==
WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE
) {
android.provider.Settings.System.getInt(
contentResolver,
android.provider.Settings.System.SCREEN_BRIGHTNESS
@@ -0,0 +1,49 @@
package de.markusfisch.android.binaryeye.preference
import android.content.SharedPreferences
import android.graphics.Point
import androidx.core.content.edit
import org.json.JSONObject
fun SharedPreferences.storeCropHandle(
name: String,
viewWidth: Int,
viewHeight: Int,
cropHandle: Point
) {
edit {
putString(
cropHandleKey(name, viewWidth, viewHeight),
JSONObject().apply {
put("x", cropHandle.x)
put("y", cropHandle.y)
}.toString()
)
}
}
fun SharedPreferences.restoreCropHandle(
name: String,
viewWidth: Int,
viewHeight: Int,
default: Point = Point(-2, -2) // -2 means set default roi.
): Point {
val s = getString(
cropHandleKey(name, viewWidth, viewHeight), null
) ?: return default
return try {
val json = JSONObject(s)
Point(
json.getInt("x"),
json.getInt("y")
)
} catch (_: Exception) {
return default
}
}
private fun cropHandleKey(
name: String,
viewWidth: Int,
viewHeight: Int
) = "${name}:${viewWidth}:${viewHeight}"
@@ -3,56 +3,62 @@ package de.markusfisch.android.binaryeye.preference
import android.annotation.SuppressLint
import android.content.Context
import android.content.SharedPreferences
import android.graphics.Point
import android.media.ToneGenerator
import android.os.Build
import android.preference.PreferenceManager
import android.support.annotation.RequiresApi
import androidx.core.content.edit
import de.markusfisch.android.binaryeye.automation.AutomatedAction
import de.markusfisch.android.binaryeye.automation.AutomatedAction.Companion.fromJsonArray
import de.markusfisch.android.binaryeye.automation.AutomatedAction.Companion.toJsonArray
import de.markusfisch.android.binaryeye.zxingcpp.migrateBarcodeFormatName
import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
import org.json.JSONArray
class Preferences {
lateinit var defaultPreferences: SharedPreferences
lateinit var preferences: SharedPreferences
val profiles = ArrayList<String>()
var profile: String? = null
set(value) {
defaultPreferences.edit {
putString(PROFILE, value)
}
field = value
}
var barcodeFormats = setOf(
BarcodeFormat.AZTEC.name,
BarcodeFormat.CODABAR.name,
BarcodeFormat.CODE_39.name,
BarcodeFormat.CODE_93.name,
BarcodeFormat.CODE_128.name,
BarcodeFormat.DATA_BAR.name,
BarcodeFormat.DATA_BAR_EXPANDED.name,
BarcodeFormat.DATA_MATRIX.name,
BarcodeFormat.DX_FILM_EDGE.name,
BarcodeFormat.EAN_8.name,
BarcodeFormat.EAN_13.name,
BarcodeFormat.Aztec.name,
BarcodeFormat.Codabar.name,
BarcodeFormat.Code39.name,
BarcodeFormat.Code39Ext.name,
BarcodeFormat.Code32.name,
BarcodeFormat.PZN.name,
BarcodeFormat.Code93.name,
BarcodeFormat.Code128.name,
BarcodeFormat.DataBar.name,
BarcodeFormat.DataBarOmni.name,
BarcodeFormat.DataBarStk.name,
BarcodeFormat.DataBarLtd.name,
BarcodeFormat.DataBarExp.name,
BarcodeFormat.DataBarExpStk.name,
BarcodeFormat.DataMatrix.name,
BarcodeFormat.DXFilmEdge.name,
BarcodeFormat.EAN8.name,
BarcodeFormat.EAN13.name,
BarcodeFormat.ITF.name,
BarcodeFormat.MAXICODE.name,
BarcodeFormat.PDF_417.name,
BarcodeFormat.QR_CODE.name,
BarcodeFormat.MICRO_QR_CODE.name,
BarcodeFormat.RMQR_CODE.name,
BarcodeFormat.UPC_A.name,
BarcodeFormat.UPC_E.name,
BarcodeFormat.MaxiCode.name,
BarcodeFormat.PDF417.name,
BarcodeFormat.QRCode.name,
BarcodeFormat.MicroQRCode.name,
BarcodeFormat.RMQRCode.name,
BarcodeFormat.UPCA.name,
BarcodeFormat.UPCE.name,
)
@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
set(value) {
apply(BARCODE_FORMATS, value)
field = value
}
var cropHandleX = -2 // -2 means set default roi.
set(value) {
apply(CROP_HANDLE_X, value)
field = value
}
var cropHandleY = -2
set(value) {
apply(CROP_HANDLE_Y, value)
field = value
}
var cropHandleOrientation = 0
set(value) {
apply(CROP_HANDLE_ORIENTATION, value)
field = value
}
var showCropHandle = true
set(value) {
apply(SHOW_CROP_HANDLE, value)
@@ -210,34 +216,103 @@ class Preferences {
apply(EXPAND_ESCAPE_SEQUENCES, value)
field = value
}
var addQuietZone = true
set(value) {
apply(ADD_QUIET_ZONE, value)
field = value
}
var brightenScreen = false
set(value) {
apply(BRIGHTEN_SCREEN, value)
field = value
}
var previewScale = 0f
set(value) {
apply(PREVIEW_SCALE, value)
field = value
}
var automatedActions = mutableListOf<AutomatedAction>()
private set
fun init(context: Context) {
preferences = PreferenceManager.getDefaultSharedPreferences(context)
// I'm not including a support library just to get the
// default preferences. Dependencies are a burden.
@Suppress("DEPRECATION")
defaultPreferences = PreferenceManager.getDefaultSharedPreferences(context)
loadProfiles()
load(context, defaultPreferences.getString(PROFILE, null))
}
fun load(context: Context, profileName: String?) {
preferences = if (profileName.isNullOrEmpty()) {
profile = null
defaultPreferences
} else {
profile = profileName
context.getSharedPreferences(
profileName,
Context.MODE_PRIVATE
)
}
update()
}
fun addProfile(name: String): Boolean {
if (!name.matches("^[a-zA-Z0-9_-]+$".toRegex()) ||
profiles.contains(name)
) {
return false
}
profiles.add(name)
saveProfiles()
return true
}
fun removeProfile(name: String): Boolean {
if (!profiles.remove(name)) {
return false
}
saveProfiles()
return true
}
fun saveProfiles() {
defaultPreferences.edit {
putString(PROFILES, JSONArray(profiles).toString())
}
}
fun loadProfiles() {
profiles.clear()
JSONArray(
defaultPreferences.getString(PROFILES, "[]")
).let {
profiles.addAll(Array(it.length()) { i -> it.getString(i) })
}
}
fun update() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
preferences.getStringSet(BARCODE_FORMATS, barcodeFormats)?.let {
barcodeFormats = addFormatsOnUpdate(
it,
BarcodeFormat.RMQR_CODE,
BarcodeFormat.DX_FILM_EDGE
)
preferences.getStringSet(BARCODE_FORMATS, barcodeFormats)?.let {
val migrated = migrateBarcodeFormats(it)
if (migrated != it) {
apply(BARCODE_FORMATS, migrated)
}
barcodeFormats = addFormatsOnUpdate(
migrated,
BarcodeFormat.Code39Ext,
BarcodeFormat.Code32,
BarcodeFormat.PZN,
BarcodeFormat.DataBarOmni,
BarcodeFormat.DataBarStk,
BarcodeFormat.DataBarLtd,
BarcodeFormat.DataBarExp,
BarcodeFormat.DataBarExpStk,
BarcodeFormat.RMQRCode,
BarcodeFormat.DXFilmEdge
)
}
cropHandleX = preferences.getInt(CROP_HANDLE_X, cropHandleX)
cropHandleY = preferences.getInt(CROP_HANDLE_Y, cropHandleY)
cropHandleOrientation = preferences.getInt(
CROP_HANDLE_ORIENTATION,
cropHandleOrientation
)
showCropHandle = preferences.getBoolean(
SHOW_CROP_HANDLE,
showCropHandle
@@ -264,11 +339,16 @@ class Preferences {
// Map old setting to new one if it wasn't on default value.
val ignoreConsecutiveDuplicates = "ignore_consecutive_duplicates"
if (!preferences.getBoolean(ignoreConsecutiveDuplicates, true)) {
preferences.edit().remove(ignoreConsecutiveDuplicates).apply()
preferences.edit {
remove(ignoreConsecutiveDuplicates)
}
ignoreDuplicatesName = "accept_duplicates"
}
preferences.getString(IGNORE_DUPLICATES_NAME, ignoreDuplicatesName)?.also {
preferences.getString(
IGNORE_DUPLICATES_NAME,
ignoreDuplicatesName
)?.also {
ignoreDuplicatesName = it
}
copyImmediately = preferences.getBoolean(
@@ -331,10 +411,23 @@ class Preferences {
EXPAND_ESCAPE_SEQUENCES,
expandEscapeSequences
)
addQuietZone = preferences.getBoolean(ADD_QUIET_ZONE, addQuietZone)
brightenScreen = preferences.getBoolean(
BRIGHTEN_SCREEN,
brightenScreen
)
previewScale = preferences.getFloat(
PREVIEW_SCALE,
previewScale
)
automatedActions = fromJsonArray(
preferences.getString(AUTOMATED_ACTIONS, "[]") ?: "[]"
)
}
fun setAutomatedActions(actions: List<AutomatedAction>) {
automatedActions = actions.toMutableList()
apply(AUTOMATED_ACTIONS, toJsonArray(actions))
}
private fun addFormatsOnUpdate(
@@ -344,12 +437,33 @@ class Preferences {
for (format in formats) {
val name = "${format.name}_added"
if (!preferences.getBoolean(name, false)) {
preferences.edit().putBoolean(name, true).apply()
preferences.edit {
putBoolean(name, true)
}
add(format.name)
}
}
}
private fun migrateBarcodeFormats(formats: Set<String>): Set<String> {
return formats.mapTo(mutableSetOf()) { format ->
format.migrateBarcodeFormatName()
}
}
fun restoreCropHandle(
name: String,
viewWidth: Int,
viewHeight: Int
) = preferences.restoreCropHandle(name, viewWidth, viewHeight)
fun storeCropHandle(
name: String,
viewWidth: Int,
viewHeight: Int,
cropHandle: Point
) = preferences.storeCropHandle(name, viewWidth, viewHeight, cropHandle)
fun beepTone() = when (beepToneName) {
"tone_cdma_confirm" -> ToneGenerator.TONE_CDMA_CONFIRM
"tone_sup_radio_ack" -> ToneGenerator.TONE_SUP_RADIO_ACK
@@ -365,32 +479,41 @@ class Preferences {
else -> IgnoreDuplicates.Never
}
private fun put(label: String, value: Boolean) =
preferences.edit().putBoolean(label, value)
private fun put(label: String, value: String) =
preferences.edit().putString(label, value)
private fun apply(label: String, value: Boolean) {
put(label, value).apply()
preferences.edit {
putBoolean(label, value)
}
}
private fun apply(label: String, value: String) {
preferences.edit().putString(label, value).apply()
preferences.edit {
putString(label, value)
}
}
private fun apply(label: String, value: Int) {
preferences.edit().putInt(label, value).apply()
preferences.edit {
putInt(label, value)
}
}
private fun apply(label: String, value: Float) {
preferences.edit {
putFloat(label, value)
}
}
@SuppressLint("ApplySharedPref")
private fun commit(label: String, value: String) {
preferences.edit().putString(label, value).commit()
preferences.edit(true) {
putString(label, value)
}
}
@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
private fun apply(label: String, value: Set<String>) {
preferences.edit().putStringSet(label, value).apply()
preferences.edit {
putStringSet(label, value)
}
}
companion object {
@@ -398,10 +521,9 @@ class Preferences {
Consecutive, Any, Never
}
private const val PROFILES = "profiles"
private const val PROFILE = "profile"
private const val BARCODE_FORMATS = "formats"
private const val CROP_HANDLE_X = "crop_handle_x"
private const val CROP_HANDLE_Y = "crop_handle_y"
private const val CROP_HANDLE_ORIENTATION = "crop_handle_orientation"
private const val SHOW_CROP_HANDLE = "show_crop_handle"
private const val ZOOM_BY_SWIPING = "zoom_by_swiping"
private const val AUTO_ROTATE = "auto_rotate"
@@ -433,6 +555,9 @@ class Preferences {
private const val INDEX_OF_LAST_SELECTED_EC_LEVEL = "index_of_last_selected_ec_level"
private const val FREE_ROTATION = "free_rotation"
private const val EXPAND_ESCAPE_SEQUENCES = "expand_escape_sequences"
private const val ADD_QUIET_ZONE = "add_quiet_zone"
private const val BRIGHTEN_SCREEN = "brighten_screen"
private const val PREVIEW_SCALE = "preview_scale"
private const val AUTOMATED_ACTIONS = "automated_actions"
}
}
@@ -1,12 +1,12 @@
package de.markusfisch.android.binaryeye.preference
import android.content.Context
import android.support.v7.preference.DialogPreference
import android.util.AttributeSet
import androidx.preference.DialogPreference
import de.markusfisch.android.binaryeye.R
class UrlPreference(
context: Context?,
context: Context,
attrs: AttributeSet?
) : DialogPreference(context, attrs) {
private var url: String? = null
@@ -5,7 +5,7 @@ import android.app.PendingIntent
import android.content.Intent
import android.os.Build
import android.service.quicksettings.TileService
import android.support.annotation.RequiresApi
import androidx.annotation.RequiresApi
import de.markusfisch.android.binaryeye.activity.CameraActivity
@RequiresApi(Build.VERSION_CODES.N)
@@ -2,16 +2,16 @@ package de.markusfisch.android.binaryeye.view
import android.content.Context
import android.content.ContextWrapper
import android.graphics.drawable.ColorDrawable
import android.os.Build
import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.Toolbar
import android.view.View
import android.view.WindowManager
import android.widget.AbsListView
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.toDrawable
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import de.markusfisch.android.binaryeye.R
val systemBarListViewScrollListener = object : AbsListView.OnScrollListener {
@@ -26,7 +26,8 @@ val systemBarListViewScrollListener = object : AbsListView.OnScrollListener {
view.post {
val scrolled = firstVisibleItem > 0 ||
(totalItemCount > 0 && firstChildScrolled(view))
val scrollable = scrolled || totalItemCount > 0 && lastChildOutOfView(view)
val scrollable = scrolled ||
totalItemCount > 0 && lastChildOutOfView(view)
colorSystemAndToolBars(view.context, scrolled, scrollable)
}
}
@@ -38,9 +39,11 @@ val systemBarListViewScrollListener = object : AbsListView.OnScrollListener {
val systemBarRecyclerViewScrollListener = object : RecyclerView.OnScrollListener() {
override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
val layoutManager = recyclerView.layoutManager as LinearLayoutManager
val scrolled = layoutManager.findFirstCompletelyVisibleItemPosition() != 0
val scrollable = scrolled || layoutManager.findLastVisibleItemPosition() <
recyclerView.adapter.itemCount - 1
val scrolled =
layoutManager.findFirstCompletelyVisibleItemPosition() != 0
val scrollable = scrolled ||
layoutManager.findLastVisibleItemPosition() <
(recyclerView.adapter?.itemCount ?: 0) - 1
colorSystemAndToolBars(recyclerView.context, scrolled, scrollable)
}
@@ -59,23 +62,21 @@ private fun lastChildOutOfView(listView: AbsListView): Boolean {
}
fun AppCompatActivity.initBars() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
// Keeps the soft keyboard from repositioning the layout.
window.setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
)
window.decorView.systemUiVisibility =
View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
}
// Keeps the soft keyboard from repositioning the layout.
window.setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
)
window.decorView.systemUiVisibility =
View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
colorSystemAndToolBars(this)
setPaddingFromWindowInsets(
findViewById(R.id.main),
(findViewById(R.id.toolbar) as Toolbar).apply {
setSupportActionBar(this)
},
findViewById(R.id.navbar)?.apply {
findViewById<View>(R.id.navbar)?.apply {
setBackgroundColor(translucentPrimaryColor)
}
)
@@ -91,7 +92,6 @@ fun unlockStatusBarColor() {
}
private var translucentPrimaryColor = 0
private val actionBarBackground = ColorDrawable()
fun colorSystemAndToolBars(
context: Context,
scrolled: Boolean = false,
@@ -105,40 +105,29 @@ fun colorSystemAndToolBars(
}
val topColor = if (scrolled) translucentPrimaryColor else 0
val activity = getAppCompatActivity(context) ?: return
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
// System bars no longer have a background from SDK35+.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
val window = activity.window
if (!statusBarColorLocked) {
@Suppress("DEPRECATION")
window.statusBarColor = topColor
}
// System bars no longer have a background from SDK35+.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
val window = activity.window
if (!statusBarColorLocked) {
@Suppress("DEPRECATION")
window.navigationBarColor = if (scrolled || scrollable) {
translucentPrimaryColor
} else {
0
}
window.statusBarColor = topColor
}
@Suppress("DEPRECATION")
window.navigationBarColor = if (scrolled || scrollable) {
translucentPrimaryColor
} else {
activity.findViewById(R.id.navbar)?.apply {
visibility = if (scrolled || scrollable) {
View.VISIBLE
} else {
View.GONE
}
0
}
} else {
activity.findViewById<View>(R.id.navbar)?.apply {
visibility = if (scrolled || scrollable) {
View.VISIBLE
} else {
View.GONE
}
}
}
activity.supportActionBar?.setBackgroundDrawable(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
// Avoid allocation on Honeycomb and better.
actionBarBackground.color = topColor
actionBarBackground
} else {
// ColorDrawable.setColor() doesn't exist pre Honeycomb.
ColorDrawable(topColor)
}
)
activity.supportActionBar?.setBackgroundDrawable(topColor.toDrawable())
}
private fun getAppCompatActivity(context: Context): AppCompatActivity? {
@@ -2,15 +2,18 @@ package de.markusfisch.android.binaryeye.view
import android.graphics.Rect
import android.os.Build
import android.support.annotation.RequiresApi
import android.support.v4.view.ViewCompat
import android.support.v4.view.WindowInsetsCompat
import android.support.v7.widget.Toolbar
import android.view.View
import android.view.WindowInsets
import androidx.appcompat.widget.Toolbar
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
private var toolbarHeight = 0
fun setPaddingFromWindowInsets(mainLayout: View, toolbar: Toolbar, navbar: View?) {
fun setPaddingFromWindowInsets(
mainLayout: View,
toolbar: Toolbar,
navbar: View?
) {
toolbarHeight = toolbar.layoutParams.height
// SDK 35+ is edge-to-edge by default, so the toolbar needs to extend
// below the status bar.
@@ -49,19 +52,15 @@ fun View.setPaddingFromWindowInsets() {
// For the original post see here:
// https://medium.com/androiddevelopers/windowinsets-listeners-to-layouts-8f9ccc8fa4d1
fun View.doOnApplyWindowInsets(f: (View, Rect) -> Unit) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
f(this, insetsWithToolbar())
} else {
ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
f(v, insetsWithToolbar(insets))
insets
}
// It's important to explicitly request the insets (again) in
// case the view was created in Fragment.onCreateView() because
// setOnApplyWindowInsetsListener() won't fire when the view
// isn't attached.
requestApplyInsetsWhenAttached()
ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
f(v, insetsWithToolbar(insets))
insets
}
// It's important to explicitly request the insets (again) in
// case the view was created in Fragment.onCreateView() because
// setOnApplyWindowInsetsListener() won't fire when the view
// isn't attached.
requestApplyInsetsWhenAttached()
}
private fun insetsWithToolbar(insets: WindowInsetsCompat? = null) = Rect(
@@ -71,7 +70,6 @@ private fun insetsWithToolbar(insets: WindowInsetsCompat? = null) = Rect(
insets?.systemWindowInsetBottom ?: 0
)
@RequiresApi(Build.VERSION_CODES.KITKAT)
private fun View.requestApplyInsetsWhenAttached() {
if (isAttachedToWindow) {
ViewCompat.requestApplyInsets(this)
@@ -10,6 +10,8 @@ import de.markusfisch.android.scalingimageview.widget.ScalingImageView
open class ConfinedScalingImageView : ScalingImageView {
val insets = Rect()
var runAfterLayout: (() -> Unit)? = null
constructor(context: Context, attrs: AttributeSet, defStyle: Int) :
super(context, attrs, defStyle)
@@ -37,5 +39,8 @@ open class ConfinedScalingImageView : ScalingImageView {
)
}
centerRemap()
runAfterLayout?.invoke()
}
fun isInBounds(): Boolean = inBounds()
}
@@ -27,7 +27,8 @@ class ConfinedScrollView : ScrollView {
// not putting it on the queue makes it only work sometimes.
post {
getChildAt(0)?.also { child ->
scrollable = height < child.height + paddingTop + paddingBottom
scrollable = height <
child.height + paddingTop + paddingBottom
colorSystemAndToolBars(
context,
scrollY > 0,
@@ -9,16 +9,14 @@ import android.graphics.Point
import android.graphics.Rect
import android.graphics.Region
import android.os.Build
import android.os.Parcel
import android.os.Parcelable
import android.support.v4.content.ContextCompat
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
import androidx.core.content.ContextCompat
import androidx.core.graphics.withSave
import de.markusfisch.android.binaryeye.R
import de.markusfisch.android.binaryeye.app.prefs
import de.markusfisch.android.binaryeye.graphics.getBitmapFromDrawable
import de.markusfisch.android.binaryeye.graphics.getDashedBorderPaint
import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min
@@ -28,15 +26,14 @@ class DetectorView : View {
val coordinates = FloatArray(32)
val roi = Rect()
var cropHandleName: String? = null
var onRoiChange: (() -> Unit)? = null
var onRoiChanged: (() -> Unit)? = null
private val currentOrientation = resources.configuration.orientation
private val invalidateRunnable: Runnable = Runnable {
coordinatesLast = 0
invalidate()
}
private val roiPaint = context.getDashedBorderPaint()
private val dotPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = ContextCompat.getColor(context, R.color.dot)
style = Paint.Style.FILL
@@ -47,7 +44,8 @@ class DetectorView : View {
)
private val handleXRadius = handleBitmap.width / 2
private val handleYRadius = handleBitmap.height / 2
private val handlePos = Point(-1, -1)
private val inactiveHandlePos = Point(-1, -1)
private val handlePos = Point(inactiveHandlePos)
private val handleHome = Point()
private val center = Point()
private val touchDown = Point()
@@ -57,6 +55,8 @@ class DetectorView : View {
private val fabHeight: Int
private val padding: Int
private var viewWidth = 0
private var viewHeight = 0
private var coordinatesLast = 0
private var handleGrabbed = false
private var handleActive = false
@@ -83,37 +83,38 @@ class DetectorView : View {
constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) :
super(context, attrs, defStyleAttr)
fun saveCropHandlePos() {
val pos = getCropHandlePos()
prefs.cropHandleX = pos.x
prefs.cropHandleY = pos.y
prefs.cropHandleOrientation = currentOrientation
}
private fun getCropHandlePos() = if (handleActive) {
handlePos
} else {
Point(-1, -1)
}
fun restoreCropHandlePos() {
setCropHandlePos(
prefs.cropHandleX,
prefs.cropHandleY,
prefs.cropHandleOrientation
fun storeCropHandlePos() {
val name = cropHandleName ?: return
val pos = if (handleActive) {
handlePos
} else {
inactiveHandlePos
}
prefs.storeCropHandle(
name,
viewWidth,
viewHeight,
pos
)
}
private fun setCropHandlePos(x: Int, y: Int, orientation: Int) {
// Always set handlePos even if it's invalid because
// handlePos.x may be -2 which is a signal to set the
// default ROI.
if (orientation == currentOrientation) {
handlePos.set(x, y)
} else {
handlePos.set(y, x)
fun updateCropHandlePos() {
val name = cropHandleName ?: return
if (viewWidth < 1 || viewHeight < 1) {
return
}
val cropHandle = prefs.restoreCropHandle(name, viewWidth, viewHeight)
if (cropHandle.x == -2) {
setHandleToDefaultRoi()
} else {
handlePos.set(cropHandle.x, cropHandle.y)
handleActive = handlePos.x > -1
}
if (handleActive) {
updateClipRect()
} else {
reset()
}
handleActive = handlePos.x > -1
}
fun update(numberOfCoordinates: Int) {
@@ -123,31 +124,6 @@ class DetectorView : View {
postDelayed(invalidateRunnable, 500)
}
override fun onSaveInstanceState(): Parcelable? {
if (!handleActive) {
return super.onSaveInstanceState()
}
return SavedState(super.onSaveInstanceState()).apply {
savedHandlePos.set(getCropHandlePos())
savedOrientation = currentOrientation
}
}
override fun onRestoreInstanceState(state: Parcelable) {
super.onRestoreInstanceState(
if (state is SavedState) {
setCropHandlePos(
state.savedHandlePos.x,
state.savedHandlePos.y,
state.savedOrientation
)
state.superState
} else {
state
}
)
}
@SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent?): Boolean {
event ?: return super.onTouchEvent(event)
@@ -244,28 +220,27 @@ class DetectorView : View {
roi.set(0, 0, 0, 0)
}
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
override fun onLayout(
changed: Boolean,
left: Int,
top: Int,
right: Int,
bottom: Int
) {
super.onLayout(changed, left, top, right, bottom)
val width = right - left
val height = bottom - top
viewWidth = right - left
viewHeight = bottom - top
center.set(
left + (width / 2),
top + (height / 2)
left + (viewWidth / 2),
top + (viewHeight / 2)
)
minY = padding * 2
maxY = height - minY
maxY = viewHeight - minY
handleHome.set(
width - handleXRadius - paddingRight - padding,
height - handleYRadius - paddingBottom - fabHeight
viewWidth - handleXRadius - paddingRight - padding,
viewHeight - handleYRadius - paddingBottom - fabHeight
)
if (handlePos.x == -2) {
setHandleToDefaultRoi()
}
if (handleActive) {
updateClipRect()
} else {
reset()
}
updateCropHandlePos()
}
override fun onDraw(canvas: Canvas) {
@@ -294,10 +269,8 @@ class DetectorView : View {
if (minDist < 1) {
return
}
// canvas.clipRect() doesn't work reliably below KITKAT.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
val radius = min(minDist / 2, cornerRadius).toFloat()
save()
val radius = min(minDist / 2, cornerRadius).toFloat()
withSave {
clipOutPathCompat(
calculateRoundedRectPath(
roi.left.toFloat(),
@@ -309,9 +282,6 @@ class DetectorView : View {
)
)
drawColor(shadeColor)
restore()
} else {
drawRect(roi, roiPaint)
}
}
@@ -349,37 +319,6 @@ class DetectorView : View {
private fun clampX(x: Int) = min(center.x * 2, max(0, x))
private fun clampY(y: Int) = min(maxY, max(minY, y))
internal class SavedState : BaseSavedState {
val savedHandlePos = Point()
var savedOrientation = 0
constructor(superState: Parcelable?) : super(superState)
private constructor(parcel: Parcel) : super(parcel) {
savedHandlePos.set(
parcel.readInt(),
parcel.readInt()
)
savedOrientation = parcel.readInt()
}
override fun writeToParcel(out: Parcel, flags: Int) {
super.writeToParcel(out, flags)
out.writeInt(savedHandlePos.x)
out.writeInt(savedHandlePos.y)
out.writeInt(savedOrientation)
}
companion object {
@JvmField
val CREATOR = object : Parcelable.Creator<SavedState> {
override fun createFromParcel(source: Parcel) = SavedState(source)
override fun newArray(size: Int): Array<SavedState?> = arrayOfNulls(size)
}
}
}
}
private fun distSq(a: Point, b: Point): Int {
@@ -0,0 +1,36 @@
package de.markusfisch.android.binaryeye.zxingcpp
/**
* Translate legacy barcode format names from ZXingC++ before 3.x
* to current BarcodeFormat enum names.
*/
fun String.migrateBarcodeFormatName() = when (this) {
"NONE" -> "None"
"AZTEC" -> "Aztec"
"CODABAR" -> "Codabar"
"CODE_39" -> "Code39"
"CODE_39_EXT" -> "Code39Ext"
"CODE_32" -> "Code32"
"PZN" -> "PZN"
"CODE_93" -> "Code93"
"CODE_128" -> "Code128"
"DATA_BAR" -> "DataBar"
"DATA_BAR_OMNI" -> "DataBarOmni"
"DATA_BAR_STK" -> "DataBarStk"
"DATA_BAR_LTD" -> "DataBarLtd"
"DATA_BAR_EXPANDED" -> "DataBarExp"
"DATA_BAR_EXP_STK" -> "DataBarExpStk"
"DATA_MATRIX" -> "DataMatrix"
"DX_FILM_EDGE" -> "DXFilmEdge"
"EAN_8" -> "EAN8"
"EAN_13" -> "EAN13"
"ITF" -> "ITF"
"MAXICODE" -> "MaxiCode"
"PDF_417" -> "PDF417"
"QR_CODE" -> "QRCode"
"MICRO_QR_CODE" -> "MicroQRCode"
"RMQR_CODE" -> "RMQRCode"
"UPC_A" -> "UPCA"
"UPC_E" -> "UPCE"
else -> this
}
@@ -0,0 +1,16 @@
<selector
xmlns:android="http://schemas.android.com/apk/res/android"
android:constantSize="true">
<item android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="2dp"/>
<solid android:color="@color/selected_row"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="2dp"/>
<solid android:color="@color/pressed_row"/>
</shape>
</item>
</selector>
@@ -0,0 +1,3 @@
<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
</vector>
@@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
<path android:fillColor="#fff" android:pathData="M480,480Q414,480 367,433Q320,386 320,320Q320,254 367,207Q414,160 480,160Q546,160 593,207Q640,254 640,320Q640,386 593,433Q546,480 480,480ZM160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q286,551 350,535.5Q414,520 480,520Q546,520 610,535.5Q674,551 736,582Q765,597 782.5,625.5Q800,654 800,688L800,800L160,800ZM240,720L720,720L720,688Q720,677 714.5,668Q709,659 700,654Q646,627 591,613.5Q536,600 480,600Q424,600 369,613.5Q314,627 260,654Q251,659 245.5,668Q240,677 240,688L240,720ZM480,400Q513,400 536.5,376.5Q560,353 560,320Q560,287 536.5,263.5Q513,240 480,240Q447,240 423.5,263.5Q400,287 400,320Q400,353 423.5,376.5Q447,400 480,400ZM480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320ZM480,720L480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720Q480,720 480,720L480,720Z"/>
</vector>
+9 -8
View File
@@ -1,13 +1,16 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<de.markusfisch.android.cameraview.widget.CameraView
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.camera.view.PreviewView
android:id="@+id/camera_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
app:scaleType="fillCenter"/>
<de.markusfisch.android.binaryeye.widget.DetectorView
android:id="@+id/detector_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -19,15 +22,13 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:layout_marginBottom="16dp"
android:layout_marginRight="88dp"
android:layout_marginEnd="88dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:padding="24dp"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/flash"
android:contentDescription="@string/toggle_flash"
android:src="@drawable/ic_action_flash"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</merge>
+1 -1
View File
@@ -1,5 +1,5 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
+3 -3
View File
@@ -8,17 +8,17 @@
android:id="@+id/detector_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="@bool/fitsSystemWindows">
<include layout="@layout/toolbar"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/scan"
android:contentDescription="@string/scan_code"
android:src="@drawable/ic_action_next"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<include layout="@layout/navbar"/>
</merge>
@@ -0,0 +1,58 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<!-- The FrameLayout is necessary because this LinearLayout
should have a padding which would be reset by the window
insets from `fitsSystemWindows`. -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
android:padding="24dp"
android:orientation="vertical"
tools:ignore="UselessParent">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:drawablePadding="16dp"
android:gravity="center"
android:text="@string/welcome"
android:textAppearance="?android:attr/textAppearanceLarge"
app:drawableTopCompat="@drawable/logo"/>
<LinearLayout
style="@style/WelcomeButton"
android:id="@+id/expert"
android:layout_marginBottom="16dp"
android:orientation="vertical">
<TextView
style="@style/WelcomeButtonText"
android:text="@string/mode_expert"/>
<TextView
style="@style/WelcomeButtonSubText"
android:text="@string/mode_expert_description"/>
</LinearLayout>
<LinearLayout
style="@style/WelcomeButton"
android:id="@+id/simple"
android:orientation="vertical">
<TextView
style="@style/WelcomeButtonText"
android:text="@string/mode_simple"/>
<TextView
style="@style/WelcomeButtonSubText"
android:text="@string/mode_simple_description"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
</ScrollView>
@@ -0,0 +1,76 @@
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/automated_action_regex"/>
<EditText
android:id="@+id/regex"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/automated_action_regex_hint"
android:inputType="text"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:text="@string/automated_action_type"/>
<RadioGroup
android:id="@+id/action_type"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RadioButton
android:id="@+id/action_type_intent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/automated_action_type_intent"/>
<RadioButton
android:id="@+id/action_type_custom_intent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/automated_action_type_custom_intent"/>
</RadioGroup>
<LinearLayout
android:id="@+id/url_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/automated_action_url_template"/>
<EditText
android:id="@+id/url_template"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/automated_action_url_hint"
android:inputType="textUri"/>
</LinearLayout>
<LinearLayout
android:id="@+id/intent_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/automated_action_intent_uri_template"/>
<EditText
android:id="@+id/intent_uri_template"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/automated_action_intent_uri_hint"
android:inputType="textUri"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
@@ -0,0 +1,22 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/profile_enter_name"/>
<EditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textShortMessage|textAutoCorrect|textCapSentences"
android:imeOptions="actionDone"
android:hint="@string/profile_enter_name_hint"
android:maxLines="1"
android:maxLength="1024"
android:importantForAutofill="no"/>
</LinearLayout>
@@ -0,0 +1,31 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/actions"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:divider="@color/separator"
android:dividerHeight="1px"/>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:visibility="gone"
android:id="@+id/no_actions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="32dp"
android:text="@string/automated_actions_empty"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/add"
android:contentDescription="@string/automated_action_add"
android:src="@drawable/ic_action_create"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
+3 -3
View File
@@ -7,14 +7,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/view_barcode"/>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/share"
android:contentDescription="@string/share"
android:src="@drawable/ic_action_share"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
+3 -3
View File
@@ -77,14 +77,14 @@
android:contentDescription="@string/view_barcode"/>
</LinearLayout>
</de.markusfisch.android.binaryeye.widget.ConfinedScrollView>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/open"
android:contentDescription="@string/open_url"
android:src="@drawable/ic_action_open"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
+4 -5
View File
@@ -65,22 +65,21 @@
android:id="@+id/colors"
android:layout_marginBottom="16dp"
android:entries="@array/colors"/>
<android.support.v7.widget.SwitchCompat
android:visibility="gone"
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/add_quiet_zone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/add_quiet_zone"/>
</LinearLayout>
</de.markusfisch.android.binaryeye.widget.ConfinedScrollView>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/encode"
android:contentDescription="@string/encode"
android:src="@drawable/ic_action_next"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
+4 -4
View File
@@ -10,11 +10,11 @@
android:clipToPadding="false"
android:divider="@color/separator"
android:dividerHeight="1px"/>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.SwitchCompat
<androidx.appcompat.widget.SwitchCompat
android:visibility="gone"
android:id="@+id/use_history"
android:layout_width="match_parent"
@@ -22,12 +22,12 @@
android:layout_alignParentTop="true"
android:padding="16dp"
android:text="@string/use_history"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:visibility="gone"
android:id="@+id/share"
android:contentDescription="@string/share"
android:src="@drawable/ic_action_share"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<include layout="@layout/progress_view"/>
</FrameLayout>
@@ -10,7 +10,7 @@
android:clipToPadding="false"
android:divider="@color/separator"
android:dividerHeight="1px"/>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -23,10 +23,10 @@
android:gravity="center"
android:padding="32dp"
android:text="@string/clear_network_suggestions_nothing_to_remove"/>
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/remove"
android:contentDescription="@string/remove_suggestion"
android:src="@drawable/ic_action_remove"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
@@ -0,0 +1,31 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/profiles"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:divider="@color/separator"
android:dividerHeight="1px"/>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/inset_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:visibility="gone"
android:id="@+id/no_profiles"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="32dp"
android:text="@string/profile_empty"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
style="@style/FAB"
android:id="@+id/add"
android:contentDescription="@string/profile_add"
android:src="@drawable/ic_action_create"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</FrameLayout>
-3
View File
@@ -9,7 +9,6 @@
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"/>
<TextView
@@ -18,9 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_toRightOf="@+id/time"
android:layout_toEndOf="@+id/time"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"/>
<TextView
+1 -1
View File
@@ -1,4 +1,4 @@
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="Overdraw"
@@ -47,4 +47,9 @@
android:title="@string/info"
android:icon="@drawable/ic_action_info"
material:showAsAction="ifRoom"/>
<item
android:id="@+id/profile"
android:title="@string/profile_default"
android:icon="@drawable/ic_action_profile"
material:showAsAction="ifRoom"/>
</menu>
@@ -11,6 +11,11 @@
android:title="@string/copy_to_clipboard"
android:icon="@drawable/ic_action_copy"
material:showAsAction="ifRoom"/>
<item
android:id="@+id/copy_as_deeplink"
android:title="@string/copy_as_deeplink"
android:icon="@drawable/ic_action_link"
material:showAsAction="ifRoom"/>
<item
android:id="@+id/export_to_file"
android:title="@string/export_to_file"
+6 -1
View File
@@ -18,6 +18,11 @@
android:title="@string/copy_to_clipboard"
android:icon="@drawable/ic_action_copy"
material:showAsAction="ifRoom"/>
<item
android:id="@+id/copy_as_deeplink"
android:title="@string/copy_as_deeplink"
android:icon="@drawable/ic_action_link"
material:showAsAction="ifRoom"/>
<item
android:id="@+id/share"
android:title="@string/share"
@@ -26,7 +31,7 @@
<item
android:id="@+id/share_file"
android:title="@string/share_file"
android:icon="@drawable/ic_action_share"
android:icon="@drawable/ic_action_pick_file"
material:showAsAction="ifRoom"/>
<item
android:id="@+id/create"
+1 -1
View File
@@ -5,7 +5,7 @@
android:id="@+id/search"
android:icon="@drawable/ic_action_search"
android:title="@string/search_scan"
material:actionViewClass="android.support.v7.widget.SearchView"
material:actionViewClass="androidx.appcompat.widget.SearchView"
material:showAsAction="collapseActionView|always"/>
<item
android:id="@+id/export_history"
+74 -14
View File
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="welcome">مرحبًا!</string>
<string name="mode_expert">متقدم</string>
<string name="mode_expert_description">أود التحقق من المحتوى المقروء وفتحه يدويًا.</string>
<string name="mode_simple">بسيط</string>
<string name="mode_simple_description">أريد فقط قراءة الباركود وفتحه فورًا.</string>
<string name="camera_error">يتعذر الوصول إلى الكاميرا، يرجى المحاولة مرة أخرى</string>
<string name="scan_code">مسح الرمز</string>
<string name="compose_barcode">إنشاء رمز Bardcode</string>
@@ -14,10 +20,10 @@
<item quantity="other">%2$d حرف، %1$s</item>
</plurals>
<string name="error_correction_level">مستوى تصحيح الأخطاء</string>
<string name="error_correction_level_l" formatted="false">منخفض (~7&#37; تصحيح)</string>
<string name="error_correction_level_m" formatted="false">متوسط (~15&#37; تصحيح)</string>
<string name="error_correction_level_q" formatted="false">ربع (~25&#37; تصحيح)</string>
<string name="error_correction_level_h" formatted="false">مرتفع (~30&#37; تصحيح)</string>
<string name="error_correction_level_l" formatted="false">منخفض (~7% تصحيح)</string>
<string name="error_correction_level_m" formatted="false">متوسط (~15% تصحيح)</string>
<string name="error_correction_level_q" formatted="false">ربع (~25% تصحيح)</string>
<string name="error_correction_level_h" formatted="false">مرتفع (~30% تصحيح)</string>
<string name="label">العنوان</string>
<string name="colors">المقدمة والخلفية</string>
<string name="colors_black_on_white">أسود على خلفية بيضاء</string>
@@ -33,23 +39,23 @@
<string name="gtin_add_on">إضافة UPC EAN</string>
<string name="barcode_version_number">الإصدار</string>
<string name="qr_version_and_modules" tools:ignore="PluralsCandidate">%1$s (%2$d وحدات)</string>
<string name="qr_data_mask">Data mask</string>
<string name="qr_data_mask">قناع البيانات</string>
<string name="toggle_flash">تشغيل/إيقاف الوميض</string>
<string name="error_flash">خطأ في تشغيل الوميض</string>
<string name="share">مشاركة</string>
<string name="share_file">مشاركة كملف</string>
<string name="share_as">مشاركة كـ؟</string>
<string name="copy_to_clipboard">نسخ إلى الحافظة</string>
<string name="copy_as_deeplink">نسخ كرابط عميق</string>
<string name="copied_to_clipboard">تم النسخ إلى الحافظة</string>
<string name="copy_password">نسخ كلمة المرور إلى الحافظة</string>
<string name="copied_password_to_clipboard">تم نسخ كلمة المرور إلى الحافظة</string>
<string name="open_url">فتح الرابط</string>
<string name="cannot_resolve_action">لم يتم العثور على تطبيق يمكنه فتح ذلك</string>
<string name="pick_search_engine">اختر محرك البحث</string>
<string name="format">التنسيق</string>
<string name="size_width_by_height">الحجم بالبكسل: %1$d×%2$d</string>
<string name="size_no_magnification">بدون تكبير</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="add_quiet_zone">إضافة منطقة هادئة</string>
<string name="input_content_here">أدخل المحتوى هنا</string>
<string name="unescape">توسيع رموز الهروب (escape sequences)</string>
<string name="encode">ترميز</string>
@@ -63,10 +69,11 @@
<string name="bulk_mode_delay">الفارق الزمني بين عمليات المسح المستمرة</string>
<string name="restrict_format">تحديد التنسيق</string>
<string name="remove_restriction">إزالة التحديد</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">مسح %s</string>
<string name="find_code">العثور على الرمز</string>
<string name="find_code_with_content">ما المحتوى؟</string>
<string name="find_code_hint">مصطلح أو تعبير عادي</string>
<string name="does_not_match_search_term">لا يطابق مصطلح البحث</string>
<string name="scan_for">مسح %s</string>
<string name="quarter_second">ربع ثانية</string>
<string name="half_second">نصف ثانية</string>
<string name="a_second">ثانية واحدة</string>
@@ -77,6 +84,17 @@
<string name="scan_category">المسح</string>
<string name="content_category">المحتوى</string>
<string name="locale_category">اللغة</string>
<string name="profile_category">الملف الشخصي</string>
<string name="profile">الملف الشخصي</string>
<string name="profile_default">افتراضي</string>
<string name="profile_add">إضافة ملف شخصي جديد</string>
<string name="profile_enter_name">أدخل اسم الملف الشخصي</string>
<string name="profile_enter_name_hint">الاسم</string>
<string name="profile_invalid_name">اسم الملف الشخصي غير صالح</string>
<string name="profile_empty">لا توجد ملفات شخصية بعد</string>
<string name="profile_current">الملف الشخصي الحالي</string>
<string name="profile_remove_confirm">إزالة هذا الملف الشخصي؟</string>
<string name="current_profile">الملف الشخصي: %s</string>
<string name="custom_locale">تغيير اللغة</string>
<string name="follow_system_settings">اتبع إعدادات النظام</string>
<string name="show_crop_handle">عرض محدد الاقتصاص</string>
@@ -97,7 +115,7 @@
<string name="beep_tone">نغمة الصفير</string>
<string name="tone_cdma_confirm">تأكيد CDMA</string>
<string name="tone_sup_confirm">تأكيد الإشراف على الاتصال</string>
<string name="tone_sup_radio_ack">إقرار مسار الراديو الإشرافي على الاتصال.</string>
<string name="tone_sup_radio_ack">إقرار مسار الراديو الإشرافي على الاتصال</string>
<string name="tone_prop_ack">إقرار إيجابي</string>
<string name="tone_prop_beep">صوت صفير عام</string>
<string name="tone_prop_beep2">صوت صفير مزدوج عام</string>
@@ -124,6 +142,34 @@
<string name="default_search_engine">فتح البيانات المجهولة في</string>
<string name="always_ask">اسأل دائمًا</string>
<string name="open_with_url">فتح البيانات المجهولة باستخدام رابط</string>
<string name="automated_actions">الإجراءات الآلية</string>
<string name="automated_actions_none">لا توجد إجراءات آلية</string>
<string name="automated_actions_empty">لا توجد إجراءات آلية بعد</string>
<plurals name="automated_actions_count">
<item quantity="zero">%d إجراء آلي</item>
<item quantity="one">%d إجراء آلي</item>
<item quantity="two">%d إجراءان آليان</item>
<item quantity="few">%d إجراءات آلية</item>
<item quantity="many">%d إجراءً آليًا</item>
<item quantity="other">%d إجراءات آلية</item>
</plurals>
<string name="automated_action_add">إضافة إجراء</string>
<string name="automated_action_edit">تعديل الإجراء</string>
<string name="automated_action_regex">تعبير نمطي</string>
<string name="automated_action_regex_hint">مثل ^https?://.*</string>
<string name="automated_action_regex_required">التعبير النمطي مطلوب</string>
<string name="automated_action_regex_invalid">تعبير نمطي غير صالح</string>
<string name="automated_action_type">نوع الإجراء</string>
<string name="automated_action_type_intent">فتح URL</string>
<string name="automated_action_url_template">قالب URL</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">قالب URL مطلوب</string>
<string name="automated_action_invalid_url">قالب URL غير صالح</string>
<string name="automated_action_remove_confirm">إزالة هذا الإجراء؟</string>
<string name="automated_action_list_intent">فتح URL: %s</string>
<string name="automated_action_list_intent_empty">فتح URL</string>
<string name="automated_action_webview_title">إجراء آلي</string>
<string name="clear_network_suggestions">إزالة الشبكات المقترحة</string>
<string name="clear_network_suggestions_summary">إزالة الشبكات المقترحة التي تمت إضافتها مسبقًا من خلال هذا التطبيق.</string>
<string name="really_remove_all_networks">هل تريد حقًا إزالة جميع الشبكات؟</string>
@@ -134,8 +180,8 @@
<string name="send_scan_active_summary">قم بالتمكين لإعادة توجيه عمليات المسح إلى رابط معين.</string>
<string name="send_scan_url">الرابط المراد إعادة التوجيه إليه</string>
<string name="send_scan_type">نوع الطلب</string>
<string name="send_type_get_add_content">GET and simply add content</string>
<string name="send_type_get_query_string">GET with complete query string</string>
<string name="send_type_get_add_content">نوع GET وأضفه ببساطة</string>
<string name="send_type_get_query_string">نوع GET مع سلسلة الاستعلام الكاملة</string>
<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
<string name="send_type_post_json">POST application/json</string>
<string name="send_type_external_browser">فتح في متصفح خارجي</string>
@@ -214,4 +260,18 @@
<string name="wifi_phase2">طريقة Phase 2</string>
<string name="network_suggestions">الشبكات المقترحة</string>
<string name="remove_suggestion">إزالة الاقتراحات</string>
<string name="email_to">المستلم</string>
<string name="email_subject">الموضوع</string>
<string name="email_body">النص</string>
<string name="scheme">المخطط</string>
<string name="host">المضيف</string>
<string name="query">استعلام</string>
<string name="automated_action_type_custom_intent">Intent مخصص</string>
<string name="automated_action_intent_uri_template">قالب عنوان Intent</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">عنوان Intent مطلوب</string>
<string name="automated_action_intent_uri_invalid">عنوان Intent غير صالح</string>
<string name="automated_action_list_custom_intent">Intent مخصص: %s</string>
<string name="automated_action_list_custom_intent_empty">Intent مخصص</string>
</resources>
+75 -20
View File
@@ -1,4 +1,9 @@
<resources>
<string name="welcome">Добре дошли!</string>
<string name="mode_expert">Разширен</string>
<string name="mode_expert_description">Искам да проверя прочетеното съдържание и да го отворя ръчно.</string>
<string name="mode_simple">Опростен</string>
<string name="mode_simple_description">Искам просто да сканирам баркодове и да ги отварям веднага.</string>
<string name="camera_error">Няма достъп до камерата, моля, опитайте отново</string>
<string name="scan_code">Сканирайте код</string>
<string name="compose_barcode">Създаване на баркод</string>
@@ -14,7 +19,7 @@
<string name="error_correction_level_m" formatted="false">Средно (~15&#37; корекция)</string>
<string name="error_correction_level_q" formatted="false">Четвъртично (~25&#37; корекция)</string>
<string name="error_correction_level_h" formatted="false">Високо (~30&#37; корекция)</string>
<string name="label">Label</string>
<string name="label">Етикет</string>
<string name="colors">Преден и заден план</string>
<string name="colors_black_on_white">Черно на бяло</string>
<string name="colors_white_on_black">Бяло на черно</string>
@@ -29,23 +34,23 @@
<string name="gtin_add_on">UPC EAN разширение</string>
<string name="barcode_version_number">Версия</string>
<string name="qr_version_and_modules">%1$s (%2$d модули)</string>
<string name="qr_data_mask">Data mask</string>
<string name="qr_data_mask">Маска за данни</string>
<string name="toggle_flash">Превключване на светкавицата</string>
<string name="error_flash">Грешка при превключването на светкавицата</string>
<string name="share">Сподели</string>
<string name="share_file">Share as file</string>
<string name="share_file">Споделяне като файл</string>
<string name="share_as">Сподели като?</string>
<string name="copy_to_clipboard">Копиране в клипборда</string>
<string name="copy_as_deeplink">Копиране като дийп линк</string>
<string name="copied_to_clipboard">Копирано в клипборда</string>
<string name="copy_password">Копиране на паролата в клипборда</string>
<string name="copied_password_to_clipboard">Паролата е копирана в клипборда</string>
<string name="open_url">Отворете URL(Линк)</string>
<string name="cannot_resolve_action">Няма приложение което може да отвори това</string>
<string name="pick_search_engine">Изберете търсачка</string>
<string name="format">Формат</string>
<string name="size_width_by_height">Размер в пиксели: %1$d×%2$d</string>
<string name="size_no_magnification">No magnification</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="size_no_magnification">Без увеличение</string>
<string name="add_quiet_zone">Добавяне на тиха зона</string>
<string name="input_content_here">Въведете съдържание тук</string>
<string name="unescape">Разширете последователности за извеждане</string>
<string name="encode">КОДИРАНЕ</string>
@@ -59,10 +64,11 @@
<string name="bulk_mode_delay">Забавяне между непрекъснатите сканирания</string>
<string name="restrict_format">Ограничаване на формат</string>
<string name="remove_restriction">Премахване на ограничението</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">Сканиране %s</string>
<string name="find_code">Намерете кода</string>
<string name="find_code_with_content">Какво съдържание?</string>
<string name="find_code_hint">Термин или регулярен израз</string>
<string name="does_not_match_search_term">Не съответства на търсения термин</string>
<string name="scan_for">Сканиране %s</string>
<string name="quarter_second">Червърт секунда</string>
<string name="half_second">Половин секунда</string>
<string name="a_second">Една секунда</string>
@@ -73,6 +79,17 @@
<string name="scan_category">Сканиране</string>
<string name="content_category">Съдържание</string>
<string name="locale_category">Език</string>
<string name="profile_category">Профил</string>
<string name="profile">Профил</string>
<string name="profile_default">По подразбиране</string>
<string name="profile_add">Добавяне на нов профил</string>
<string name="profile_enter_name">Въведете име на профила</string>
<string name="profile_enter_name_hint">Име</string>
<string name="profile_invalid_name">Невалидно име на профила</string>
<string name="profile_empty">Все още няма профили</string>
<string name="profile_current">Текущ профил</string>
<string name="profile_remove_confirm">Премахване на този профил?</string>
<string name="current_profile">Профил: %s</string>
<string name="custom_locale">Персонализиран език</string>
<string name="follow_system_settings">Следване на системните настройки</string>
<string name="show_crop_handle">Показване на ограничителя за изрязване</string>
@@ -99,10 +116,10 @@
<string name="tone_prop_beep2">Общ двоен звуков сигнал</string>
<string name="use_history">Хронология на сканирането</string>
<string name="use_history_summary">Запазва разпознатите кодове на вашето устройство.</string>
<string name="ignore_duplicates">Ignore duplicates</string>
<string name="ignore_duplicates">Игнорирайте дубликати</string>
<string name="ignore_consecutive_duplicates">Игнориране на дубликатите</string>
<string name="ignore_any_duplicates">Ignore any duplicates</string>
<string name="accept_duplicates">Accept duplicates</string>
<string name="accept_duplicates">Приемане на дубликати</string>
<string name="open_immediately">Отваряй внезапно</string>
<string name="open_immediately_summary">Пропуска проверката и внезапно отваря съдържанието. Може да отвори вредно съдържание, ако е активирано.</string>
<string name="copy_immediately">Поставяй в клипборда</string>
@@ -111,8 +128,8 @@
<string name="show_meta_data_summary">Показване на допълнителни данни за сканирания баркод.</string>
<string name="show_hex_dump">Показване на шестнадесетичен дъмп</string>
<string name="show_hex_dump_summary">Показване на шестнадесетичен дъмп на сканираното съдържание.</string>
<string name="show_checksum">Show checksum</string>
<string name="no_checksum">No checksum</string>
<string name="show_checksum">Покажи контролна сума</string>
<string name="no_checksum">Без контролна сума</string>
<string name="show_recreation">Показване на пресъздаден баркод</string>
<string name="show_recreation_summary">Създай и покажи баркод отново от прочетеното съдържание, ако е възможно.</string>
<string name="close_automatically">Върщане се след Копиране/Споделяне</string>
@@ -120,6 +137,30 @@
<string name="default_search_engine">Отворяй неизвестни данни в</string>
<string name="always_ask">Винаги питай</string>
<string name="open_with_url">Отворяне на неизвестни данни с URL</string>
<string name="automated_actions">Автоматизирани действия</string>
<string name="automated_actions_none">Няма автоматизирани действия</string>
<string name="automated_actions_empty">Все още няма автоматизирани действия</string>
<plurals name="automated_actions_count">
<item quantity="one">%d автоматизирано действие</item>
<item quantity="other">%d автоматизирани действия</item>
</plurals>
<string name="automated_action_add">Добавяне на действие</string>
<string name="automated_action_edit">Редактиране на действие</string>
<string name="automated_action_regex">Регулярен израз</string>
<string name="automated_action_regex_hint">напр. ^https?://.*</string>
<string name="automated_action_regex_required">Регулярен израз е задължителен</string>
<string name="automated_action_regex_invalid">Невалиден регулярен израз</string>
<string name="automated_action_type">Тип действие</string>
<string name="automated_action_type_intent">Отваряне на URL</string>
<string name="automated_action_url_template">Шаблон на URL</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">Шаблон на URL е задължителен</string>
<string name="automated_action_invalid_url">Невалиден шаблон на URL</string>
<string name="automated_action_remove_confirm">Да се премахне ли това действие?</string>
<string name="automated_action_list_intent">Отваряне на URL: %s</string>
<string name="automated_action_list_intent_empty">Отваряне на URL</string>
<string name="automated_action_webview_title">Автоматизирано действие</string>
<string name="clear_network_suggestions">Премахнете мрежовите предложения</string>
<string name="clear_network_suggestions_summary">Премахване на мрежовите предложения, които преди са били добавени с това приложение.</string>
<string name="really_remove_all_networks">Наистина ли искате да премахнете всички мрежи?</string>
@@ -143,9 +184,9 @@
<string name="bluetooth_connect_fail">Неуспешно свързване с Bluetooth устройство.</string>
<string name="bluetooth_send_fail">Неуспешно изпращане до Bluetooth устройство.</string>
<string name="bluetooth_send_success">Успешно Bluetooth изпращане.</string>
<string name="generation_category">Generation</string>
<string name="brighten_screen">Brighten screen</string>
<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
<string name="generation_category">Поколение</string>
<string name="brighten_screen">Подсвети екрана</string>
<string name="brighten_screen_summary">Задайте яркостта на максимум, за да подобрите сканирането на баркод от екрана.</string>
<string name="really_remove_scan">Наистина ли искате да премахнете това сканиране?</string>
<string name="really_remove_all_scans">Наистина ли искате да премахнете всички сканирания?</string>
<string name="really_remove_selected_scans">Наистина ли искате да премахнете избраните сканирания?</string>
@@ -179,8 +220,8 @@
<string name="otpauth_add">Добави 2FA</string>
<string name="search_web">Търси в мрежата</string>
<string name="search_scan">Търсещо сканиране</string>
<string name="add_to_history">Add to history</string>
<string name="added_to_history">Added to history</string>
<string name="add_to_history">Добави към историята</string>
<string name="added_to_history">Добавено към историята</string>
<string name="export_to_file">Извеждане в файл</string>
<string name="export_as">Извеждане като?</string>
<string name="export_csv_comma">CSV файл със запетаи</string>
@@ -195,7 +236,7 @@
<string name="pick_code_to_scan">Изберете код за сканиране</string>
<string name="shortcut_decode">Сканирай баркод</string>
<string name="shortcut_encode">Създай баркод</string>
<string name="shortcut_history">History</string>
<string name="shortcut_history">История</string>
<string name="shortcut_preferences">Настройки</string>
<string name="background_request_failed">Неуспешна заявка в фонов режим</string>
<string name="entry_type">Тип</string>
@@ -210,4 +251,18 @@
<string name="wifi_phase2">Фаза 2 метод</string>
<string name="network_suggestions">Предложения за интернет мрежа</string>
<string name="remove_suggestion">Премахване на предложението</string>
<string name="email_to">Получател</string>
<string name="email_subject">Тема</string>
<string name="email_body">Съдържание</string>
<string name="scheme">Схема</string>
<string name="host">Домакин</string>
<string name="query">Заявка</string>
<string name="automated_action_type_custom_intent">Персонализиран Intent</string>
<string name="automated_action_intent_uri_template">Шаблон за Intent URI</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">Intent URI е задължителен</string>
<string name="automated_action_intent_uri_invalid">Невалиден Intent URI</string>
<string name="automated_action_list_custom_intent">Персонализиран Intent: %s</string>
<string name="automated_action_list_custom_intent_empty">Персонализиран Intent</string>
</resources>
+130 -75
View File
@@ -1,4 +1,9 @@
<resources>
<string name="welcome">স্বাগতম!</string>
<string name="mode_expert">উন্নত</string>
<string name="mode_expert_description">আমি পড়া বিষয়বস্তু যাচাই করতে চাই এবং এটি নিজে খুলতে চাই।</string>
<string name="mode_simple">সহজ</string>
<string name="mode_simple_description">আমি কেবল বারকোড স্ক্যান করতে চাই এবং তা সঙ্গে সঙ্গে খুলতে চাই।</string>
<string name="camera_error">ক্যামেরা পাওয়া যাচ্ছে না, পরে চেষ্টা করো</string>
<string name="scan_code">সংকেতের পাঠোদ্ধার</string>
<string name="compose_barcode">বারকোড বানাও</string>
@@ -14,40 +19,40 @@
<string name="error_correction_level_m" formatted="false">মধ্যম (~১৫&#37; ঠিককরণ)</string>
<string name="error_correction_level_q" formatted="false">বেশি (~২৫&#37; ঠিককরণ)</string>
<string name="error_correction_level_h" formatted="false">অনেক বেশি (~৩০&#37; ঠিককরণ)</string>
<string name="label">Label</string>
<string name="colors">Fore and background</string>
<string name="colors_black_on_white">Black on white</string>
<string name="colors_white_on_black">White on black</string>
<string name="colors_black_on_transparent">Black on transparent</string>
<string name="colors_white_on_transparent">White on transparent</string>
<string name="sequence_size">Sequence size</string>
<string name="sequence_index">Sequence index</string>
<string name="sequence_id">Sequence ID</string>
<string name="label">লেবেল</string>
<string name="colors">পূর্ববর্তী এবং সৃজনাধীন</string>
<string name="colors_black_on_white">সাদা উপরে কালো</string>
<string name="colors_white_on_black">কালো উপর সাদা</string>
<string name="colors_black_on_transparent">সাদা সহজ পারদার উপর</string>
<string name="colors_white_on_transparent">পারদার উপর সাদা</string>
<string name="sequence_size">ধারার আকার</string>
<string name="sequence_index">ক্রমিক সূচী</string>
<string name="sequence_id">ক্রম আইডি</string>
<string name="gtin_issue_number">সমস্যা ক্রম</string>
<string name="gtin_country">তৈরির সম্ভাব্য দেশ</string>
<string name="gtin_price">প্রস্তসবিত দাম</string>
<string name="gtin_add_on">ইউপিসি ইএএন বর্ধিত</string>
<string name="barcode_version_number">Version</string>
<string name="barcode_version_number">সংস্করণ</string>
<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
<string name="qr_data_mask">Data mask</string>
<string name="qr_data_mask">ডেটা মাস্ক</string>
<string name="toggle_flash">আলো</string>
<string name="error_flash">Error toggling flash</string>
<string name="error_flash">ফ্ল্যাশ টগল করার সময় ত্রুটি</string>
<string name="share">ভাগ করো</string>
<string name="share_file">Share as file</string>
<string name="share_file">ফাইল হিসেবে ভাগাভাগি</string>
<string name="share_as">ভাগ করার মাধ্যম</string>
<string name="copy_to_clipboard">ক্লিপবোর্ডে অনুলিপি</string>
<string name="copy_as_deeplink">ডিপলিংক হিসেবে কপি করুন</string>
<string name="copied_to_clipboard">ক্লিপবোর্ডে অনুলিপিত</string>
<string name="copy_password">ক্লিপবোর্ডে পাসওয়ার্ড অনুলিপি করো</string>
<string name="copied_password_to_clipboard">ক্লিপবোর্ডে পাসওয়ার্ড অনুলিপিত</string>
<string name="open_url">ইউআরএল খুলো</string>
<string name="cannot_resolve_action">খোলার মতো অ্যাপ নেই</string>
<string name="pick_search_engine">একটা সার্চ ইঞ্জিন নাও</string>
<string name="format">ধরণ</string>
<string name="size_width_by_height">পিক্সেলে আকা:%1$d×%2$d</string>
<string name="size_no_magnification">No magnification</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="size_no_magnification">কোনো বৃদ্ধি নেই</string>
<string name="add_quiet_zone">শান্তি জোন যোগ করুন</string>
<string name="input_content_here">এখানে তথ্য দাও</string>
<string name="unescape">Expand escape sequences</string>
<string name="unescape">এস্কেপ সিকোয়েন্স প্রসারিত করুন</string>
<string name="encode">সংকেতকরণ</string>
<string name="error_no_content">তথ্য নেই</string>
<string name="error_encoding_barcode">বারকোড বানানো যায়নি</string>
@@ -56,28 +61,40 @@
<string name="switch_camera">ক্যামেরা পাল্টাও</string>
<string name="bulk_mode">ধারাবাহিকভাবে খুঁজো</string>
<string name="bulk_mode_summary">শুরুতে সবসময় ধারাবাহিকভাবে খুঁজো</string>
<string name="bulk_mode_delay">Delay between continuous scans</string>
<string name="restrict_format">Restrict format</string>
<string name="remove_restriction">Remove restriction</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">Scan %s</string>
<string name="quarter_second">A quarter second</string>
<string name="half_second">Half a second</string>
<string name="a_second">One second</string>
<string name="two_seconds">Two seconds</string>
<string name="five_seconds">Five seconds</string>
<string name="bulk_mode_delay">একটি অবিরত স্ক্যান মধ্যে বিলম্ব</string>
<string name="restrict_format">বিনিয়োগ বাধাগ্রস্ত ফরম্যাট</string>
<string name="remove_restriction">সীমাবদ্ধতা অপসারণ করুন</string>
<string name="find_code">কোড খুঁজুন</string>
<string name="find_code_with_content"> কী বিষয়টি? </string>
<string name="find_code_hint">শব্দ বা রেগুলার এক্সপ্রেশন</string>
<string name="does_not_match_search_term">অনুসন্ধান শর্তের সাথে মিলে না</string>
<string name="scan_for">স্ক্যান %s</string>
<string name="quarter_second">এক চতুর্থ সেকেন্ড</string>
<string name="half_second">আধা সেকেন্ড</string>
<string name="a_second">এক সেকেন্ড</string>
<string name="two_seconds">দুই সেকেন্ড</string>
<string name="five_seconds">পাঁচ সেকেন্ড</string>
<string name="history">ইতিহাস</string>
<string name="preferences">পছন্দসমূহ</string>
<string name="scan_category">খুঁজো</string>
<string name="content_category">তথ্য</string>
<string name="locale_category">ভাষা</string>
<string name="profile_category">প্রোফাইল</string>
<string name="profile">প্রোফাইল</string>
<string name="profile_default">ডিফল্ট</string>
<string name="profile_add">নতুন প্রোফাইল যোগ করো</string>
<string name="profile_enter_name">প্রোফাইলের নাম লেখো</string>
<string name="profile_enter_name_hint">নাম</string>
<string name="profile_invalid_name">প্রোফাইলের নাম অবৈধ</string>
<string name="profile_empty">এখনও কোনো প্রোফাইল নেই</string>
<string name="profile_current">বর্তমান প্রোফাইল</string>
<string name="profile_remove_confirm">এই প্রোফাইলটি সরাবেন?</string>
<string name="current_profile">প্রোফাইল: %s</string>
<string name="custom_locale">আলাদা ভাষা</string>
<string name="follow_system_settings">ব্যবস্থার পছন্দসমূহ অনুসরণ করো</string>
<string name="show_crop_handle">ছাটার সীমা দেখাও</string>
<string name="show_crop_handle_summary">পরিবর্তনযোগ্য জায়গায়ই শুধু খুঁজো।</string>
<string name="barcode_formats">Barcode formats</string>
<string name="barcode_formats">বারকোড বিন্যাস</string>
<string name="zoom_by_swiping">ওপরে/নিচে টানো বড়ো করার জন্য</string>
<string name="zoom_by_swiping_summary">ক্যামেরার ছোটো-বড় নিয়ন্ত্রণের জন্য উপরে-নিচে টানো।</string>
<string name="auto_rotate">খাড়া ১ডি বারকোড সনাক্ত করো</string>
@@ -88,21 +105,21 @@
<string name="show_toast_in_bulk_mode_summary">ধারাবাহিকভাবে তথ্য দেখানোর সময় মুহূর্তের জন্য তথ্য দেখাও।</string>
<string name="vibrate">চিনলে কাঁপো</string>
<string name="vibrate_summary">এটা সক্ষম রাখলে সংকেত চিনার সাথে সাথে কাঁপবে।</string>
<string name="beep">Beep on detection</string>
<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
<string name="beep_tone">Beep tone</string>
<string name="tone_cdma_confirm">CDMA confirm</string>
<string name="tone_sup_confirm">Call supervisory confirm</string>
<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
<string name="tone_prop_ack">Positive acknowledgment</string>
<string name="tone_prop_beep">General beep</string>
<string name="tone_prop_beep2">General double beep</string>
<string name="beep">প্রকোপে বিপ দিন</string>
<string name="beep_summary">যদি আপনি চান যে আপনার ডিভাইসটি কোড প্রাপ্ত হলে বিপ শব্দ করে।</string>
<string name="beep_tone">বিপ টোন</string>
<string name="tone_cdma_confirm">সিডিএমএ নিশ্চিত করুন</string>
<string name="tone_sup_confirm">কল সুপারভাইজরী কনফার্ম</string>
<string name="tone_sup_radio_ack">কল সুপারভাইজরি রেডিও পাথ স্বীকৃতি</string>
<string name="tone_prop_ack">ধন্যবাদ</string>
<string name="tone_prop_beep">সাধারণ বিপ</string>
<string name="tone_prop_beep2">সাধারণ ডাবল বিপ</string>
<string name="use_history">ইতিহাস সংরক্ষণ করো।</string>
<string name="use_history_summary">সনাক্তকৃত সংকেত যন্ত্রে সংরক্ষণ করো।</string>
<string name="ignore_duplicates">Ignore duplicates</string>
<string name="ignore_duplicates">নকল উপেক্ষা করুন</string>
<string name="ignore_consecutive_duplicates">দ্বিত্ব উপেক্ষা করো</string>
<string name="ignore_any_duplicates">Ignore any duplicates</string>
<string name="accept_duplicates">Accept duplicates</string>
<string name="accept_duplicates">ডুপ্লিকেট গ্রহণ করুন</string>
<string name="open_immediately">সাথে সাথে খুলো</string>
<string name="open_immediately_summary">না দেখে সাথে সাথে খুলো। সক্রিয় থাকলে ক্ষতিকারক তথ্য খুলতে পারে।</string>
<string name="copy_immediately">ক্লিপবোর্ডে রাখো</string>
@@ -111,22 +128,46 @@
<string name="show_meta_data_summary">সনাক্তকৃত বারকোড নিয়ে অতিরিক্ত তথ্য দেখাও।</string>
<string name="show_hex_dump">ষড়(hex) সংকেত দেখাও</string>
<string name="show_hex_dump_summary">পড়া তথ্যের ষড় সংকেত দেখাও</string>
<string name="show_checksum">Show checksum</string>
<string name="no_checksum">No checksum</string>
<string name="show_recreation">Show recreated barcode</string>
<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
<string name="show_checksum">সামগ্রিক চেকসাম দেখান</string>
<string name="no_checksum">কোনো চেকসাম নেই</string>
<string name="show_recreation">পুনরায় তৈরি বারকোড দেখান</string>
<string name="show_recreation_summary">যদি সম্ভব হয়, পঠিত বিষয় থেকে পুনরায় সৃষ্টি করুন এবং বারকোড দেখান।</string>
<string name="close_automatically">অনুলিপি/ভাগ করার পরে পিছনে যাও</string>
<string name="close_automatically_summary">তথ্য অনুলিপি/ভাগ করার পরে স্বয়ংক্রিয়ভাবে পিছনে যাও।</string>
<string name="default_search_engine">Open unknown data in</string>
<string name="always_ask">Always ask</string>
<string name="default_search_engine">অজানা ডেটা খোলুন</string>
<string name="always_ask">সবসময় জিজ্ঞাসা করুন</string>
<string name="open_with_url">অজানা ইউআরএল খুলো</string>
<string name="automated_actions">স্বয়ংক্রিয় ক্রিয়াসমূহ</string>
<string name="automated_actions_none">কোনো স্বয়ংক্রিয় ক্রিয়া নেই</string>
<string name="automated_actions_empty">এখনো কোনো স্বয়ংক্রিয় ক্রিয়া নেই</string>
<plurals name="automated_actions_count">
<item quantity="one">%dটি স্বয়ংক্রিয় ক্রিয়া</item>
<item quantity="other">%dটি স্বয়ংক্রিয় ক্রিয়া</item>
</plurals>
<string name="automated_action_add">ক্রিয়া যোগ করুন</string>
<string name="automated_action_edit">ক্রিয়া সম্পাদনা</string>
<string name="automated_action_regex">রেগেক্স</string>
<string name="automated_action_regex_hint">উদাহরণ ^https?://.*</string>
<string name="automated_action_regex_required">রেগেক্স প্রয়োজন</string>
<string name="automated_action_regex_invalid">অবৈধ রেগেক্স</string>
<string name="automated_action_type">ক্রিয়ার ধরন</string>
<string name="automated_action_type_intent">URL খুলুন</string>
<string name="automated_action_url_template">URL টেমপ্লেট</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">URL টেমপ্লেট প্রয়োজন</string>
<string name="automated_action_invalid_url">অবৈধ URL টেমপ্লেট</string>
<string name="automated_action_remove_confirm">এই ক্রিয়াটি সরাবেন?</string>
<string name="automated_action_list_intent">URL খুলুন: %s</string>
<string name="automated_action_list_intent_empty">URL খুলুন</string>
<string name="automated_action_webview_title">স্বয়ংক্রিয় ক্রিয়া</string>
<string name="clear_network_suggestions">Clear network suggestions</string>
<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
<string name="really_remove_all_networks">Really remove all networks?</string>
<string name="clear_network_suggestions_success">Network suggestions cleared</string>
<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
<string name="really_remove_all_networks">সব নেটওয়ার্ক সত্যিই সরান?</string>
<string name="clear_network_suggestions_success">নেটওয়ার্ক পরামর্শ মোছা হয়েছে</string>
<string name="clear_network_suggestions_nothing_to_remove">মুছতে কিছু নেই</string>
<string name="send_category">অন্যকে পাঠাও</string>
<string name="send_scan_active">Forward scans</string>
<string name="send_scan_active">পুনরায় স্ক্যান পাঠান</string>
<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
<string name="send_scan_url">প্রতিটি পাঠোদ্ধার ইউআরএল-এ পাঠাও</string>
<string name="send_scan_type">প্রতি পাঠোদ্ধারের জন্য অনুরোধ</string>
@@ -134,18 +175,18 @@
<string name="send_type_get_query_string">সম্পূর্ণ কুয়েরি স্ট্রিং দিয়ে গেট(GET) করো</string>
<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
<string name="send_type_post_json">POST application/json</string>
<string name="send_type_external_browser">Open in external browser</string>
<string name="send_type_external_browser">বাহ্যিক ব্রাউজারে খোলুন</string>
<string name="test_url">পরীক্ষার জন্য ইউআরএল</string>
<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
<string name="send_scan_bluetooth">ব্লুটুথ দিয়ে স্ক্যান ফরোয়ার্ড করুন</string>
<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
<string name="send_scan_bluetooth_host">Host</string>
<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
<string name="send_scan_bluetooth_host">হোস্ট</string>
<string name="no_bluetooth_hosts_paired">কোন হোস্ট পেয়ার করা হয়নি</string>
<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
<string name="bluetooth_send_success">Successful bluetooth send.</string>
<string name="generation_category">Generation</string>
<string name="brighten_screen">Brighten screen</string>
<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
<string name="generation_category">প্রজন্ম</string>
<string name="brighten_screen">স্ক্রিন উজ্জ্বল করুন</string>
<string name="brighten_screen_summary">স্ক্রিন থেকে বারকোড স্ক্যান করার জন্য উজ্জ্বলতা সর্বোচ্চ করুন।</string>
<string name="really_remove_scan">আসলেই এটা মুছবে?</string>
<string name="really_remove_all_scans">আসলেই সব মুছবে?</string>
<string name="really_remove_selected_scans">আসলেই নির্বাচিত সব মুছবে?</string>
@@ -179,8 +220,8 @@
<string name="otpauth_add">২এফএ যোগ করো</string>
<string name="search_web">ওয়েবে খুঁজো</string>
<string name="search_scan">আগেরগুলোতে খুঁজো</string>
<string name="add_to_history">Add to history</string>
<string name="added_to_history">Added to history</string>
<string name="add_to_history">ইতিহাসে যোগ করুন</string>
<string name="added_to_history">ইতিহাসে যোগ করা হয়েছে</string>
<string name="export_to_file">নথিতে রপ্তানি করো</string>
<string name="export_as">রপ্তানির ধরণ?</string>
<string name="export_csv_comma">কমাসহ সিএসভি(.csv) নথি</string>
@@ -189,25 +230,39 @@
<string name="export_database">এসকিউলাইট তথ্যভিত্তি</string>
<string name="saved_in_downloads">ডাউনলোডে সংরক্ষিত</string>
<string name="rotate_image_cw">ছবি ঘড়ির দিকে ঘুরাও</string>
<string name="toggle_free_rotation">Toggle free rotation</string>
<string name="pick_file">Pick a file</string>
<string name="toggle_free_rotation">মুক্ত ঘূর্ণন টগল করুন</string>
<string name="pick_file">একটি ফাইল চয়ন করুন</string>
<string name="pick_image_file">ছবি নাও</string>
<string name="pick_code_to_scan">খুঁজার জন্য কোড নাও</string>
<string name="shortcut_decode">বারকোড খুজো</string>
<string name="shortcut_encode">বারকোড বানাও</string>
<string name="shortcut_history">History</string>
<string name="shortcut_history">ইতিহাস</string>
<string name="shortcut_preferences">পছন্দসমূহ</string>
<string name="background_request_failed">পটভূমির অনুরোধ ব্যর্থ</string>
<string name="entry_type">Type</string>
<string name="wifi_network">Wi-Fi network</string>
<string name="wifi_ssid">Name</string>
<string name="wifi_type">Authentication type</string>
<string name="wifi_password">Password</string>
<string name="wifi_hidden">Hidden network</string>
<string name="wifi_eap">EAP method</string>
<string name="wifi_anonymous_identity">Anonymous identity</string>
<string name="wifi_identity">Identity</string>
<string name="wifi_phase2">Phase 2 method</string>
<string name="network_suggestions">Network suggestions</string>
<string name="remove_suggestion">Remove suggestion</string>
<string name="entry_type">ধরণ</string>
<string name="wifi_network">ওয়াই-ফাই নেটওয়ার্ক</string>
<string name="wifi_ssid">নাম</string>
<string name="wifi_type">প্রমাণীকরণ ধরণ</string>
<string name="wifi_password">গুরুত্বপূর্ণ</string>
<string name="wifi_hidden">লুকানো নেটওয়ার্ক</string>
<string name="wifi_eap">EAP পদ্ধতি</string>
<string name="wifi_anonymous_identity">অজ্ঞাত পরিচিতি</string>
<string name="wifi_identity">পরিচয়</string>
<string name="wifi_phase2">ধাপ ২ পদ্ধতি</string>
<string name="network_suggestions">নেটওয়ার্ক সুপারিশ</string>
<string name="remove_suggestion">প্রস্তাব সরান</string>
<string name="email_to">প্রাপক</string>
<string name="email_subject">বিষয়</string>
<string name="email_body">বার্তা</string>
<string name="scheme">ব্যবস্থা</string>
<string name="host">হোস্ট</string>
<string name="query">অনুসন্ধান</string>
<string name="automated_action_type_custom_intent">কাস্টম Intent</string>
<string name="automated_action_intent_uri_template">Intent URI টেমপ্লেট</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">Intent URI প্রয়োজন</string>
<string name="automated_action_intent_uri_invalid">অবৈধ Intent URI</string>
<string name="automated_action_list_custom_intent">কাস্টম Intent: %s</string>
<string name="automated_action_list_custom_intent_empty">কাস্টম Intent</string>
</resources>
+88 -30
View File
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="welcome">Vítejte!</string>
<string name="mode_expert">Pokročilý</string>
<string name="mode_expert_description">Chci zkontrolovat načtený obsah a otevřít jej ručně.</string>
<string name="mode_simple">Jednoduchý</string>
<string name="mode_simple_description">Chci jen skenovat čárové kódy a okamžitě je otevírat.</string>
<string name="camera_error">Nepodařilo se otevřít fotoaparát, prosím zkuste to znovu</string>
<string name="scan_code">Naskenovat kód</string>
<string name="compose_barcode">Vytvořit čárový kód</string>
@@ -12,11 +18,11 @@
<item quantity="other">%2$d znaků, %1$s</item>
</plurals>
<string name="error_correction_level">Stupeň korekce chyb</string>
<string name="error_correction_level_l" formatted="false">Nízký (~7&#37; korekce)</string>
<string name="error_correction_level_m" formatted="false">Střední (~15&#37; korekce)</string>
<string name="error_correction_level_q" formatted="false">Čtvrtinový (~25&#37; korekce)</string>
<string name="error_correction_level_h" formatted="false">Vysoký (~30&#37; korekce)</string>
<string name="label">Label</string>
<string name="error_correction_level_l" formatted="false">Nízký (~7% korekce)</string>
<string name="error_correction_level_m" formatted="false">Střední (~15% korekce)</string>
<string name="error_correction_level_q" formatted="false">Čtvrtinový (~25% korekce)</string>
<string name="error_correction_level_h" formatted="false">Vysoký (~30% korekce)</string>
<string name="label">Štítek</string>
<string name="colors">Popředí a pozadí</string>
<string name="colors_black_on_white">Černá na bílé</string>
<string name="colors_white_on_black">Bílá na černé</string>
@@ -31,23 +37,23 @@
<string name="gtin_add_on">rozšíření UPC EAN</string>
<string name="barcode_version_number">Verze</string>
<string name="qr_version_and_modules">%1$s (%2$d modulů)</string>
<string name="qr_data_mask">Data mask</string>
<string name="qr_data_mask">Maska dat</string>
<string name="toggle_flash">Přepnout blesk</string>
<string name="error_flash">Zapnutí/vypnutí blesku selhalo</string>
<string name="share">Sdílet</string>
<string name="share_file">Sdílet jako soubor</string>
<string name="share_as">Sdílet jako</string>
<string name="share_as">Sdílet jako?</string>
<string name="copy_to_clipboard">Zkopírovat do schránky</string>
<string name="copy_as_deeplink">Kopírovat jako deeplink</string>
<string name="copied_to_clipboard">Zkopírováno do schránky</string>
<string name="copy_password">Zkopírovat heslo do schránky</string>
<string name="copied_password_to_clipboard">Heslo zkopírováno do schránky</string>
<string name="open_url">Otevřít URL</string>
<string name="cannot_resolve_action">Nemáte aplikaci, která by toto uměla otevřít</string>
<string name="pick_search_engine">Zvolte vyhledávač</string>
<string name="format">Formát</string>
<string name="size_width_by_height">Velikost v pixelech: %1$d×%2$d</string>
<string name="size_no_magnification">No magnification</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="size_no_magnification">Žádné zvětšení</string>
<string name="add_quiet_zone">Přidat tichou zónu</string>
<string name="input_content_here">Sem vložte obsah</string>
<string name="unescape">Rozšířit escape sekvence</string>
<string name="encode">ZAKÓDOVAT</string>
@@ -61,10 +67,11 @@
<string name="bulk_mode_delay">Prodleva mezi skeny</string>
<string name="restrict_format">Omezit na formát</string>
<string name="remove_restriction">Zrušit omezení formátu</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">Naskenovat %s</string>
<string name="find_code">Najít kód</string>
<string name="find_code_with_content">Co obsah?</string>
<string name="find_code_hint">Termín nebo regulární výraz</string>
<string name="does_not_match_search_term">Neodpovídá vyhledávacímu termínu</string>
<string name="scan_for">Naskenovat %s</string>
<string name="quarter_second">Čtvrt sekundy</string>
<string name="half_second">Půl sekundy</string>
<string name="a_second">Jedna sekunda</string>
@@ -75,6 +82,17 @@
<string name="scan_category">Skenování</string>
<string name="content_category">Obsah</string>
<string name="locale_category">Jazyk</string>
<string name="profile_category">Profil</string>
<string name="profile">Profil</string>
<string name="profile_default">Výchozí</string>
<string name="profile_add">Přidat nový profil</string>
<string name="profile_enter_name">Zadejte název profilu</string>
<string name="profile_enter_name_hint">Název</string>
<string name="profile_invalid_name">Neplatný název profilu</string>
<string name="profile_empty">Zatím žádné profily</string>
<string name="profile_current">Aktuální profil</string>
<string name="profile_remove_confirm">Odebrat tento profil?</string>
<string name="current_profile">Profil: %s</string>
<string name="custom_locale">Nastavit jazyk</string>
<string name="follow_system_settings">Podle systému</string>
<string name="show_crop_handle">Zobrazovat hrany výřezu</string>
@@ -94,17 +112,17 @@
<string name="beep_summary">Povolte, pokud chcete pípnutí při rozpoznání kódu.</string>
<string name="beep_tone">Tón pípnutí</string>
<string name="tone_cdma_confirm">Potvrzení CDMA</string>
<string name="tone_sup_confirm">Call supervisory confirm</string>
<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
<string name="tone_sup_confirm">Potvrzení dohledu volání</string>
<string name="tone_sup_radio_ack">Hovor na dohledové rádiové cestě potvrzení</string>
<string name="tone_prop_ack">Kladné potvrzení příjmu</string>
<string name="tone_prop_beep">Obecné pípnutí</string>
<string name="tone_prop_beep2">Dvojité obecné pípnutí</string>
<string name="use_history">Ukládat historii skenování</string>
<string name="use_history_summary">Rozpoznané kódy se uloží do zařízení.</string>
<string name="ignore_duplicates">Ignore duplicates</string>
<string name="ignore_duplicates">Ignorovat duplicity</string>
<string name="ignore_consecutive_duplicates">Ignorovat duplikáty</string>
<string name="ignore_any_duplicates">Ignore any duplicates</string>
<string name="accept_duplicates">Accept duplicates</string>
<string name="accept_duplicates">Přijmout duplicity</string>
<string name="open_immediately">Otevírat okamžitě</string>
<string name="open_immediately_summary">Přeskočí kontrolu a otevře obsah okamžitě. Může otevřít škodlivý obsah.</string>
<string name="copy_immediately">Vložit do schránky</string>
@@ -113,8 +131,8 @@
<string name="show_meta_data_summary">Zobrazí další data o naskenovaném čárovém kódu.</string>
<string name="show_hex_dump">Zobrazit hex dump</string>
<string name="show_hex_dump_summary">Zobrazí hex dump naskenovaného obsahu.</string>
<string name="show_checksum">Show checksum</string>
<string name="no_checksum">No checksum</string>
<string name="show_checksum">Zobrazit kontrolní součet</string>
<string name="no_checksum">Žádný kontrolní součet</string>
<string name="show_recreation">Zobrazit zrekonstruovaný kód</string>
<string name="show_recreation_summary">Zrekonstruovat a zobrazit čárový kód z přečteného obrazu, pokud je to možné.</string>
<string name="close_automatically">Vrátit se po zkopírování/sdílení</string>
@@ -122,6 +140,32 @@
<string name="default_search_engine">Nerozpoznaná data otevřít v</string>
<string name="always_ask">Vždy se zeptat</string>
<string name="open_with_url">Otevřít nerozpoznaná data pomocí URL</string>
<string name="automated_actions">Automatizované akce</string>
<string name="automated_actions_none">Žádné automatizované akce</string>
<string name="automated_actions_empty">Zatím žádné automatizované akce</string>
<plurals name="automated_actions_count">
<item quantity="one">%d automatizovaná akce</item>
<item quantity="few">%d automatizované akce</item>
<item quantity="many">%d automatizovaných akcí</item>
<item quantity="other">%d automatizované akce</item>
</plurals>
<string name="automated_action_add">Přidat akci</string>
<string name="automated_action_edit">Upravit akci</string>
<string name="automated_action_regex">Regulární výraz</string>
<string name="automated_action_regex_hint">např. ^https?://.*</string>
<string name="automated_action_regex_required">Regulární výraz je povinný</string>
<string name="automated_action_regex_invalid">Neplatný regulární výraz</string>
<string name="automated_action_type">Typ akce</string>
<string name="automated_action_type_intent">Otevřít URL</string>
<string name="automated_action_url_template">Šablona URL</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">Šablona URL je povinná</string>
<string name="automated_action_invalid_url">Neplatná šablona URL</string>
<string name="automated_action_remove_confirm">Odstranit tuto akci?</string>
<string name="automated_action_list_intent">Otevřít URL: %s</string>
<string name="automated_action_list_intent_empty">Otevřít URL</string>
<string name="automated_action_webview_title">Automatizovaná akce</string>
<string name="clear_network_suggestions">Smazat navrhované sítě</string>
<string name="clear_network_suggestions_summary">Smazat všechny sítě, které byly navrženy touto aplikací.</string>
<string name="really_remove_all_networks">Opravdu smazat všechny sítě?</string>
@@ -129,11 +173,11 @@
<string name="clear_network_suggestions_nothing_to_remove">Nic ke smazání</string>
<string name="send_category">Předávání</string>
<string name="send_scan_active">Předávat skeny</string>
<string name="send_scan_active_summary">Zapnout předávání skenů na danou URL</string>
<string name="send_scan_active_summary">Zapnout předávání skenů na danou URL.</string>
<string name="send_scan_url">Posílat každý sken na URL</string>
<string name="send_scan_type">Typ požadavku pro každý sken</string>
<string name="send_type_get_add_content">GET a simply add content</string>
<string name="send_type_get_query_string">GET with complete query string</string>
<string name="send_type_get_query_string">GET s kompletním řetězcem dotazu</string>
<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
<string name="send_type_post_json">POST application/json</string>
<string name="send_type_external_browser">Otevřít v prohlížeči</string>
@@ -145,9 +189,9 @@
<string name="bluetooth_connect_fail">Nelze se připojit k zařízení Bluetooth.</string>
<string name="bluetooth_send_fail">Nelze odesílat na zařízení Bluetooth.</string>
<string name="bluetooth_send_success">Odesílání přes Bluetooth se zdařilo.</string>
<string name="generation_category">Generation</string>
<string name="brighten_screen">Brighten screen</string>
<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
<string name="generation_category">Generace</string>
<string name="brighten_screen">Zvýšit jas obrazovky</string>
<string name="brighten_screen_summary">Nastavte jas na maximum pro zlepšení skenování čárového kódu ze obrazovky.</string>
<string name="really_remove_scan">Opravdu odstranit sken?</string>
<string name="really_remove_all_scans">Opravdu odstranit všechny skeny?</string>
<string name="really_remove_selected_scans">Opravdu odstranit zvolené skeny?</string>
@@ -161,7 +205,7 @@
<string name="pick_list_separator">Jak mají být odděleny položky?</string>
<string name="separator_line_break">Nový řádek</string>
<string name="separator_ruler">Svislice</string>
<string name="save_as_file_name">Uložit jako do složky Stahování</string>
<string name="save_as_file_name">Uložit do složky Stahování?</string>
<string name="file_name">Název souboru</string>
<string name="error_saving_file">Soubor se nepodařilo uložit</string>
<string name="error_file_exists">Soubor již existuje</string>
@@ -181,10 +225,10 @@
<string name="otpauth_add">Přidat 2FA</string>
<string name="search_web">Vyhledat na webu</string>
<string name="search_scan">Vyhledat sken</string>
<string name="add_to_history">Add to history</string>
<string name="added_to_history">Added to history</string>
<string name="add_to_history">Přidat do historie</string>
<string name="added_to_history">Přidáno do historie</string>
<string name="export_to_file">Exportovat do souboru</string>
<string name="export_as">Exportovat jako</string>
<string name="export_as">Exportovat jako?</string>
<string name="export_csv_comma">CSV oddělené čárkami</string>
<string name="export_csv_semicolon">CSV oddělené středníky</string>
<string name="export_json">soubor JSON</string>
@@ -197,7 +241,7 @@
<string name="pick_code_to_scan">Vyberte kód k naskenování</string>
<string name="shortcut_decode">Skenovat čárový kód</string>
<string name="shortcut_encode">Vytvořit čárový kód</string>
<string name="shortcut_history">History</string>
<string name="shortcut_history">Historie</string>
<string name="shortcut_preferences">Nastavení</string>
<string name="background_request_failed">Požadavek na pozadí selhal</string>
<string name="entry_type">Typ</string>
@@ -212,4 +256,18 @@
<string name="wifi_phase2">Ověření Phase 2</string>
<string name="network_suggestions">Návrhy sítí</string>
<string name="remove_suggestion">Odebrat návrh</string>
<string name="email_to">Příjemce</string>
<string name="email_subject">Předmět</string>
<string name="email_body">Tělo zprávy</string>
<string name="scheme">Schéma</string>
<string name="host">Host</string>
<string name="query">Dotaz</string>
<string name="automated_action_type_custom_intent">Vlastní intent</string>
<string name="automated_action_intent_uri_template">Šablona URI intentu</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">URI intentu je povinné</string>
<string name="automated_action_intent_uri_invalid">Neplatné URI intentu</string>
<string name="automated_action_list_custom_intent">Vlastní intent: %s</string>
<string name="automated_action_list_custom_intent_empty">Vlastní intent</string>
</resources>
+80 -25
View File
@@ -1,4 +1,9 @@
<resources>
<string name="welcome">Velkommen!</string>
<string name="mode_expert">Avanceret</string>
<string name="mode_expert_description">Jeg vil kontrollere det læste indhold og åbne det manuelt.</string>
<string name="mode_simple">Simpel</string>
<string name="mode_simple_description">Jeg vil bare scanne stregkoder og få dem åbnet med det samme.</string>
<string name="camera_error">Kan ikke få adgang til kamera, prøv igen</string>
<string name="scan_code">Scan kode</string>
<string name="compose_barcode">Opret stregkode</string>
@@ -14,7 +19,7 @@
<string name="error_correction_level_m" formatted="false">Medium (~15&#37; korrigering)</string>
<string name="error_correction_level_q" formatted="false">Kvartil (~25&#37; korrigering)</string>
<string name="error_correction_level_h" formatted="false">Høj (~30&#37; korrigering)</string>
<string name="label">Label</string>
<string name="label">Mærke</string>
<string name="colors">For- og baggrund</string>
<string name="colors_black_on_white">Sort på hvidt</string>
<string name="colors_white_on_black">Hvid på sort</string>
@@ -33,21 +38,21 @@
<string name="toggle_flash">Slå blitz til/fra</string>
<string name="error_flash">Der opstod en fejl ved at slå blitz til/fra</string>
<string name="share">Del</string>
<string name="share_file">Share as file</string>
<string name="share_file">Del som fil</string>
<string name="share_as">Del som?</string>
<string name="copy_to_clipboard">Kopier til udklipsholder</string>
<string name="copy_as_deeplink">Kopiér som deeplink</string>
<string name="copied_to_clipboard">Kopieret til udklipsholder</string>
<string name="copy_password">Kopier adgangskode til udklipsholderen</string>
<string name="copied_password_to_clipboard">Adgangskode kopieret til udklipsholderen</string>
<string name="open_url">Åbn URL</string>
<string name="cannot_resolve_action">Inge applikation kan åbne det</string>
<string name="pick_search_engine">Vælg en søgemaskine</string>
<string name="format">Format</string>
<string name="size_width_by_height">Størrelse i pixels: %1$d×%2$d</string>
<string name="size_no_magnification">No magnification</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="size_no_magnification">Ingen forstørrelse</string>
<string name="add_quiet_zone">Tilføj stille zone</string>
<string name="input_content_here">Indtast indhold her</string>
<string name="unescape">Expand escape sequences</string>
<string name="unescape">Udvid escape-sekvenser</string>
<string name="encode">INDKOD</string>
<string name="error_no_content">Manglende indhold</string>
<string name="error_encoding_barcode">Stregkode kan ikke genereres</string>
@@ -59,10 +64,11 @@
<string name="bulk_mode_delay">Forsinkelse mellem kontinuerlige scanninger</string>
<string name="restrict_format">Begræns format</string>
<string name="remove_restriction">Fjern begrænsningen</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">Scan %s</string>
<string name="find_code">Find kode</string>
<string name="find_code_with_content">Hvad indhold?</string>
<string name="find_code_hint">Term eller regulært udtryk</string>
<string name="does_not_match_search_term">Stemmer ikke overens med søgeterm</string>
<string name="scan_for">Scan %s</string>
<string name="quarter_second">Et kvart sekund</string>
<string name="half_second">Et halvt sekund</string>
<string name="a_second">Et sekund</string>
@@ -73,6 +79,17 @@
<string name="scan_category">Scan</string>
<string name="content_category">Indhold</string>
<string name="locale_category">Sprog</string>
<string name="profile_category">Profil</string>
<string name="profile">Profil</string>
<string name="profile_default">Standard</string>
<string name="profile_add">Tilføj ny profil</string>
<string name="profile_enter_name">Indtast profilnavn</string>
<string name="profile_enter_name_hint">Navn</string>
<string name="profile_invalid_name">Ugyldigt profilnavn</string>
<string name="profile_empty">Ingen profiler endnu</string>
<string name="profile_current">Nuværende profil</string>
<string name="profile_remove_confirm">Fjern denne profil?</string>
<string name="current_profile">Profil: %s</string>
<string name="custom_locale">Brugerdefineret sprog</string>
<string name="follow_system_settings">Følg systemindstillingerne</string>
<string name="show_crop_handle">Vis beskæringsbegrænser</string>
@@ -92,14 +109,14 @@
<string name="beep_summary">Aktiver dette, hvis du vil have din enhed til at bippe, når en kode genkendes.</string>
<string name="beep_tone">Bip tone</string>
<string name="tone_cdma_confirm">CDMA bekræftelse</string>
<string name="tone_sup_confirm">Call supervisory confirm</string>
<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
<string name="tone_sup_confirm">Opkald tilsyn bekræft</string>
<string name="tone_sup_radio_ack">Opkald tilsynsradio sti anerkendelse</string>
<string name="tone_prop_ack">Positiv anerkendelse</string>
<string name="tone_prop_beep">Generelt bip</string>
<string name="tone_prop_beep2">Generelt dobbelt bip</string>
<string name="use_history">Gem scanningshistorik</string>
<string name="use_history_summary">Gem genkendte koder på din enhed.</string>
<string name="ignore_duplicates">Ignore duplicates</string>
<string name="ignore_duplicates">Ignorer duplikater</string>
<string name="ignore_consecutive_duplicates">Ignorer dubletter</string>
<string name="ignore_any_duplicates">Ignore any duplicates</string>
<string name="accept_duplicates">Accept duplicates</string>
@@ -111,8 +128,8 @@
<string name="show_meta_data_summary">Vis yderligere data om den scannede stregkode.</string>
<string name="show_hex_dump">Vis hex-dump</string>
<string name="show_hex_dump_summary">Vis et hex-dump af det scannede indhold.</string>
<string name="show_checksum">Show checksum</string>
<string name="no_checksum">No checksum</string>
<string name="show_checksum">Vis kontrolsum</string>
<string name="no_checksum">Ingen kontrolsum</string>
<string name="show_recreation">Vis genskabt stregkode</string>
<string name="show_recreation_summary">Genskab og vis stregkode fra læst indhold, hvis det er muligt.</string>
<string name="close_automatically">Gå tilbage efter Kopier/Del</string>
@@ -120,6 +137,30 @@
<string name="default_search_engine">Åbn ukendte data i</string>
<string name="always_ask">Spørg altid</string>
<string name="open_with_url">Åbn ukendte data med URL</string>
<string name="automated_actions">Automatiserede handlinger</string>
<string name="automated_actions_none">Ingen automatiserede handlinger</string>
<string name="automated_actions_empty">Ingen automatiserede handlinger endnu</string>
<plurals name="automated_actions_count">
<item quantity="one">%d automatiseret handling</item>
<item quantity="other">%d automatiserede handlinger</item>
</plurals>
<string name="automated_action_add">Tilføj handling</string>
<string name="automated_action_edit">Rediger handling</string>
<string name="automated_action_regex">Regex</string>
<string name="automated_action_regex_hint">f.eks. ^https?://.*</string>
<string name="automated_action_regex_required">Regex påkrævet</string>
<string name="automated_action_regex_invalid">Ugyldig regex</string>
<string name="automated_action_type">Handlingstype</string>
<string name="automated_action_type_intent">Åbn URL</string>
<string name="automated_action_url_template">URL-skabelon</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">URL-skabelon påkrævet</string>
<string name="automated_action_invalid_url">Ugyldig URL-skabelon</string>
<string name="automated_action_remove_confirm">Fjern denne handling?</string>
<string name="automated_action_list_intent">Åbn URL: %s</string>
<string name="automated_action_list_intent_empty">Åbn URL</string>
<string name="automated_action_webview_title">Automatiseret handling</string>
<string name="clear_network_suggestions">Fjern netværksforslag</string>
<string name="clear_network_suggestions_summary">Fjern netværksforslag, der tidligere blev tilføjet med denne app.</string>
<string name="really_remove_all_networks">Vil du virkelig fjerne alle netværk?</string>
@@ -136,16 +177,16 @@
<string name="send_type_post_json">POST application/json</string>
<string name="send_type_external_browser">Åbn i ekstern browser</string>
<string name="test_url">Test URL</string>
<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
<string name="send_scan_bluetooth">Send scanninger med Bluetooth</string>
<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
<string name="send_scan_bluetooth_host">Host</string>
<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
<string name="send_scan_bluetooth_host">Vært</string>
<string name="no_bluetooth_hosts_paired">Ingen værter parret</string>
<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
<string name="bluetooth_send_success">Successful bluetooth send.</string>
<string name="generation_category">Generation</string>
<string name="brighten_screen">Brighten screen</string>
<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
<string name="brighten_screen">Skærm lysere</string>
<string name="brighten_screen_summary">Indstil lysstyrken til maksimum for at forbedre scanning af en stregkode fra skærmen.</string>
<string name="really_remove_scan">Vil du virkelig fjerne scanningen?</string>
<string name="really_remove_all_scans">Vil du virkelig fjerne alle scanninger?</string>
<string name="really_remove_selected_scans">Vil du virkelig fjerne valgte scanninger?</string>
@@ -179,23 +220,23 @@
<string name="otpauth_add">Tilføj 2FA</string>
<string name="search_web">Søg på nettet</string>
<string name="search_scan">Søg scanning</string>
<string name="add_to_history">Add to history</string>
<string name="added_to_history">Added to history</string>
<string name="add_to_history">Tilføj til historik</string>
<string name="added_to_history">Tilføjet til historik</string>
<string name="export_to_file">Eksporter til fil</string>
<string name="export_as">Eksporter som?</string>
<string name="export_csv_comma">CSV-fil med kommaer</string>
<string name="export_csv_semicolon">CSV-fil med semikoloner</string>
<string name="export_json">JSON fil</string>
<string name="export_database">SQLite database</string>
<string name="export_database">SQLite-database</string>
<string name="saved_in_downloads">Gemt i downloads</string>
<string name="rotate_image_cw">Roter billedet med uret</string>
<string name="toggle_free_rotation">Slå fri rotation til/fra</string>
<string name="pick_file">Pick a file</string>
<string name="pick_file">Vælg en fil</string>
<string name="pick_image_file">Vælg billedfil</string>
<string name="pick_code_to_scan">Vælg kode til at scanne</string>
<string name="shortcut_decode">Scan en stregkode</string>
<string name="shortcut_encode">Opret en stregkode</string>
<string name="shortcut_history">History</string>
<string name="shortcut_history">Historik</string>
<string name="shortcut_preferences">Indstillinger</string>
<string name="background_request_failed">Baggrundsanmodning mislykkedes</string>
<string name="entry_type">Type</string>
@@ -210,4 +251,18 @@
<string name="wifi_phase2">Fase 2 metode</string>
<string name="network_suggestions">Netværksforslag</string>
<string name="remove_suggestion">Fjern forslag</string>
<string name="email_to">Modtager</string>
<string name="email_subject">Emne</string>
<string name="email_body">Brødtekst</string>
<string name="scheme">Ordning</string>
<string name="host">Vært</string>
<string name="query">Forespørgsel</string>
<string name="automated_action_type_custom_intent">Brugerdefineret intent</string>
<string name="automated_action_intent_uri_template">Intent-URI-skabelon</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">Intent-URI påkrævet</string>
<string name="automated_action_intent_uri_invalid">Ugyldig Intent-URI</string>
<string name="automated_action_list_custom_intent">Brugerdefineret intent: %s</string>
<string name="automated_action_list_custom_intent_empty">Brugerdefineret intent</string>
</resources>
+67 -12
View File
@@ -1,4 +1,9 @@
<resources>
<string name="welcome">Willkommen!</string>
<string name="mode_expert">Erweitert</string>
<string name="mode_expert_description">Ich möchte den gelesenen Inhalt überprüfen und manuell öffnen.</string>
<string name="mode_simple">Einfach</string>
<string name="mode_simple_description">Ich möchte nur Barcodes scannen und sie sofort öffnen.</string>
<string name="camera_error">Auf die Kamera kann nicht zugegriffen werden, bitte versuche es nochmal</string>
<string name="scan_code">Code scannen</string>
<string name="compose_barcode">Barcode erstellen</string>
@@ -20,9 +25,9 @@
<string name="colors_white_on_black">Weiß auf Schwarz</string>
<string name="colors_black_on_transparent">Schwarz auf Transparent</string>
<string name="colors_white_on_transparent">Weiß auf Transparent</string>
<string name="sequence_size">Sequence size</string>
<string name="sequence_index">Sequence index</string>
<string name="sequence_id">Sequence ID</string>
<string name="sequence_size">Sequenzgröße</string>
<string name="sequence_index">Sequenzindex</string>
<string name="sequence_id">Sequenz-ID</string>
<string name="gtin_issue_number">Ausgabe Nummer</string>
<string name="gtin_country">Mögliches Ursprungsland</string>
<string name="gtin_price">Preisvorschlag</string>
@@ -36,9 +41,9 @@
<string name="share_file">Als Datei teilen</string>
<string name="share_as">Teilen als?</string>
<string name="copy_to_clipboard">In die Zwischenablage kopieren</string>
<string name="copy_as_deeplink">Als Deeplink kopieren</string>
<string name="copied_to_clipboard">Inhalt wurde in die Zwischenablage kopiert</string>
<string name="copy_password">Passwort in die Zwischenablage kopieren</string>
<string name="copied_password_to_clipboard">Passwort wurde in die Zwischenablage kopiert</string>
<string name="open_url">URL öffnen</string>
<string name="cannot_resolve_action">Keine App kann das öffnen</string>
<string name="pick_search_engine">Suchmaschine auswählen</string>
@@ -61,8 +66,9 @@
<string name="remove_restriction">Einschränkung entfernen</string>
<string name="find_code">Barcode finden</string>
<string name="find_code_with_content">Mit welchem Inhalt?</string>
<string name="find_code_hint">Begriff eingeben</string>
<string name="scan_format">%s scannen</string>
<string name="find_code_hint">Begriff oder regulärer Ausdruck</string>
<string name="does_not_match_search_term">Entspricht nicht dem Suchbegriff</string>
<string name="scan_for">%s scannen</string>
<string name="quarter_second">Eine Viertelsekunde</string>
<string name="half_second">Eine halbe Sekunde</string>
<string name="a_second">Eine Sekunde</string>
@@ -73,6 +79,17 @@
<string name="scan_category">Scannen</string>
<string name="content_category">Inhalt</string>
<string name="locale_category">Sprache</string>
<string name="profile_category">Profil</string>
<string name="profile">Profil</string>
<string name="profile_default">Standard</string>
<string name="profile_add">Neues Profil hinzufügen</string>
<string name="profile_enter_name">Profilnamen eingeben</string>
<string name="profile_enter_name_hint">Name</string>
<string name="profile_invalid_name">Ungültiger Profilname</string>
<string name="profile_empty">Noch keine Profile</string>
<string name="profile_current">Aktuelles Profil</string>
<string name="profile_remove_confirm">Dieses Profil entfernen?</string>
<string name="current_profile">Profil: %s</string>
<string name="custom_locale">Spracheinstellung</string>
<string name="follow_system_settings">Systemeinstellung übernehmen</string>
<string name="show_crop_handle">Ausschnitt verkleinern anzeigen</string>
@@ -91,12 +108,12 @@
<string name="beep">Signalton bei Erkennung</string>
<string name="beep_summary">Bei Erkennung eines Codes soll ein Signalton abgespielt werden.</string>
<string name="beep_tone">Signalton</string>
<string name="tone_cdma_confirm">CDMA confirm</string>
<string name="tone_sup_confirm">Call supervisory confirm</string>
<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
<string name="tone_prop_ack">Positive acknowledgment</string>
<string name="tone_prop_beep">General beep</string>
<string name="tone_prop_beep2">General double beep</string>
<string name="tone_cdma_confirm">CDMA bestätigen</string>
<string name="tone_sup_confirm">Anrufaufsicht bestätigen</string>
<string name="tone_sup_radio_ack">Anrufüberwachungsfunkpfadbestätigung</string>
<string name="tone_prop_ack">Positive Bestätigung</string>
<string name="tone_prop_beep">Allgemeines Piepen</string>
<string name="tone_prop_beep2">Allgemeiner Doppelton</string>
<string name="use_history">Codes speichern</string>
<string name="use_history_summary">Eingelesene Barcodes auf dem Gerät speichern.</string>
<string name="ignore_duplicates">Ignoriere Duplikate</string>
@@ -120,6 +137,30 @@
<string name="default_search_engine">Unbekannte Daten öffnen mit</string>
<string name="always_ask">Immer fragen</string>
<string name="open_with_url">URL zum Öffnen unbekannter Daten</string>
<string name="automated_actions">Automatisierte Aktionen</string>
<string name="automated_actions_none">Keine automatisierten Aktionen</string>
<string name="automated_actions_empty">Noch keine automatisierten Aktionen</string>
<plurals name="automated_actions_count">
<item quantity="one">%d automatisierte Aktion</item>
<item quantity="other">%d automatisierte Aktionen</item>
</plurals>
<string name="automated_action_add">Aktion hinzufügen</string>
<string name="automated_action_edit">Aktion bearbeiten</string>
<string name="automated_action_regex">Regex</string>
<string name="automated_action_regex_hint">z.B. ^https?://.*</string>
<string name="automated_action_regex_required">Regex erforderlich</string>
<string name="automated_action_regex_invalid">Ungültiger Regex</string>
<string name="automated_action_type">Aktionstyp</string>
<string name="automated_action_type_intent">URL öffnen</string>
<string name="automated_action_url_template">URL-Vorlage</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">URL-Vorlage erforderlich</string>
<string name="automated_action_invalid_url">Ungültige URL-Vorlage</string>
<string name="automated_action_remove_confirm">Diese Aktion entfernen?</string>
<string name="automated_action_list_intent">URL öffnen: %s</string>
<string name="automated_action_list_intent_empty">URL öffnen</string>
<string name="automated_action_webview_title">Automatisierte Aktion</string>
<string name="clear_network_suggestions">WiFi Netzwerkvorschläge entfernen</string>
<string name="clear_network_suggestions_summary">Betrifft nur Netzwerke, die zuvor mit dieser App bereitgestellt wurden.</string>
<string name="really_remove_all_networks">Alle Netzwerkvorschläge entfernen?</string>
@@ -210,4 +251,18 @@
<string name="wifi_phase2">Phase 2 Methode</string>
<string name="network_suggestions">WiFi Netzwerkvorschläge</string>
<string name="remove_suggestion">Vorschlag entfernen</string>
<string name="email_to">Empfänger</string>
<string name="email_subject">Betreff</string>
<string name="email_body">Nachricht</string>
<string name="scheme">Schema</string>
<string name="host">Host</string>
<string name="query">Query</string>
<string name="automated_action_type_custom_intent">Benutzerdefinierter Intent</string>
<string name="automated_action_intent_uri_template">Intent-URI-Vorlage</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">Intent-URI erforderlich</string>
<string name="automated_action_intent_uri_invalid">Ungültige Intent-URI</string>
<string name="automated_action_list_custom_intent">Benutzerdefinierter Intent: %s</string>
<string name="automated_action_list_custom_intent_empty">Benutzerdefinierter Intent</string>
</resources>
+76 -21
View File
@@ -1,4 +1,9 @@
<resources>
<string name="welcome">¡Bienvenido!</string>
<string name="mode_expert">Avanzado</string>
<string name="mode_expert_description">Quiero verificar el contenido leído y abrirlo manualmente.</string>
<string name="mode_simple">Sencillo</string>
<string name="mode_simple_description">Solo quiero escanear códigos de barras y abrirlos de inmediato.</string>
<string name="camera_error">No se puede acceder a la cámara, por favor, inténtelo de nuevo</string>
<string name="scan_code">Escanear código</string>
<string name="compose_barcode">Componer código</string>
@@ -14,7 +19,7 @@
<string name="error_correction_level_m" formatted="false">Medio (~15&#37; de correción)</string>
<string name="error_correction_level_q" formatted="false">Cuartil (~25&#37; de correción)</string>
<string name="error_correction_level_h" formatted="false">Alto (~30&#37; de correción)</string>
<string name="label">Label</string>
<string name="label">Etiqueta</string>
<string name="colors">Color frontal y fondo</string>
<string name="colors_black_on_white">Negro sobre blanco</string>
<string name="colors_white_on_black">Blanco sobre negro</string>
@@ -27,25 +32,25 @@
<string name="gtin_country">Posible país de fabricación</string>
<string name="gtin_price">Precio sugerido</string>
<string name="gtin_add_on">Extensión UPC EAN</string>
<string name="barcode_version_number">Version</string>
<string name="barcode_version_number">Versión</string>
<string name="qr_version_and_modules">%1$s (%2$d modulos)</string>
<string name="qr_data_mask">Data mask</string>
<string name="qr_data_mask">Máscara de datos</string>
<string name="toggle_flash">Activar el flash</string>
<string name="error_flash">Error activando flash</string>
<string name="share">Compartir</string>
<string name="share_file">Compartir como archivo</string>
<string name="share_as">¿Compartir como?</string>
<string name="copy_to_clipboard">Copiar al portapapeles</string>
<string name="copy_as_deeplink">Copiar como deeplink</string>
<string name="copied_to_clipboard">Copiado al portapapeles</string>
<string name="copy_password">Copiar contraseña al portapapeles</string>
<string name="copied_password_to_clipboard">Contraseña copiada al portapapeles</string>
<string name="open_url">Abrir URL</string>
<string name="cannot_resolve_action">Ninguna aplicación puede abrir eso</string>
<string name="pick_search_engine">Seleccionar motor de búsqueda</string>
<string name="format">Formato</string>
<string name="size_width_by_height">Tamaño en píxeles: %1$d×%2$d</string>
<string name="size_no_magnification">No magnification</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="size_no_magnification">Sin aumento</string>
<string name="add_quiet_zone">Agregar zona tranquila</string>
<string name="input_content_here">Introduzca el contenido aquí</string>
<string name="unescape">Expandir secuencia de escape</string>
<string name="encode">CODIFICAR</string>
@@ -59,10 +64,11 @@
<string name="bulk_mode_delay">Demora entre escaneos continuos</string>
<string name="restrict_format">Restringir formato</string>
<string name="remove_restriction">Eliminar restricción</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">Escanear %s</string>
<string name="find_code">Encontrar código</string>
<string name="find_code_with_content">¿Qué contenido?</string>
<string name="find_code_hint">Término o expresión regular</string>
<string name="does_not_match_search_term">No coincide con el término de búsqueda</string>
<string name="scan_for">Escanear %s</string>
<string name="quarter_second">Un cuarto de segundo</string>
<string name="half_second">Medio segundo</string>
<string name="a_second">Un segundo</string>
@@ -73,6 +79,17 @@
<string name="scan_category">Escanear</string>
<string name="content_category">Contenido</string>
<string name="locale_category">Idioma</string>
<string name="profile_category">Perfil</string>
<string name="profile">Perfil</string>
<string name="profile_default">Predeterminado</string>
<string name="profile_add">Añadir nuevo perfil</string>
<string name="profile_enter_name">Introduce el nombre del perfil</string>
<string name="profile_enter_name_hint">Nombre</string>
<string name="profile_invalid_name">Nombre de perfil no válido</string>
<string name="profile_empty">Aún no hay perfiles</string>
<string name="profile_current">Perfil actual</string>
<string name="profile_remove_confirm">¿Eliminar este perfil?</string>
<string name="current_profile">Perfil: %s</string>
<string name="custom_locale">Idioma personalizado</string>
<string name="follow_system_settings">Seguir los ajustes del sistema</string>
<string name="show_crop_handle">Mostrar delimitador de recorte</string>
@@ -99,10 +116,10 @@
<string name="tone_prop_beep2">Sonido doble general</string>
<string name="use_history">Guardar historial de escaneo</string>
<string name="use_history_summary">Guarda los códigos reconocidos en su dispositivo.</string>
<string name="ignore_duplicates">Ignore duplicates</string>
<string name="ignore_duplicates">Ignorar duplicados</string>
<string name="ignore_consecutive_duplicates">Ignorar duplicados</string>
<string name="ignore_any_duplicates">Ignore any duplicates</string>
<string name="accept_duplicates">Accept duplicates</string>
<string name="accept_duplicates">Aceptar duplicados</string>
<string name="open_immediately">Abrir inmediatamente</string>
<string name="open_immediately_summary">Omite la inspección y abre el contenido inmediatamente. Podría abrir contenido dañino si está activado.</string>
<string name="copy_immediately">Copiar en el portapapeles</string>
@@ -111,8 +128,8 @@
<string name="show_meta_data_summary">Muestra datos adicionales del código escaneado.</string>
<string name="show_hex_dump">Mostrar volcado hexadecimal</string>
<string name="show_hex_dump_summary">Muestra un volcado hexadecimal del contenido escaneado.</string>
<string name="show_checksum">Show checksum</string>
<string name="no_checksum">No checksum</string>
<string name="show_checksum">Mostrar suma de comprobación</string>
<string name="no_checksum">Sin suma de comprobación</string>
<string name="show_recreation">Mostrar reconstrucción del código</string>
<string name="show_recreation_summary">Reconstruye y muestra el código de barras desde el contenido leído si es posible.</string>
<string name="close_automatically">Retroceder tras Copiar/Compartir</string>
@@ -120,6 +137,30 @@
<string name="default_search_engine">Abrir datos desconocidos en</string>
<string name="always_ask">Preguntar siempre</string>
<string name="open_with_url">Abrir datos desconocidos en la URL</string>
<string name="automated_actions">Acciones automatizadas</string>
<string name="automated_actions_none">No hay acciones automatizadas</string>
<string name="automated_actions_empty">Aún no hay acciones automatizadas</string>
<plurals name="automated_actions_count">
<item quantity="one">%d acción automatizada</item>
<item quantity="other">%d acciones automatizadas</item>
</plurals>
<string name="automated_action_add">Añadir acción</string>
<string name="automated_action_edit">Editar acción</string>
<string name="automated_action_regex">Expresión regular</string>
<string name="automated_action_regex_hint">p. ej. ^https?://.*</string>
<string name="automated_action_regex_required">Se requiere expresión regular</string>
<string name="automated_action_regex_invalid">Expresión regular inválida</string>
<string name="automated_action_type">Tipo de acción</string>
<string name="automated_action_type_intent">Abrir URL</string>
<string name="automated_action_url_template">Plantilla de URL</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">Se requiere plantilla de URL</string>
<string name="automated_action_invalid_url">Plantilla de URL inválida</string>
<string name="automated_action_remove_confirm">¿Eliminar esta acción?</string>
<string name="automated_action_list_intent">Abrir URL: %s</string>
<string name="automated_action_list_intent_empty">Abrir URL</string>
<string name="automated_action_webview_title">Acción automatizada</string>
<string name="clear_network_suggestions">Eliminar sugerencias de red</string>
<string name="clear_network_suggestions_summary">Elimina todas las sugerencias de red proporcionadas por esta aplicación.</string>
<string name="really_remove_all_networks">¿Realmente eliminar todas las redes?</string>
@@ -138,14 +179,14 @@
<string name="test_url">URL de prueba</string>
<string name="send_scan_bluetooth">Enviar escaneos con Bluetooth</string>
<string name="send_scan_bluetooth_summary">Habilita el envío de escaneos a un host Bluetooth.</string>
<string name="send_scan_bluetooth_host">Host</string>
<string name="send_scan_bluetooth_host">Anfitrión</string>
<string name="no_bluetooth_hosts_paired">Ningún host emparejado</string>
<string name="bluetooth_connect_fail">No se pudo conectar a un dispositivo bluetooth.</string>
<string name="bluetooth_send_fail">No se pudo enviar a un dispositivo bluetooth.</string>
<string name="bluetooth_send_success">Envío bluetooth completado.</string>
<string name="generation_category">Generation</string>
<string name="brighten_screen">Brighten screen</string>
<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
<string name="generation_category">Generación</string>
<string name="brighten_screen">Aumentar el brillo de la pantalla</string>
<string name="brighten_screen_summary">Suba el brillo al máximo para mejorar la lectura del código de barras desde la pantalla.</string>
<string name="really_remove_scan">¿Eliminar el escaneo seleccionado?</string>
<string name="really_remove_all_scans">¿Eliminar todos los escaneos?</string>
<string name="really_remove_selected_scans">¿Eliminar los escaneos seleccionados?</string>
@@ -179,8 +220,8 @@
<string name="otpauth_add">Añadir 2FA</string>
<string name="search_web">Buscar en la web</string>
<string name="search_scan">Buscar escaneo</string>
<string name="add_to_history">Add to history</string>
<string name="added_to_history">Added to history</string>
<string name="add_to_history">Añadir al historial</string>
<string name="added_to_history">Añadido al historial</string>
<string name="export_to_file">Exportar a archivo</string>
<string name="export_as">¿Exportar como?</string>
<string name="export_csv_comma">Archivo CSV con comas</string>
@@ -195,7 +236,7 @@
<string name="pick_code_to_scan">Seleccione el código a escanear</string>
<string name="shortcut_decode">Escanear un código</string>
<string name="shortcut_encode">Crear un código</string>
<string name="shortcut_history">History</string>
<string name="shortcut_history">Historial</string>
<string name="shortcut_preferences">Ajustes</string>
<string name="background_request_failed">Solicitud de fondo fallida</string>
<string name="entry_type">Tipo</string>
@@ -210,4 +251,18 @@
<string name="wifi_phase2">Método Phase 2</string>
<string name="network_suggestions">Sugerencias de red</string>
<string name="remove_suggestion">Eliminar sugerencia</string>
<string name="email_to">Destinatario</string>
<string name="email_subject">Asunto</string>
<string name="email_body">Cuerpo</string>
<string name="scheme">Esquema</string>
<string name="host">Anfitrión</string>
<string name="query">Consulta</string>
<string name="automated_action_type_custom_intent">Intent personalizado</string>
<string name="automated_action_intent_uri_template">Plantilla de URI de Intent</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">URI de Intent requerida</string>
<string name="automated_action_intent_uri_invalid">URI de Intent no válida</string>
<string name="automated_action_list_custom_intent">Intent personalizado: %s</string>
<string name="automated_action_list_custom_intent_empty">Intent personalizado</string>
</resources>
+105 -50
View File
@@ -1,4 +1,9 @@
<resources>
<string name="welcome">خوش آمدید!</string>
<string name="mode_expert">پیشرفته</string>
<string name="mode_expert_description">می‌خواهم محتوای خوانده شده را بررسی کرده و به صورت دستی باز کنم.</string>
<string name="mode_simple">ساده</string>
<string name="mode_simple_description">فقط می‌خواهم بارکدها را اسکن کنم و فوراً باز شوند.</string>
<string name="camera_error">نمی‌توان به دوربین دسترسی داشت، لطفاً دوباره تلاش کنید</string>
<string name="scan_code">پویش کد</string>
<string name="compose_barcode">ایجاد بارکد</string>
@@ -14,40 +19,40 @@
<string name="error_correction_level_m" formatted="false">متوسط (⁦~۱۵٪⁩ تصحیح)</string>
<string name="error_correction_level_q" formatted="false">یک‌چهارم (⁦~۲۵٪⁩ تصحیح)</string>
<string name="error_correction_level_h" formatted="false">زیاد (~۳۰٪⁩ تصحیح)</string>
<string name="label">Label</string>
<string name="colors">Fore and background</string>
<string name="colors_black_on_white">Black on white</string>
<string name="colors_white_on_black">White on black</string>
<string name="colors_black_on_transparent">Black on transparent</string>
<string name="colors_white_on_transparent">White on transparent</string>
<string name="sequence_size">Sequence size</string>
<string name="sequence_index">Sequence index</string>
<string name="sequence_id">Sequence ID</string>
<string name="label">برچسب</string>
<string name="colors">پس زمینه و پیش زمینه</string>
<string name="colors_black_on_white">سیاه روی سفید</string>
<string name="colors_white_on_black">سفید روی سیاه</string>
<string name="colors_black_on_transparent">سیاه روی شفاف</string>
<string name="colors_white_on_transparent">سفید روی شفاف</string>
<string name="sequence_size">اندازه دنباله</string>
<string name="sequence_index">اندیکس دنباله</string>
<string name="sequence_id">شناسه دنباله</string>
<string name="gtin_issue_number">شمارهٔ اشکال</string>
<string name="gtin_country">کشور احتمالی سازنده</string>
<string name="gtin_price">قیمت پیشنهادی</string>
<string name="gtin_add_on">UPC EAN extension</string>
<string name="barcode_version_number">Version</string>
<string name="gtin_add_on">تمدید UPC EAN</string>
<string name="barcode_version_number">نسخه</string>
<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
<string name="qr_data_mask">Data mask</string>
<string name="qr_data_mask">ماسک داده</string>
<string name="toggle_flash">روشن/خاموش کردن چراغ</string>
<string name="error_flash">خطا هنگام روشن/خاموش کردن چراغ</string>
<string name="share">هم‌رسانی</string>
<string name="share_file">Share as file</string>
<string name="share_file">اشتراک گذاری به عنوان فایل</string>
<string name="share_as">هم‌رسانی به عنوان؟</string>
<string name="copy_to_clipboard">رونوشت به تخه‌گیره</string>
<string name="copy_as_deeplink">کپی به صورت پیوند عمیق</string>
<string name="copied_to_clipboard">به تخته‌گیره رونوشت شد</string>
<string name="copy_password">رونوشت گذرواژه به تخته‌گیره</string>
<string name="copied_password_to_clipboard">گذرواژه به تخته‌گیره رونوشت شد</string>
<string name="open_url">گشودن نشانی</string>
<string name="cannot_resolve_action">هیچ برنامه‌ای نمی‌تواند آن را بگشاید</string>
<string name="pick_search_engine">یک موتور جست‌وجو برگزینید</string>
<string name="format">قالب</string>
<string name="size_width_by_height">اندازه به پیکسل: %1$d×%2$d</string>
<string name="size_no_magnification">No magnification</string>
<string name="add_quiet_zone">Add quiet zone</string>
<string name="size_no_magnification">بدون بزرگنمایی</string>
<string name="add_quiet_zone">اضافه کردن حوزه ساکت</string>
<string name="input_content_here">محتویات ورودی را اینجا بنویسید</string>
<string name="unescape">Expand escape sequences</string>
<string name="unescape">توسیع دنباله‌های فراری</string>
<string name="encode">رمزگذاری</string>
<string name="error_no_content">محتویاتی نیست</string>
<string name="error_encoding_barcode">بارکد نمی‌تواند ایجاد شود</string>
@@ -59,10 +64,11 @@
<string name="bulk_mode_delay">تأخیر بین پویش‌های مداوم</string>
<string name="restrict_format">محدود کردن قالب</string>
<string name="remove_restriction">برداشتن محدودیت</string>
<string name="find_code">Find code</string>
<string name="find_code_with_content">What content?</string>
<string name="find_code_hint">Enter a term</string>
<string name="scan_format">پویش %s</string>
<string name="find_code">کد را پیدا کنید</string>
<string name="find_code_with_content">چه محتوا؟</string>
<string name="find_code_hint">عبارت یا عبارت منظم</string>
<string name="does_not_match_search_term">با عبارت جستجو مطابقت ندارد</string>
<string name="scan_for">پویش %s</string>
<string name="quarter_second">یک‌چهارم ثانیه</string>
<string name="half_second">نیم ثانیه</string>
<string name="a_second">یک ثانیه</string>
@@ -73,6 +79,17 @@
<string name="scan_category">پویش</string>
<string name="content_category">محتویات</string>
<string name="locale_category">زبان</string>
<string name="profile_category">نمایه</string>
<string name="profile">نمایه</string>
<string name="profile_default">پیش‌فرض</string>
<string name="profile_add">افزودن نمایهٔ جدید</string>
<string name="profile_enter_name">نام نمایه را وارد کنید</string>
<string name="profile_enter_name_hint">نام</string>
<string name="profile_invalid_name">نام نمایه نامعتبر است</string>
<string name="profile_empty">هنوز هیچ نمایه‌ای نیست</string>
<string name="profile_current">نمایهٔ فعلی</string>
<string name="profile_remove_confirm">این نمایه حذف شود؟</string>
<string name="current_profile">نمایه: %s</string>
<string name="custom_locale">زبان سفارشی</string>
<string name="follow_system_settings">پیروی از زبان سامانه</string>
<string name="show_crop_handle">نمایش محدود کننده برش</string>
@@ -88,21 +105,21 @@
<string name="show_toast_in_bulk_mode_summary">هنگام پویش مداوم، داده‌های پویش شده را به طور خلاصه نشان می‌دهید.</string>
<string name="vibrate">لرزش هنگام تشخیص</string>
<string name="vibrate_summary">اگر می‌خواهید دستگاهتان هنگام شناسایی کد بلرزد، این را فعال کنید.</string>
<string name="beep">Beep on detection</string>
<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
<string name="beep_tone">Beep tone</string>
<string name="tone_cdma_confirm">CDMA confirm</string>
<string name="tone_sup_confirm">Call supervisory confirm</string>
<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
<string name="tone_prop_ack">Positive acknowledgment</string>
<string name="tone_prop_beep">General beep</string>
<string name="tone_prop_beep2">General double beep</string>
<string name="beep">صدای بیپ در شناسایی</string>
<string name="beep_summary">اگر می‌خواهید دستگاه شما هنگام شناسایی یک کد صدا کند، این را فعال کنید.</string>
<string name="beep_tone">صدای بیپ</string>
<string name="tone_cdma_confirm">تأیید CDMA</string>
<string name="tone_sup_confirm">تماس نظارتی تأیید کنید</string>
<string name="tone_sup_radio_ack">تائید مسیر رادیویی نظارت تماس</string>
<string name="tone_prop_ack">تایید مثبت</string>
<string name="tone_prop_beep">صدای عمومی</string>
<string name="tone_prop_beep2">صدای دو بیپ عمومی</string>
<string name="use_history">ذخیرهٔ تاریخچهٔ پویش</string>
<string name="use_history_summary">کدهای شناسایی شده را در همین دستگاه ذخیره می‌کند.</string>
<string name="ignore_duplicates">Ignore duplicates</string>
<string name="ignore_duplicates">نادیده گرفتن تکراری ها</string>
<string name="ignore_consecutive_duplicates">نادیده گرفتن موارد تکراری</string>
<string name="ignore_any_duplicates">Ignore any duplicates</string>
<string name="accept_duplicates">Accept duplicates</string>
<string name="accept_duplicates">تکراری‌ها را پذیرا باش</string>
<string name="open_immediately">گشودن بلافاصله</string>
<string name="open_immediately_summary">بازرسی را رها کنید و محتویات را فورا باز کنید. در صورت فعال بودن ممکن است محتوای مضر را باز کند.</string>
<string name="copy_immediately">قرار دادن در تخته‌گیره</string>
@@ -111,15 +128,39 @@
<string name="show_meta_data_summary">نمایش داده‌های اضافی در مورد بارکد پویش شده.</string>
<string name="show_hex_dump">نمایش کد هگز استخراج شده</string>
<string name="show_hex_dump_summary">نمایش کد هگز استخراج شده از محتویات پویش شده.</string>
<string name="show_checksum">Show checksum</string>
<string name="no_checksum">No checksum</string>
<string name="show_recreation">Show recreated barcode</string>
<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
<string name="show_checksum">نمایش مجموعه کنترلی</string>
<string name="no_checksum">بدون چک‌سام</string>
<string name="show_recreation">نمایش بارکد بازسازی شده</string>
<string name="show_recreation_summary">دوباره ایجاد کرده و بارکد را از محتوای خوانده شده نشان دهید اگر امکان دارد.</string>
<string name="close_automatically">بازگشت پس از رونوشت یا هم‌رسانی</string>
<string name="close_automatically_summary">پس از رونوشت یا هم‌رسانی مطالب خوانده شده، به طور خودکار به صفحهٔ پویش بازگردید.</string>
<string name="default_search_engine">گشودن دادهٔ نامشخص در</string>
<string name="always_ask">همیشه بپرس</string>
<string name="open_with_url">داده‌های ناشناخته را با URL باز کنید</string>
<string name="automated_actions">اقدام‌های خودکار</string>
<string name="automated_actions_none">هیچ اقدام خودکاری وجود ندارد</string>
<string name="automated_actions_empty">هنوز اقدام خودکاری وجود ندارد</string>
<plurals name="automated_actions_count">
<item quantity="one">%d اقدام خودکار</item>
<item quantity="other">%d اقدام خودکار</item>
</plurals>
<string name="automated_action_add">افزودن اقدام</string>
<string name="automated_action_edit">ویرایش اقدام</string>
<string name="automated_action_regex">عبارت منظم</string>
<string name="automated_action_regex_hint">مثلاً ^https?://.*</string>
<string name="automated_action_regex_required">عبارت منظم لازم است</string>
<string name="automated_action_regex_invalid">عبارت منظم نامعتبر است</string>
<string name="automated_action_type">نوع اقدام</string>
<string name="automated_action_type_intent">باز کردن URL</string>
<string name="automated_action_url_template">قالب URL</string>
<string name="automated_action_url_hint">https://example.com/?q={RESULT}</string>
<string name="automated_action_url_required">قالب URL لازم است</string>
<string name="automated_action_invalid_url">قالب URL نامعتبر است</string>
<string name="automated_action_remove_confirm">این اقدام حذف شود؟</string>
<string name="automated_action_list_intent">باز کردن URL: %s</string>
<string name="automated_action_list_intent_empty">باز کردن URL</string>
<string name="automated_action_webview_title">اقدام خودکار</string>
<string name="clear_network_suggestions">پاک کردن پیشنهادات شبکه</string>
<string name="clear_network_suggestions_summary">همه پیشنهادات شبکه را که قبلاً توسط این برنامه ارائه شده است حذف کنید.</string>
<string name="really_remove_all_networks">واقعاً همه شبکه‌ها را حذف می‌کنید؟</string>
@@ -132,20 +173,20 @@
<string name="send_scan_type">گونهٔ درخواست</string>
<string name="send_type_get_add_content">GET و به سادگی محتوا را اضافه کنید</string>
<string name="send_type_get_query_string">GET با رشته پرس‌وجو کامل</string>
<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
<string name="send_type_post_form">POST application/x-www-form-urlencoded ارسال</string>
<string name="send_type_post_json">POST application/json</string>
<string name="send_type_external_browser">گشودن در مرورگر خارجی</string>
<string name="test_url">آزمودن نشانی</string>
<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
<string name="send_scan_bluetooth">انتقال اسکن ها با بلوتوث</string>
<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
<string name="send_scan_bluetooth_host">Host</string>
<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
<string name="send_scan_bluetooth_host">میزبان</string>
<string name="no_bluetooth_hosts_paired">میزبان های جفت نشده</string>
<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
<string name="bluetooth_send_success">Successful bluetooth send.</string>
<string name="generation_category">Generation</string>
<string name="brighten_screen">Brighten screen</string>
<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
<string name="generation_category">نسل</string>
<string name="brighten_screen">روشن کردن صفحه نمایش</string>
<string name="brighten_screen_summary">تنظیم روشنایی به حداکثر برای افزایش اسکن کردن بارکد از صفحه نمایش.</string>
<string name="really_remove_scan">برای برداشتن پویش مطمئنید؟</string>
<string name="really_remove_all_scans">برای برداشتن همهٔ پویش‌ها مطمئنید؟</string>
<string name="really_remove_selected_scans">برای برداشتن پویش‌های برگزیده شده مطمئنید؟</string>
@@ -179,8 +220,8 @@
<string name="otpauth_add">افزودن احراز هویت چندعاملی(2FA)</string>
<string name="search_web">جست‌وجوی وب</string>
<string name="search_scan">جست‌وجوی پویش</string>
<string name="add_to_history">Add to history</string>
<string name="added_to_history">Added to history</string>
<string name="add_to_history">اضافه به تاریخچه</string>
<string name="added_to_history">اضافه شد به تاریخچه</string>
<string name="export_to_file">برون‌ریزی به پرونده</string>
<string name="export_as">برون‌ریزی به عنوان؟</string>
<string name="export_csv_comma">پروندهٔ سی‌اس‌وی با ویرگول</string>
@@ -189,13 +230,13 @@
<string name="export_database">پایگاه‌دادهٔ اس‌کیولایت</string>
<string name="saved_in_downloads">در بارگیری‌ها ذخیره شد</string>
<string name="rotate_image_cw">تصویر را در جهت ساعتگرد بچرخانید</string>
<string name="toggle_free_rotation">Toggle free rotation</string>
<string name="pick_file">Pick a file</string>
<string name="toggle_free_rotation">تغییر چرخش آزاد</string>
<string name="pick_file">یک فایل را انتخاب کنید</string>
<string name="pick_image_file">پروندهٔ تصویری را برگزینید</string>
<string name="pick_code_to_scan">کدی را برای پویش برگزینید</string>
<string name="shortcut_decode">پویش یک بارکد</string>
<string name="shortcut_encode">ایجاد یک بارکد</string>
<string name="shortcut_history">History</string>
<string name="shortcut_history">تاریخچه</string>
<string name="shortcut_preferences">تنظیمات</string>
<string name="background_request_failed">درخواست پس‌زمینه انجام نشد</string>
<string name="entry_type">گونه</string>
@@ -208,6 +249,20 @@
<string name="wifi_anonymous_identity">هویت ناشناس</string>
<string name="wifi_identity">هویت</string>
<string name="wifi_phase2">روش دو مرحله‌ای</string>
<string name="network_suggestions">Network suggestions</string>
<string name="remove_suggestion">Remove suggestion</string>
<string name="network_suggestions">پیشنهادهای شبکه</string>
<string name="remove_suggestion">حذف پیشنهاد</string>
<string name="email_to">گیرنده</string>
<string name="email_subject">موضوع</string>
<string name="email_body">متن</string>
<string name="scheme">برنامه</string>
<string name="host">میزبان</string>
<string name="query">پرس و جو</string>
<string name="automated_action_type_custom_intent">Intent سفارشی</string>
<string name="automated_action_intent_uri_template">الگوی URI Intent</string>
<string name="automated_action_intent_uri_hint">intent:#Intent;action=android.intent.action.SEND;type=text/plain;S.android.intent.extra.TEXT={RESULT};end</string>
<string name="automated_action_intent_uri_required">URI Intent لازم است</string>
<string name="automated_action_intent_uri_invalid">URI Intent نامعتبر</string>
<string name="automated_action_list_custom_intent">Intent سفارشی: %s</string>
<string name="automated_action_list_custom_intent_empty">Intent سفارشی</string>
</resources>

Some files were not shown because too many files have changed in this diff Show More