Jayesh.Jain/Tanami_App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new splash screen, deposit screen

Browse Source
This commit is contained in:
jayesh
2024-07-22 18:40:32 +05:30
parent fe73681e09
commit 3d7d6b8368
46 changed files with 572 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/images/wallet_screen/d_step_1.svg
View File

@@ -1,4 +1,4 @@
<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" width="40" height="40" rx="20" fill="#DBF1E4"/>
<path d="M19.88 26.5V15.42L17.58 15.96V14L20.96 12.5H22.54V26.5H19.88Z" fill="black"/>
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="20" fill="#004717"/>
<path d="M19.38 26.5V15.42L17.08 15.96V14L20.46 12.5H22.04V26.5H19.38Z" fill="white"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 244 B

6
assets/images/wallet_screen/d_step_2.svg
View File

@@ -1,4 +1,4 @@
<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" width="40" height="40" rx="20" fill="#DBF1E4"/>
<path d="M15.52 26.5V24.64C16.3733 23.9333 17.2 23.2333 18 22.54C18.8133 21.8467 19.5333 21.16 20.16 20.48C20.8 19.8 21.3067 19.14 21.68 18.5C22.0667 17.8467 22.26 17.2133 22.26 16.6C22.26 16.0267 22.1 15.52 21.78 15.08C21.4733 14.64 20.96 14.42 20.24 14.42C19.5067 14.42 18.9533 14.66 18.58 15.14C18.2067 15.62 18.02 16.2 18.02 16.88H15.54C15.5667 15.8533 15.7933 15 16.22 14.32C16.6467 13.6267 17.2133 13.1133 17.92 12.78C18.6267 12.4333 19.42 12.26 20.3 12.26C21.7267 12.26 22.8333 12.6533 23.62 13.44C24.42 14.2133 24.82 15.22 24.82 16.46C24.82 17.2333 24.64 17.9867 24.28 18.72C23.9333 19.4533 23.4733 20.16 22.9 20.84C22.3267 21.52 21.7067 22.16 21.04 22.76C20.3733 23.3467 19.7267 23.8933 19.1 24.4H25.16V26.5H15.52Z" fill="black"/>
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="20" fill="#004717"/>
<path d="M15.02 26.5V24.64C15.8733 23.9333 16.7 23.2333 17.5 22.54C18.3133 21.8467 19.0333 21.16 19.66 20.48C20.3 19.8 20.8067 19.14 21.18 18.5C21.5667 17.8467 21.76 17.2133 21.76 16.6C21.76 16.0267 21.6 15.52 21.28 15.08C20.9733 14.64 20.46 14.42 19.74 14.42C19.0067 14.42 18.4533 14.66 18.08 15.14C17.7067 15.62 17.52 16.2 17.52 16.88H15.04C15.0667 15.8533 15.2933 15 15.72 14.32C16.1467 13.6267 16.7133 13.1133 17.42 12.78C18.1267 12.4333 18.92 12.26 19.8 12.26C21.2267 12.26 22.3333 12.6533 23.12 13.44C23.92 14.2133 24.32 15.22 24.32 16.46C24.32 17.2333 24.14 17.9867 23.78 18.72C23.4333 19.4533 22.9733 20.16 22.4 20.84C21.8267 21.52 21.2067 22.16 20.54 22.76C19.8733 23.3467 19.2267 23.8933 18.6 24.4H24.66V26.5H15.02Z" fill="white"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 905 B

After

Width:  |  Height:  |  Size: 899 B

6
assets/images/wallet_screen/d_step_3.svg
View File

@@ -1,4 +1,4 @@
<svg width="41" height="40" viewBox="0 0 41 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="0.5" width="40" height="40" rx="20" fill="#DBF1E4"/>
<path d="M20.44 26.74C19.52 26.74 18.6867 26.58 17.94 26.26C17.1933 25.9267 16.5933 25.42 16.14 24.74C15.6867 24.06 15.4467 23.2067 15.42 22.18H17.94C17.9533 22.86 18.1733 23.4333 18.6 23.9C19.04 24.3533 19.6533 24.58 20.44 24.58C21.1867 24.58 21.76 24.3733 22.16 23.96C22.56 23.5467 22.76 23.0267 22.76 22.4C22.76 21.6667 22.4933 21.1133 21.96 20.74C21.44 20.3533 20.7667 20.16 19.94 20.16H18.9V18.06H19.96C20.64 18.06 21.2067 17.9 21.66 17.58C22.1133 17.26 22.34 16.7867 22.34 16.16C22.34 15.64 22.1667 15.2267 21.82 14.92C21.4867 14.6 21.02 14.44 20.42 14.44C19.7667 14.44 19.2533 14.6333 18.88 15.02C18.52 15.4067 18.32 15.88 18.28 16.44H15.78C15.8333 15.1467 16.28 14.1267 17.12 13.38C17.9733 12.6333 19.0733 12.26 20.42 12.26C21.38 12.26 22.1867 12.4333 22.84 12.78C23.5067 13.1133 24.0067 13.56 24.34 14.12C24.6867 14.68 24.86 15.3 24.86 15.98C24.86 16.7667 24.64 17.4333 24.2 17.98C23.7733 18.5133 23.24 18.8733 22.6 19.06C23.3867 19.22 24.0267 19.6067 24.52 20.22C25.0133 20.82 25.26 21.58 25.26 22.5C25.26 23.2733 25.0733 23.98 24.7 24.62C24.3267 25.26 23.78 25.7733 23.06 26.16C22.3533 26.5467 21.48 26.74 20.44 26.74Z" fill="black"/>
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="40" height="40" rx="20" fill="#004717"/>
<path d="M19.94 26.74C19.02 26.74 18.1867 26.58 17.44 26.26C16.6933 25.9267 16.0933 25.42 15.64 24.74C15.1867 24.06 14.9467 23.2067 14.92 22.18H17.44C17.4533 22.86 17.6733 23.4333 18.1 23.9C18.54 24.3533 19.1533 24.58 19.94 24.58C20.6867 24.58 21.26 24.3733 21.66 23.96C22.06 23.5467 22.26 23.0267 22.26 22.4C22.26 21.6667 21.9933 21.1133 21.46 20.74C20.94 20.3533 20.2667 20.16 19.44 20.16H18.4V18.06H19.46C20.14 18.06 20.7067 17.9 21.16 17.58C21.6133 17.26 21.84 16.7867 21.84 16.16C21.84 15.64 21.6667 15.2267 21.32 14.92C20.9867 14.6 20.52 14.44 19.92 14.44C19.2667 14.44 18.7533 14.6333 18.38 15.02C18.02 15.4067 17.82 15.88 17.78 16.44H15.28C15.3333 15.1467 15.78 14.1267 16.62 13.38C17.4733 12.6333 18.5733 12.26 19.92 12.26C20.88 12.26 21.6867 12.4333 22.34 12.78C23.0067 13.1133 23.5067 13.56 23.84 14.12C24.1867 14.68 24.36 15.3 24.36 15.98C24.36 16.7667 24.14 17.4333 23.7 17.98C23.2733 18.5133 22.74 18.8733 22.1 19.06C22.8867 19.22 23.5267 19.6067 24.02 20.22C24.5133 20.82 24.76 21.58 24.76 22.5C24.76 23.2733 24.5733 23.98 24.2 24.62C23.8267 25.26 23.28 25.7733 22.56 26.16C21.8533 26.5467 20.98 26.74 19.94 26.74Z" fill="white"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

5
assets/images/wallet_screen/deposit_check.svg Normal file
View File

@@ -0,0 +1,5 @@
<svg width="84" height="84" viewBox="0 0 84 84" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="42" cy="42" r="42" fill="#B5D0BD"/>
<circle cx="42" cy="42" r="27" fill="#066123"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M57.357 30.9319C58.6588 32.1745 58.6588 34.1891 57.357 35.4317L39.5792 52.4014C38.2775 53.644 36.1669 53.644 34.8652 52.4014L25.9763 43.9166C24.6746 42.674 24.6746 40.6594 25.9763 39.4168C27.2781 38.1742 29.3886 38.1742 30.6904 39.4168L37.2222 45.6517L52.643 30.9319C53.9447 29.6894 56.0553 29.6894 57.357 30.9319Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 579 B

10
assets/images/wallet_screen/deposit_step_complete_1.svg Normal file
View File

