Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI branch - Draft PR #36

Merged
merged 31 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
137d149
Attempts to load image in iOS
nostrbuddha Oct 29, 2024
2accb8f
[Splash] Animation
nostrbuddha Oct 29, 2024
c811bde
Onboarding page
nostrbuddha Oct 30, 2024
0e9cf8d
Nav module
nostrbuddha Oct 30, 2024
491c781
Bottom Tab bar nav - with Placeholder screens
nostrbuddha Oct 30, 2024
5c6585f
Profile, Bisq URL screen - UI
nostrbuddha Oct 31, 2024
a903329
Exchange screen - UI
nostrbuddha Oct 31, 2024
7c7b067
Home screen
nostrbuddha Nov 2, 2024
1f0b8a6
Theme - Colors, Typography classes
nostrbuddha Nov 6, 2024
f841c32
Implemented Theme colors, Typography classes across other screens
nostrbuddha Nov 7, 2024
a8df92d
Components: Layout, Button, Logo; Font adjustments in inital setup sc…
nostrbuddha Nov 7, 2024
1f76e7d
MVP pattern for Splash, Onboarding, GettingStarted screens
nostrbuddha Nov 9, 2024
a27d71a
i18n - Done in splash screen with lyricist package
nostrbuddha Nov 10, 2024
51e820c
Resources - Cleanup
nostrbuddha Nov 10, 2024
94eb346
All images converted to PNG, tested in both iOS, Android and removed …
nostrbuddha Nov 10, 2024
5b646f8
First code review corrections 1/2
nostrbuddha Nov 13, 2024
85c73ca
i18n Improvements
nostrbuddha Nov 14, 2024
8188fae
Code review corrections 2/2
nostrbuddha Nov 14, 2024
328a07a
Code review corrections 3/n (This partial commit fails in android)
nostrbuddha Nov 15, 2024
7deb383
- fix compilation issue (in kotlin getters are not necessary, making…
rodvar Nov 15, 2024
7a4578d
- fix runtime crashes by specifying which nav controller to get (to …
rodvar Nov 15, 2024
d6bd1b1
- fix compose example test compilation errors
rodvar Nov 15, 2024
038eb4e
- upgrading gradle wrapper to 8.11 to get the gradle config cache fi…
rodvar Nov 15, 2024
8fd4b09
- referencing new sub readme doc from main readme (navigation docs)
rodvar Nov 15, 2024
3119ff9
- reverting cocoapods downgrade
rodvar Nov 15, 2024
13eca0d
NetworkRepository improvement - Partial
nostrbuddha Nov 16, 2024
7f5f89e
[added] CreateProfilePresenter
nostrbuddha Nov 16, 2024
0ed838b
[added] TrustedNodeSetupPresenter
nostrbuddha Nov 16, 2024
aa118e6
- i18n: revert to English
nostrbuddha Nov 16, 2024
ffadc0b
- added presenter hierarchy to propagate lifecycle events to all pre…
rodvar Nov 17, 2024
2d52845
- using iOS notification center for a more precise onResume() behaviour
rodvar Nov 17, 2024
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
9 changes: 8 additions & 1 deletion bisqapps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,21 @@ Addicionally, for the `androidNode` module to build you need to have its depende

Done! Alternatively if you are interested only in contributing for the `xClients` you can just build them individually instead of building the whole project.

### UI Designs
### UI

**Designs**

androidNode + xClient screens are designed in Figma.
Yet to differentiate between which screens goes into which.

Figma link: https://www.figma.com/design/IPnuicxGKIZXq28gybxOgp/Xchange?node-id=7-759&t=LV9Gx9XgJRvXu5YQ-1

Though the figma design captures most of the functionality, it's an evolving document. It will be updated with new screens, flow updates, based on discussions happening in GH issues / matrix.

**Navigation Implementation**

Please refer to [this README](shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/README.md)

### Configuring dev env: known issues

- Some Apple M chips have trouble with cocoapods, follow [this guide](https://stackoverflow.com/questions/64901180/how-to-run-cocoapods-on-apple-silicon-m1/66556339#66556339) to fix it
Expand Down
2 changes: 1 addition & 1 deletion bisqapps/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Gradle
org.gradle.jvmargs=-Xmx4096M -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx8g"
org.gradle.caching=true
org.gradle.configuration-cache=true

Expand Down
10 changes: 8 additions & 2 deletions bisqapps/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ kotlinTestJunit = "2.0.20"
kotlinx = "1.9.0"
kermit = "2.0.4"
buildconfig = "5.5.0"
navigationCompose = "2.7.0-alpha07"
protobuf = "0.9.4"
protob = "4.28.2"
protoblite = "4.28.2"
ksp = "2.0.20-1.0.25"

chimp-jsocks-lib = { strictly = '567e1cd6' }
chimp-jtorctl-lib = { strictly = '9b5ba203' }
Expand All @@ -48,6 +51,7 @@ grpc = { strictly = '1.61.0' }
i2p-lib = { strictly = '1.8.0' }
i2p-v2 = { strictly = '2.4.0' }
jackson-lib = { strictly = '2.17.2' }
lyricist = "1.7.0"

koin = "4.0.0"
lombok-lib = { strictly = '1.18.34' }
Expand Down Expand Up @@ -82,11 +86,12 @@ typesafe-config = { module = 'com.typesafe:config', version.ref = 'typesafe-conf
bouncycastle = { module = 'org.bouncycastle:bcprov-jdk18on', version.ref = 'bouncycastle-lib' }
bouncycastle-pg = { module = 'org.bouncycastle:bcpg-jdk18on', version.ref = 'bouncycastle-lib' }

#protobuf-lite = { group ="com.google.protobuf", name = "protobuf-javalite", version.ref = "protoblite"}
lyricist = { module = "cafe.adriel.lyricist:lyricist", version.ref = "lyricist" }
navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
protobuf-lite = { group ="com.google.protobuf", name = "protobuf-javalite", version.ref = "protoblite"}
rodvar marked this conversation as resolved.
Show resolved Hide resolved
protobuf-gradle-plugin = { module = 'com.google.protobuf:protobuf-gradle-plugin', version.ref = 'protobuf' }
protoc = { module = "com.google.protobuf:protoc", version.ref = "protob" }


bisq-core-common = { module = "bisq:common", version.ref = "bisq-core" }
bisq-core-security = { module = "bisq:security", version.ref = "bisq-core" }
bisq-core-settings = { module = "bisq:settings", version.ref = "bisq-core" }
Expand Down Expand Up @@ -162,3 +167,4 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "buildconfig" }
protobuf = { id = "com.google.protobuf", version.ref = "protobuf" }
ksp = { id = "com.google.devtools.ksp", version.ref="ksp" }
rodvar marked this conversation as resolved.
Show resolved Hide resolved
Binary file modified bisqapps/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion bisqapps/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading
Loading