Commit d118f4d
Phase 2A-2: Remove NFC / QR / Scan
Mirrors NativeAppTemplate-Android PR #39 (which itself mirrors iOS PR #50).
After this, the app is a generic CRUD shell with Shops and Settings tabs;
ItemTagDetailView is a placeholder (name, description, state, completedAt).
### Deletions
- NfcError; ItemTagWriteView/VM + test
- ui/scan/* (ScanView, ScanViewModel, DoScanView, DoScanViewModel,
CompleteScanResultView, ShowTagInfoScanResultView, ScanNavigation)
+ DoScanViewModelTest
- Models: CompleteScanResult, CompleteScanResultType, ShowTagInfoScanResult,
ShowTagInfoScanResultType, ItemTagInfoFromNdefMessage, ItemTagType,
ScanState, ItemTagData
- Proto schemas: scan_result.proto, item_tag_data.proto,
item_tag_info_from_ndef_message.proto
- res/raw/nfc_reader.json
### Strip / rewrite
- MainActivity: dropped NFC imports, onNewIntent, ACTION_NDEF_DISCOVERED
handling, singleTask launch mode
- MainActivityViewModel: rewritten minimal (logout + permissions refresh +
didShowTapShopBelowTip)
- NatAppState / NatNavHost / TopLevelDestination: dropped SCAN_TAB,
shouldNavigateToScanView flow, navigateToScan helper, scan nav graph
- ShopDetailView / VM: dropped queue instructions block, ReadInstructionsTip,
didShowReadInstructionsTip; renamed resetItemTag -> idleItemTag and swipe
action "Reset" -> "Idle" (width 64dp -> 96dp)
- ShopSettingsView / VM: removed the "Reset Number Tags" section, resetShop
flow
- ItemTagDetailView / VM: placeholder (name, description, state, completedAt)
- LoginRepository (+ Impl) / NatPreferencesDataSource: dropped scan-related
setters/getters, didShowReadInstructionsTip
- ShopRepository / ShopApi / Impl: dropped resetShop
- ItemTagApi / Repository / Impl: renamed resetItemTag (/reset) ->
idleItemTag (/idle)
- Utility: dropped scanUri(), extractItemTagInfoFrom(), NFC imports
- NatConstants: dropped SCAN_PATH, SCAN_PATH_CUSTOMER
- UserData: dropped didShowReadInstructionsTip,
scanViewSelectedTabIndex, shouldFetchItemTagForShowTagInfoScan,
shouldCompleteItemTagForCompleteScan
- shopSettingsNavigation: dropped ItemTagWriteRoute / itemTagWriteView
- Demo / test repos updated to match trimmed interfaces; obsolete tests
removed (UtilityTest scanUri, CodedErrorTest NfcError, ItemTagDetailVMTest
isLock, ShopDetailVMTest reset/didShowReadInstructionsTip)
### Config
- AndroidManifest.xml: removed NFC permission, android.hardware.nfc feature,
NDEF_DISCOVERED intent-filter, singleTask launch mode
- build.gradle.kts / libs.versions.toml: removed compose-qr-code, capturable,
lottie-compose
- user_preferences.proto: removed scan fields
- strings.xml: removed ~25 scan/NFC/QR strings; onboarding descriptions 1-13
rewritten to generic "Welcome to the app." placeholder so OnboardingView
still compiles (worth redesigning or deleting in a follow-up)
### Test plan
- [x] ./gradlew assembleDebug passes
- [x] ./gradlew test passes
- [x] ./gradlew spotlessCheck passes
- [x] ./gradlew lint passes
- [x] ./gradlew buildHealth passes
- [ ] Manual smoke test on device/emulator: 2 tabs visible (Shops /
Settings), no Scan tab; sign-in works; ItemTag create / view detail
placeholder / edit / delete flows work
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent ba89b56 commit d118f4d
63 files changed
Lines changed: 64 additions & 3930 deletions
File tree
- app
- src
- main
- kotlin/com/nativeapptemplate/nativeapptemplatefree
- common/errors
- datastore
- data
- item_tag
- login
- shop
- ui
- app_root
- scan
- shop_detail
- shop_settings
- item_tag_detail
- utils
- res
- raw
- values
- test/kotlin/com/nativeapptemplate/nativeapptemplatefree
- common/errors
- demo
- item_tag
- login
- shop
- testing/repository
- ui
- scan
- shop_detail
- shop_settings/item_tag_detail
- utils
- datastore-proto/src/main/proto
- gradle
- model/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/model
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
100 | | - | |
101 | 99 | | |
102 | 100 | | |
103 | 101 | | |
104 | 102 | | |
105 | | - | |
106 | 103 | | |
107 | 104 | | |
108 | 105 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | 8 | | |
12 | 9 | | |
13 | 10 | | |
| |||
21 | 18 | | |
22 | 19 | | |
23 | 20 | | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | 21 | | |
29 | 22 | | |
30 | | - | |
31 | | - | |
| 23 | + | |
32 | 24 | | |
33 | 25 | | |
34 | 26 | | |
35 | 27 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | 28 | | |
45 | 29 | | |
46 | 30 | | |
| |||
52 | 36 | | |
53 | 37 | | |
54 | 38 | | |
55 | | - | |
| 39 | + | |
Lines changed: 0 additions & 91 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | 4 | | |
9 | 5 | | |
10 | 6 | | |
| |||
26 | 22 | | |
27 | 23 | | |
28 | 24 | | |
29 | | - | |
30 | 25 | | |
31 | 26 | | |
32 | 27 | | |
33 | | - | |
34 | 28 | | |
35 | 29 | | |
36 | | - | |
37 | 30 | | |
38 | 31 | | |
39 | 32 | | |
| |||
51 | 44 | | |
52 | 45 | | |
53 | 46 | | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | 47 | | |
65 | 48 | | |
66 | 49 | | |
| |||
117 | 100 | | |
118 | 101 | | |
119 | 102 | | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | | - | |
138 | | - | |
139 | | - | |
140 | | - | |
141 | | - | |
142 | | - | |
143 | | - | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | 103 | | |
186 | 104 | | |
187 | 105 | | |
188 | 106 | | |
189 | 107 | | |
190 | 108 | | |
191 | | - | |
192 | | - | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | 109 | | |
201 | 110 | | |
202 | 111 | | |
| |||
Lines changed: 0 additions & 71 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | 9 | | |
14 | | - | |
15 | 10 | | |
16 | 11 | | |
17 | 12 | | |
| |||
37 | 32 | | |
38 | 33 | | |
39 | 34 | | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | 35 | | |
77 | 36 | | |
78 | 37 | | |
79 | 38 | | |
80 | 39 | | |
81 | 40 | | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | 41 | | |
89 | 42 | | |
90 | 43 | | |
| |||
110 | 63 | | |
111 | 64 | | |
112 | 65 | | |
113 | | - | |
114 | | - | |
115 | | - | |
116 | | - | |
117 | | - | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
135 | | - | |
136 | | - | |
137 | 66 | | |
138 | 67 | | |
139 | 68 | | |
| |||
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | 4 | | |
8 | 5 | | |
9 | 6 | | |
| |||
Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
| 48 | + | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
app/src/main/kotlin/com/nativeapptemplate/nativeapptemplatefree/data/item_tag/ItemTagRepository.kt
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
80 | | - | |
| 80 | + | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
Lines changed: 0 additions & 28 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | 23 | | |
36 | 24 | | |
37 | 25 | | |
| |||
42 | 30 | | |
43 | 31 | | |
44 | 32 | | |
45 | | - | |
46 | | - | |
47 | 33 | | |
48 | 34 | | |
49 | 35 | | |
| |||
70 | 56 | | |
71 | 57 | | |
72 | 58 | | |
73 | | - | |
74 | | - | |
75 | 59 | | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | 60 | | |
0 commit comments