@@ -0,0 +1,10 @@
<svg width="300" height="28" viewBox="0 0 300 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M148 14L287 14" stroke="#066123" stroke-opacity="0.46" stroke-dasharray="4 4"/>
<path d="M12 14L151 14" stroke="#066123" stroke-opacity="0.5" stroke-dasharray="4 4"/>
<rect width="28" height="28" rx="14" fill="#004717"/>
<path d="M13.228 18.5V11.852L11.848 12.176V11L13.876 10.1H14.824V18.5H13.228Z" fill="white"/>
<rect x="136" width="28" height="28" rx="14" fill="#D8D8D8"/>
<path d="M147.112 18.5V17.384C147.624 16.96 148.12 16.54 148.6 16.124C149.088 15.708 149.52 15.296 149.896 14.888C150.28 14.48 150.584 14.084 150.808 13.7C151.04 13.308 151.156 12.928 151.156 12.56C151.156 12.216 151.06 11.912 150.868 11.648C150.684 11.384 150.376 11.252 149.944 11.252C149.504 11.252 149.172 11.396 148.948 11.684C148.724 11.972 148.612 12.32 148.612 12.728H147.124C147.14 12.112 147.276 11.6 147.532 11.192C147.788 10.776 148.128 10.468 148.552 10.268C148.976 10.06 149.452 9.956 149.98 9.956C150.836 9.956 151.5 10.192 151.972 10.664C152.452 11.128 152.692 11.732 152.692 12.476C152.692 12.94 152.584 13.392 152.368 13.832C152.16 14.272 151.884 14.696 151.54 15.104C151.196 15.512 150.824 15.896 150.424 16.256C150.024 16.608 149.636 16.936 149.26 17.24H152.896V18.5H147.112Z" fill="white"/>
<rect x="272" width="28" height="28" rx="14" fill="#D8D8D8"/>
<path d="M285.564 18.644C285.012 18.644 284.512 18.548 284.064 18.356C283.616 18.156 283.256 17.852 282.984 17.444C282.712 17.036 282.568 16.524 282.552 15.908H284.064C284.072 16.316 284.204 16.66 284.46 16.94C284.724 17.212 285.092 17.348 285.564 17.348C286.012 17.348 286.356 17.224 286.596 16.976C286.836 16.728 286.956 16.416 286.956 16.04C286.956 15.6 286.796 15.268 286.476 15.044C286.164 14.812 285.76 14.696 285.264 14.696H284.64V13.436H285.276C285.684 13.436 286.024 13.34 286.296 13.148C286.568 12.956 286.704 12.672 286.704 12.296C286.704 11.984 286.6 11.736 286.392 11.552C286.192 11.36 285.912 11.264 285.552 11.264C285.16 11.264 284.852 11.38 284.628 11.612C284.412 11.844 284.292 12.128 284.268 12.464H282.768C282.8 11.688 283.068 11.076 283.572 10.628C284.084 10.18 284.744 9.956 285.552 9.956C286.128 9.956 286.612 10.06 287.004 10.268C287.404 10.468 287.704 10.736 287.904 11.072C288.112 11.408 288.216 11.78 288.216 12.188C288.216 12.66 288.084 13.06 287.82 13.388C287.564 13.708 287.244 13.924 286.86 14.036C287.332 14.132 287.716 14.364 288.012 14.732C288.308 15.092 288.456 15.548 288.456 16.1C288.456 16.564 288.344 16.988 288.12 17.372C287.896 17.756 287.568 18.064 287.136 18.296C286.712 18.528 286.188 18.644 285.564 18.644Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

10
assets/images/wallet_screen/deposit_step_complete_2.svg Normal file
View File

@@ -0,0 +1,10 @@
<svg width="300" height="28" viewBox="0 0 300 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M148 14L287 14" stroke="#066123" stroke-opacity="0.46" stroke-dasharray="4 4"/>
<path d="M12 14L151 14" stroke="#066123" stroke-opacity="0.8" stroke-dasharray="4 4"/>
<rect width="28" height="28" rx="14" fill="#004717"/>
<path d="M13.228 18.5V11.852L11.848 12.176V11L13.876 10.1H14.824V18.5H13.228Z" fill="white"/>
<rect x="136" width="28" height="28" rx="14" fill="#004717"/>
<path d="M147.112 18.5V17.384C147.624 16.96 148.12 16.54 148.6 16.124C149.088 15.708 149.52 15.296 149.896 14.888C150.28 14.48 150.584 14.084 150.808 13.7C151.04 13.308 151.156 12.928 151.156 12.56C151.156 12.216 151.06 11.912 150.868 11.648C150.684 11.384 150.376 11.252 149.944 11.252C149.504 11.252 149.172 11.396 148.948 11.684C148.724 11.972 148.612 12.32 148.612 12.728H147.124C147.14 12.112 147.276 11.6 147.532 11.192C147.788 10.776 148.128 10.468 148.552 10.268C148.976 10.06 149.452 9.956 149.98 9.956C150.836 9.956 151.5 10.192 151.972 10.664C152.452 11.128 152.692 11.732 152.692 12.476C152.692 12.94 152.584 13.392 152.368 13.832C152.16 14.272 151.884 14.696 151.54 15.104C151.196 15.512 150.824 15.896 150.424 16.256C150.024 16.608 149.636 16.936 149.26 17.24H152.896V18.5H147.112Z" fill="white"/>
<rect x="272" width="28" height="28" rx="14" fill="#D8D8D8"/>
<path d="M285.564 18.644C285.012 18.644 284.512 18.548 284.064 18.356C283.616 18.156 283.256 17.852 282.984 17.444C282.712 17.036 282.568 16.524 282.552 15.908H284.064C284.072 16.316 284.204 16.66 284.46 16.94C284.724 17.212 285.092 17.348 285.564 17.348C286.012 17.348 286.356 17.224 286.596 16.976C286.836 16.728 286.956 16.416 286.956 16.04C286.956 15.6 286.796 15.268 286.476 15.044C286.164 14.812 285.76 14.696 285.264 14.696H284.64V13.436H285.276C285.684 13.436 286.024 13.34 286.296 13.148C286.568 12.956 286.704 12.672 286.704 12.296C286.704 11.984 286.6 11.736 286.392 11.552C286.192 11.36 285.912 11.264 285.552 11.264C285.16 11.264 284.852 11.38 284.628 11.612C284.412 11.844 284.292 12.128 284.268 12.464H282.768C282.8 11.688 283.068 11.076 283.572 10.628C284.084 10.18 284.744 9.956 285.552 9.956C286.128 9.956 286.612 10.06 287.004 10.268C287.404 10.468 287.704 10.736 287.904 11.072C288.112 11.408 288.216 11.78 288.216 12.188C288.216 12.66 288.084 13.06 287.82 13.388C287.564 13.708 287.244 13.924 286.86 14.036C287.332 14.132 287.716 14.364 288.012 14.732C288.308 15.092 288.456 15.548 288.456 16.1C288.456 16.564 288.344 16.988 288.12 17.372C287.896 17.756 287.568 18.064 287.136 18.296C286.712 18.528 286.188 18.644 285.564 18.644Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

10
assets/images/wallet_screen/deposit_step_complete_3.svg Normal file
View File

@@ -0,0 +1,10 @@
<svg width="300" height="28" viewBox="0 0 300 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M148 14L287 14" stroke="#066123" stroke-opacity="0.8" stroke-dasharray="4 4"/>
<path d="M12 14L151 14" stroke="#066123" stroke-opacity="0.8" stroke-dasharray="4 4"/>
<rect width="28" height="28" rx="14" fill="#004717"/>
<path d="M13.228 18.5V11.852L11.848 12.176V11L13.876 10.1H14.824V18.5H13.228Z" fill="white"/>
<rect x="136" width="28" height="28" rx="14" fill="#004717"/>
<path d="M147.112 18.5V17.384C147.624 16.96 148.12 16.54 148.6 16.124C149.088 15.708 149.52 15.296 149.896 14.888C150.28 14.48 150.584 14.084 150.808 13.7C151.04 13.308 151.156 12.928 151.156 12.56C151.156 12.216 151.06 11.912 150.868 11.648C150.684 11.384 150.376 11.252 149.944 11.252C149.504 11.252 149.172 11.396 148.948 11.684C148.724 11.972 148.612 12.32 148.612 12.728H147.124C147.14 12.112 147.276 11.6 147.532 11.192C147.788 10.776 148.128 10.468 148.552 10.268C148.976 10.06 149.452 9.956 149.98 9.956C150.836 9.956 151.5 10.192 151.972 10.664C152.452 11.128 152.692 11.732 152.692 12.476C152.692 12.94 152.584 13.392 152.368 13.832C152.16 14.272 151.884 14.696 151.54 15.104C151.196 15.512 150.824 15.896 150.424 16.256C150.024 16.608 149.636 16.936 149.26 17.24H152.896V18.5H147.112Z" fill="white"/>
<rect x="272" width="28" height="28" rx="14" fill="#004717"/>
<path d="M285.564 18.644C285.012 18.644 284.512 18.548 284.064 18.356C283.616 18.156 283.256 17.852 282.984 17.444C282.712 17.036 282.568 16.524 282.552 15.908H284.064C284.072 16.316 284.204 16.66 284.46 16.94C284.724 17.212 285.092 17.348 285.564 17.348C286.012 17.348 286.356 17.224 286.596 16.976C286.836 16.728 286.956 16.416 286.956 16.04C286.956 15.6 286.796 15.268 286.476 15.044C286.164 14.812 285.76 14.696 285.264 14.696H284.64V13.436H285.276C285.684 13.436 286.024 13.34 286.296 13.148C286.568 12.956 286.704 12.672 286.704 12.296C286.704 11.984 286.6 11.736 286.392 11.552C286.192 11.36 285.912 11.264 285.552 11.264C285.16 11.264 284.852 11.38 284.628 11.612C284.412 11.844 284.292 12.128 284.268 12.464H282.768C282.8 11.688 283.068 11.076 283.572 10.628C284.084 10.18 284.744 9.956 285.552 9.956C286.128 9.956 286.612 10.06 287.004 10.268C287.404 10.468 287.704 10.736 287.904 11.072C288.112 11.408 288.216 11.78 288.216 12.188C288.216 12.66 288.084 13.06 287.82 13.388C287.564 13.708 287.244 13.924 286.86 14.036C287.332 14.132 287.716 14.364 288.012 14.732C288.308 15.092 288.456 15.548 288.456 16.1C288.456 16.564 288.344 16.988 288.12 17.372C287.896 17.756 287.568 18.064 287.136 18.296C286.712 18.528 286.188 18.644 285.564 18.644Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

23
assets/images/welcome_screen/Tanami_Capital_Logo.svg Normal file
View File

