refactor: moved user profile related files to the package

PratyushSingh07 · PratyushSingh07 · commit 747d26d97f62 · 2023-12-24T12:39:54.000+05:30
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -67,7 +67,7 @@
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name="org.mifos.mobile.ui.activities.UserProfileActivity"
+            android:name="org.mifos.mobile.ui.user_profile.UserProfileActivity"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
 
diff --git a/app/src/main/java/org/mifos/mobile/ui/activities/HomeActivity.kt b/app/src/main/java/org/mifos/mobile/ui/activities/HomeActivity.kt
@@ -41,7 +41,8 @@ import org.mifos.mobile.utils.TextDrawable
 import org.mifos.mobile.utils.Toaster
 import org.mifos.mobile.utils.UserDetailUiState
 import org.mifos.mobile.utils.fcm.RegistrationIntentService
-import org.mifos.mobile.viewModels.UserDetailViewModel
+import org.mifos.mobile.ui.user_profile.UserDetailViewModel
+import org.mifos.mobile.ui.user_profile.UserProfileActivity
 import javax.inject.Inject
 
 /**
diff --git a/app/src/main/java/org/mifos/mobile/ui/fragments/HomeOldFragment.kt b/app/src/main/java/org/mifos/mobile/ui/fragments/HomeOldFragment.kt
@@ -22,7 +22,7 @@ import org.mifos.mobile.models.client.Client
 import org.mifos.mobile.ui.activities.HomeActivity
 import org.mifos.mobile.ui.activities.LoanApplicationActivity
 import org.mifos.mobile.ui.activities.NotificationActivity
-import org.mifos.mobile.ui.activities.UserProfileActivity
+import org.mifos.mobile.ui.user_profile.UserProfileActivity
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.enums.AccountType
 import org.mifos.mobile.ui.enums.ChargeType
diff --git a/app/src/main/java/org/mifos/mobile/ui/user_profile/UserDetailViewModel.kt b/app/src/main/java/org/mifos/mobile/ui/user_profile/UserDetailViewModel.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.viewModels
+package org.mifos.mobile.ui.user_profile
 
 import android.util.Base64
 import android.util.Log
diff --git a/app/src/main/java/org/mifos/mobile/ui/user_profile/UserProfileActivity.kt b/app/src/main/java/org/mifos/mobile/ui/user_profile/UserProfileActivity.kt
@@ -1,10 +1,10 @@
-package org.mifos.mobile.ui.activities
+package org.mifos.mobile.ui.user_profile
 
 import android.os.Bundle
 import org.mifos.mobile.R
 import org.mifos.mobile.databinding.ActivityUserProfileBinding
 import org.mifos.mobile.ui.activities.base.BaseActivity
-import org.mifos.mobile.ui.fragments.UserProfileFragment
+import org.mifos.mobile.ui.user_profile.UserProfileFragment
 
 class UserProfileActivity : BaseActivity() {
 
diff --git a/app/src/main/java/org/mifos/mobile/ui/user_profile/UserProfileDetails.kt b/app/src/main/java/org/mifos/mobile/ui/user_profile/UserProfileDetails.kt
@@ -18,6 +18,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.mifos.mobile.R
 
+/**
+ * @author pratyush
+ * @since 20/12/2023
+ */
+
 @Composable
 fun UserProfileDetails(
     userDetails: UserDetails
diff --git a/app/src/main/java/org/mifos/mobile/ui/user_profile/UserProfileFragment.kt b/app/src/main/java/org/mifos/mobile/ui/user_profile/UserProfileFragment.kt
@@ -1,4 +1,4 @@
-package org.mifos.mobile.ui.fragments
+package org.mifos.mobile.ui.user_profile
 
 import android.content.Intent
 import android.graphics.Bitmap
@@ -24,15 +24,12 @@ import org.mifos.mobile.ui.activities.EditUserDetailActivity
 import org.mifos.mobile.ui.activities.base.BaseActivity
 import org.mifos.mobile.ui.fragments.base.BaseFragment
 import org.mifos.mobile.ui.getThemeAttributeColor
-import org.mifos.mobile.ui.user_profile.UserDetails
-import org.mifos.mobile.ui.user_profile.UserProfileScreen
 import org.mifos.mobile.utils.Constants
 import org.mifos.mobile.utils.DateHelper
 import org.mifos.mobile.utils.Network
 import org.mifos.mobile.utils.TextDrawable
 import org.mifos.mobile.utils.Toaster
 import org.mifos.mobile.utils.UserDetailUiState
-import org.mifos.mobile.viewModels.UserDetailViewModel
 import javax.inject.Inject
 
 /**
diff --git a/app/src/test/java/org/mifos/mobile/viewModels/UserDetailViewModelTest.kt b/app/src/test/java/org/mifos/mobile/viewModels/UserDetailViewModelTest.kt
@@ -17,6 +17,7 @@ import org.mifos.mobile.api.local.PreferencesHelper
 import org.mifos.mobile.models.client.Client
 import org.mifos.mobile.repositories.HomeRepositoryImp
 import org.mifos.mobile.repositories.UserDetailRepositoryImp
+import org.mifos.mobile.ui.user_profile.UserDetailViewModel
 import org.mifos.mobile.util.RxSchedulersOverrideRule
 import org.mifos.mobile.utils.UserDetailUiState
 import org.mockito.Mock
diff --git a/core/src/main/java/org/mifos/mobile/core/ui/component/MifosUserImage.kt b/core/src/main/java/org/mifos/mobile/core/ui/component/MifosUserImage.kt
@@ -13,6 +13,11 @@ import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 
+/**
+ * @author pratyush
+ * @since 20/12/2023
+ */
+
 @Composable
 fun MifosUserImage(
     isDarkTheme: Boolean,
diff --git a/core/src/main/java/org/mifos/mobile/core/ui/component/NoInternet.kt b/core/src/main/java/org/mifos/mobile/core/ui/component/NoInternet.kt
@@ -18,6 +18,11 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
+/**
+ * @author pratyush
+ * @since 20/12/2023
+ */
+
 @Composable
 fun NoInternet(
     icon: Int,
diff --git a/core/src/main/java/org/mifos/mobile/core/ui/component/UserProfileField.kt b/core/src/main/java/org/mifos/mobile/core/ui/component/UserProfileField.kt
@@ -19,6 +19,11 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
+/**
+ * @author pratyush
+ * @since 20/12/2023
+ */
+
 @Composable
 fun UserProfileField(
     text: Int, icon: Int, onClick: (() -> Unit)
@@ -42,7 +47,6 @@ fun UserProfileField(
         )
     }
     Divider(color = if (isSystemInDarkTheme()) Color(0xFF8E9099) else Color.Black)
-    //8E9099
 }
 
 @Composable
diff --git a/core/src/main/java/org/mifos/mobile/core/ui/component/UserProfileTopBar.kt b/core/src/main/java/org/mifos/mobile/core/ui/component/UserProfileTopBar.kt
@@ -26,6 +26,11 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
+/**
+ * @author pratyush
+ * @since 20/12/2023
+ */
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun UserProfileTopBar(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.mifos.mobile.viewModels`
	`1`	`+package org.mifos.mobile.ui.user_profile`
`2`	`2`
`3`	`3`	`import android.util.Base64`
`4`	`4`	`import android.util.Log`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@ import androidx.compose.ui.text.font.FontWeight`
`19`	`19`	`import androidx.compose.ui.unit.dp`
`20`	`20`	`import androidx.compose.ui.unit.sp`
`21`	`21`
	`22`	`+/**`
	`23`	`+ * @author pratyush`
	`24`	`+ * @since 20/12/2023`
	`25`	`+ */`
	`26`	`+`
`22`	`27`	`@Composable`
`23`	`28`	`fun UserProfileField(`
`24`	`29`	`text: Int, icon: Int, onClick: (() -> Unit)`
`@@ -42,7 +47,6 @@ fun UserProfileField(`
`42`	`47`	`)`
`43`	`48`	`}`
`44`	`49`	`Divider(color = if (isSystemInDarkTheme()) Color(0xFF8E9099) else Color.Black)`
`45`		`- //8E9099`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`@Composable`