Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
48fa2c3
refactor: Reorganize messaging functionality into dedicated module
ccoppo Feb 2, 2025
c339d96
refactor: fixing oops some files did not get committed/pushed in my f…
ccoppo Feb 5, 2025
67a52e2
Added Craig's chat screen
cybarney Feb 5, 2025
ce1a236
Fix for app crashing when IP field empty
cybarney Feb 5, 2025
ad9943b
feat(chat): Replace manual IP entry with ChatNodeListScreen for node-…
aryan-r-0 Feb 6, 2025
071c595
Added Messaging Bubbles
cybarney Feb 12, 2025
8658411
Added the file encoder class
CLiang46 Feb 13, 2025
57d2c7d
Merge branch 'messaging-updates-wil-mesh-asu-cidse2024' of https://gi…
CLiang46 Feb 13, 2025
c08dc2e
refactor(WifiListItem): move WifiListItem to shared utility file for …
aryan-r-0 Feb 13, 2025
f8a5250
Fixed functionality for sending text messages
cybarney Feb 13, 2025
826c5f3
Fixing issue in gradle.xml
cybarney Feb 13, 2025
674b206
Added colors for message bubles
cybarney Feb 14, 2025
e05e321
Add test device functionality
ccoppo Feb 15, 2025
9942d78
Added the file encoder class
CLiang46 Feb 19, 2025
b73fe91
Added the file encoder class
CLiang46 Feb 19, 2025
aa1ecab
commented out some of the changes to the Message class that were caus…
CLiang46 Feb 19, 2025
754de44
feat: unify and persist local device name in DB, integrate /myinfo en…
aryan-r-0 Feb 20, 2025
b7cc38d
feat: unify and persist local device name in DB, integrate /myinfo en…
aryan-r-0 Feb 20, 2025
56cd348
Merge remote-tracking branch 'origin/messaging-updates-wil-mesh-asu-c…
aryan-r-0 Feb 20, 2025
bbf18a3
feat: fixed merge issues
aryan-r-0 Feb 20, 2025
8ee6a10
feat: fixed merge issues with the test device
aryan-r-0 Feb 27, 2025
982e88d
feat(settings): propagate device name updates and broadcast user info
aryan-r-0 Feb 27, 2025
9be7ec1
Cleaned up ChatScreen.kt
cybarney Feb 27, 2025
95b0564
Fixed onboarding and user info bugs; include DI-provided local IP
aryan-r-0 Mar 5, 2025
d420773
Added time stamps to messages
cybarney Mar 11, 2025
170a9da
added conversation homescreen and persisting chat history
ccoppo Mar 17, 2025
54d3d6d
Resolved merge conflicts in ChatScreen
ccoppo Mar 17, 2025
85a3b18
merge conflicts were not, infact resolved. my b collin, all better now
ccoppo Mar 17, 2025
715c25d
fixed issue with messages not getting shown on chat screen after quit…
ccoppo Mar 18, 2025
6042089
Changed chat/file sending so it is being sent as a JSON payload via H…
CollinBarney Mar 19, 2025
d636e17
Fixed some issues that were caused by my previous push.
CollinBarney Mar 20, 2025
e90423f
Added JSON schema so that the JSON payloads could be validated.
CollinBarney Mar 20, 2025
24253c3
Cleaned up chat screen UI
CollinBarney Mar 20, 2025
49bd026
Merge branch 'main' of https://github.com/grey-box/Project-Mesh into …
aryan-r-0 Mar 27, 2025
1dcf713
Merge feature and main branches: integrate Conversations screen, navi…
aryan-r-0 Mar 27, 2025
89572d0
Not perfect yet but chats finally appearing yay
ccoppo Apr 16, 2025
663aec7
Fixed some bugs in device status centralization
ccoppo Apr 17, 2025
977238d
Fixed some bugs in device status centralization
ccoppo Apr 18, 2025
0ed62d5
Fixed more device status bugs, fixed dual conversation creation issue
ccoppo Apr 18, 2025
797c0e3
STATUSES ARE NOW OFFICIALLY WORKING FOR SURE FOR SURE GOD BLESS
ccoppo Apr 18, 2025
ecab1ae
ITS WORKING ITS WORKING ITS WORKING
ccoppo Apr 19, 2025
dab6c0b
Fixed JSON/HTTP POST stuff for messages
CollinBarney Apr 22, 2025
ee44efa
Fixed indent issue
CollinBarney Apr 22, 2025
dd934b8
Added file picker button to chat screen
CollinBarney Apr 22, 2025
50c4666
Added README documentation and images for testusers, user profiles, a…
ccoppo Apr 30, 2025
aeee172
Update README.md
cassie-coppo Apr 30, 2025
9ea025c
Update README.md
cassie-coppo Apr 30, 2025
2a6c32a
Update README.md
cassie-coppo Apr 30, 2025
5025361
Added file picker functionality
CollinBarney Apr 30, 2025
c625444
Merge branch 'messaging-updates-wil-mesh-asu-cidse2024' of https://gi…
CollinBarney Apr 30, 2025
51f778e
Fixed Image issues and spacing hopefully
ccoppo May 1, 2025
21664f7
Added border for readability
ccoppo May 1, 2025
28931f9
Added Ping screen back to network tab
CollinBarney May 1, 2025
91ffe47
Offline messaging works now yall goodnight and God Bless
ccoppo May 2, 2025
2b7dc98
Merge remote-tracking branch 'origin/messaging-updates-wil-mesh-asu-c…
ccoppo May 2, 2025
350e16d
Created the French strings.xml, and added the option in SettingsScree…
ForbiddenKiwis Jun 2, 2025
89a670d
Fix the TextField Bug in which it goes to the top of the Screen. By a…
ForbiddenKiwis Jun 2, 2025
5e09a8c
Integrate Prior Bug Fixes and Feature Implementations
kelvinlin9614 Jun 3, 2025
b346569
Fixed Username crash bug when username is null made it so that the us…
ForbiddenKiwis Jun 5, 2025
4c42701
Nav-Bar Modification
FireLordBruno Jun 9, 2025
8ebb54b
increased font size
FireLordBruno Jun 9, 2025
8dd50d3
Created a default value for the Username in the OnboardingScreen.kt. …
ForbiddenKiwis Jun 10, 2025
cdeb6d6
Change username to unisex name from John Doe -> Guest
ForbiddenKiwis Jun 12, 2025
6b78b7f
Created a blankUsernameGenerator() in order to resolve the Username P…
ForbiddenKiwis Jun 13, 2025
255505e
Created Debug Build Variant
ForbiddenKiwis Jun 16, 2025
1b758df
The App now does not show the Log Tab when in Release Mode but when i…
ForbiddenKiwis Jun 17, 2025
74d2db5
Applying Logging Good practices by using Timber to handle logs by giv…
ForbiddenKiwis Jun 23, 2025
dc16eb4
Refactor MainActivity.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
3ef9619
Refactor ChatScreen.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
fb5745b
Refactor CrashHandler.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
627d243
Refactor JSONSchema.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
4df206b
Refactor MessageNetworkHandler.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
5cf4d21
Refactor MessageService.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
755eaa4
Refactor ConversationRepository.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
6ed57ac
Refactor ChatScreenViewModel.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
0925e41
Refactor ConversationsHomeScreenViewModel.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
a4fc819
Refactor Logger.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
b2c62db
Refactor MessageMigrationUtils.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
dcc7ae3
Refactor AppServer.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
eae3a19
Refactor TestDeviceEntry.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
ee7baab
Refactor TestDeviceService.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
ee197b5
Refactor HomeScreenViewModel.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
d39e050
Refactor NetworkScreenViewModel.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
892a471
Refactor OnboardingViewModel.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
56508d3
Refactor SelectDestNodeScreenViewModel.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
5a387f6
Refactor ReceiveScreen.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
b0710e2
Refactor MNetLoggerAndroid.kt Log into Timber
ForbiddenKiwis Jun 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {

android {
namespace = "com.greybox.projectmesh"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.greybox.projectmesh"
Expand All @@ -30,6 +30,13 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig = signingConfigs.getByName("debug")
}

debug {
isDebuggable = true
applicationIdSuffix = ".debug"
versionNameSuffix = "-debug"
}
}
compileOptions {
Expand Down Expand Up @@ -70,6 +77,7 @@ dependencies {
implementation("androidx.compose.material3:material3:1.2.1")
implementation("androidx.compose.material:material-icons-core:1.6.8")
implementation("androidx.compose.material:material-icons-extended-android:1.6.8")
implementation(libs.androidx.foundation)
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
Expand Down Expand Up @@ -144,4 +152,7 @@ dependencies {

// For JSON serialisation
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")

// For Debug Build
implementation("com.jakewharton.timber:timber:5.0.1")
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.ProjectMesh">
android:theme="@style/Theme.ProjectMesh.Launcher">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -83,7 +83,7 @@
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.greybox.projectmesh.fileprovider"
android:authorities="${applicationId}.fileprovider"
android:grantUriPermissions="true"
android:exported="false">

Expand Down
Loading