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

Bluetooth #7

Merged
merged 45 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
37e9363
testing scanner
NidhishVyas Feb 1, 2024
daac881
QR Generator added
NidhishVyas Feb 2, 2024
afb89fe
theme changed
NidhishVyas Feb 6, 2024
01acd3a
testing
NidhishVyas Feb 6, 2024
7c5a1f8
hard-code
NidhishVyas Feb 14, 2024
b0b7427
zkp testing
NidhishVyas Feb 15, 2024
95c28c4
zkp done
NidhishVyas Feb 17, 2024
ff5c424
zkp done
NidhishVyas Feb 17, 2024
187083b
animations added
NidhishVyas Mar 4, 2024
3bae537
made changes
NidhishVyas Mar 6, 2024
d7095b6
made portrait
NidhishVyas Mar 6, 2024
330f3c1
made changes
NidhishVyas Mar 6, 2024
34a0b59
for demo
NidhishVyas Mar 10, 2024
aba71db
changes
NidhishVyas Mar 26, 2024
dbfd67c
changes
NidhishVyas Apr 2, 2024
ccbe514
testing
NidhishVyas Apr 4, 2024
06dc03d
Add react-native-maps and Maps screen
NidhishVyas Apr 4, 2024
33e8b1b
Add react-native-onesignal and react-native-maps dependencies
NidhishVyas Apr 4, 2024
54659c9
BLE changes
NidhishVyas May 24, 2024
c37c985
BLE changes
NidhishVyas May 24, 2024
2cb38df
Fixed bluetooth build
nashidahmed May 27, 2024
bb346dd
Updated design for bluetooth page
nashidahmed May 29, 2024
74c5894
Merge pull request #2 from nashidahmed/feature/bluetooth
NidhishVyas May 30, 2024
b0dd8d6
Added bluetooth advertise functionality
nashidahmed Jun 2, 2024
2f58fee
Implemented bluetooth invitation functionality
nashidahmed Jun 3, 2024
94c7732
Moved common function to new invitation utils file
nashidahmed Jun 6, 2024
0b9f7ae
Merge pull request #3 from nashidahmed/feature/bluetooth
NidhishVyas Jun 7, 2024
e68d161
Moved stringToBytes to helper file
nashidahmed Jun 7, 2024
a22bfab
Updated BleAdvertiseModule
nashidahmed Jun 10, 2024
ee4053c
Changed CameraDisclosureModal to generic component
nashidahmed Jun 10, 2024
a3da139
Added permission check for bluetooth
nashidahmed Jun 10, 2024
6f4938a
Added translation text
nashidahmed Jun 10, 2024
de6d575
Fixed PermissionDisclosureModal navigation
nashidahmed Jun 10, 2024
b954292
Updated permissions and implemented loader
nashidahmed Jun 13, 2024
75e7dc3
Merge pull request #1 from nashidahmed/feature/disclosure-modal
nashidahmed Jun 13, 2024
b7080b0
chore: updated ios build stage to test on real device
AmishFaldu May 23, 2024
b731ef1
chore: update ledgers
AmishFaldu May 30, 2024
c113390
chore: modified ios app image and name
AmishFaldu Jun 3, 2024
4575fa1
chore: added bluetooth functionality for ios
AmishFaldu Jun 8, 2024
5ede633
BLE integration and bug fixes
AmishFaldu Jun 13, 2024
e690066
modified schema id and cred def id
AmishFaldu Jun 17, 2024
2b2587c
Merge pull request #4 from nashidahmed/feature/bluetooth
wYaobiz Jun 17, 2024
0cd845b
iOS ask permission when bluetooth disabled
AmishFaldu Jun 18, 2024
4240485
merge changes
AmishFaldu Jun 18, 2024
9ffdfce
Merge pull request #6 from AmishFaldu/feat/bluetooth
wYaobiz Jun 18, 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
"@aries-framework/react-hooks": "patch:@aries-framework/react-hooks@npm:0.4.2#./.yarn/patches/@aries-framework-react-hooks-npm-0.4.2-84b7eb8764.patch"
},
"dependencies": {
"lottie-react-native": "^6.6.0",
"react-native-ble-manager": "^11.5.3",
"react-native-ble-plx": "^3.1.2",
"react-native-maps": "^1.15.4",
"react-native-qrcode-svg": "^6.2.0",
"react-native-svg": "^14.1.0"
}
Expand Down
16 changes: 16 additions & 0 deletions packages/legacy/app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,23 @@ dependencies {
} else {
implementation jscFlavor
}
implementation 'com.polidea.rxandroidble2:dagger-library-shadow:1.17.2'
implementation 'org.reactivestreams:reactive-streams:1.0.3'
implementation 'io.reactivex.rxjava2:rxjava:2.2.17'
implementation 'com.jakewharton.rxrelay2:rxrelay:2.1.1'
implementation 'com.polidea.rxandroidble2:rxandroidble:1.17.2'
}

apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
}

// Explicitly declare the dependency between lintAnalyzeDebug and copyReactNativeVectorIconFonts
tasks.whenTaskAdded { task ->
if (task.name.startsWith("lintAnalyze")) {
task.dependsOn("copyReactNativeVectorIconFonts")
}
}
58 changes: 38 additions & 20 deletions packages/legacy/app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.ariesbifold">
xmlns:tools="http://schemas.android.com/tools"
package="com.ariesbifold">

<!-- Only when targeting Android 12 or higher -->
<!-- Please make sure you read the following documentation to have a
better understanding of the new permissions.
https://developer.android.com/guide/topics/connectivity/bluetooth/permissions#assert-never-for-location
-->

<!-- Request legacy Bluetooth permissions on older devices. -->
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
<!-- Needed only if your app makes the device discoverable to Bluetooth devices. -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30"/>
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
<uses-permission android:name="android.permission.USE_BIOMETRICS" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.INTERNET" />
Expand All @@ -9,25 +25,27 @@
<uses-permission-sdk-23 android:name="android.permission.VIBRATE"/>

<application
android:name=".MainApplication"
android:label="@string/app_name"
android:icon="@mipmap/basic_swish"
android:allowBackup="false"
android:resizeableActivity="false"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
<activity
android:name=".MainActivity"
android:name=".MainApplication"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
android:icon="@mipmap/basic_swish"
android:allowBackup="false"
android:resizeableActivity="false"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:replace="android:label, android:icon, android:allowBackup, android:resizeableActivity, android:theme, android:usesCleartextTraffic">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="fullSensor"
android:exported="true"
tools:replace="android:label, android:configChanges, android:launchMode, android:windowSoftInputMode, android:screenOrientation, android:exported">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
Loading
Loading