feat: MVP - Vibecoded with Opus 4.5 #2
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit brings the OpenPrintTag Writer to MVP-ready state with critical bug fixes, comprehensive testing, and UX improvements. - Fix type errors: lowercase `int?` → `Int?` in OpenPrintTagModel.kt (totalWeight, ActTotalWeight, consumedWeight fields) - Add missing `JsonNode` import in Serializer.kt - Remove duplicate nested onNewIntent() inside onCreate() that shadowed the class-level override in MainActivity - Wire materialClass dropdown to model in GeneratorActivity (was being ignored during serialization) - Add NFC intent filters to AndroidManifest for proper tag discovery: - NDEF_DISCOVERED for application/vnd.openprinttag MIME type - TECH_DISCOVERED with nfc_tech_filter.xml (NfcA, NfcV, Ndef) - Set versionCode=1, versionName="0.1.0" - Add test dependencies (JUnit 4.13.2, AndroidX Test, Espresso) - Create proguard-rules.pro with rules for: - Kotlinx.serialization (keep serializers and companions) - Jackson CBOR (keep ObjectMapper methods) - SnakeYAML and model classes - Update CI workflow to use JDK 21 and add explicit build step - Create adaptive app icons (vector drawables): - ic_launcher_background.xml (teal gradient) - ic_launcher_foreground.xml (3D printer/tag design) - ic_launcher.xml and ic_launcher_round.xml (adaptive configs) - Create comprehensive strings.xml with 40+ externalized strings for all UI text, error messages, toasts, and status indicators - Add mode indicator colors to colors.xml: - mode_read_background (#4CAF50 green) - mode_write_background (#F44336 red) - SerializerTest.kt: 17 tests covering CBOR encoding, NDEF formatting, dual-record generation, and deserialization - OpenPrintTagModelTest.kt: 17 tests for model defaults, field assignments, nested regions, and date serialization - SelectionManagerTest.kt: 15 tests for tag selection logic including implies chains, hints, circular dependencies, and edge cases - Add ProgressBar for visual feedback during NFC operations - Add mode indicator TextView showing current read/write mode with color-coded background (green=read, red=write) - Add try-catch error handling around all NFC operations with user-friendly error messages via Toast and status TextView - Update activity_main.xml layout with new UI components
- Fix bug where read failure showed "Write Failed" toast instead of "Read Failed" in readAndDisplayTag() error handler - Add toast_read_failed string resource for read operation errors - Call updateModeIndicator() in onCreate() to ensure mode indicator is properly initialized on app startup
- Replace manual Gradle cache with gradle/actions/setup-gradle@v4 which handles caching automatically and more efficiently - Add Android SDK caching for faster subsequent builds - Remove --no-daemon flag (Gradle action manages daemon lifecycle) This should reduce CI build times from ~5-10 min to ~1-2 min on cache hits.
- Remove redundant Android SDK cache (pre-installed on runners) - Add concurrency group to cancel in-progress runs on new pushes - Upload test results as artifact (even on failure) for debugging - Upload debug APK as downloadable artifact
## Serializer.kt fixes: - Change `OpenPrintTagModel.MainRegion` to `MainRegion` (top-level class) - Change `OpenPrintTagModel.AuxRegion` to `AuxRegion` (top-level class) - Add missing `decodeCbor()` function called by parseNextNdefRecord - Add `deserialize()` method for GeneratorActivity to use - Add `findCborPayloadStart()` helper for payload extraction - Add JsonNode overloads for `decodeMainRegion()` and `decodeAuxRegion()` to fix type mismatch errors (functions expected ByteArray, got JsonNode) ## AndroidManifest.xml: - Remove deprecated `package` attribute (namespace is in build.gradle) These changes fix 40+ compilation errors that were causing CI build failure.
Serializer.kt: - Add explicit type annotations for JsonNode variables - Use path() instead of get() for null-safe int access - Rename JsonNode overloads to decodeMainRegionFromNode/decodeAuxRegionFromNode to avoid overload resolution ambiguity - Add null fallback for decodeMainRegion assignment Test files: - Fix imports: MainRegion, AuxRegion, UrlRegion are top-level classes, not nested in OpenPrintTagModel - Update all test references from OpenPrintTagModel.* to direct class refs Build now compiles successfully and all tests pass.
Replace hardcoded colors with theme attributes in layouts: - tag_category_header.xml: use colorSurfaceVariant/colorOnSurface - tag_selectable_option.xml: use colorOnSurface/colorOnSurfaceVariant Use explicit Light/Dark themes for reliable switching: - values/styles.xml: Theme.Material3.Light.NoActionBar - values-night/styles.xml: Theme.Material3.Dark.NoActionBar
- Add deserialize() call in readAndDisplayTag() and loadBytesFromFile() - Add formatModelForDisplay() to show human-readable material properties - Load enum maps (classMap, typeMap, tagsMap, certsMap) for deserialization - Add testOptions.returnDefaultValues for Android unit tests - Add serialization tests for various model configurations
- Fix findCborPayloadStart() to properly parse NDEF record headers
and calculate correct CBOR payload offset
- Add version marker detection to skip {2: version} wrapper objects
- Add custom serializers for int-to-string conversion:
- IntOrStringSerializer for non-null String fields
- NullableIntOrStringSerializer for nullable String fields
- IntListAsStringListSerializer for List<String> from int arrays
- Replace kotlinx.serialization with direct JsonNode mapping in
decodeMainRegionFromNode() for more lenient type handling
- Handle bytes-to-hex conversion for color fields stored as raw bytes
This enables loading .bin files that use different CBOR encoding
formats, such as files from other OpenPrintTag implementations.
This commit implements full coverage of all OpenPrintTag specification fields and adds comprehensive test coverage for spec compliance. Model Changes (OpenPrintTagModel.kt): - Add 22 new MainRegion fields: UUIDs (keys 0-3), brand IDs (5-7), writeProtection (13), expirationDate (15), emptyContainerWeight (18), shoreHardness A/D (31-32), minNozzleDiameter (33), container dimensions (42-45), SLA viscosity fields (46-49), containerVolumetricCapacity (50), cureWavelength (51), filament lengths (53-54) - Add 2 new AuxRegion fields: generalPurposeRangeUser (2), lastStirTime (3) - Fix critical key mapping: filamentDiameter now uses key 30 (key 12 is deprecated) - Fix type mismatches: weight fields changed from Int to Float per spec - Rename fields per spec: brand→brandName, totalWeight→nominalNettoFullWeight, ActTotalWeight→actualNettoFullWeight, idealChamberTemp→chamberTemperature, secondary_color_X→secondaryColorX, transmission_distance→transmissionDistance - Add NullableLocalDateSerializer for optional date fields Serializer Changes: - Update encoder (encodeMain) to support all 50+ fields - Update decoder (decodeMainRegionFromNode) with all field mappings - Update decodeAuxRegionFromNode to decode directly from JsonNode - Update encodeAux to support new aux fields UI Changes: - MainActivity: Enhanced display showing hardness, certifications, expiration date, spool dimensions, country of origin - GeneratorActivity: Updated field references Test Coverage: - New FieldCoverageTest.kt: Spec compliance tests verifying all 56 CBOR keys present, deprecated keys not used, correct types - Updated OpenPrintTagModelTest.kt: Tests for all new fields - Updated SerializerTest.kt and SerializerUnitTest.kt: Fixed field refs - Added test resource: openprinttag_PETG_Kandy_Blast.bin - Added kotlin-reflect dependency for reflection-based tests Breaking Changes: - Field renames require code updates (brand→brandName, etc.) - Weight fields now Float instead of Int - Key 12 removed, key 30 used for filamentDiameter
This commit introduces a complete UI overhaul following Material Design 3 principles with a Modern Minimal aesthetic (teal accent #14B8A6). ## Design System Foundation - Add dimens.xml with consistent spacing system (xs/sm/md/lg/xl) - Add type.xml with typography scale (headlines, body, labels, section headers) - Add themes.xml with component theme overlays (cards, buttons, chips, progress) - Expand colors.xml with teal-based palette for light mode - Add values-night/colors.xml for proper dark mode support ## Tag Data Display System (MainActivity) - Create TagDisplaySection.kt with sealed class hierarchy for 8 display types: MaterialHeader, SectionHeader, PropertyRow, TemperatureRow, UsageProgress, ColorSwatches, ChipGroup, EmptyState - Create TagDataAdapter.kt with ViewHolders for rich card-based display - Add 8 item layouts for RecyclerView-based tag data presentation - Replace plain text display with visual cards, color swatches, progress bars - Add material-class-aware display logic (shows FFF vs SLA fields appropriately) - Display usage tracking from AuxRegion (consumed weight with progress bar) ## MainActivity Improvements - Redesign layout with CoordinatorLayout, AppBarLayout, BottomAppBar - Add toolbar menu for quick access to Generator, Load, and Save actions - Implement proper view binding throughout (remove all findViewById) - Add mode indicator as Material Chip with teal/amber colors - Keep Read/Write toggle buttons in bottom bar for primary actions ## GeneratorActivity Expansion - Expand form from ~8 fields to 50+ fields covering full OpenPrintTag spec: - UUIDs (instance, package, material, brand) - Brand-specific IDs (instance, package, material) - Write protection setting - Dates with Material DatePicker (manufactured, expiration) - Weights (nominal, actual, empty container) - 6 colors with color pickers (primary + 5 secondary) - Physical properties (diameter, density, nozzle, shore hardness, length) - All temperatures (print, bed, chamber min/max, preheat) - Container dimensions (width, outer/inner/hole diameter) - SLA properties (viscosity at 4 temps, cure wavelength, volume) - Certifications with multi-select dialog - Implement material-class-aware field filtering: - FFF: shows filament, temperature, and spool dimension fields - SLA: shows viscosity, cure wavelength, container volume fields - SLS: shows temperature fields only - Auto-populate all fields when loading cached tag data - Organize fields into logical collapsible sections ## New Resources - Drawables: ic_arrow_back, ic_calendar, ic_edit, ic_folder_open, ic_save, progress_usage, progress_usage_track - Menu: menu_main.xml for toolbar actions - Layouts: 8 item_*.xml layouts for RecyclerView display - Strings: 60+ new strings for section headers, hints, labels ## Technical Improvements - Full view binding usage in both activities - Extracted reusable methods (launchGenerator, loadBinFile, saveBinFile) - Proper coroutine usage for async operations - Clean separation of UI logic with TagDisplayBuilder
Und3rf10w
changed the title
Use snake_case field names to match the official OpenPrintTag specification exactly, making it easier to cross-reference code with spec documentation. No functional changes - purely cosmetic renames across 8 files (~200 field references). Key changes: - brandName → brand_name - materialType → material_type - nominalNettoFullWeight → nominal_netto_full_weight - minPrintTemp → min_print_temperature - All UUID fields (instanceUuid → instance_uuid, etc.) - All secondary color fields (secondaryColor0 → secondary_color_0) - All SLA fields (viscosity25c → viscosity_25c) - All container dimension fields
Owner
|
It's okay. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Complete MVP implementation of the OpenPrintTag Writer Android app - a tool for reading, writing, and generating standardized NFC data tags for 3D printing materials.
Changes in this PR
Core Features
Bug Fixes
Refactoring
CI/CD
Key Features
Full OpenPrintTag Spec Coverage
Robust CBOR Serialization
Material Design 3 UI
NFC Operations
Generator Activity
Files Changed
Core Model
OpenPrintTagModel.kt- Data classes with full spec field coverageSerializer.kt- CBOR encode/decode with NDEF formattingActivities
MainActivity.kt- NFC read/write, file import/exportGeneratorActivity.kt- Material data editor formUI Components
TagDisplaySection.kt- Display item buildersTagDataAdapter.kt- RecyclerView adapterTests
FieldCoverageTest.kt- Spec compliance verificationOpenPrintTagModelTest.kt- Model unit testsSerializerTest.kt/SerializerUnitTest.kt- Serialization testsTest Plan
./gradlew test- 71 tests)./gradlew assembleDebug)UI Screenshots