@@ -0,0 +1,23 @@
<svg width="123" height="32" viewBox="0 0 123 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_699_21034)">
<path d="M47.5693 0.91821C48.4315 0.784938 49.7546 0.577627 50.3194 0.533203L50.4978 0.710899C50.3938 1.54014 49.814 4.72386 49.6208 5.49387L49.0707 5.67156C48.8329 5.21252 47.8518 3.28748 47.4801 2.25093L44.0462 2.39901V8.45546C44.0462 14.8821 44.1503 15.4448 44.1949 16.0964L47.2869 16.9256L46.945 17.9918C45.3841 17.9918 43.7935 17.9622 42.2178 17.9622C40.642 17.9622 38.9176 17.9918 37.223 17.9918L37.5352 16.9256L40.0772 16.0964C40.1515 15.3115 40.1515 14.2602 40.1515 9.31432V2.41381L36.9257 2.26573C36.3013 3.25787 35.4391 4.48693 34.7405 5.37541L34.1161 5.50868C34.0715 4.8127 34.1161 1.42168 34.2648 0.696091L34.5026 0.548011C34.9634 0.548011 36.5094 0.829362 37.0743 0.933018H47.5247L47.5693 0.91821Z" fill="#002F0F"/>
<path d="M56.9354 10.1438C57.0098 8.23357 55.7313 7.75972 54.8543 7.75972C54.3043 7.75972 53.8583 7.89299 53.6056 8.01145C53.4569 9.18128 53.1893 10.4696 53.011 10.9582L52.7434 11.1952C52.4609 11.1655 50.796 9.92168 50.3798 8.663C51.3609 7.80414 53.0258 6.93047 54.3489 6.45662C55.0475 6.19007 55.553 6.04199 56.0881 6.04199C59.5964 6.04199 60.5329 8.42607 60.5329 9.98091C60.5329 11.8467 60.5031 14.0531 60.4883 15.5783C60.6369 15.8597 61.4991 16.4816 62.4357 16.763L62.3019 17.3108C61.9897 17.5922 61.0532 18.2437 59.6707 18.2437C58.0355 18.2437 57.2327 17.5182 56.9949 16.9406H56.9354C55.5827 17.8735 54.7502 18.2882 53.888 18.2882C51.6731 18.2882 50.3203 16.452 50.3203 14.8972C50.3203 13.7569 50.7068 13.135 51.4947 12.6908C52.3271 12.1725 55.1664 11.2692 56.876 10.7953L56.9057 10.129L56.9354 10.1438ZM55.8949 16.1558C56.207 16.1558 56.3854 16.0522 56.653 15.9041C56.8165 15.7708 56.8611 15.5635 56.8611 15.2822L56.9206 12.0688C56.2962 12.3354 55.5232 12.6611 54.9435 13.0313C54.3637 13.4164 54.111 13.831 54.111 14.3493C54.111 15.6968 55.1219 16.1558 55.9097 16.1558" fill="#002F0F"/>
<path d="M64.9329 8.66261L63.5505 8.07029L63.8329 7.19662C64.2789 6.88566 68.0101 6.0268 68.6939 6.05641L68.4412 7.92221L68.4858 7.95183C69.9426 6.88566 71.2359 6.05641 72.3359 6.05641C75.2496 6.05641 76.1861 8.41088 76.1861 10.173V15.7112C76.1861 16.0518 76.3645 16.1999 76.751 16.3628L78.1037 16.9255L77.8362 17.9916C76.6618 17.9916 75.4725 17.962 74.2982 17.962C73.2279 17.962 72.1873 17.9916 71.1021 17.9916L71.3102 16.9255L72.3211 16.1702C72.3508 15.5039 72.4251 13.9194 72.4251 10.9578C72.4251 9.16608 71.7264 8.42568 70.5521 8.42568C69.898 8.42568 69.3034 8.70704 68.679 9.22531V16.1702L70.0021 16.9255L69.7939 17.9916C68.7534 17.962 67.7425 17.962 66.7019 17.962C65.5573 17.962 64.4127 17.9916 63.2383 17.9916L63.5059 16.9255L64.8586 16.1702C64.8883 15.8593 64.9181 13.3715 64.9181 10.6617V8.66261H64.9329Z" fill="#002F0F"/>
<path d="M85.8339 10.1438C85.9082 8.23357 84.6298 7.75972 83.7527 7.75972C83.2027 7.75972 82.7716 7.89299 82.504 8.01145C82.3405 9.18128 82.0878 10.4696 81.9094 10.9582L81.6418 11.1952C81.3594 11.1655 79.6944 9.92168 79.2782 8.663C80.2593 7.80414 81.9243 6.93047 83.2621 6.45662C83.9608 6.19007 84.4514 6.04199 85.0014 6.04199C88.5097 6.04199 89.4462 8.42607 89.4462 9.98091C89.4462 11.8467 89.4164 14.0531 89.3867 15.5783C89.5502 15.8597 90.3976 16.4816 91.3341 16.763L91.2003 17.3108C90.8881 17.5922 89.9516 18.2437 88.5691 18.2437C86.9339 18.2437 86.1312 17.5182 85.8933 16.9406H85.8339C84.4811 17.8735 83.6486 18.2882 82.7865 18.2882C80.5715 18.2882 79.2188 16.452 79.2188 14.8972C79.2188 13.7569 79.6053 13.135 80.3931 12.6908C81.2256 12.1725 84.05 11.2692 85.7744 10.7953L85.8041 10.129L85.8339 10.1438ZM84.7933 16.1558C85.1055 16.1558 85.2838 16.0522 85.5514 15.9041C85.7149 15.7708 85.7595 15.5635 85.7595 15.2822L85.819 12.0688C85.1947 12.3354 84.4217 12.6611 83.8419 13.0313C83.2622 13.4164 83.0094 13.831 83.0094 14.3493C83.0094 15.6968 84.0203 16.1558 84.8082 16.1558" fill="#002F0F"/>
<path d="M93.9056 8.633L92.5231 8.07029L92.8056 7.19662C93.2515 6.88566 96.9976 6.0268 97.6368 6.05641L97.399 7.92221L97.4584 7.95183C99.0193 6.88566 100.09 6.05641 101.532 6.05641C103.122 6.05641 104.103 7.09297 104.52 8.05549C106.11 6.87085 107.507 6.05641 108.726 6.05641C111.61 6.05641 112.502 8.47011 112.502 10.0694V15.8445C112.502 16.1258 112.74 16.2591 113.052 16.4368L114.375 16.9255L114.108 17.9916C112.963 17.9916 111.789 17.962 110.629 17.962C109.559 17.962 108.474 17.9916 107.359 17.9916L107.597 16.9255L108.667 16.1406C108.697 15.4447 108.771 13.7862 108.771 11.2244C108.771 8.66261 107.493 8.38126 106.868 8.38126C105.991 8.38126 105.441 8.79588 104.847 9.25493C104.98 9.74359 105.084 10.2323 105.084 10.943V16.1554L106.482 16.9403L106.214 18.0064C105.233 18.0064 104.237 17.9768 103.226 17.9768C102.111 17.9768 100.967 18.0064 99.8221 18.0064L100 16.9699L101.279 16.1702C101.309 15.7556 101.338 14.0675 101.338 10.869C101.338 8.8255 100.194 8.51453 99.391 8.51453C98.8409 8.51453 98.3058 8.69223 97.6517 9.21051C97.6517 11.0171 97.6517 15.8445 97.6814 16.1702L98.9747 16.9551L98.7369 18.0212C97.726 18.0212 96.7152 17.9916 95.6895 17.9916C94.5448 17.9916 93.3704 18.0212 92.2109 18.0212L92.3893 16.9847L93.8461 16.1851C93.8759 15.8741 93.9056 14.2452 93.9056 10.6913V8.67742V8.633Z" fill="#002F0F"/>
<path d="M115.638 6.85616C116.025 6.75251 118.418 6.18981 120.663 6.02692V11.4466C120.663 14.3934 120.693 15.7706 120.722 16.2296L122.491 16.896L122.224 17.9769C121.049 17.9769 119.964 17.9473 118.76 17.9473C117.645 17.9473 116.471 17.9769 115.326 17.9769L115.564 16.896L116.857 16.2296C116.857 15.43 116.917 13.4901 116.917 11.3874V8.45542L115.386 7.77426L115.653 6.84136L115.638 6.85616ZM118.805 0.355469C119.325 0.533164 120.336 1.67338 120.722 2.39897L120.648 2.70993C120.336 3.40591 119.251 4.44247 118.745 4.75343L118.433 4.82747C117.705 4.44247 116.842 3.45033 116.486 2.78397L116.56 2.47301C117.051 1.67338 117.957 0.7849 118.537 0.429509L118.805 0.355469Z" fill="#002F0F"/>
<path d="M39.8536 31.5263C39.3185 31.2153 38.9022 30.7711 38.6049 30.1936C38.3225 29.616 38.1738 28.9497 38.1738 28.1649C38.1738 27.38 38.3225 26.7137 38.6049 26.151C38.8874 25.5735 39.3036 25.144 39.8536 24.8331C40.3888 24.5221 41.028 24.374 41.7415 24.374C42.2024 24.374 42.6483 24.4481 43.0497 24.5813C43.4659 24.7146 43.8227 24.9219 44.1349 25.1737C44.2241 25.2477 44.2835 25.3217 44.3281 25.3958C44.3579 25.4698 44.3876 25.5735 44.3876 25.6771C44.3876 25.8252 44.343 25.9585 44.2538 26.0621C44.1646 26.1658 44.0605 26.225 43.9416 26.225C43.793 26.225 43.6592 26.1806 43.5105 26.0769C43.2132 25.8548 42.9308 25.6919 42.6632 25.6031C42.3956 25.5142 42.1132 25.4698 41.801 25.4698C41.0726 25.4698 40.5077 25.6919 40.1361 26.151C39.7644 26.61 39.5712 27.2764 39.5712 28.1649C39.5712 29.0533 39.7644 29.7345 40.1361 30.1936C40.5077 30.6526 41.0726 30.8747 41.801 30.8747C42.0983 30.8747 42.3807 30.8303 42.6483 30.7414C42.901 30.6526 43.1983 30.4897 43.5254 30.2824C43.5997 30.238 43.674 30.2084 43.7335 30.1787C43.8078 30.1491 43.8822 30.1343 43.9565 30.1343C44.0754 30.1343 44.1795 30.1936 44.2687 30.2972C44.3579 30.4009 44.4025 30.5341 44.4025 30.6822C44.4025 30.7859 44.3876 30.8747 44.343 30.9636C44.3133 31.0376 44.2389 31.1116 44.1497 31.1857C43.8376 31.4522 43.4659 31.6447 43.0646 31.778C42.6632 31.9113 42.2172 31.9853 41.7564 31.9853C41.0429 31.9853 40.4036 31.8372 39.8685 31.5263" fill="#002F0F"/>
<path d="M59.0463 31.3631C59.0463 31.5259 58.9869 31.6592 58.8531 31.7777C58.7193 31.8961 58.5706 31.9406 58.4071 31.9406C58.2882 31.9406 58.1841 31.911 58.0949 31.8517C57.9909 31.7925 57.9166 31.7036 57.8571 31.5704L57.2179 30.1636H53.5015L52.8623 31.5704C52.8028 31.6888 52.7285 31.7925 52.6245 31.8517C52.5204 31.911 52.4163 31.9406 52.2974 31.9406C52.1339 31.9406 51.9852 31.8813 51.8515 31.7777C51.7177 31.674 51.6582 31.5259 51.6582 31.3631C51.6582 31.2742 51.6731 31.1854 51.7177 31.0817L54.6313 24.8328C54.6908 24.6995 54.7948 24.581 54.9286 24.507C55.0624 24.4329 55.1962 24.4033 55.3448 24.4033C55.4935 24.4033 55.6273 24.4329 55.7611 24.507C55.8949 24.581 55.9841 24.6847 56.0435 24.8328L58.972 31.0817C59.0166 31.1706 59.0315 31.2594 59.0315 31.3631M56.7422 29.1123L55.3448 25.9878L53.9475 29.1123H56.7422Z" fill="#002F0F"/>
<path d="M67.0143 31.7779C66.8954 31.6594 66.8359 31.4817 66.8359 31.2744V25.1143C66.8359 24.907 66.8954 24.7589 67.0143 24.6404C67.1333 24.522 67.2968 24.4775 67.49 24.4775H70.0915C70.8942 24.4775 71.5037 24.6848 71.9497 25.0699C72.3956 25.4697 72.6186 26.0176 72.6186 26.7432C72.6186 27.4687 72.3956 28.0166 71.9497 28.4165C71.5037 28.8163 70.8793 29.0236 70.0915 29.0236H68.2036V31.2892C68.2036 31.4965 68.1441 31.6742 68.0252 31.7927C67.9062 31.9111 67.7279 31.9704 67.5197 31.9704C67.3116 31.9704 67.1481 31.9111 67.0292 31.7927M69.928 27.987C70.8645 27.987 71.3402 27.5872 71.3402 26.7728C71.3402 25.9583 70.8645 25.5437 69.928 25.5437H68.2036V27.987H69.928Z" fill="#002F0F"/>
<path d="M80.7643 31.7774C80.6454 31.6589 80.5859 31.4812 80.5859 31.2887V25.099C80.5859 24.8917 80.6454 24.7288 80.7643 24.6103C80.8832 24.4919 81.0468 24.4326 81.2549 24.4326C81.463 24.4326 81.6265 24.4919 81.7603 24.6103C81.8792 24.7288 81.9387 24.8917 81.9387 25.099V31.2887C81.9387 31.496 81.8792 31.6589 81.7603 31.7774C81.6414 31.9106 81.463 31.9699 81.2549 31.9699C81.0468 31.9699 80.8832 31.9106 80.7643 31.7774Z" fill="#002F0F"/>
<path d="M92.2704 31.7632C92.1515 31.6448 92.092 31.4819 92.092 31.2746V25.5883H90.1744C89.7433 25.5883 89.5352 25.4106 89.5352 25.0256C89.5352 24.6406 89.7433 24.4629 90.1744 24.4629H95.3921C95.8084 24.4629 96.0314 24.6554 96.0314 25.0256C96.0314 25.3958 95.8232 25.5883 95.3921 25.5883H93.4745V31.2746C93.4745 31.4819 93.415 31.6448 93.2961 31.7632C93.1772 31.8817 93.0137 31.9409 92.8056 31.9409C92.5974 31.9409 92.4191 31.8817 92.3001 31.7632" fill="#002F0F"/>
<path d="M109.484 31.3631C109.484 31.5259 109.424 31.6592 109.291 31.7777C109.157 31.8961 109.008 31.9406 108.845 31.9406C108.726 31.9406 108.622 31.911 108.532 31.8517C108.428 31.7925 108.354 31.7036 108.295 31.5704L107.655 30.1636H103.939L103.3 31.5704C103.24 31.6888 103.166 31.7925 103.062 31.8517C102.958 31.911 102.854 31.9406 102.735 31.9406C102.571 31.9406 102.423 31.8813 102.289 31.7777C102.155 31.674 102.096 31.5259 102.096 31.3631C102.096 31.2742 102.111 31.1854 102.155 31.0817L105.069 24.8328C105.128 24.6995 105.232 24.581 105.366 24.507C105.5 24.4329 105.634 24.4033 105.782 24.4033C105.931 24.4033 106.065 24.4329 106.199 24.507C106.332 24.581 106.422 24.6847 106.496 24.8328L109.424 31.0817C109.469 31.1706 109.484 31.2594 109.484 31.3631ZM107.195 29.1123L105.797 25.9878L104.4 29.1123H107.195Z" fill="#002F0F"/>
<path d="M117.437 31.7329C117.318 31.6145 117.273 31.4664 117.273 31.2739V25.099C117.273 24.8917 117.333 24.7288 117.452 24.6103C117.571 24.4919 117.734 24.4326 117.942 24.4326C118.15 24.4326 118.329 24.4919 118.448 24.6103C118.567 24.7288 118.626 24.8917 118.626 25.099V30.7852H121.599C122.016 30.7852 122.239 30.9777 122.239 31.3479C122.239 31.7181 122.03 31.9106 121.599 31.9106H117.913C117.705 31.9106 117.556 31.8514 117.437 31.7477" fill="#002F0F"/>
<path d="M25.6429 6.13049C25.6875 5.89356 25.6429 5.65664 25.524 5.46413C24.8996 4.472 22.8333 1.37714 20.5589 0.103652C20.2913 -0.0592359 20.0981 -0.044428 19.4143 0.296155C16.0398 2.32485 6.09483 8.5738 6.09483 8.5738C4.25152 9.74363 0.624349 11.7723 0 14.571C0.252713 15.3559 1.54601 17.3697 3.6569 18.584C4.13259 18.658 4.34071 18.6728 5.79752 17.9917L13.483 14.808C13.483 17.5919 13.0667 22.1231 13.2748 25.9732C13.2748 25.9732 14.9992 28.7571 16.7682 29.69C16.7682 29.69 17.2588 30.1046 18.3886 29.2309C21.0792 27.1282 21.4508 25.7362 21.7482 24.7737C22.7144 20.4498 25.1969 8.35169 25.6578 6.11568" fill="#002F0F"/>
</g>
<defs>
<clipPath id="clip0_699_21034">
<rect width="122.462" height="32" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
assets/images/welcome_screen/png/First_Onboarding.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 295 KiB

