corrected for static analysis, top app bar and inserting fragment int…

…o composable
openMF · Mar 17, 2024 · 5cc84f6 · 5cc84f6
1 parent ef21045
commit 5cc84f6
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 95 deletions.
diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/AddBeneficiaryActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/AddBeneficiaryActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityContainerBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.BeneficiaryAddOptionsFragment
+import org.mifos.mobile.ui.beneficiary.presentation.BeneficiaryAddOptionsFragment
 
 /**
  * @author Rajan Maurya

diff --git a/...ragments/BeneficiaryAddOptionsFragment.kt → ...entation/BeneficiaryAddOptionsFragment.kt b/...ragments/BeneficiaryAddOptionsFragment.kt → ...entation/BeneficiaryAddOptionsFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.fragments
+package org.mifos.mobile.ui.beneficiary.presentation
 
 import android.Manifest
 import android.content.Intent
@@ -8,12 +8,18 @@ import android.provider.MediaStore
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import dagger.hilt.android.AndroidEntryPoint
 import org.mifos.mobile.R
+import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 import org.mifos.mobile.databinding.FragmentBeneficiaryAddOptionsBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.enums.BeneficiaryState
 import org.mifos.mobile.ui.enums.RequestAccessType
+import org.mifos.mobile.ui.fragments.BeneficiaryApplicationFragment
+import org.mifos.mobile.ui.fragments.QrCodeImportFragment
+import org.mifos.mobile.ui.fragments.QrCodeReaderFragment
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.CheckSelfPermissionAndRequest
 import org.mifos.mobile.utils.CheckSelfPermissionAndRequest.checkSelfPermission
@@ -27,6 +33,8 @@ import org.mifos.mobile.utils.Toaster
 @AndroidEntryPoint
 class BeneficiaryAddOptionsFragment : BaseFragment() {
 
+    private lateinit var composeView: ComposeView
+
     private var _binding: FragmentBeneficiaryAddOptionsBinding? = null
     private val binding get() = _binding!!
 
@@ -37,25 +45,27 @@ class BeneficiaryAddOptionsFragment : BaseFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View {
-        _binding = FragmentBeneficiaryAddOptionsBinding.inflate(inflater, container, false)
-        setToolbarTitle(getString(R.string.add_beneficiary))
-        return binding.root
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            composeView = this
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        composeView.setContent {
 
-        with(binding) {
-            llAddBeneficiaryManually.setOnClickListener {
-                addManually()
-            }
-            llAddBeneficiaryQrcode.setOnClickListener {
-                addUsingQrCode()
-            }
-            binding.llUploadBeneficiaryQrcode.setOnClickListener {
-                addByImportingQrCode()
+            MifosMobileTheme {
+                BeneficiaryScreen(
+                    topAppbarNavigateback ={},
+                    addiconClicked ={ addManually()},
+                    scaniconClicked ={ addUsingQrCode()},
+                    uploadiconClicked ={ addByImportingQrCode()}
+                )
             }
+
         }
+
     }
 
     /**
@@ -248,6 +258,7 @@ class BeneficiaryAddOptionsFragment : BaseFragment() {
         _binding = null
     }
 
+
     companion object {
         @JvmStatic
         fun newInstance(): BeneficiaryAddOptionsFragment {

diff --git a/...esentation/beneficiaryaddoptionsscreen.kt → ...ficiary/presentation/BeneficiaryScreen.kt b/...esentation/beneficiaryaddoptionsscreen.kt → ...ficiary/presentation/BeneficiaryScreen.kt
@@ -57,7 +57,7 @@ fun BeneficiaryScreen(
             color =  MaterialTheme.colorScheme.onSurface
         )
 
-        multipleIcons(
+        Icons(
             modifier = Modifier.padding(top = 20.dp),
             addIconclicked = addiconClicked,
             scanIconClicked = scaniconClicked,
@@ -78,14 +78,14 @@ fun BeneficiaryScreen(
     uiMode = Configuration.UI_MODE_NIGHT_NO,
 )
 @Composable
-fun beneficiaryscreenpreview() {
-    MifosMobileTheme{
+fun BeneficiaryScreenPreview() {
+    MifosMobileTheme {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .fillMaxHeight(),
         ) {
-            BeneficiaryScreen({},{},{},{})
+            BeneficiaryScreen({}, {}, {}, {})
         }
     }
 }
diff --git a/...i/beneficiary/presentation/iconandText.kt → ...i/beneficiary/presentation/IconAndText.kt b/...i/beneficiary/presentation/iconandText.kt → ...i/beneficiary/presentation/IconAndText.kt
@@ -32,7 +32,7 @@ import org.mifos.mobile.core.ui.theme.MifosMobileTheme
  *
  * */
 @Composable
-fun iconandText(
+fun IconAndText(
     @DrawableRes icon:Int,
     icondescription:String,
     text:String,
@@ -69,15 +69,15 @@ fun iconandText(
     uiMode = Configuration.UI_MODE_NIGHT_NO,
 )
 @Composable
-fun iconsandtextpreview() {
+fun IconsAndTextPreview() {
     MifosMobileTheme{
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .fillMaxHeight(),
         ) {
 
-            iconandText(
+            IconAndText(
                 icon = R.drawable.ic_qrcode_scan_gray_dark,
                 text = stringResource(id = R.string.scan),
                 icondescription = stringResource(id = R.string.scan),

diff --git a/...bile/ui/beneficiary/presentation/icons.kt → ...bile/ui/beneficiary/presentation/Icons.kt b/...bile/ui/beneficiary/presentation/icons.kt → ...bile/ui/beneficiary/presentation/Icons.kt
@@ -17,7 +17,7 @@ import org.mifos.mobile.R
 import org.mifos.mobile.core.ui.theme.MifosMobileTheme
 
 @Composable
-fun multipleIcons(
+fun Icons(
     modifier: Modifier = Modifier,
     addIconclicked:()->Unit,
     scanIconClicked:()->Unit,
@@ -30,14 +30,14 @@ fun multipleIcons(
             horizontalArrangement = Arrangement.SpaceAround,
             modifier = Modifier.fillMaxWidth()
         ) {
-            iconandText(
+            IconAndText(
                 icon = R.drawable.ic_beneficiary_add_48px,
                 text = stringResource(id = R.string.add),
                 icondescription = stringResource(id = R.string.add),
                 iconClick = addIconclicked
             )
 
-            iconandText(
+            IconAndText(
                 icon = R.drawable.ic_qrcode_scan_gray_dark,
                 text = stringResource(id = R.string.scan),
                 icondescription = stringResource(id = R.string.scan),
@@ -50,7 +50,7 @@ fun multipleIcons(
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier.fillMaxWidth()
         ) {
-            iconandText(
+            IconAndText(
                 icon = R.drawable.ic_file_upload_black_24dp,
                 text = stringResource(id = R.string.upload_qr_code),
                 icondescription = stringResource(id = R.string.upload_qr_code),
@@ -70,14 +70,14 @@ fun multipleIcons(
     uiMode = Configuration.UI_MODE_NIGHT_NO,
 )
 @Composable
-fun iconsscreenpreview() {
+fun IconsScreenPreview() {
     MifosMobileTheme{
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .fillMaxHeight(),
         ) {
-            multipleIcons(
+            Icons(
                 modifier = Modifier.padding(top = 20.dp),
                 addIconclicked = {},
                 scanIconClicked = {},

diff --git a/app/src/main/java/org/mifos/mobile/ui/beneficiary/presentation/beneficiaryTopapppbar.kt b/app/src/main/java/org/mifos/mobile/ui/beneficiary/presentation/beneficiaryTopapppbar.kt
diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/ThirdPartyTransferFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/ThirdPartyTransferFragment.kt
@@ -30,6 +30,7 @@ import org.mifos.mobile.models.templates.account.AccountOptionsTemplate
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.adapters.AccountsSpinnerAdapter
 import org.mifos.mobile.ui.adapters.BeneficiarySpinnerAdapter
+import org.mifos.mobile.ui.beneficiary.presentation.BeneficiaryAddOptionsFragment
 import org.mifos.mobile.ui.enums.TransferType
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.utils.Constants