Merge branch 'main' into fix-scheduled-transfer-clipboard-text

Author: orhoj

CHANGELOG.md

@@ -11,6 +11,8 @@
 - Incorrect environment name in a private key export file for Mainnet
 - Improper handling of rejected identity verification when setting up a new wallet
 - Showing "Address copied" when copying a transaction hash to the clipboard in the scheduled transfer view
+- An issue where the identity name was off-center when the edit name icon was visible
+- An issue where exporting transaction logs for an account without any transactions would be stuck at 0%
 
 ### Changed
 - Suggest running a recovery when facing account or identity creation errors

app/src/main/java/com/concordium/wallet/ui/more/export/ExportTransactionLogActivity.kt

@@ -34,7 +34,6 @@ class ExportTransactionLogActivity : BaseActivity(
         viewModel.onIdleRequested()
 
         hideActionBarBack(isVisible = true) {
-            viewModel.onIdleRequested()
             finish()
         }
     }
@@ -86,6 +85,7 @@ class ExportTransactionLogActivity : BaseActivity(
 
             binding.successLayout.isVisible = downloadState is FileDownloadScreenState.Downloaded
             binding.failedLayout.isVisible = downloadState is FileDownloadScreenState.Failed
+            binding.noContentLayout.isVisible = downloadState is FileDownloadScreenState.NoContent
 
             binding.generate.isVisible = downloadState is FileDownloadScreenState.Idle
             binding.cancel.isVisible = downloadState is FileDownloadScreenState.Downloading

app/src/main/java/com/concordium/wallet/ui/more/export/ExportTransactionLogViewModel.kt

@@ -21,6 +21,7 @@ import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.http.GET
 import retrofit2.http.Streaming
@@ -31,20 +32,24 @@ import java.util.concurrent.TimeUnit
 interface FileDownloadApi {
     @Streaming
     @GET
-    suspend fun downloadFile(@Url url: String?): ResponseBody
+    suspend fun downloadFile(@Url url: String?): Response<ResponseBody>
 }
 
 sealed class FileDownloadScreenState {
     object Idle : FileDownloadScreenState()
     data class Downloading(val progress: Int) : FileDownloadScreenState()
     object Failed : FileDownloadScreenState()
     object Downloaded : FileDownloadScreenState()
+    object NoContent : FileDownloadScreenState()
 }
 
 class ExportTransactionLogViewModel(application: Application) : AndroidViewModel(application) {
     lateinit var account: Account
     private lateinit var api: FileDownloadApi
 
+    val HTTP_OK = 200
+    val HTTP_NO_CONTENT = 204
+
     val textResourceInt: MutableLiveData<Int> by lazy { MutableLiveData<Int>() }
 
     private sealed class DownloadState {
@@ -78,8 +83,17 @@ class ExportTransactionLogViewModel(application: Application) : AndroidViewModel
                     )
                 )
 
-                api.downloadFile(downloadFile)
-                    .saveFile(destinationFolder)
+                val response = api.downloadFile(downloadFile)
+                val statusCode = response.code()
+                if (statusCode == HTTP_NO_CONTENT) {
+                    this@ExportTransactionLogViewModel.downloadState.postValue(FileDownloadScreenState.NoContent)
+                    return@launch
+                } else if (statusCode != HTTP_OK || response.body() == null) {
+                    this@ExportTransactionLogViewModel.downloadState.postValue(FileDownloadScreenState.Failed)
+                    return@launch
+                }
+
+                response.body()!!.saveFile(destinationFolder)
                     .collect { downloadState ->
                         // Add visual delay and ensure the coroutine is active.
                         delay(300)

app/src/main/java/com/concordium/wallet/uicore/view/IdentityView.kt

@@ -46,15 +46,8 @@ constructor(
     private var onChangeNameClickListener: OnChangeNameClickListener? = null
 
     fun enableChangeNameOption(identity: Identity) {
-        binding.nameTextview.compoundDrawablePadding = 20
-        val drawable = AppCompatResources.getDrawable(context, R.drawable.cryptox_ico_edit)
-        binding.nameTextview.setCompoundDrawablesRelativeWithIntrinsicBounds(
-            null,
-            null,
-            drawable,
-            null
-        )
-        binding.nameTextview.setOnClickListener {
+        binding.nameIcon.isVisible = true
+        binding.nameTextAndIcon.setOnClickListener {
             onChangeNameClickListener?.onChangeNameClicked(identity)
         }
     }

app/src/main/res/layout/activity_export_transaction_log.xml

@@ -100,6 +100,11 @@
                 style="@style/CryptoX_Container_Error.TextView"
                 android:text="@string/export_transaction_log_failed" />
 
+            <TextView
+                android:id="@+id/no_content_layout"
+                style="@style/CryptoX_Container_Information.TextView"
+                android:text="@string/export_transaction_log_no_content" />
+
             <Space
                 android:layout_width="0dp"
                 android:layout_height="20dp" />

app/src/main/res/layout/view_identity.xml

@@ -31,18 +31,34 @@
         tools:text="@string/view_identity_status_done"
         tools:textColor="@color/ccx_status_success" />
 
-    <TextView
-        android:id="@+id/name_textview"
+    <RelativeLayout
+        android:id="@+id/name_text_and_icon"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="8dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:textAppearance="@style/CCX_Typography_H2"
-        android:textColor="@color/ccx_neutral_tint_1"
-        tools:drawableEndCompat="@drawable/cryptox_ico_edit"
-        tools:text="Identity 1" />
+        >
+
+        <TextView
+            android:id="@+id/name_textview"
+            android:layout_width="match_parent"
+            android:layout_marginHorizontal="25dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAppearance="@style/CCX_Typography_H2"
+            android:textColor="@color/ccx_neutral_tint_1"
+            tools:text="Identity 1" />
+
+        <ImageView
+            android:id="@+id/name_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:visibility="invisible"
+            android:src="@drawable/cryptox_ico_edit"/>
+    </RelativeLayout>
 
     <TextView
         android:id="@+id/expires_textview"

app/src/main/res/values/strings.xml

@@ -1022,6 +1022,7 @@
     <string name="export_transaction_log_cancel">Cancel</string>
     <string name="export_transaction_log_saved">The transaction logs have been saved</string>
     <string name="export_transaction_log_failed">Failed to download transaction logs</string>
+    <string name="export_transaction_log_no_content">There are no transaction logs available for this account</string>
     <string name="export_transaction_log_progress">%1$d%%</string> <!-- 45% -->
     <string name="export_transaction_log_downloading">Downloading transaction logs…</string>