BIN
assets/images/welcome_screen/png/Second_Onboarding.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 116 KiB

After

Width:  |  Height:  |  Size: 140 KiB

BIN
assets/images/welcome_screen/png/Third_Onboarding.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 268 KiB

38
assets/language/ar.json
View File

@@ -1,12 +1,12 @@
{
"splashVersionText": "التطبيق: v.",
"splashCopyrightText": "© 2024 Tanami",
"welcomeTitle1Text": "تانامي تقدم",
"splashCopyrightText": "© 2024 Tanami",
"welcomeTitle1Text": "يوفر Tanami الوصول إلى",
"welcomeTitle2Text": "استثمر مع",
"welcomeTitle3Text": "ابدأ الاستثمار اليوم",
"welcomeDescription1Text": "الوصول إلى استثمارات خاصة عالمية حصرية من الدرجة الأولى",
"welcomeDescription2Text": "خبراء استثمار ذوو خبرة مع سجل حافل طويل الأمد",
"welcomeDescription3Text": "بمبلغ 1000 ريال سعودي فقط",
"welcomeTitle3Text": "بمبلغ 1,000 ريال سعودي فقط",
"welcomeDescription1Text": "استثمارات خاصة عالمية حصرية",
"welcomeDescription2Text": "خبراء الاستثمار ذوي الخبرة مع سجل حافل طويل الأمد",
"welcomeDescription3Text": "ابدأ الاستثمار اليوم",
"loginText": "تسجيل الدخول",
"signUpText": "اشتراك",
"welcomeText": "مرحبا بعودتك!",
@@ -108,7 +108,7 @@
"withdrawal": "انسحاب",
"yield": "عائد",
"refund": "استرداد",
"investment": " ",
"investment": "استثمار",
"walletDetailsTitle": "تفاصيل",
"withdrawalScreenTitle": "أدخل تفاصيل البنك",
"depositScreenTitle": "إخطار الإيداع",
@@ -252,7 +252,27 @@
"passwordChangedSucessfully" : "تم تغيير الرقم السري بنجاح!",
"passwordResetSucessful" : "تمت إعادة تعيين كلمة المرور بنجاح!",
"otpSendSuccessfulText" : "تم إرسال OTP بنجاح!",
"successfulText" : "ناجح !",
"portfolioBottomText" : "مَلَفّ"
"successfulText" : "ناجح !",
"portfolioBottomText" : "مَلَفّ",
"inOrderForYouToCompleteBankTransfers" : "لكي تتمكن من إكمال التحويل المصرفي، ستحتاج إلى إنشاء إشعار إيداع وتحويل الأموال من محفظتك مباشرة إلى حسابك المصرفي.",
"tanamiWillNotifyUponReceiptFunds" : "سوف يقوم Tanami بإخطارك عند استلام أموالك وسيظهر في رصيد محفظتك بعد 3-4 أيام عمل من بدء التحويل.",
"pleaseCompleteTheBelowSteps" : "يرجى إكمال الخطوات أدناه",
"insertTheAmountYouWouldLikeToTransfer" : "أدخل المبلغ الذي ترغب في تحويله.",
"copyTheBankDetailsYourTanamiAccountShownNextPage" : "انسخ التفاصيل المصرفية لحساب Tanami الخاص بك والموضحة في الصفحة التالية. تأكد من ملاحظة المعرف المرجعي.",
"transferTheFundsDirectlyFromYourBankAccount": "تحويل الأموال مباشرة من حسابك المصرفي.",
"copyTheBankDetailsOfYourTanamiAccount" : "انسخ التفاصيل المصرفية لحساب Tanami الخاص بك. تأكد من ملاحظة المعرف المرجعي/معرف العميل.",
"youAreAllSet" : "أنت جاهز تمامًا!",
"depositNotificationCreated" : "تم إنشاء إشعار الإيداع!",
"amountDeposited" : "المبلغ المودع",
"pleaseEnsureTheFundsAreTransferredFromBank" : "يرجى التأكد من تحويل الأموال من البنك الذي تتعامل معه خلال 14 يومًا من إنشاء إشعار الإيداع.",
"manageDepositNotifications" : "إدارة إشعارات الإيداع",
"accountNo" : "رقم الحساب",
"swiftCode" :"رمز السرعة",
"bankAddress" : "عنوان البنك",
"clientId" : "معرف العميل"
}

