UI Update & Project Reorganization (MVVM) by kelvinlin9614 · Pull Request #7 · grey-box/Project-Mesh

kelvinlin9614 · 2024-08-26T20:33:29Z

Optimize the file structure to improve organization and maintainability.
Implement Dependency Injection (DI) to centralize the initialization of all global variables.
Create a separate Context Extension file for all Context-related extensions.
Add a WifiConnection file to handle Wi-Fi setup after scanning a QR code, reusing code from the Meshrabiya test app.
Include additional comments throughout the code to enhance clarity and understanding.

1. Update UI(add bottom nav, modify button style, etc) 2. Using MVVM architecture to reorganize the whole project (Trying..) 3. Couldn't fetch the data from nodes(if not initialize it in the main activity) 4. Will focus on Wifi connection and File transfer function for now.

1. Optimize the file structure to improve organization and maintainability. 2. Implement Dependency Injection (DI) to centralize the initialization of all global variables. 3. Create a separate Context Extension file for all Context-related extensions. 4. Add a WifiConnection file to handle Wi-Fi setup after scanning a QR code, reusing code from the Meshrabiya test app. 5. Include additional comments throughout the code to enhance clarity and understanding.

commit e598e17 Author: Li Lin <lilin.boardgame@gmail.com> Date: Thu Oct 3 15:18:48 2024 -0700 Use Android Sharesheet when sharing the connect URI commit 810746f Author: Li Lin <lilin.boardgame@gmail.com> Date: Fri Sep 27 09:45:54 2024 -0700 Allow sharing connect URI with Quick Share commit b05bcdf Author: Lee Lin <lilin.boardgame@gmail.com> Date: Mon Sep 23 14:28:41 2024 -0700 Fix HomeScreen buttons Disable the buttons if the phone does not support WiFi STA/AP concurrency and the other service is running. commit a55e7cb Merge: 3cf347a 0520dec Author: Chris Cameron <113069558+ccameron-gb@users.noreply.github.com> Date: Mon Sep 23 12:42:01 2024 -0600 Merge pull request #9 from kelvinlin9614/main Minor Update(09/20/2024) & (09/12/2024) commit 0520dec Author: kelvinlin9614 <kelvinlin9614@gmail.com> Date: Fri Sep 20 15:15:19 2024 -0700 Minor Update(09/20/2024) 1. Wi-Fi connection is working properly. 2. Added additional comments. 3. The Network Screen now displays Wi-Fi nodes when another device connects. 4. Added a local test for the Network Screen UI, allowing you to test it on an emulator (just uncomment the code I've specified). 5. Redesigned the Network Screen UI. commit 735bddb Author: kelvinlin9614 <kelvinlin9614@gmail.com> Date: Thu Sep 12 02:15:41 2024 -0700 Minor Update(09/12/2024) 1. Wi-Fi connection is functioning properly. 2. Added more comments. 3. Network screen now displays Wi-Fi nodes when another device is connected. commit 3cf347a Merge: cde458f 1d5906e Author: Chris Cameron <113069558+ccameron-gb@users.noreply.github.com> Date: Thu Sep 5 20:14:48 2024 -0600 Merge pull request #8 from kelvinlin9614/main Minor Update(09/05/2024) commit 1d5906e Author: kelvinlin9614 <kelvinlin9614@gmail.com> Date: Thu Sep 5 14:20:05 2024 -0700 Minor Update(09/05/2024) 1. Add Hotspot status indicator on Home Screen. 2. Add detailed comments. 3. Able to Show connected device Network on Network Screen. 4. Fix Bug Where Hotspot Stops After Changing Screens. commit cde458f Merge: f895efa 454aad3 Author: Chris Cameron <113069558+ccameron-gb@users.noreply.github.com> Date: Tue Aug 27 08:39:26 2024 -0600 Merge pull request #7 from kelvinlin9614/main UI Update & Project Reorganization (MVVM) commit 454aad3 Author: kelvinlin9614 <kelvinlin9614@gmail.com> Date: Mon Aug 26 01:47:55 2024 -0700 Reorganized(MVVM Architecture) 1. Optimize the file structure to improve organization and maintainability. 2. Implement Dependency Injection (DI) to centralize the initialization of all global variables. 3. Create a separate Context Extension file for all Context-related extensions. 4. Add a WifiConnection file to handle Wi-Fi setup after scanning a QR code, reusing code from the Meshrabiya test app. 5. Include additional comments throughout the code to enhance clarity and understanding. commit 60bf198 Author: kelvinlin9614 <kelvinlin9614@gmail.com> Date: Tue Aug 20 02:17:10 2024 -0700 UI update, Reorganize Project, Fetching node's info issue. 1. Update UI(add bottom nav, modify button style, etc) 2. Using MVVM architecture to reorganize the whole project (Trying..) 3. Couldn't fetch the data from nodes(if not initialize it in the main activity) 4. Will focus on Wifi connection and File transfer function for now.

