Skip to content
New issue

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

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

Already on GitHub? # to your account

Feat/update create invite #1343

Merged
merged 48 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d8fccf2
chore: update checkpoints
HashEngineering Jan 22, 2025
80b9106
fix: activate invite features on testnet
HashEngineering Jan 23, 2025
d97d770
fix: handle mix dash dialog result
HashEngineering Jan 23, 2025
661ccbd
fix: SendInviteWorker should take value parameter
HashEngineering Jan 23, 2025
d1a2d7f
fix: add fee and confirm dialog and result fragment
HashEngineering Jan 23, 2025
a77da59
fix: add fee and confirm dialog and result fragment
HashEngineering Jan 23, 2025
6cacd8a
feat: add nav invite history nav graph
HashEngineering Jan 23, 2025
8411c29
feat: add search user fragment to nav graph
HashEngineering Jan 23, 2025
4a25a00
fix: pass caller to Invite History
HashEngineering Jan 23, 2025
302b342
chore: cleanup
HashEngineering Jan 23, 2025
785faab
fix: simplify function to get number of invites
HashEngineering Jan 23, 2025
c7b81d7
fix: other fixes
HashEngineering Jan 23, 2025
b29f32a
fix: add balance check and check pin dialog
HashEngineering Jan 23, 2025
e9db64e
fix: move register/unregister to main thread
HashEngineering Jan 23, 2025
1f1e6c6
fix: don't publish tx metadata if there is no identity
HashEngineering Jan 23, 2025
650d270
feat: update translations
HashEngineering Jan 23, 2025
9f11a5b
refactor: LiveData to StateFlow
HashEngineering Jan 25, 2025
704b3ee
feat: add retry/fix, change DB table
HashEngineering Jan 25, 2025
bca1e72
Merge branch 'prepare-release-11.1' of https://github.com/dashevo/das…
HashEngineering Jan 25, 2025
c63710f
refactor: rename inviteId to fundingAddress
HashEngineering Jan 25, 2025
d3a2d1c
refactor: simplify InvitationFragment
HashEngineering Jan 25, 2025
67aa4a6
feat: add progress circle for loading
HashEngineering Jan 25, 2025
007bfb8
fix: fix errors with creating invites
HashEngineering Jan 25, 2025
50ccce6
fix: problem with frame vs linear layout
HashEngineering Jan 25, 2025
f6c991f
fix: catch errors and handle retry for Restore Identity
HashEngineering Jan 27, 2025
7e3278a
fix: make sure identity is fully restored/created before observingCon…
HashEngineering Jan 27, 2025
42ac6ca
fix: prevent transaction observer from updating view if past lifecycle
HashEngineering Jan 27, 2025
1d04e03
fix: save restore state to blockchain identity data
HashEngineering Jan 27, 2025
9b9851b
refactor: rename createInviteFundingTransaction
HashEngineering Jan 27, 2025
80bb44c
fix: ensure that identity funding addresses are not reused
HashEngineering Jan 27, 2025
7a27093
refactor: update sendInviteLauncher
HashEngineering Jan 27, 2025
fb7eb5a
fix: allow invites without ISLocks
HashEngineering Jan 27, 2025
ef956c5
fix: start worker in coroutine
HashEngineering Jan 27, 2025
ba0f304
chore: update dashj and dpp
HashEngineering Jan 27, 2025
bbc5504
Merge branch 'prepare-release-11.1' of https://github.com/dashevo/das…
HashEngineering Jan 27, 2025
10c88ff
refactor: improvements
HashEngineering Jan 27, 2025
bbd9d48
fix: recover invite
HashEngineering Jan 27, 2025
a4d49f1
fix: titles of menus and screens
HashEngineering Jan 27, 2025
49ca4cd
Merge branch 'master' of https://github.com/dashevo/dash-wallet into …
HashEngineering Feb 3, 2025
9980964
Merge branch 'master' of https://github.com/dashevo/dash-wallet into …
HashEngineering Feb 6, 2025
5418bc3
fix: show Invitations menu item only if username creation is finished.
HashEngineering Feb 6, 2025
4568581
fix: refactor to avoid uninit blockchainIdentity in platform
HashEngineering Feb 11, 2025
bd16e0f
fix: refactor to avoid uninit blockchainIdentity in platform
HashEngineering Feb 11, 2025
b96205b
refactor: move validateIdentity to TopUpRepository
HashEngineering Feb 11, 2025
16b1d3d
refactor: orderBy for UsernameSearchResults
HashEngineering Feb 11, 2025
e9f3f6c
Merge branch 'master' of https://github.com/dashevo/dash-wallet into …
HashEngineering Feb 25, 2025
13a7227
fix: add error handling, logging and cleanup
HashEngineering Feb 26, 2025
527c7c9
chore: remove commented code
HashEngineering Feb 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions wallet/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -326,30 +326,12 @@
android:theme="@style/My.Theme.ChildActivity"
android:windowSoftInputMode="stateHidden|adjustResize" />