36
assets/language/en.json
View File

@@ -1,12 +1,12 @@
{
"splashVersionText": "APP: v.",
"splashCopyrightText": "© 2024 Tanami",
"welcomeTitle1Text": "Tanami offers",
"splashCopyrightText": "© 2024 Tanami",
"welcomeTitle1Text": "Tanami offers access to",
"welcomeTitle2Text": "Invest alongside",
"welcomeTitle3Text": "Start investing today",
"welcomeDescription1Text": "access to best-in-class, exclusive, global private investments",
"welcomeDescription2Text": "experienced investment experts with a long-standing track record",
"welcomeDescription3Text": "with only SAR 1,000",
"welcomeTitle3Text": "With only SAR 1,000",
"welcomeDescription1Text": "Exclusive, Global Private Investments",
"welcomeDescription2Text": "Experienced Investment Experts with a long-standing track record",
"welcomeDescription3Text": "Start Investing Today ",
"loginText": "Log In",
"signUpText": "Sign Up",
"welcomeText": "Welcome back!",
@@ -113,7 +113,7 @@
"withdrawalScreenTitle": "Enter bank details",
"depositScreenTitle": "Deposit notification",
"status": "Status",
"paymentMethod": "Payment Method",
"paymentMethod": "Payment Method",
"accountName": "Account Name",
"accountHolderName": "Account Holder Name/Beneficiary Name",
"iban": "IBAN",
@@ -253,6 +253,26 @@
"passwordResetSucessful" : "Password reset successful!",
"otpSendSuccessfulText" : "OTP send successful !",
"successfulText" : "successful !",
"portfolioBottomText" : "Portfolio"
"portfolioBottomText" : "Portfolio",
"inOrderForYouToCompleteBankTransfers" : "In order for you to complete a bank transfer, you need will need to create a deposit notification and transfer funds from your wallet, directly into your bank account.",
"tanamiWillNotifyUponReceiptFunds" : "Tanami will notify you upon receipt of your funds and it will appear in your wallet balance 3-4 business days after initiating the transfer.",
"pleaseCompleteTheBelowSteps" : "Please complete the below steps",
"insertTheAmountYouWouldLikeToTransfer" : "Insert the amount you would like to transfer.",
"copyTheBankDetailsYourTanamiAccountShownNextPage" : "Copy the bank details of your Tanami account shown on the next page. Make sure to keep note of the reference ID.",
"transferTheFundsDirectlyFromYourBankAccount": "Transfer the funds directly from your bank account.",
"copyTheBankDetailsOfYourTanamiAccount" : "Copy the bank details of your Tanami account. Make sure to keep note of the Reference ID/ Client ID.",
"youAreAllSet" : "You're all set!",
"depositNotificationCreated" : "Deposit Notification Created!",
"amountDeposited" : "Amount Deposited",
"pleaseEnsureTheFundsAreTransferredFromBank" : "Please ensure the funds are transferred from your bank within 14 days of creating the deposit notification.",
"manageDepositNotifications" : "Manage Deposit Notifications",
"accountNo" : "Account No.",
"swiftCode" :"SWIFT Code",
"bankAddress" : "Bank Address",
"clientId" : "Client ID"
}

1
lib/core/routes/route_name.dart
View File

@@ -45,6 +45,7 @@ class RouteName {
static const String depositPreview = 'depositPreview';
static const String selectDepositMethodScreen = 'selectDepositMethodScreen';
static const String depositStepScreen = 'depositStepScreen';
static const String depositCompleteScreen = 'depositCompleteScreen';
//Biometric
static const String biometricScreen = 'biometricScreen';

8
lib/core/routes/routes.dart
View File

@@ -31,6 +31,7 @@ import 'package:tanami_app/features/securePin/presentation/pages/pin_screen.dart
import 'package:tanami_app/features/welcome/presentation/pages/weclome_screen.dart';
import 'package:tanami_app/shared/components/no_internet.dart';
import '../../features/MainScreens/Wallet/presentation/pages/deposit/deposit_completed_screen.dart';
import '../../features/MainScreens/main_screen.dart';
import '../../features/forgotPassword/presentation/pages/restore_password_phone_verification_screen.dart';
import '../../features/login/presentation/pages/login_screen.dart';
@@ -225,6 +226,13 @@ final goRouter = GoRouter(
return const DepositStepScreen();
},
),
GoRoute(
name: RouteName.depositCompleteScreen,
path: RouteName.depositCompleteScreen,
builder: (context, state) {
return const DepositeCompleteScreen();
},
),
GoRoute(
name: RouteName.depositPreview,
path: RouteName.depositPreview,

10
lib/core/styles/app_images.dart
View File

@@ -6,6 +6,8 @@ class AppImages {
"assets/images/welcome_screen/svg/Tanami_Capital_Splash_Logo.svg";
//Welcome
static const String welcomeLogo1 =
"assets/images/welcome_screen/Tanami_Capital_Logo.svg";
static const String welcomeLogo =
"assets/images/welcome_screen/svg/Tanami_Capital_Logo.svg";
static const String firstWelcome =
@@ -142,4 +144,12 @@ class AppImages {
static const String dStep1Icon = 'assets/images/wallet_screen/d_step_1.svg';
static const String dStep2Icon = 'assets/images/wallet_screen/d_step_2.svg';
static const String dStep3Icon = 'assets/images/wallet_screen/d_step_3.svg';
static const String dStepCount1Icon =
'assets/images/wallet_screen/deposit_step_complete_1.svg';
static const String dStep2CountIcon =
'assets/images/wallet_screen/deposit_step_complete_2.svg';
static const String dStep3CountIcon =
'assets/images/wallet_screen/deposit_step_complete_3.svg';
static const String depositCheckIcon =
'assets/images/wallet_screen/deposit_check.svg';
}

24
lib/core/styles/app_text.dart
View File

@@ -212,6 +212,30 @@ class AppText {
static const String byDate = "byDate";
static const String byAction = "byAction";
static const String byStatus = "byStatus";
static const String inOrderForYouToCompleteBankTransfers =
"inOrderForYouToCompleteBankTransfers";
static const String tanamiWillNotifyUponReceiptFunds =
"tanamiWillNotifyUponReceiptFunds";
static const String pleaseCompleteTheBelowSteps =
"pleaseCompleteTheBelowSteps";
static const String insertTheAmountYouWouldLikeToTransfer =
"insertTheAmountYouWouldLikeToTransfer";
static const String copyTheBankDetailsYourTanamiAccountShownNextPage =
"copyTheBankDetailsYourTanamiAccountShownNextPage";
static const String transferTheFundsDirectlyFromYourBankAccount =
"transferTheFundsDirectlyFromYourBankAccount";
static const String copyTheBankDetailsOfYourTanamiAccount =
"copyTheBankDetailsOfYourTanamiAccount";
static const String youAreAllSet = "youAreAllSet";
static const String depositNotificationCreated = "depositNotificationCreated";
static const String amountDeposited = "amountDeposited";
static const String pleaseEnsureTheFundsAreTransferredFromBank =
"pleaseEnsureTheFundsAreTransferredFromBank";
static const String manageDepositNotifications = "manageDepositNotifications";
static const String accountNo = "accountNo";
static const String swiftCode = "swiftCode";
static const String bankAddress = "bankAddress";
static const String clientId = "clientId";
//Settings
static const String settingsText = "settingsText";

2
lib/features/MainScreens/Academy/presentation/pages/academy_layout.dart
View File

@@ -13,7 +13,7 @@ class AcademyLayout extends StatelessWidget {
body: ListView.builder(
itemCount: data.length,
itemBuilder: (context, index) {
return academyCard(data[index]);
return academyCard(data[index], context);
},
),
);

8
lib/features/MainScreens/Academy/presentation/widgets/academy_card.dart
View File

@@ -3,12 +3,16 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:gap/gap.dart';
import 'package:tanami_app/core/styles/app_color.dart';
import 'package:tanami_app/core/styles/app_images.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import 'package:tanami_app/shared/components/text_widget.dart';
import '../../../../../core/routes/route_name.dart';
import '../../../../../core/routes/routes.dart';
import '../../../../../core/utils/language/localizations_delegate.dart';
Widget academyCard(dynamic data, BuildContext context) {
var localizations = AppLocalizations.of(context);
Widget academyCard(dynamic data) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
child: GestureDetector(
@@ -79,7 +83,7 @@ Widget academyCard(dynamic data) {
5.w,
),
TextWidget().text12W700(
'${data['videos']} videos',
'${data['videos']} ${localizations.translate(AppText.videosTitle)}',
clr: AppColor.academyCardTextColor,
),
],

5
lib/features/MainScreens/Settings/presentation/widgets/general_settings_section.dart
View File

@@ -65,7 +65,10 @@ class GeneralSettingsSection extends StatelessWidget {
},
icon: AppImages.languageIcon,
title: localizations.translate(AppText.languageText),
trailing: localizations.translate(AppText.englishText),
trailing: "English",
// Globalconst.languageSelected == "en"
// ? "English"
// : "اللغة العربية",
),
const Gap(10),
const Divider(

199
lib/features/MainScreens/Wallet/presentation/pages/deposit/deposit_completed_screen.dart Normal file
View File

@@ -0,0 +1,199 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/core/routes/routes.dart';
import 'package:tanami_app/core/styles/app_images.dart';
import 'package:tanami_app/shared/components/text_widget.dart';
import '../../../../../../core/styles/app_color.dart';
import '../../../../../../core/styles/app_text.dart';
import '../../../../../../core/utils/language/localizations_delegate.dart';
import '../../../../../../shared/components/button_widget.dart';
class DepositeCompleteScreen extends StatelessWidget {
const DepositeCompleteScreen({super.key});
@override
Widget build(BuildContext context) {
var localizations = AppLocalizations.of(context);
return Scaffold(
backgroundColor: Colors.white,
bottomNavigationBar: Column(
mainAxisSize: MainAxisSize.min,
children: [
Container(
margin: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 16,
),
width: 1.sw,
height: 56.h,
child: ButtonWidget().elevatedBtn(
txtClr: AppColor.plainWhite,
function: () {
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
},
text: localizations.translate(AppText.closeText),
clr: AppColor.primaryColor2,
),
),
InkWell(
onTap: () {
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
},
child: Container(
width: 1.sw,
height: 56.h,
margin: const EdgeInsets.only(
bottom: 16,
left: 16,
right: 16,
),
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 16),
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const BorderSide(width: 1, color: Color(0xFFE3E3E3)),
borderRadius: BorderRadius.circular(30),
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
TextWidget().text14W700(
localizations
.translate(AppText.manageDepositNotifications),
clr: AppColor.textLabelColor,
textDecoration: TextDecoration.underline),
],
),
),
)
],
),
appBar: AppBar(
backgroundColor: Colors.white,
elevation: 0,
scrolledUnderElevation: 0.0,
centerTitle: true,
title: Text(
localizations.translate(AppText.deposit),
style: GoogleFonts.dmSans(
color: const Color(0xFF272727),
fontSize: 20.sp,
fontWeight: FontWeight.w700,
),
),
),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Center(child: SvgPicture.asset(AppImages.dStep3CountIcon)),
const Gap(15),
Center(
child: TextWidget().text14W400(
localizations.translate(AppText.youAreAllSet),
clr: AppColor.textLabelColor,
txtAlign: TextAlign.center),
),
const Gap(50),
Stack(
alignment: Alignment.topCenter,
children: [
Padding(
padding: const EdgeInsets.only(top: 45),
child: Container(
width: 1.sw,
clipBehavior: Clip.antiAlias,
decoration: ShapeDecoration(
color: AppColor.plainWhite,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(22),
),
shadows: const [
BoxShadow(
color: Color(0x14000000),
blurRadius: 8,
offset: Offset(-2, -2),
spreadRadius: 0.50,
),
BoxShadow(
color: Color(0x3391978E),
blurRadius: 8,
offset: Offset(2, 2),
spreadRadius: 4,
)
],
),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Align(
alignment: Alignment.topRight,
child: TextWidget().text12W400('17th of June, 2024',
clr: const Color(0xFF787878)),
),
const Gap(25),
TextWidget().text20W700(
localizations.translate(
AppText.depositNotificationCreated),
clr: AppColor.plainBlack),
const Gap(18),
TextWidget().text12W400(
localizations.translate(AppText.amountDeposited),
clr: AppColor.plainBlack),
const Gap(8),
Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
margin: const EdgeInsets.only(top: 2),
child: TextWidget().text15W400("SAR",
clr: AppColor.investTextColor),
),
const Gap(5),
TextWidget().text32W700("1000",
clr: AppColor.investTextColor),
],
),
const Gap(40),
],
),
),
),
),
Positioned(
child: SvgPicture.asset(AppImages.depositCheckIcon),
),
],
),
const Gap(50),
TextWidget().text14W400(
localizations.translate(
AppText.pleaseEnsureTheFundsAreTransferredFromBank),
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
],
),
),
);
}
}