commit b006a14 Merge: e7c1da2 742272e Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Mar 1 13:06:02 2026 -0700 Merge branch 'unitTesting-asu2025F' of https://github.com/grey-box/Project-Mesh into unitTesting-asu2025F commit e7c1da2 Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Mar 1 13:05:48 2026 -0700 Add NotificationHelper tests and UML Adds a Robolectric test for NotificationHelper and supporting UML assets. New test (app/src/test/java/com/greybox/projectmesh/util/NotificationHelperTest.kt) verifies: creation of notification channel on API 26+, no channel behavior on API <26, and that showFileReceivedNotification posts a notification with expected title/text/auto-cancel flag and intent extras. Also adds UML diagram and image (uml/class-diagrams/components/util/NotificationHelper.puml and uml/Images/Components/util/NotificationHelper.png) documenting the NotificationHelper API and its related classes. These changes improve test coverage and documentation for notification behavior. commit 1d5f904 Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Mar 1 12:45:16 2026 -0700 Add UserEntity tests and UML diagrams Add unit tests for UserEntity that verify default nullable fields, data class equality/hashCode/copy behavior, and kotlinx.serialization round-trip. Also add a PlantUML class diagram and corresponding PNG image to document the UserEntity structure. commit 99c5068 Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Mar 1 12:35:15 2026 -0700 Add UserDao tests and UML diagram Add comprehensive unit tests for UserDao using an in-memory Room database and Robolectric (SDK 29). Tests cover insert/getByUuid, getUserByIp, updateUser, hasWithID, getAllConnectedUsers, getAllUsers, and missing-query behavior, and use ExperimentalCoroutinesApi with runTest. Also add a PlantUML class diagram and corresponding PNG for the UserDao component. commit 7ddd663 Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Mar 1 12:30:20 2026 -0700 Add MessageService tests and UML diagrams Add unit tests for MessageService (MessageServiceTest.kt) covering sendMessage behavior: verifies message is saved before network send, repository failures prevent network sends, and network failures propagate after save. Also add UML assets (MessageService.png and MessageService.puml) documenting the MessageService class and its dependencies. commit 742272e Author: Jai Patel <22jaipp@gmail.com> Date: Sun Mar 1 03:23:53 2026 -0700 Organised images and Puml Files according to components commit 3cd62ba Merge: 58bc3ab 1091cfd Author: Jai Patel <22jaipp@gmail.com> Date: Sun Mar 1 03:23:43 2026 -0700 Merge remote-tracking branch 'origin/unitTesting-asu2025F' into unitTesting-asu2025F commit 58bc3ab Author: Jai Patel <22jaipp@gmail.com> Date: Sun Mar 1 03:23:32 2026 -0700 Organised images and Puml Files according to components commit 7d94de2 Author: taimuradam <taimur.adam1@gmail.com> Date: Wed Feb 25 19:35:09 2026 -0700 Add MessageNetworkHandler tests and UML diagrams Add comprehensive unit tests for MessageNetworkHandler (app/src/test/.../MessageNetworkHandlerTest.kt) covering sendChatMessage (request construction, file query param, and exception handling) and handleIncomingMessage (mapping messages to users, conversation creation/update, and unknown-sender behavior). Tests mock OkHttp, Kodein DI, repositories and GlobalApp globals. Also add UML class diagram and PNG (uml/class-diagrams/... .puml and uml/Images/...) describing MessageNetworkHandler structure and companion. commit d6a6347 Author: taimuradam <taimur.adam1@gmail.com> Date: Wed Feb 25 19:29:51 2026 -0700 Add messaging UML images and relocate diagrams Add PNG renderings for messaging UML assets (Conversation, ConversationDao, JSONSchema, Message, MessageDao) under uml/Images/Components/messaging and move corresponding .puml class diagrams into uml/class-diagrams/components/messaging to better organize messaging-related UML files. commit 1091cfd Author: taimuradam <taimur.adam1@gmail.com> Date: Wed Feb 25 18:58:28 2026 -0700 Created tests for messaging/data commit 1099fd2 Author: Jai Patel <22jaipp@gmail.com> Date: Mon Feb 16 15:52:01 2026 -0700 Organised images and Puml Files according to components commit 70731a0 Author: Jai Patel <22jaipp@gmail.com> Date: Mon Feb 16 15:51:51 2026 -0700 Organised images and Puml Files according to components commit 83ff9cf Author: Jai Patel <22jaipp@gmail.com> Date: Mon Feb 16 15:33:06 2026 -0700 final files of ViewModel Component commit ef3fde4 Author: Jai Patel <22jaipp@gmail.com> Date: Mon Feb 16 15:30:13 2026 -0700 final files of ViewModel Component commit 2fa97bc Author: Jai Patel <22jaipp@gmail.com> Date: Mon Feb 16 15:10:44 2026 -0700 final files of ViewModel Component # Conflicts: # app/src/test/java/com/greybox/projectmesh/viewModel/SelectDestNodeScreenViewModelTest.kt # app/src/test/java/com/greybox/projectmesh/viewModel/SendScreenViewModelTest.kt # app/src/test/java/com/greybox/projectmesh/viewModel/SettingsScreenViewModelTest.kt commit 4ab5222 Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Feb 15 18:44:02 2026 -0700 Add tests for ContentResolver and ViewModel Add unit tests for ContentResolver extension and SelectDestNodeScreenViewModel. Tests cover getUriNameAndSize (file URIs, null/query/cursor behaviors, name/size extraction) and ViewModel behaviors (initial state, collecting node state, onClickReceiver success/failure paths and interactions with AppServer). Also add UML class diagram sources and PNG images for both components. Minor whitespace adjustment in SelectDestNodeScreenViewModel.kt. commit 7026b2c Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Feb 15 18:28:44 2026 -0700 Add UML images for viewmodels and repository Add PNG UML diagrams for SendScreenViewModel, SettingsScreenViewModel, and UserRepository under uml/Images. These new binary assets provide visual documentation of the viewmodel and repository structure. commit 18a89ef Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Feb 15 18:25:27 2026 -0700 Created UserRepository, SendScreenVM, SettingsScreenVM commit b103b1d Author: taimuradam <taimur.adam1@gmail.com> Date: Sun Feb 15 18:15:24 2026 -0700 Tested DeviceStatusManager, ConversationRepository, MessageRepository commit 3be481d Author: Jai Patel <22jaipp@gmail.com> Date: Thu Feb 12 13:59:13 2026 -0700 Created Unit more testing files for multiple files commit a1d3c17 Author: Jai Patel <22jaipp@gmail.com> Date: Thu Feb 12 13:36:28 2026 -0700 Created Unit more testing files for multiple files commit 57a4cdf Author: Jai Patel <22jaipp@gmail.com> Date: Sun Feb 1 21:29:53 2026 -0700 Created Unit more testing files for multiple files commit 5fe521b Author: Jai Patel <22jaipp@gmail.com> Date: Sun Feb 1 19:37:40 2026 -0700 Created Unit more testing files for multiple files commit b67861d Author: Jai Patel <22jaipp@gmail.com> Date: Sun Feb 1 19:37:08 2026 -0700 Created Unit more testing files for multiple files commit da7317e Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:44:26 2025 -0700 Created MessageUtils.puml commit ec12fe0 Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:43:39 2025 -0700 Created MessageMigrationUtils.puml commit d4c7f6c Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:41:51 2025 -0700 Created Logger.puml commit fcfaf28 Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:40:26 2025 -0700 Created FileEncoder.puml commit 8817def Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:38:01 2025 -0700 Created ConversationUtils.puml commit 9befe75 Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:36:04 2025 -0700 Created ListExtension.puml commit d3ae065 Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Dec 1 19:34:19 2025 -0700 Created InputStreamCounter.puml commit d716450 Merge: b8aad94 922c607 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 25 15:50:31 2025 -0700 Merge branch 'main' into unitTesting-asu2025F commit b8aad94 Author: taimuradam <taimur.adam1@gmail.com> Date: Mon Nov 24 18:07:25 2025 -0700 Added 4 new test files Added tests for FileEncoder, Logger, MessageMigrationUtils and MessageUtils commit 31f7046 Author: Jai Patel <22jaipp@gmail.com> Date: Sat Nov 22 19:01:43 2025 -0700 Created Unit more testing files for multiple files commit 922c607 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Nov 13 19:52:17 2025 -0700 Correct artifact expiration period commit d3250d3 Author: taimuradam <taimur.adam1@gmail.com> Date: Thu Nov 13 11:25:27 2025 -0700 Add detailed comments to test classes Added descriptive block and section comments to ListExtensionTest, ConversationUtilsTest, and InputStreamCounterTest to clarify test coverage, intent, and expected behaviors for JVM-only extension and utility functions. Improves maintainability and understanding of test cases. commit d6ad974 Author: taimuradam <taimur.adam1@gmail.com> Date: Thu Nov 13 11:12:19 2025 -0700 Add unit tests for ConversationUtils Introduces ConversationUtilsTest to verify conversation ID creation logic, including handling of identical UUIDs and special cases for device UUIDs. commit 597de63 Author: taimuradam <taimur.adam1@gmail.com> Date: Thu Nov 13 03:21:45 2025 -0700 Add ListExtensionTest and rename InputStreamCounterTest methods Introduced ListExtensionTest to cover updateItem extension function with various scenarios. Renamed test methods in InputStreamCounterTest for improved clarity and consistency. commit c28cc89 Author: taimuradam <taimur.adam1@gmail.com> Date: Wed Nov 12 22:47:09 2025 -0700 Remove redundant read override and add tests for InputStreamCounter Deleted the unnecessary override of read(ByteArray) in InputStreamCounter, relying on the existing read(ByteArray, Int, Int) implementation for byte counting. Added unit tests for InputStreamCounter to verify byte counting and closed state behavior. commit 67360c0 Author: Jai Patel <22jaipp@gmail.com> Date: Wed Nov 12 15:58:41 2025 -0700 Created Unit testing file specifically to test WifiConnection.kt commit e624eff Author: Jai Patel <22jaipp@gmail.com> Date: Wed Nov 12 15:36:27 2025 -0700 Created Unit testing file specifically to test WifiConnection.kt commit d1f91ba Author: Jai Patel <22jaipp@gmail.com> Date: Wed Nov 12 14:41:35 2025 -0700 Created Unit testing file specifically to test WifiConnection.kt commit 2ce6e4e Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 16:29:48 2025 -0700 Improve Action Summaries commit cd6ce5f Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 15:57:51 2025 -0700 Add job concurrency and debug coverage workflow commit ff87ded Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 15:49:26 2025 -0700 Improve Actions Summaries commit ac4829d Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 15:31:08 2025 -0700 Improve Actions Summaries commit dfc6b99 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 15:17:56 2025 -0700 Update Action names and add build comment for APKs commit c2ee7b2 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 14:50:27 2025 -0700 Attempt to understand actions failure #4 - Adjust path printing - Add artifact upload action steps for build commit 541edd3 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 14:41:23 2025 -0700 Attempt to understand actions failure #3 commit 6548407 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 14:33:45 2025 -0700 Attempt to understand actions failure #2 commit 92de44a Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 14:02:05 2025 -0700 (Hopefully) fix coverage reporting Original workflow did not account for app folder nesting commit e4ab6fa Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 13:52:37 2025 -0700 Attempt to understand action failure KoverReport failed because path to report.xml was invalid. Hopefully this commit will allow me to see the correct path so I can change the action commit 3249be4 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 13:34:19 2025 -0700 PLEASE REVIEW: Minor changes to address lint build failures - Localize "log" to "Registre" in French - Add constraints to activity crash screen textview commit 0460d94 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Tue Nov 11 13:31:38 2025 -0700 Config changes for usable build Only significant change is to specify a Java toolchain (17) in the top-level build.gradle.kts file, so it doesn't implicitly use your local version commit b68612d Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Nov 6 11:25:29 2025 -0700 First APK build workflow Kover report can't function without build commit 4c790a2 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Nov 6 10:39:17 2025 -0700 First attempt at coverage report commit e376ff8 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 15:15:22 2025 -0700 Remove prettier XML plugin XML plugin causes errors in Super-Linter action flow. This is a known problem and is unlikely to be resolved commit d865162 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 14:55:32 2025 -0700 Add commit message input to workflow_dispatch commit 5611477 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 14:35:03 2025 -0700 Slight fix + test commit commit 6df090b Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 14:07:21 2025 -0700 Format all XML and README files commit 537913e Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 14:03:04 2025 -0700 Finish Prettier Config Add xml formatting, remove JS test file. Tested use of Prettier Kotlin plugin, but it's ill-maintained and errors on many files so will try to use ktlint to handle kotlin formatting commit a49d744 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 13:16:24 2025 -0700 Test Prettier pre-commit (#10) commit 909d253 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 13:12:55 2025 -0700 Debug Prettier pre-commit (#9) commit 3011ce0 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 13:07:32 2025 -0700 Debug Prettier pre-commit (#8) commit 38db27c Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 13:02:52 2025 -0700 Debug Prettier pre-commit (#7) commit 7cdabd9 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 12:28:50 2025 -0700 Debug Prettier pre-commit (#6) commit 8b09517 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 12:24:44 2025 -0700 Debug Prettier pre-commit (#5) commit bcba2cd Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 12:02:20 2025 -0700 Test Prettier pre-commit (#4) commit ef08187 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:58:17 2025 -0700 Debug Prettier pre-commit (#3) Add back lint-staged commit a45ebec Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:51:51 2025 -0700 Debug Prettier pre-commit (#2) commit e16f9ae Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:40:42 2025 -0700 Debug Prettier pre-commit (#1) Add back husky install script in package.json commit 5124610 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:36:24 2025 -0700 Test pre-commit Prettier action This commit will be effectively rolled back, it's just to test Prettier in action commit 3737c03 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:32:23 2025 -0700 Correct badges commit e5fa935 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:22:33 2025 -0700 Reformat badges commit 428e122 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:20:33 2025 -0700 Add Prettier, Super-Linter badges commit 5f96903 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 11:19:05 2025 -0700 Implement pre-commit formatting with Prettier commit 3aa1690 Author: Thalia Wood <42354895+polygeist111@users.noreply.github.com> Date: Thu Oct 30 10:55:49 2025 -0700 Add Actions linting

kelvinlin9614 added 2 commits August 20, 2024 02:17

ccameron-gb merged commit cde458f into grey-box:mvvm-refactor Aug 27, 2024

polygeist111 added a commit to polygeist111/Project-Mesh that referenced this pull request Oct 30, 2025

Debug Prettier pre-commit (grey-box#7)

38db27c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI Update & Project Reorganization (MVVM)#7

UI Update & Project Reorganization (MVVM)#7
ccameron-gb merged 2 commits intogrey-box:mvvm-refactorfrom
kelvinlin9614:main

kelvinlin9614 commented Aug 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants