* Fix brush color/size not remembered bug

* Update build artifacts naming scheme * Minor UI bug fixes
ARK-Builders · Jun 27, 2024 · fdc3dc4 · fdc3dc4
1 parent 7f440e6
commit fdc3dc4
Show file tree

Hide file tree

Showing 5 changed files with 311 additions and 284 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,20 +59,20 @@ jobs:
     - name: Build release APK
       run: ./gradlew assembleRelease
 
-    - name: Upload release arm64-v8a APK
+    - name: Upload Memo release arm64-v8a APK
       uses: actions/upload-artifact@v3
       with:
-        name: release-arm64-v8a-apk
-        path: ./app/build/outputs/apk/release/app-arm64-v8a-release.apk
+        name: ark-memo-release-arm64-v8a-apk
+        path: ./app/build/outputs/apk/release/ark-memo-arm64-v8a-release.apk
 
-    - name: Upload release armeabi-v7a APK
+    - name: Upload Memo release armeabi-v7a APK
       uses: actions/upload-artifact@v3
       with:
-        name: release-armeabi-v7a-apk
-        path: ./app/build/outputs/apk/release/app-armeabi-v7a-release.apk
+        name: ark-memo-release-armeabi-v7a-apk
+        path: ./app/build/outputs/apk/release/ark-memo-armeabi-v7a-release.apk
 
-    - name: Upload release universal APK
+    - name: Upload Memo release universal APK
       uses: actions/upload-artifact@v3
       with:
-        name: release-universal-apk
-        path: ./app/build/outputs/apk/release/app-universal-release.apk
+        name: ark-memo-release-universal-apk
+        path: ./app/build/outputs/apk/release/ark-memo-universal-release.apk
diff --git a/app/src/main/java/dev/arkbuilders/arkmemo/ui/dialogs/DonateDialog.kt b/app/src/main/java/dev/arkbuilders/arkmemo/ui/dialogs/DonateDialog.kt
@@ -15,6 +15,7 @@ import dev.arkbuilders.arkmemo.utils.copyToClipboard
 
 
 class DonateDialog(private val walletAddress: String,
+                   private val title: String,
                    private val onPositiveClick: (() -> Unit)? = null,
                    private val onCloseClicked: (() -> Unit)? = null,
 ): DialogFragment() {
@@ -44,6 +45,8 @@ class DonateDialog(private val walletAddress: String,
             dismiss()
         }
 
+        binding.tvTitle.text = title
+
         binding.layoutDownloadQr.setOnClickListener {
             onPositiveClick?.invoke()
             dismiss()

diff --git a/app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/EditGraphicNotesFragment.kt b/app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/EditGraphicNotesFragment.kt
@@ -99,7 +99,15 @@ class EditGraphicNotesFragment: BaseEditNoteFragment() {
         noteTitle.setText(title)
         noteTitle.addTextChangedListener(noteTitleChangeListener)
         notesCanvas.isVisible = true
-        notesCanvas.setViewModel(graphicNotesViewModel)
+        notesCanvas.setViewModel(graphicNotesViewModel.apply {
+            colorBrushes.firstOrNull { it.isSelected }?.let {
+                setPaintColor(it)
+            }
+
+            sizeBrushes.firstOrNull { it.isSelected }?.let {
+                setBrushSize(it)
+            }
+        })
         btnSave.setOnClickListener {
             val note = createNewNote()
             notesViewModel.onSaveClick(note, parentNote = this.note) { show ->

diff --git a/app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/SettingsFragmentV2.kt b/app/src/main/java/dev/arkbuilders/arkmemo/ui/fragments/SettingsFragmentV2.kt
@@ -59,13 +59,15 @@ open class SettingsFragmentV2: Fragment(R.layout.fragment_settings) {
         binding.tvDonateBtc.setOnClickListener {
             DonateDialog(
                 walletAddress = "bc1qx8n9r4uwpgrhgnamt2uew53lmrxd8tuevp7lv5",
+                title = getString(R.string.setting_donate_btc),
                 onPositiveClick = {
                 }).show(childFragmentManager, CommonActionDialog.TAG)
         }
 
         binding.tvDonateEth.setOnClickListener {
             DonateDialog(
                 walletAddress = "0x9765C5aC38175BFbd2dC7a840b63e50762B80a1b",
+                title = getString(R.string.setting_donate_eth),
                 onPositiveClick = {
             }).show(childFragmentManager, CommonActionDialog.TAG)
         }