74
lib/features/MainScreens/Wallet/presentation/pages/deposit/deposit_layout.dart
View File

@@ -147,45 +147,25 @@ class DepositLayout extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(12.0),
child: selectedIndex == 1
? Row(children: [
SvgPicture.asset(AppImages.applePayIcon),
const Gap(5),
TextWidget().text14W700(
localizations
.translate(AppText.applePayText),
clr: AppColor.textLabelColor),
])
: Row(
children: [
SvgPicture.asset(AppImages.walletIcon),
const Gap(5),
TextWidget().text14W700(
localizations
.translate(AppText.bankTransfer),
clr: AppColor.textLabelColor),
],
),
Center(
child: SvgPicture.asset(AppImages.dStepCount1Icon)),
const Gap(30),
Center(
child: TextWidget().text14W500(
localizations.translate(
AppText.insertTheAmountYouWouldLikeToTransfer),
clr: AppColor.textLabelColor),
),
const Gap(30),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 16.0, horizontal: 12.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
'SAR',
style: GoogleFonts.dmSans(
color: const Color(0xFF363636),
fontSize: 15.sp,
fontWeight: FontWeight.w400,
),
),
SizedBox(
width: 12.w,
),
TextWidget().text15W400("SAR",
clr: AppColor.textLabelColor),
Gap(12.w),
SizedBox(
width: 280.w,
child: TextFormField(
@@ -310,21 +290,21 @@ class DepositLayout extends StatelessWidget {
// ),
// ),
const Gap(15),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
localizations
.translate("Total : SAR ${state.amount}"),
style: GoogleFonts.dmSans(
color: const Color(0xFF066123),
fontSize: 16.sp,
fontWeight: FontWeight.w700,
),
),
],
),
// const Gap(15),
// Row(
// mainAxisAlignment: MainAxisAlignment.center,
// children: [
// Text(
// localizations
// .translate("Total : SAR ${state.amount}"),
// style: GoogleFonts.dmSans(
// color: const Color(0xFF066123),
// fontSize: 16.sp,
// fontWeight: FontWeight.w700,
// ),
// ),
// ],
// ),
],
);
},

168
lib/features/MainScreens/Wallet/presentation/pages/deposit/deposit_step_screen.dart
View File

