Fix Accounts list UI

Concordium · Nov 11, 2024 · adbc458 · adbc458
1 parent 81ae603
commit adbc458
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/src/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountView.kt b/app/src/main/java/com/concordium/wallet/ui/account/accountsoverview/AccountView.kt
@@ -45,6 +45,8 @@ class AccountView(context: Context, attrs: AttributeSet?) : ConstraintLayout(con
             accountWithIdentity.account.transactionStatus == TransactionStatus.FINALIZED
         binding.sendFundsBtn.isEnabled = !accountWithIdentity.account.readOnly
                 && accountWithIdentity.account.transactionStatus == TransactionStatus.FINALIZED
+        binding.addressBtn.isEnabled =
+            accountWithIdentity.account.transactionStatus == TransactionStatus.FINALIZED
     }
 
     fun setOnItemClickListener(onItemClickListener: OnItemClickListener?) {

diff --git a/app/src/main/java/com/concordium/wallet/ui/more/import/ImportViewModel.kt b/app/src/main/java/com/concordium/wallet/ui/more/import/ImportViewModel.kt
@@ -375,7 +375,6 @@ class ImportViewModel(application: Application) :
             } // End of identity
             confirmImport()
             session.hasCompletedInitialSetup()
-            session.hasCompletedOnboarding()
             _waitingLiveData.postValue(false)
         }
     }

diff --git a/app/src/main/java/com/concordium/wallet/ui/seed/recover/SeedPhraseRecoverViewModel.kt b/app/src/main/java/com/concordium/wallet/ui/seed/recover/SeedPhraseRecoverViewModel.kt
@@ -103,7 +103,6 @@ class SeedPhraseRecoverViewModel(application: Application) : AndroidViewModel(ap
 
         if (isSavedSuccessfully) {
             session.hasCompletedInitialSetup()
-            session.hasCompletedOnboarding()
         }
 
         _saveSeedLiveData.value = isSavedSuccessfully

diff --git a/app/src/main/java/com/concordium/wallet/ui/seed/recover/seed/SeedRecoverViewModel.kt b/app/src/main/java/com/concordium/wallet/ui/seed/recover/seed/SeedRecoverViewModel.kt
@@ -58,7 +58,6 @@ class SeedRecoverViewModel(application: Application) : AndroidViewModel(applicat
         )
         if (success) {
             session.hasCompletedInitialSetup()
-            session.hasCompletedOnboarding()
         }
         _saveSeedSuccess.value = success
     }

diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
@@ -30,9 +30,10 @@
             android:id="@+id/onboarding_content_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="114dp"
             android:layout_marginHorizontal="16dp"
             android:layout_marginTop="18dp"
-            android:paddingBottom="8dp"
+            android:paddingBottom="9dp"
             app:layout_constraintBottom_toTopOf="@id/divider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -74,17 +75,17 @@
                 style="@style/CryptoX_Onboarding_Progress_Horizontal"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginBottom="14dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/title_layout"
+                app:layout_constraintBottom_toTopOf="@id/onboarding_status_description"
                 tools:progress="33" />
 
             <Button
                 android:id="@+id/onboarding_inner_action_button"
                 style="@style/CCX_Button_Primary.ArrowRight"
                 android:layout_width="match_parent"
-                android:layout_marginBottom="24dp"
+                android:layout_marginBottom="12dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/accounts_overview_create_identity"
                 android:visibility="gone"
@@ -98,14 +99,14 @@
                 style="@style/CCX_Typography_Item"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
                 android:gravity="start"
                 android:text="@string/onboarding_status_card_title"
                 android:textColor="@color/cryptox_grey_main"
+                android:lineHeight="20sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/onboarding_status_progress_bar" />
+                tools:targetApi="p" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>