Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Confirm an NFC tag that was written despite an error and smooth the write sheet
InlitXb2701781ed7a
diff --git a/android/app/src/main/kotlin/com/gymmane/app/NfcBridge.kt b/android/app/src/main/kotlin/com/gymmane/app/NfcBridge.ktindex 277c3f7..cb8f4bf 100644--- a/android/app/src/main/kotlin/com/gymmane/app/NfcBridge.kt+++ b/android/app/src/main/kotlin/com/gymmane/app/NfcBridge.kt@@ -118,10 +118,23 @@ object NfcBridge {main.post { channel?.invokeMethod("written", outcome) }}+ private fun holds(tag: Tag, bytes: ByteArray): Boolean {+ val ndef = Ndef.get(tag) ?: return false+ return try {+ ndef.connect()+ ndef.ndefMessage?.toByteArray()?.contentEquals(bytes) == true+ } catch (_: Exception) {+ false+ } finally {+ runCatching { ndef.close() }+ }+ }+private fun write(tag: Tag, message: NdefMessage): String {val bytes = message.toByteArray()+ if (holds(tag, bytes)) return "ok"Ndef.get(tag)?.let { ndef ->- return try {+ val outcome = try {ndef.connect()when {!ndef.isWritable -> "locked"@@ -137,9 +150,10 @@ object NfcBridge {} finally {runCatching { ndef.close() }}+ return if (outcome == "lost" && holds(tag, bytes)) "ok" else outcome}NdefFormatable.get(tag)?.let { blank ->- return try {+ val outcome = try {blank.connect()blank.format(message)"ok"@@ -148,6 +162,7 @@ object NfcBridge {} finally {runCatching { blank.close() }}+ return if (outcome == "lost" && holds(tag, bytes)) "ok" else outcome}return "unsupported"}diff --git a/lib/widgets/nfc_sheet.dart b/lib/widgets/nfc_sheet.dartindex 63eaf1a..10836cd 100644--- a/lib/widgets/nfc_sheet.dart+++ b/lib/widgets/nfc_sheet.dart@@ -584,7 +584,7 @@ class _NfcSheetState extends State<_NfcSheet> with WidgetsBindingObserver {}void _onWritten(String outcome) {- if (!mounted || _step != _Step.waiting) return;+ if (!mounted || (_step != _Step.waiting && _step != _Step.failed)) return;if (outcome == 'ok') {HapticFeedback.mediumImpact();fit.setNfcTag(true);@@ -612,34 +612,58 @@ class _NfcSheetState extends State<_NfcSheet> with WidgetsBindingObserver {padding: sheetPad(context),constraints: BoxConstraints(maxHeight: MediaQuery.sizeOf(context).height * 0.92),decoration: sheetDecoration(gc),- child: SingleChildScrollView(- child: AnimatedSize(- duration: const Duration(milliseconds: 280),- curve: Curves.easeOutCubic,- alignment: Alignment.topCenter,- child: AnimatedSwitcher(- duration: const Duration(milliseconds: 220),- layoutBuilder: (current, previous) => Stack(- alignment: Alignment.topCenter,- children: [- ...previous.map((w) => Positioned(left: 0, right: 0, top: 0, child: w)),- ?current,- ],- ),- child: KeyedSubtree(- key: ValueKey(intro),- child: Column(- mainAxisSize: MainAxisSize.min,- crossAxisAlignment: CrossAxisAlignment.stretch,- children: [- const SheetHandle(),- const SizedBox(height: 16),- if (intro) ..._intro(context, gc) else ..._writing(context, gc),- ],+ child: Column(+ mainAxisSize: MainAxisSize.min,+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: [+ const SheetHandle(),+ const SizedBox(height: 16),+ Flexible(+ child: SingleChildScrollView(+ child: AnimatedSize(+ duration: const Duration(milliseconds: 420),+ curve: Curves.easeInOutCubic,+ alignment: Alignment.topCenter,+ child: AnimatedSwitcher(+ duration: const Duration(milliseconds: 420),+ layoutBuilder: (current, previous) => Stack(+ alignment: Alignment.topCenter,+ children: [+ ...previous.map((w) => Positioned(left: 0, right: 0, top: 0, child: w)),+ ?current,+ ],+ ),+ transitionBuilder: (child, anim) {+ final incoming = child.key == ValueKey(intro);+ final v = CurvedAnimation(+ parent: anim,+ curve: incoming+ ? const Interval(0.4, 1, curve: Curves.easeOutCubic)+ : const Interval(0.6, 1, curve: Curves.easeInCubic),+ );+ return AnimatedBuilder(+ animation: v,+ builder: (context, child) => Opacity(+ opacity: v.value,+ child: Transform.translate(+ offset: Offset(0, (1 - v.value) * (incoming ? 14 : -8)),+ child: child,+ ),+ ),+ child: child,+ );+ },+ child: Column(+ key: ValueKey(intro),+ mainAxisSize: MainAxisSize.min,+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: intro ? _intro(context, gc) : _writing(context, gc),+ ),+ ),),),),- ),+ ],),);}