@@ -1,8 +1,10 @@
import 'package:dotted_line/dotted_line.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/Globalconst.dart';
import 'package:tanami_app/core/routes/route_name.dart';
import 'package:tanami_app/core/routes/routes.dart';
import 'package:tanami_app/core/styles/app_images.dart';
@@ -51,107 +53,99 @@ class DepositStepScreen extends StatelessWidget {
fontWeight: FontWeight.w700,
),
),
actions: const [
Icon(
Icons.info,
color: Color(0xFF363636),
),
Gap(10)
],
),
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 20),
decoration: ShapeDecoration(
color: const Color(0xFFF6F6F6),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(22),
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 0.8.sw,
child: Text(
'In order for you to complete a bank transfer, you need will need to create a deposit notification and transfer funds from your wallet, directly into your bank account.',
style: GoogleFonts.dmSans(
color: const Color(0xFF363636),
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
),
const Spacer(),
const Icon(
Icons.close,
color: Color(0xFF363636),
)
],
),
),
TextWidget().text14W500(
localizations
.translate(AppText.inOrderForYouToCompleteBankTransfers),
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start),
const Gap(16),
TextWidget().text15W700("Please complete the below steps",
TextWidget().text15W700(
localizations.translate(AppText.pleaseCompleteTheBelowSteps),
clr: AppColor.plainBlack),
const Gap(16),
Padding(
padding: const EdgeInsets.all(16.0),
child: ListView(
shrinkWrap: true,
children: [
Row(
Stack(
children: [
Positioned(
left: Globalconst.languageSelected == "en" ? 35.w : 0.w,
right: Globalconst.languageSelected == "en" ? 0.w : 35.w,
top: 40.h,
child: DottedLine(
direction: Axis.vertical,
alignment: WrapAlignment.center,
lineLength: 150,
lineThickness: 1.0,
dashLength: 4.0,
dashColor: const Color(0xFF066123).withOpacity(0.46),
dashRadius: 0.0,
dashGapLength: 4.0,
dashGapRadius: 0.0,
),
),
Padding(
padding: const EdgeInsets.all(16.0),
child: ListView(
shrinkWrap: true,
children: [
SvgPicture.asset(AppImages.dStep1Icon),
const Gap(16),
Expanded(
child: TextWidget().text14W400(
"Insert the amount you would like to transfer.",
clr: const Color(0xFF363636),
txtAlign: TextAlign.start,
),
)
Row(
children: [
SvgPicture.asset(AppImages.dStep1Icon),
const Gap(16),
Expanded(
child: TextWidget().text14W400(
localizations.translate(AppText
.insertTheAmountYouWouldLikeToTransfer),
clr: const Color(0xFF363636),
txtAlign: TextAlign.start,
),
)
],
),
const Gap(24),
Row(
children: [
SvgPicture.asset(AppImages.dStep2Icon),
const Gap(16),
Expanded(
child: TextWidget().text14W400(
localizations.translate(AppText
.copyTheBankDetailsYourTanamiAccountShownNextPage),
clr: const Color(0xFF363636),
txtAlign: TextAlign.start,
),
)
],
),
const Gap(24),
Row(
children: [
SvgPicture.asset(AppImages.dStep3Icon),
const Gap(16),
Expanded(
child: TextWidget().text14W400(
localizations.translate(AppText
.insertTheAmountYouWouldLikeToTransfer),
clr: const Color(0xFF363636),
txtAlign: TextAlign.start,
),
)
],
),
],
),
const Gap(24),
Row(
children: [
SvgPicture.asset(AppImages.dStep2Icon),
const Gap(16),
Expanded(
child: TextWidget().text14W400(
"Copy the bank details of your Tanami account shown on the next page. Make sure to keep note of the reference ID.",
clr: const Color(0xFF363636),
txtAlign: TextAlign.start,
),
)
],
),
const Gap(24),
Row(
children: [
SvgPicture.asset(AppImages.dStep3Icon),
const Gap(16),
Expanded(
child: TextWidget().text14W400(
"Insert the amount you would like to transfer.",
clr: const Color(0xFF363636),
txtAlign: TextAlign.start,
),
)
],
),
],
),
),
],
),
const Spacer(),
const Gap(36),
TextWidget().text13W500(
"Tanami will notify you upon receipt of your funds and it will appear in your wallet balance 3-4 business days after initiating the transfer.",
clr: const Color(0xFF888888),
localizations
.translate(AppText.tanamiWillNotifyUponReceiptFunds),
clr: AppColor.plainBlack,
fontStyle: FontStyle.italic),
],
),

243
lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart
View File

@@ -1,11 +1,15 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/core/routes/route_name.dart';
import 'package:tanami_app/core/routes/routes.dart';
import 'package:tanami_app/core/styles/app_color.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import 'package:tanami_app/shared/components/text_widget.dart';
import '../../../../../../core/styles/app_images.dart';
import '../../../../../../core/utils/language/localizations_delegate.dart';
class DepositPreview extends StatefulWidget {
@@ -42,13 +46,13 @@ class _DepositPreviewState extends State<DepositPreview> {
Widget build(BuildContext context) {
var localizations = AppLocalizations.of(context);
List titles = [
localizations.translate("Account Name"),
localizations.translate("Account No."),
localizations.translate("IBAN"),
localizations.translate("SWIFT Code"),
localizations.translate("Bank Name"),
localizations.translate("Bank Address"),
localizations.translate("Client ID"),
localizations.translate(AppText.accountName),
localizations.translate(AppText.accountNo),
localizations.translate(AppText.iban),
localizations.translate(AppText.swiftCode),
localizations.translate(AppText.bankName),
localizations.translate(AppText.bankAddress),
localizations.translate(AppText.clientId),
];
return Scaffold(
backgroundColor: Colors.white,
@@ -58,7 +62,7 @@ class _DepositPreviewState extends State<DepositPreview> {
scrolledUnderElevation: 0.0,
centerTitle: true,
title: Text(
localizations.translate("Deposit confirmation"),
localizations.translate(AppText.deposit),
style: GoogleFonts.dmSans(
color: const Color(0xFF272727),
fontSize: 20.sp,
@@ -72,215 +76,15 @@ class _DepositPreviewState extends State<DepositPreview> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// RichText(
// text: TextSpan(
// children: [
// TextSpan(
// text: '${localizations.translate(AppText.balance)}: ',
// style: GoogleFonts.dmSans(
// color: Colors.grey,
// fontSize: 12.sp,
// fontWeight: FontWeight.bold,
// ),
// ),
// TextSpan(
// text: 'SAR 178,000 ',
// style: GoogleFonts.dmSans(
// color: Colors.black,
// fontSize: 14.sp,
// fontWeight: FontWeight.bold,
// ),
// ),
// ],
// ),
// ),
// SizedBox(
// height: 20.h,
// ),
// Container(
// width: double.infinity,
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(22.r),
// color: Colors.white,
// boxShadow: [
// BoxShadow(
// color: Colors.black.withOpacity(0.15),
// spreadRadius: 2,
// blurRadius: 10,
// offset: const Offset(0, 5),
// ),
// ],
// ),
// child: Column(
// children: [
// Padding(
// padding: const EdgeInsets.all(12.0),
// child: Row(
// children: [
// Container(
// decoration: const BoxDecoration(
// shape: BoxShape.circle,
// color: Color(0xFF0FA4A4)),
// child: Padding(
// padding: const EdgeInsets.all(12.0),
// child: Image.asset(
// 'assets/images/wallet_screen/deposit_list.png',
// height: 36.h,
// ),
// ),
// ),
// SizedBox(
// width: 12.w,
// ),
// Text(
// localizations.translate (AppText.depositTitle),
// style: GoogleFonts.dmSans(
// color: Colors.black,
// fontSize: 17.sp,
// fontWeight: FontWeight.w700,
// ),
// ),
// ],
// ),
// ),
// Container(
// decoration: BoxDecoration(
// borderRadius: BorderRadius.only(
// bottomLeft: Radius.circular(22.r),
// bottomRight: Radius.circular(22.r),
// ),
// color: const Color(0xFFD8D8D8).withOpacity(0.4),
// ),
// child: Padding(
// padding: const EdgeInsets.symmetric(
// vertical: 16.0, horizontal: 12.0),
// child: ListView.builder(
// physics: const NeverScrollableScrollPhysics(),
// shrinkWrap: true,
// itemCount: titles2.length,
// itemBuilder: (context, index) {
// return Padding(
// padding:
// const EdgeInsets.symmetric(vertical: 5.0),
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// mainAxisAlignment:
// MainAxisAlignment.spaceBetween,
// children: [
// Text(
// titles2[index],
// style: GoogleFonts.dmSans(
// color: const Color(0xFF535353),
// fontSize: 14.sp,
// fontWeight: FontWeight.w500,
// ),
// ),
// (index == 0)
// ? Column(
// crossAxisAlignment:
// CrossAxisAlignment.end,
// children: [
// Text(
// 'SAR 55,000',
// style: GoogleFonts.dmSans(
// color: Colors.black,
// fontSize: 14.sp,
// fontWeight: FontWeight.w700,
// ),
// ),
// Text(
// '\$ 14,685',
// style: GoogleFonts.dmSans(
// color: Colors.black,
// fontSize: 11.sp,
// fontWeight: FontWeight.w400,
// ),
// ),
// ],
// )
// : Text(
// values2[index],
// style: GoogleFonts.dmSans(
// color: Colors.black,
// fontSize: 14.sp,
// fontWeight: FontWeight.w700,
// ),
// ),
// ],
// ),
// );
// },
// ),
// ),
// ),
// ],
// ),
// ),
// SizedBox(
// height: 20.h,
// ),
// Container(
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(22.r),
// color: const Color(0xFFEEF6FB),
// border: Border.all(color: const Color(0xFF90D4FF)),
// boxShadow: const [
// BoxShadow(
// color: Color(0xFFB0D3EF),
// spreadRadius: 1,
// blurRadius: 10,
// offset: Offset(0, 3),
// ),
// ],
// ),
// child: Padding(
// padding: const EdgeInsets.symmetric(
// vertical: 12.0, horizontal: 16.0),
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Image.asset(
// 'assets/images/wallet_screen/info.png',
// height: 25.h,
// ),
// SizedBox(
// width: 10.w,
// ),
// Expanded(
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Text(
// AppText.depositScreenTitle,
// style: GoogleFonts.dmSans(
// color: const Color(0xFF015698),
// fontSize: 14.sp,
// fontWeight: FontWeight.w700,
// ),
// ),
// const Gap(4),
// SizedBox(
// width: 280.w,
// child: Text(
// AppText.info3,
// style: GoogleFonts.dmSans(
// color: const Color(0xFF015698),
// fontSize: 12.sp,
// fontWeight: FontWeight.w500,
// ),
// ),
// ),
// ],
// ),
// ),
// ],
// ),
// ),
// ),
// SizedBox(
// height: 20.h,
// ),
Center(child: SvgPicture.asset(AppImages.dStep2CountIcon)),
const Gap(30),
TextWidget().text14W400(
localizations
.translate(AppText.copyTheBankDetailsOfYourTanamiAccount),
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
const Gap(10),
Card(
color: AppColor.plainWhite,
elevation: 5,
@@ -388,10 +192,7 @@ class _DepositPreviewState extends State<DepositPreview> {
children: [
GestureDetector(
onTap: () {
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pushNamed(RouteName.depositCompleteScreen);
},
child: Container(
margin: const EdgeInsets.all(10.0),

7
lib/features/contactAdmin/presentation/pages/contact_admin_screen.dart
View File

@@ -3,6 +3,7 @@ import 'package:tanami_app/features/contactAdmin/presentation/widgets/bottom_sec
import '../../../../core/styles/app_color.dart';
import '../../../../core/styles/app_text.dart';
import '../../../../core/utils/language/localizations_delegate.dart';
import '../../../../shared/components/appbar_widget.dart';
import '../widgets/top_section.dart';
@@ -11,11 +12,13 @@ class ContactAdminScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
var localizations = AppLocalizations.of(context);
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: const AppBarWidget(
appBar: AppBarWidget(
height: 75,
titleTxt: AppText.contactAdminText,
titleTxt: localizations.translate(AppText.contactAdminText),
),
body: ListView(
children: [

4
lib/features/faq/presentation/pages/faq_screen.dart
View File

@@ -24,9 +24,9 @@ class _AccountappState extends State<FAQScreen> {
var localizations = AppLocalizations.of(context);
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: const AppBarWidget(
appBar: AppBarWidget(
height: 75,
titleTxt: AppText.faqText,
titleTxt: localizations.translate(AppText.faqText),
),
body: SafeArea(
child: SingleChildScrollView(

4
lib/features/forgotPassword/bloc/restore_password_bloc.dart → lib/features/forgotPassword/presentation/bloc/restore_password_bloc.dart
View File

@@ -4,8 +4,8 @@ import 'package:bloc/bloc.dart';
import 'package:flutter/material.dart';
import 'package:tanami_app/Globalconst.dart';
import '../../../Api_Helper/base_manager.dart';
import '../domain/repository/forgot_password_api.dart';
import '../../../../Api_Helper/base_manager.dart';
import '../../domain/repository/forgot_password_api.dart';
import 'restore_password_event.dart';
import 'restore_password_state.dart';

0
lib/features/forgotPassword/bloc/restore_password_event.dart → lib/features/forgotPassword/presentation/bloc/restore_password_event.dart
View File

6
lib/features/forgotPassword/bloc/restore_password_phone_verification_bloc.dart → lib/features/forgotPassword/presentation/bloc/restore_password_phone_verification_bloc.dart
View File

@@ -2,9 +2,9 @@ import 'package:bloc/bloc.dart';
import 'package:flutter/material.dart';
import 'package:tanami_app/Globalconst.dart';
import '../../../Api_Helper/base_manager.dart';
import '../../../core/utils/secure/secure_storage_service.dart';
import '../domain/repository/forgot_password_api.dart';
import '../../../../Api_Helper/base_manager.dart';
import '../../../../core/utils/secure/secure_storage_service.dart';
import '../../domain/repository/forgot_password_api.dart';
import 'restore_password_phone_verification_event.dart';
import 'restore_password_phone_verification_state.dart';

0
lib/features/forgotPassword/bloc/restore_password_phone_verification_event.dart → lib/features/forgotPassword/presentation/bloc/restore_password_phone_verification_event.dart
View File

0
lib/features/forgotPassword/bloc/restore_password_phone_verification_state.dart → lib/features/forgotPassword/presentation/bloc/restore_password_phone_verification_state.dart
View File

0
lib/features/forgotPassword/bloc/restore_password_state.dart → lib/features/forgotPassword/presentation/bloc/restore_password_state.dart
View File

2
lib/features/forgotPassword/presentation/pages/restore_password_phone_verification_screen.dart
View File

@@ -5,7 +5,7 @@ import 'package:tanami_app/features/forgotPassword/presentation/pages/restore_pa
import '../../../../core/styles/app_color.dart';
import '../../../countrySelection/bloc/choose_country_bloc.dart';
import '../../bloc/restore_password_phone_verification_bloc.dart';
import '../bloc/restore_password_phone_verification_bloc.dart';
class RestorePasswordPhoneVerificationScreen extends StatelessWidget {
const RestorePasswordPhoneVerificationScreen({super.key});

2
lib/features/forgotPassword/presentation/pages/restore_password_screen.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../core/styles/app_color.dart';
import '../../bloc/restore_password_bloc.dart';
import '../bloc/restore_password_bloc.dart';
import 'restore_password_layout.dart';
class RestorePasswordScreen extends StatelessWidget {

6
lib/features/forgotPassword/presentation/widgets/restore_password_bottom_section.dart
View File

@@ -13,9 +13,9 @@ import '../../../../core/utils/language/localizations_delegate.dart';
import '../../../../shared/components/button_widget.dart';
import '../../../../shared/components/text_widget.dart';
import '../../../countrySelection/bloc/choose_country_bloc.dart';
import '../../bloc/restore_password_bloc.dart';
import '../../bloc/restore_password_event.dart';
import '../../bloc/restore_password_state.dart';
import '../bloc/restore_password_bloc.dart';
import '../bloc/restore_password_event.dart';
import '../bloc/restore_password_state.dart';
class RestorePasswordBottomSection extends StatelessWidget {
const RestorePasswordBottomSection({

2
lib/features/forgotPassword/presentation/widgets/restore_password_form.dart
View File

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:gap/gap.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import 'package:tanami_app/features/forgotPassword/bloc/restore_password_bloc.dart';
import '../../../../core/utils/language/localizations_delegate.dart';
import '../../../../shared/components/bloc/password_field/password_visibility_bloc.dart';
import '../../../../shared/components/form_label_textfield.dart';
import '../bloc/restore_password_bloc.dart';
class RestorePasswordForm extends StatelessWidget {
const RestorePasswordForm({super.key});

6
lib/features/forgotPassword/presentation/widgets/restore_password_phone_verification_bottom_section.dart
View File

@@ -13,9 +13,9 @@ import '../../../../core/utils/language/localizations_delegate.dart';
import '../../../../shared/components/button_widget.dart';
import '../../../../shared/components/text_widget.dart';
import '../../../countrySelection/bloc/choose_country_bloc.dart';
import '../../bloc/restore_password_phone_verification_bloc.dart';
import '../../bloc/restore_password_phone_verification_event.dart';
import '../../bloc/restore_password_phone_verification_state.dart';
import '../bloc/restore_password_phone_verification_bloc.dart';
import '../bloc/restore_password_phone_verification_event.dart';
import '../bloc/restore_password_phone_verification_state.dart';
class RestorePasswordPhoneVerificationBottomSection extends StatelessWidget {
const RestorePasswordPhoneVerificationBottomSection({

2
lib/features/forgotPassword/presentation/widgets/restore_password_phone_verification_form.dart
View File

@@ -15,7 +15,7 @@ import '../../../countrySelection/bloc/GetCountry/get_country_bloc.dart';
import '../../../countrySelection/bloc/GetCountry/get_country_state.dart';
import '../../../countrySelection/bloc/choose_country_bloc.dart';
import '../../../countrySelection/bloc/choose_country_state.dart';
import '../../bloc/restore_password_phone_verification_bloc.dart';
import '../bloc/restore_password_phone_verification_bloc.dart';
class RestorePasswordPhoneVerificationForm extends StatelessWidget {
const RestorePasswordPhoneVerificationForm({super.key});

5
lib/features/securePin/presentation/bloc/pin_bloc.dart
View File

@@ -1,7 +1,6 @@
import 'package:bloc/bloc.dart';
import 'package:equatable/equatable.dart';
import 'package:tanami_app/Api_Helper/base_manager.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import '../../../../Globalconst.dart';
import '../../../../core/routes/routes.dart';
@@ -94,7 +93,9 @@ class PinBloc extends Bloc<PinEvent, PinState> {
goRouter.pop();
emit(state.copyWith(
isVerified: false,
error: AppText.incorrectPinCode,
error: Globalconst.languageSelected == "en"
? "Incorrect PIN. Please try again."
: "رمز التعريف الشخصي غير صحيح",
verifiedOnce: true,
));
}

1
lib/features/welcome/presentation/bloc/onboarding_bloc.dart
View File

@@ -1,4 +1,5 @@
import 'package:bloc/bloc.dart';
import 'onboarding_event.dart';
import 'onboarding_state.dart';

23
lib/features/welcome/presentation/widgets/build_onboarding_page_widget.dart
View File

@@ -36,31 +36,32 @@ Widget buildOnboardingPage(
)),
)
: const SizedBox(),
index == 0 ? const Gap(20) : const Gap(80),
SvgPicture.asset(AppImages.welcomeLogo),
index == 0 ? const Gap(0) : const Gap(85),
SvgPicture.asset(AppImages.welcomeLogo1),
const Gap(50),
Image.asset(
imageAsset,
width: 1.sw,
height: index == 2 ? 380 : 450,
height: 370,
fit: BoxFit.cover,
),
const Gap(12),
TextWidget().text22W700(
welcomeIndicator(pageController),
const Gap(20),
TextWidget().text15W500(
title,
clr: AppColor.primaryColor,
clr: AppColor.darkGreyColor,
),
const Gap(12),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 50,
horizontal: 20,
),
child: TextWidget().text15W500(
child: TextWidget().text20W700(
description,
clr: AppColor.darkGreyColor,
clr: AppColor.primaryColor,
txtAlign: TextAlign.center,
),
),
const Gap(20),
welcomeIndicator(pageController),
if (isLastPage) const LoginSignUpButton(),
],
);

2
lib/main.dart
View File

@@ -15,7 +15,7 @@ import 'features/biometric/bloc/biometric_bloc.dart';
import 'features/biometric/bloc/biometric_event.dart';
import 'features/countrySelection/bloc/GetCountry/get_country_bloc.dart';
import 'features/countrySelection/bloc/choose_country_bloc.dart';
import 'features/forgotPassword/bloc/restore_password_phone_verification_bloc.dart';
import 'features/forgotPassword/presentation/bloc/restore_password_phone_verification_bloc.dart';
import 'features/otpVerification/bloc/otp_bloc.dart';
import 'features/register/presentation/bloc/register_bloc.dart';
import 'shared/components/bloc/bottom_nav_bar/bottom_navigation_bloc.dart';

2
lib/shared/components/form_label_textfield.dart
View File

@@ -11,7 +11,7 @@ import 'package:tanami_app/shared/components/text_widget.dart';
import '../../core/routes/route_name.dart';
import '../../core/routes/routes.dart';
import '../../core/utils/language/localizations_delegate.dart';
import '../../features/forgotPassword/bloc/restore_password_phone_verification_bloc.dart';
import '../../features/forgotPassword/presentation/bloc/restore_password_phone_verification_bloc.dart';
import '../../features/register/presentation/bloc/register_bloc.dart';
import 'text_from_field_widget.dart';

18
lib/shared/components/text_widget.dart
View File

@@ -216,10 +216,11 @@ class TextWidget {
String text, {
Color? clr,
TextDecoration? textDecoration,
TextAlign? textAlign,
}) {
return Text(
text,
textAlign: TextAlign.center,
textAlign: textAlign ?? TextAlign.center,
style: GoogleFonts.dmSans(
fontSize: 15.sp,
decorationColor: AppColor.hintTextColor,
@@ -323,9 +324,10 @@ class TextWidget {
}
//Text Size 20
Widget text20W700(String text, {Color? clr}) {
Widget text20W700(String text, {Color? clr, TextAlign? txtAlign}) {
return Text(
text,
textAlign: txtAlign ?? TextAlign.start,
style: GoogleFonts.dmSans(
fontSize: 20.sp,
fontWeight: FontWeight.w700,
@@ -356,4 +358,16 @@ class TextWidget {
),
);
}
//Text Size 32
Widget text32W700(String text, {Color? clr}) {
return Text(
text,
style: GoogleFonts.dmSans(
fontSize: 32.sp,
fontWeight: FontWeight.w700,
color: clr ?? AppColor.plainWhite,
),
);
}
}

8
pubspec.lock
View File

@@ -297,6 +297,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.4.3+1"
dotted_line:
dependency: "direct main"
description:
name: dotted_line
sha256: c931ba331656154711d9420f369f80cf9e8869ca9933ae5fb35b7669bcbe7d2e
url: "https://pub.dev"
source: hosted
version: "3.2.2"
equatable:
dependency: "direct main"
description:

1
pubspec.yaml
View File

@@ -73,6 +73,7 @@ dependencies:
#Style
control_style: ^0.1.0
dotted_line: ^3.2.2
#OTP Autofill
sms_autofill: ^2.3.1