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

INJI new UI/UX release #750

Merged
merged 202 commits into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from 199 commits
Commits
Show all changes
202 commits
Select commit Hold shift + click to select a range
fd8b944
Update android-custom-build.yml
ckm007 Jul 27, 2022
a6cf2dd
Merge pull request #46 from idpass/main
MonobikashDas Aug 12, 2022
af6be3c
[DSD-1364] Added delete workflow in manual mode for inji repo.
gaganama Aug 26, 2022
47b6334
Merge pull request #84 from gaganamadival/main
ckm007 Aug 26, 2022
69f13c1
[DSD-1364] Added token to the workflow for inji repo.
gaganama Sep 2, 2022
48be877
[DSD-1364] Added token to the workflow for inji repo.
gaganama Sep 2, 2022
43f2655
Merge pull request #88 from gaganamadival/main
ckm007 Sep 2, 2022
61ae341
Initial commit
Anil-kumar-Majji Jan 20, 2023
fa83ca7
UI changed in home-screen
Anil-kumar-Majji Jan 31, 2023
9194e00
update vc card layout
srikanth716 Jan 31, 2023
9931dc2
Created Splash logo screen
Anil-kumar-Majji Jan 31, 2023
1a2ff98
Replaces profileIconBg with IconContainer
Anil-kumar-Majji Feb 1, 2023
67360e9
Bottom-tab icons modified as per new UI
Anil-kumar-Majji Feb 1, 2023
85c8c37
Added styles to Tab-bar
Anil-kumar-Majji Feb 2, 2023
84a1840
Builded scan screen as per new UI
Anil-kumar-Majji Feb 2, 2023
7db3b1d
Added styles to scan screen
Anil-kumar-Majji Feb 2, 2023
99e74ae
Created history screen as new UI
Anil-kumar-Majji Feb 6, 2023
d22a0d4
Implemented Splash screen
Anil-kumar-Majji Feb 6, 2023
08fe282
changing auth screen
srikanth716 Feb 6, 2023
296e3d0
Scan screen designed asper new UI
Anil-kumar-Majji Feb 7, 2023
a94db0b
changing Vcitem and Vcdetails layout
srikanth716 Feb 7, 2023
0608e9f
Adjusted RTL issues in new UI
Anil-kumar-Majji Feb 7, 2023
6356273
Language selection at the initial launch
srikanth716 Feb 8, 2023
8703d0a
Merge branch 'Authscreens#465' of https://github.com/srikanth716/inji…
srikanth716 Feb 9, 2023
9538a38
Created settings screen
Anil-kumar-Majji Feb 9, 2023
6ec2672
Designed settings screen as per New UI
Anil-kumar-Majji Feb 9, 2023
b5c225d
Solved merge conflicts
Anil-kumar-Majji Feb 10, 2023
eb00619
implrmented help button
Anil-kumar-Majji Feb 10, 2023
11abe0d
Removed Unwanted list-items in settings
Anil-kumar-Majji Feb 11, 2023
d2b7376
Implemented Progressing modal
Anil-kumar-Majji Feb 11, 2023
5170d61
After changes as per new ui
Anil-kumar-Majji Feb 11, 2023
38fe6d7
After changes as per new ui
Anil-kumar-Majji Feb 11, 2023
49f12c6
Adjusted RTL in scan screens & corrected env.
Anil-kumar-Majji Feb 11, 2023
d9c1ece
Added progressing screen
Anil-kumar-Majji Feb 13, 2023
3e51d5d
Created gradient responsive buttons
Anil-kumar-Majji Feb 13, 2023
0c35fd0
Added CSS to the responsive buttons
Anil-kumar-Majji Feb 13, 2023
95afff3
SendVcScreen design as per new UI
Anil-kumar-Majji Feb 15, 2023
e4e7c4a
send VC Layout designed as per new UI
Anil-kumar-Majji Feb 17, 2023
ab865f6
added loader in progressingModal
Anil-kumar-Majji Feb 23, 2023
b28330f
Removes Splash screen imports
Anil-kumar-Majji Feb 24, 2023
64a8e32
Added Home-Screen Kebab locals
Anil-kumar-Majji Feb 27, 2023
c760053
Replaced with new splash-screen image
Anil-kumar-Majji Feb 28, 2023
643495d
Implemented new splash-screen image atlast
Anil-kumar-Majji Feb 28, 2023
d0464a4
feat:languase selection and intro sliders
srikanth716 Mar 4, 2023
5aabf68
new ui changes
srikanth716 Mar 10, 2023
71b4ac3
Implemented downloading popup
Anil-kumar-Majji Mar 14, 2023
75251c9
Updated OTP verification modal
Anil-kumar-Majji Mar 14, 2023
605b67a
new ui changes
srikanth716 Mar 15, 2023
22619f8
merged with srikanth's code
Anil-kumar-Majji Mar 15, 2023
9d3b3ad
Commited both the UI changes yet
Anil-kumar-Majji Mar 15, 2023
f4fb283
new ui changes
srikanth716 Mar 16, 2023
9727163
Adjusted Binding warn overlay
Anil-kumar-Majji Mar 16, 2023
0811de7
Fix walletBinding success label
srikanth716 Mar 16, 2023
41d705b
Resolved wallet-binding bug in closed VC
Anil-kumar-Majji Mar 16, 2023
99f1d90
Merge branch 'uiChanges' of https://github.com/Anil-kumar-Majji/inji_…
srikanth716 Mar 27, 2023
8293e3f
resolve package
srikanth716 Mar 27, 2023
47d9523
set language as local
srikanth716 Apr 3, 2023
309728a
Adjusted setting screen errors
Anil-kumar-Majji Apr 4, 2023
24139ed
Set language as local
Anil-kumar-Majji Apr 5, 2023
fe9adaa
feat:activity log in kebab
srikanth716 Apr 11, 2023
a105af4
Merge branch 'newUI' of https://github.com/srikanth716/inji into uiCh…
Anil-kumar-Majji Apr 17, 2023
bce932c
Activity Log added in Kebab PopUp menu
Anil-kumar-Majji Apr 17, 2023
3f1d77e
update vc card layout
srikanth716 Jan 31, 2023
b42cece
changing Vcitem and Vcdetails layout
srikanth716 Feb 7, 2023
278727a
Language selection at the initial launch
srikanth716 Feb 8, 2023
dad70fa
changing auth screen
srikanth716 Feb 6, 2023
52ff018
feat:languase selection and intro sliders
srikanth716 Mar 4, 2023
ac7dd03
new ui changes
srikanth716 Mar 10, 2023
3786d06
new ui changes
srikanth716 Mar 15, 2023
9b0d330
Fix walletBinding success label
srikanth716 Mar 16, 2023
1527931
[DSD-1364] Added token to the workflow for inji repo.
gaganama Sep 2, 2022
f4a6e5c
[DSD-1364] Added token to the workflow for inji repo.
gaganama Sep 2, 2022
4322f44
UI changed in home-screen
Anil-kumar-Majji Jan 31, 2023
3e89711
Created Splash logo screen
Anil-kumar-Majji Jan 31, 2023
0d54b9b
Replaces profileIconBg with IconContainer
Anil-kumar-Majji Feb 1, 2023
8cff30a
Bottom-tab icons modified as per new UI
Anil-kumar-Majji Feb 1, 2023
aafee68
Added styles to Tab-bar
Anil-kumar-Majji Feb 2, 2023
27aec02
Builded scan screen as per new UI
Anil-kumar-Majji Feb 2, 2023
b7090b4
Added styles to scan screen
Anil-kumar-Majji Feb 2, 2023
7c8ec91
Created history screen as new UI
Anil-kumar-Majji Feb 6, 2023
af0484f
Implemented Splash screen
Anil-kumar-Majji Feb 6, 2023
0dc00db
Scan screen designed asper new UI
Anil-kumar-Majji Feb 7, 2023
07e27a8
Adjusted RTL issues in new UI
Anil-kumar-Majji Feb 7, 2023
c82cdc6
Created settings screen
Anil-kumar-Majji Feb 9, 2023
c7a08bb
Designed settings screen as per New UI
Anil-kumar-Majji Feb 9, 2023
c085fc3
Solved merge conflicts
Anil-kumar-Majji Feb 10, 2023
ebb08d4
implrmented help button
Anil-kumar-Majji Feb 10, 2023
efaadde
Removed Unwanted list-items in settings
Anil-kumar-Majji Feb 11, 2023
1ec28e0
Implemented Progressing modal
Anil-kumar-Majji Feb 11, 2023
3aa58b2
After changes as per new ui
Anil-kumar-Majji Feb 11, 2023
a9da996
Adjusted RTL in scan screens & corrected env.
Anil-kumar-Majji Feb 11, 2023
ffc1578
Added progressing screen
Anil-kumar-Majji Feb 13, 2023
931007a
Created gradient responsive buttons
Anil-kumar-Majji Feb 13, 2023
c4ba11f
Added CSS to the responsive buttons
Anil-kumar-Majji Feb 13, 2023
f3a7a4a
SendVcScreen design as per new UI
Anil-kumar-Majji Feb 15, 2023
2b09952
send VC Layout designed as per new UI
Anil-kumar-Majji Feb 17, 2023
1d4dbb4
added loader in progressingModal
Anil-kumar-Majji Feb 23, 2023
b53cf94
Removes Splash screen imports
Anil-kumar-Majji Feb 24, 2023
5eee7d6
Added Home-Screen Kebab locals
Anil-kumar-Majji Feb 27, 2023
f8b65bd
Replaced with new splash-screen image
Anil-kumar-Majji Feb 28, 2023
961a84c
Implemented new splash-screen image atlast
Anil-kumar-Majji Feb 28, 2023
7f73ba6
Implemented downloading popup
Anil-kumar-Majji Mar 14, 2023
510b600
Updated OTP verification modal
Anil-kumar-Majji Mar 14, 2023
9900afa
Commited both the UI changes yet
Anil-kumar-Majji Mar 15, 2023
6c9b840
Adjusted Binding warn overlay
Anil-kumar-Majji Mar 16, 2023
7f4e0df
new ui changes
srikanth716 Mar 16, 2023
3038781
resolve package
srikanth716 Mar 27, 2023
8f36754
set language as local
srikanth716 Apr 3, 2023
d7e0885
feat:activity log in kebab
srikanth716 Apr 11, 2023
2ae7b69
Merge branch 'newUI' of https://github.com/srikanth716/inji into newUI
srikanth716 Apr 18, 2023
453ac36
changing Vcitem and Vcdetails layout
srikanth716 Feb 7, 2023
9524cfa
Language selection at the initial launch
srikanth716 Feb 8, 2023
55d8ef7
changing auth screen
srikanth716 Feb 6, 2023
b689f2d
feat:languase selection and intro sliders
srikanth716 Mar 4, 2023
bb39511
new ui changes
srikanth716 Mar 10, 2023
c3def30
new ui changes
srikanth716 Mar 15, 2023
f7d2187
Fix walletBinding success label
srikanth716 Mar 16, 2023
ad8cf8a
Update android-custom-build.yml
ckm007 Jul 27, 2022
6ed525f
[DSD-1364] Added delete workflow in manual mode for inji repo.
gaganama Aug 26, 2022
af84049
[DSD-1364] Added token to the workflow for inji repo.
gaganama Sep 2, 2022
421d71b
[DSD-1364] Added token to the workflow for inji repo.
gaganama Sep 2, 2022
2fc8e2e
UI changed in home-screen
Anil-kumar-Majji Jan 31, 2023
af4fc41
Created Splash logo screen
Anil-kumar-Majji Jan 31, 2023
e98d332
Replaces profileIconBg with IconContainer
Anil-kumar-Majji Feb 1, 2023
bd4b8a8
Bottom-tab icons modified as per new UI
Anil-kumar-Majji Feb 1, 2023
b220c15
Added styles to Tab-bar
Anil-kumar-Majji Feb 2, 2023
e870777
Builded scan screen as per new UI
Anil-kumar-Majji Feb 2, 2023
b7d1116
Added styles to scan screen
Anil-kumar-Majji Feb 2, 2023
3b74fdd
Created history screen as new UI
Anil-kumar-Majji Feb 6, 2023
6527f07
Implemented Splash screen
Anil-kumar-Majji Feb 6, 2023
b605add
Scan screen designed asper new UI
Anil-kumar-Majji Feb 7, 2023
bbffbfe
Adjusted RTL issues in new UI
Anil-kumar-Majji Feb 7, 2023
8f6e157
Created settings screen
Anil-kumar-Majji Feb 9, 2023
fa98ba7
Designed settings screen as per New UI
Anil-kumar-Majji Feb 9, 2023
eca5dba
Solved merge conflicts
Anil-kumar-Majji Feb 10, 2023
d0d27c7
Removed Unwanted list-items in settings
Anil-kumar-Majji Feb 11, 2023
2cc9371
Implemented Progressing modal
Anil-kumar-Majji Feb 11, 2023
568ddcb
After changes as per new ui
Anil-kumar-Majji Feb 11, 2023
4e37b22
Adjusted RTL in scan screens & corrected env.
Anil-kumar-Majji Feb 11, 2023
4c2017c
Added progressing screen
Anil-kumar-Majji Feb 13, 2023
570b22f
Created gradient responsive buttons
Anil-kumar-Majji Feb 13, 2023
f74e0fe
send VC Layout designed as per new UI
Anil-kumar-Majji Feb 17, 2023
491f2b4
added loader in progressingModal
Anil-kumar-Majji Feb 23, 2023
d295568
Removes Splash screen imports
Anil-kumar-Majji Feb 24, 2023
414d5d0
Added Home-Screen Kebab locals
Anil-kumar-Majji Feb 27, 2023
43f0fb0
Implemented new splash-screen image atlast
Anil-kumar-Majji Feb 28, 2023
e5db015
Implemented downloading popup
Anil-kumar-Majji Mar 14, 2023
b063443
Updated OTP verification modal
Anil-kumar-Majji Mar 14, 2023
706002b
Commited both the UI changes yet
Anil-kumar-Majji Mar 15, 2023
8cacd02
Adjusted Binding warn overlay
Anil-kumar-Majji Mar 16, 2023
631b1b9
resolve package
srikanth716 Mar 27, 2023
13f2e4e
set language as local
srikanth716 Apr 3, 2023
b6c6d8c
feat:activity log in kebab
srikanth716 Apr 11, 2023
7c84718
Merge branch 'newUI' of https://github.com/srikanth716/inji into newUI
srikanth716 Apr 18, 2023
2bad7ba
Modified setting screen options
Anil-kumar-Majji Apr 19, 2023
2d602c0
Merge branch 'uiChanges' of https://github.com/Anil-kumar-Majji/inji_…
srikanth716 Apr 19, 2023
41605f0
fix error
srikanth716 Apr 19, 2023
397ed7a
ui revamp on ble
srikanth716 Apr 21, 2023
152bcd7
Implemented help screen
Anil-kumar-Majji Apr 28, 2023
cd53bba
fixed merge conflicts on uiChanges and ble
srikanth716 May 2, 2023
156bc3b
Fixed merge conflicts on uiChanges and ble
Anil-kumar-Majji May 2, 2023
be448bc
Fixed merge conflicts on uiChanges and ble
Anil-kumar-Majji May 2, 2023
4fe27ad
Adjusted locals for new UI
Anil-kumar-Majji May 2, 2023
45a7e95
Adjusted locals for new UI
Anil-kumar-Majji May 2, 2023
0c83353
Timer added in OTP verificication
srikanth716 May 4, 2023
5876e58
Implemented detailes with dumi-text in Help screen
Anil-kumar-Majji May 9, 2023
82bfb31
Implemented French translation in App
Anil-kumar-Majji May 9, 2023
dad2cec
Add on intro slider
srikanth716 May 10, 2023
57810d5
Implemented Telugu language in app along with text corrections
Anil-kumar-Majji May 12, 2023
9cdda81
Implemented Telugu language in app along with text corrections
Anil-kumar-Majji May 12, 2023
2dd574e
Updated with Srikanth's code
Anil-kumar-Majji May 15, 2023
ec9363c
Updated about Inji option with new modal
Anil-kumar-Majji May 18, 2023
aeb7989
Added Qr-code overlay
Anil-kumar-Majji May 21, 2023
cdfb9f3
feat: remove from wallet-#INJI-5
srikanth716 May 26, 2023
ba99917
Merge branch 'develop' of https://github.com/mosip/inji into ui-revamp
srikanth716 May 26, 2023
0431b3b
QR-Code overlay designed as per UI/UX
Anil-kumar-Majji May 26, 2023
f75eb10
Adjusted download button size
Anil-kumar-Majji Jun 2, 2023
ea73f05
Added magnifier zoom icon
Anil-kumar-Majji Jun 2, 2023
97c5d49
Removed Telugu and French languages
Anil-kumar-Majji Jun 5, 2023
de49a46
Mergerd with develop branch
Anil-kumar-Majji Jun 9, 2023
cb5dd79
setup language
srikanth716 Jun 12, 2023
5b2d23e
Merge branch 'ui-revamp' of https://github.com/Anil-kumar-Majji/inji_…
srikanth716 Jun 16, 2023
0e7636d
Merge branch 'develop' of https://github.com/mosip/inji into ui-revamp
srikanth716 Jun 19, 2023
cb78195
Displaying Received cards option in settings (INJI-96)
Anil-kumar-Majji Jun 21, 2023
6d3bb7c
Updated eng.Json file
Anil-kumar-Majji Jun 21, 2023
ec3e7ed
Adjusted UI and locals as per wireframe
Anil-kumar-Majji Jun 22, 2023
ec5bb94
Updated with develop branch along with VcItemContent.tsx, VcItemActiv…
Anil-kumar-Majji Jun 23, 2023
6e2e3e7
Updated request screen locals
Anil-kumar-Majji Jun 23, 2023
66650f2
Fixed eng.json file
Anil-kumar-Majji Jun 23, 2023
39ca1a2
feat:setup language
srikanth716 Jun 23, 2023
5ea503a
Replaced Kebab-popup in vcItem.tsx
Anil-kumar-Majji Jun 27, 2023
6cb8687
Merge branch 'develop' of https://github.com/mosip/inji into ui-revamp
Anil-kumar-Majji Jun 27, 2023
ba08d35
Merge branch 'develop' of https://github.com/mosip/inji into ui-revamp
srikanth716 Jun 27, 2023
acc3a91
Inji new UI/UX for release
Anil-kumar-Majji Jun 27, 2023
ca7d9ed
Merge branch 'ui-revamp' of https://github.com/Anil-kumar-Majji/inji_…
srikanth716 Jun 28, 2023
d26480f
Sanitized the new UI/UX
Anil-kumar-Majji Jun 28, 2023
6b2b0be
Adjusted all the locals
Anil-kumar-Majji Jun 28, 2023
403cb76
Resolved PR-750 conversations
Anil-kumar-Majji Jun 30, 2023
82122b7
Fixed Locals
Anil-kumar-Majji Jun 30, 2023
2ce1927
Removed unused file SingleVcItem.tsx
Anil-kumar-Majji Jun 30, 2023
162eab0
Removed async at downloadModal in auth.ts
Anil-kumar-Majji Jun 30, 2023
8413c7a
Removed debug.keystore file
Anil-kumar-Majji Jul 3, 2023
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 .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ APPLICATION_THEME=orange