<activity
android:name="de.schildbach.wallet.ui.invite.InviteFriendActivity"
android:screenOrientation="portrait"
android:theme="@style/My.Theme.ChildActivity"
android:windowSoftInputMode="stateHidden|adjustResize" />

<activity
android:name="de.schildbach.wallet.ui.invite.InvitesHistoryActivity"
android:screenOrientation="portrait"
android:theme="@style/My.Theme.ChildActivity"
android:windowSoftInputMode="stateHidden|adjustResize" />

<activity
android:name="de.schildbach.wallet.ui.invite.AcceptInviteActivity"
android:screenOrientation="portrait"
android:theme="@style/My.Theme.ChildActivity"
android:windowSoftInputMode="stateHidden|adjustResize" />

<activity
android:name="de.schildbach.wallet.ui.SearchUserActivity"
android:screenOrientation="portrait"
android:theme="@style/My.Theme.ChildActivity"
android:windowSoftInputMode="stateHidden|adjustResize" />

<activity
android:name="de.schildbach.wallet.ui.DashPayUserActivity"
android:screenOrientation="portrait"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ open class DatabaseMigrationTest {
AppDatabaseMigrations.migration11To12,
AppDatabaseMigrations.migration12To13,
AppDatabaseMigrations.migration13to14,
AppDatabaseMigrations.migration14to15
AppDatabaseMigrations.migration14to15,
AppDatabaseMigrations.migration15to16
)

@Rule
Expand Down
17 changes: 0 additions & 17 deletions wallet/res/layout/activity_invite_friends.xml

This file was deleted.

154 changes: 154 additions & 0 deletions wallet/res/layout/dialog_invitation_fee.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2024 Dash Core Group
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">

<View
android:id="@+id/drag_indicator"
android:layout_width="40dp"
android:layout_height="4dp"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:background="@drawable/rounded_background"
android:theme="@style/DragIndicatorBackground"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:background="@color/light_gray" />

<ImageButton
android:id="@+id/collapse_button"
style="@style/DialogCloseButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />


<LinearLayout
android:id="@+id/text_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/collapse_button"
app:layout_constraintBottom_toTopOf="@+id/bottom_buttons"
>
<TextView
style="@style/Headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/invitation_fee_title"
/>
<TextView
style="@style/Body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/invitation_fee_message"
/>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/contested_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/headline_decs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/light_grey_border_item"
android:paddingHorizontal="20dp"
android:paddingVertical="12dp">

<TextView
android:id="@+id/contested_name_title"
style="@style/Subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/invitation_fee_contested"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/contested_name_description"
style="@style/Caption.Secondary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:text="@string/invitation_fee_contested_message"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contested_name_title" />

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/non_contested_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/intermediate_cl"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@drawable/light_grey_border_item"
android:paddingHorizontal="20dp"
android:paddingVertical="12dp">

<TextView
android:id="@+id/non_contested_name_title"
style="@style/Subtitle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/invitation_fee_noncontested"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/non_contested_name_description"
style="@style/Caption.Secondary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
android:text="@string/invitation_fee_noncontested_message"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/non_contested_name_title" />
</androidx.constraintlayout.widget.ConstraintLayout>


</LinearLayout>

<LinearLayout
android:id="@+id/bottom_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
android:orientation="horizontal"
>

<Button
android:id="@+id/mix_button"
android:layout_marginHorizontal="15dp"
android:layout_marginVertical="15dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
style="@style/Button.Primary.Blue"
android:text="@string/invitation_fee_confirm_and_pay_button"
/>
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
10 changes: 10 additions & 0 deletions wallet/res/layout/fragment_invite_created.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
android:layout_gravity="center_horizontal" />

<TextView
android:id="@+id/invite_creation_progress_title"
style="@style/Headline6.Secondary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -73,6 +74,15 @@
android:textAlignment="gravity"
android:text="@string/invitation_created_successfully" />

<ProgressBar
android:id="@+id/progress"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center"
android:visibility="gone"
tools:visibility="visible"
/>

<Button
android:id="@+id/preview_button"
style="@style/Button.Tertiary.Blue"
Expand Down
101 changes: 0 additions & 101 deletions wallet/res/layout/fragment_invite_friend.xml

This file was deleted.

39 changes: 21 additions & 18 deletions wallet/res/layout/invitation_preview_view.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<de.schildbach.wallet.ui.invite.InvitePreviewEnvelopeView
android:id="@+id/profile_picture_envelope"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_gravity="center_horizontal" />

<TextView
android:id="@+id/custom_title"
style="@style/Headline6.Blue"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:textAlignment="gravity"
android:text="@string/invitation_preview_title" />
android:orientation="vertical">

<de.schildbach.wallet.ui.invite.InvitePreviewEnvelopeView
android:id="@+id/profile_picture_envelope"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_gravity="center_horizontal" />

</LinearLayout>
<TextView
android:id="@+id/custom_title"
style="@style/Headline6.Blue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center_horizontal"
android:textAlignment="gravity"
android:text="@string/invitation_preview_title" />
</LinearLayout>
</FrameLayout>
Loading
Loading