#environment can be changed if it is toggled
CREDENTIAL_REGISTRY_EDIT=true

#supported languages( en, fil, ar, hi, kn, ta)
APPLICATION_LANGUAGE=en
5 changes: 4 additions & 1 deletion .github/workflows/clear_artifacts.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
name: 'Delete old artifacts'
on:
workflow_dispatch:
name: 'Delete old artifacts'
on:
workflow_dispatch:

Expand All @@ -8,5 +11,5 @@ jobs:
steps:
- uses: kolpav/purge-artifacts-action@v1
with:
token: ${{ secrets. access_token }}
token: ${{ secrets.ACTION_PAT }}
expire-in: 2days # Setting this to 0 will delete all artifacts
Binary file added android/app/debug.keystore
Binary file not shown.
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<resources>
<color name="splashscreen_background">#ffffff</color>
<color name="splashscreen_background">#F59B4B</color>
<color name="iconBackground">#FFFFFF</color>
<color name="colorPrimary">#023c69</color>
<color name="colorPrimaryDark">#ffffff</color>
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<string name="app_name_mosip">MOSIP Resident App - Mosip/Inji</string>
<string name="app_name_newlogic">MOSIP Resident App - Newlogic</string>
<string name="app_name_ph">MOSIP Resident App - PH</string>
<string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
<string name="expo_splash_screen_resize_mode" translatable="false">cover</string>
<string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
</resources>
2 changes: 1 addition & 1 deletion app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default {
icon: './assets/icon.png',
splash: {
image: './assets/splash.png',
resizeMode: 'contain',
resizeMode: 'cover',
backgroundColor: '#ffffff',
},
updates: {
Expand Down
Binary file added assets/Secure-Sharing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/Secure-Sharing2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/biometric-unlock-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/digital-identity-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/features-walkaround-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/help-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/inji-home-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/inji-logo-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/inji_small_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/intro-scanner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/intro-wallet-binding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/legal-notices-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/lock-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/magnifier-zoom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/otp-mobile-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/phone_mockup_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/progressing-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/receive-card-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/received-cards-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions components/ActivityLogText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const ActivityLogText: React.FC<{ activity: ActivityLog }> = (props) => {
<TextItem
label={getActionLabel(activity, i18n.language)}
text={`${activity.vcLabel} ${t(activity.type)}`}
topDivider
/>
);
};
Expand Down
3 changes: 1 addition & 2 deletions components/DeviceInfoList.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
import { TextItem } from './ui/TextItem';
import { Text } from './ui';

export const DeviceInfoList: React.FC<DeviceInfoProps> = (props) => {
const { t } = useTranslation('DeviceInfoList');
Expand All @@ -17,7 +17,6 @@ export const DeviceInfoList: React.FC<DeviceInfoProps> = (props) => {
};

interface DeviceInfoProps {
of: 'sender' | 'receiver';
deviceInfo: DeviceInfo;
}

Expand Down
22 changes: 13 additions & 9 deletions components/EditableListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,27 @@ export const EditableListItem: React.FC<EditableListItemProps> = (props) => {
}, [props.credentialRegistryResponse]);

return (
<ListItem
bottomDivider
onPress={() => setIsEditing(true)}
style={{ display: props.display }}>
<ListItem bottomDivider topDivider onPress={() => setIsEditing(true)}>
<Icon
name={props.Icon}
type="antdesign"
size={20}
style={Theme.Styles.profileIconBg}
containerStyle={Theme.Styles.settingsIconBg}
type={props.IconType}
size={22}
color={Theme.Colors.Icon}
/>
<ListItem.Content>
<ListItem.Title>
<Text color={Theme.Colors.profileLabel}>{props.label}</Text>
<Text weight="semibold" color={Theme.Colors.profileLabel}>
{props.label}
</Text>
</ListItem.Title>
<Text color={Theme.Colors.profileValue}>{props.value}</Text>
</ListItem.Content>

<Icon
name="chevron-right"
size={21}
color={Theme.Colors.profileLanguageValue}
/>
<Overlay
overlayStyle={{ padding: 24, elevation: 6 }}
isVisible={isEditing}
Expand Down Expand Up @@ -91,6 +94,7 @@ interface EditableListItemProps {
label: string;
value: string;
Icon: string;
IconType?: string;
onEdit: (newValue: string) => void;
display?: 'none' | 'flex';
credentialRegistryResponse: string;
Expand Down
75 changes: 75 additions & 0 deletions components/HelpScreen.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Pressable } from 'react-native';
import { Modal } from './ui/Modal';
import { ScrollView } from 'react-native-gesture-handler';
import { MainRouteProps } from '../routes/main';
import { Column, Text } from './ui';
import { Theme } from './ui/styleUtils';

export const HelpScreen: React.FC<HelpScreenProps & MainRouteProps> = (
props
) => {
const { t } = useTranslation('HelpScreen');

const [showHelpPage, setShowHelpPage] = useState(false);

return (
<React.Fragment>
<Pressable
onPress={() => {
setShowHelpPage(!showHelpPage);
}}>
{props.triggerComponent}
</Pressable>
<Modal
isVisible={showHelpPage}
headerTitle={t('header')}
headerElevation={2}
onDismiss={() => {
setShowHelpPage(!showHelpPage);
}}>
<ScrollView>
<Column fill padding="10" align="space-between">
<Text margin="7" style={Theme.TextStyles.header}>
{t('whatIsDigitalCredential?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-1')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('whatCanDoWithDigitalCredential?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-2')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('howToAddCard?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-3')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('howToRemoveCardFromWallet?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-4')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('canWeAddMultipleCards?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-5')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('howToShareCard?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-6')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('howToActivateCardForOnlineLogin?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-7')}</Text>
<Text margin="7" style={Theme.TextStyles.header}>
{t('howToViewActivity?')}
</Text>
<Text style={Theme.TextStyles.helpDetailes}>{t('detail-8')}</Text>
</Column>
</ScrollView>
</Modal>
</React.Fragment>
);
};

interface HelpScreenProps {
triggerComponent: React.ReactElement;
}
93 changes: 93 additions & 0 deletions components/KebabPopUp.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import React from 'react';
import { BottomSheet, Icon, ListItem } from 'react-native-elements';
import { Theme } from '../components/ui/styleUtils';
import { Centered, Column, Row, Text } from '../components/ui';
import { WalletBinding } from '../screens/Home/MyVcs/WalletBinding';
import { Pressable } from 'react-native';
import { useKebabPopUp } from './KebabPopUpController';
import { ActorRefFrom } from 'xstate';
import { vcItemMachine } from '../machines/vcItem';
import { useTranslation } from 'react-i18next';
import { HistoryTab } from '../screens/Home/MyVcs/HistoryTab';
import { RemoveVcWarningOverlay } from '../screens/Home/MyVcs/RemoveVcWarningOverlay';

export const KebabPopUp: React.FC<KebabPopUpProps> = (props) => {
const controller = useKebabPopUp(props);
const { t } = useTranslation('HomeScreenKebabPopUp');
return (
<Column>
<Icon
name={props.iconName}
type={props.iconType}
color={Theme.Colors.GrayIcon}
/>
<BottomSheet
isVisible={props.isVisible}
containerStyle={Theme.KebabPopUpStyles.kebabPopUp}>
<Row style={Theme.KebabPopUpStyles.kebabHeaderStyle}>
<Text weight="bold">{t('title')}</Text>
<Icon
name="close"
onPress={props.onDismiss}
color={Theme.Colors.Details}
size={25}
/>
</Row>
<Column>
<ListItem bottomDivider>
<ListItem.Content>
<ListItem.Title>
<Pressable onPress={controller.PIN_CARD}>
<Text size="small" weight="bold">
{props.vcKey.split(':')[4] == 'true'
? t('unPinCard')
: t('pinCard')}
</Text>
</Pressable>
</ListItem.Title>
</ListItem.Content>
</ListItem>

<WalletBinding
label={t('offlineAuthenticationDisabled!')}
content={t('offlineAuthDisabledMessage')}
service={props.service}
/>

<HistoryTab
service={props.service}
label={t('viewActivityLog')}
vcKey={props.vcKey}
/>

<ListItem bottomDivider>
<ListItem.Content>
<ListItem.Title>
<Pressable onPress={() => controller.REMOVE(props.vcKey)}>
<Text size="small" weight="bold">
{t('removeFromWallet')}
</Text>
</Pressable>
</ListItem.Title>
</ListItem.Content>
</ListItem>

<RemoveVcWarningOverlay
isVisible={controller.isRemoveWalletWarning}
onConfirm={controller.CONFIRM}
onCancel={controller.CANCEL}
/>
</Column>
</BottomSheet>
</Column>
);
};

export interface KebabPopUpProps {
iconName: string;
iconType?: string;
vcKey: string;
isVisible: boolean;
onDismiss: () => void;
service: ActorRefFrom<typeof vcItemMachine>;
}
80 changes: 80 additions & 0 deletions components/KebabPopUpController.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import { useSelector } from '@xstate/react';
import { ActorRefFrom } from 'xstate';
import {
selectKebabPopUpWalletBindingInProgress,
selectKebabPopUp,
selectKebabPopUpAcceptingBindingOtp,
selectKebabPopUpBindingWarning,
selectRemoveWalletWarning,
selectEmptyWalletBindingId,
selectIsPinned,
selectOtpError,
selectShowWalletBindingError,
selectWalletBindingError,
VcItemEvents,
vcItemMachine,
selectShowActivities,
} from '../machines/vcItem';
import { selectActivities } from '../machines/activityLog';
import { GlobalContext } from '../shared/GlobalContext';
import { useContext } from 'react';

export function useKebabPopUp(props) {
const service = props.service as ActorRefFrom<typeof vcItemMachine>;
const PIN_CARD = () => service.send(VcItemEvents.PIN_CARD());
const KEBAB_POPUP = () => service.send(VcItemEvents.KEBAB_POPUP());
const ADD_WALLET_BINDING_ID = () =>
service.send(VcItemEvents.ADD_WALLET_BINDING_ID());
const CONFIRM = () => service.send(VcItemEvents.CONFIRM());
const REMOVE = (vcKey: string) => service.send(VcItemEvents.REMOVE(vcKey));
const DISMISS = () => service.send(VcItemEvents.DISMISS());
const CANCEL = () => service.send(VcItemEvents.CANCEL());
const SHOW_ACTIVITY = () => service.send(VcItemEvents.SHOW_ACTIVITY());
const INPUT_OTP = (otp: string) => service.send(VcItemEvents.INPUT_OTP(otp));
const isPinned = useSelector(service, selectIsPinned);
const isBindingWarning = useSelector(service, selectKebabPopUpBindingWarning);
const isRemoveWalletWarning = useSelector(service, selectRemoveWalletWarning);
const isAcceptingOtpInput = useSelector(
service,
selectKebabPopUpAcceptingBindingOtp
);
const isWalletBindingError = useSelector(
service,
selectShowWalletBindingError
);
const otpError = useSelector(service, selectOtpError);
const walletBindingError = useSelector(service, selectWalletBindingError);
const WalletBindingInProgress = useSelector(
service,
selectKebabPopUpWalletBindingInProgress
);
const emptyWalletBindingId = useSelector(service, selectEmptyWalletBindingId);
const isKebabPopUp = useSelector(service, selectKebabPopUp);
const isShowActivities = useSelector(service, selectShowActivities);
const { appService } = useContext(GlobalContext);
const activityLogService = appService.children.get('activityLog');

return {
isPinned,
PIN_CARD,
KEBAB_POPUP,
ADD_WALLET_BINDING_ID,
CONFIRM,
DISMISS,
REMOVE,
CANCEL,
INPUT_OTP,
SHOW_ACTIVITY,
isBindingWarning,
isAcceptingOtpInput,
isWalletBindingError,
walletBindingError,
otpError,
WalletBindingInProgress,
emptyWalletBindingId,
isKebabPopUp,
isShowActivities,
isRemoveWalletWarning,
activities: useSelector(activityLogService, selectActivities),
};
}
Loading