Skip to content

Commit fd05edc

Browse files
committed
feat(MyKSuite): Clean code
1 parent 35fd507 commit fd05edc

File tree

5 files changed

+10
-16
lines changed

5 files changed

+10
-16
lines changed

app/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ dependencies {
121121

122122
implementation libs.coil.svg
123123

124-
// Compose
125-
implementation libs.compose.ui.android
126-
127124
// Test
128125
testImplementation libs.junit
129126
androidTestImplementation libs.ext.junit

app/src/main/java/com/infomaniak/mail/MainApplication.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
125125
if (BuildConfig.DEBUG) configureDebugMode()
126126
configureSentry()
127127
enforceAppTheme()
128-
configureRoomDatabase()
128+
configureRoomDatabases()
129129
configureAppReloading()
130130
configureInfomaniakCore()
131131
notificationUtils.initNotificationChannel()
@@ -217,7 +217,7 @@ open class MainApplication : Application(), ImageLoaderFactory, DefaultLifecycle
217217
AppCompatDelegate.setDefaultNightMode(localSettings.theme.mode)
218218
}
219219

220-
private fun configureRoomDatabase() {
220+
private fun configureRoomDatabases() {
221221
AccountUtils.init(this)
222222
MyKSuiteDataUtils.initDatabase(this)
223223
}

app/src/main/java/com/infomaniak/mail/ui/main/settings/SettingsFragment.kt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class SettingsFragment : Fragment() {
8383
}
8484

8585
private fun setupMyKSuite() {
86-
binding.myKSuitelayout.isGone = MyKSuiteDataUtils.myKSuite == null
86+
binding.myKSuiteLayout.isGone = MyKSuiteDataUtils.myKSuite == null
8787
MyKSuiteDataUtils.myKSuite?.let { setupMyKSuiteLayout(it) } ?: fetchMyKSuite()
8888
}
8989

@@ -114,14 +114,13 @@ class SettingsFragment : Fragment() {
114114
binding.myKSuiteMailAddress.apply {
115115
isVisible = mailbox != null
116116

117-
setTitle(mailbox?.email ?: "")
117+
if (mailbox == null) return@observe
118118

119-
if (mailbox != null) {
120-
setOnClickListener {
121-
animatedNavigation(
122-
SettingsFragmentDirections.actionSettingsToMailboxSettings(mailbox.objectId, mailbox.email)
123-
)
124-
}
119+
setTitle(mailbox.email)
120+
setOnClickListener {
121+
animatedNavigation(
122+
SettingsFragmentDirections.actionSettingsToMailboxSettings(mailbox.objectId, mailbox.email)
123+
)
125124
}
126125
}
127126
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
android:orientation="vertical">
3939

4040
<LinearLayout
41-
android:id="@+id/myKSuitelayout"
41+
android:id="@+id/myKSuiteLayout"
4242
android:layout_width="match_parent"
4343
android:layout_height="wrap_content"
4444
android:orientation="vertical"

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[versions]
22
androidGradlePlugin = "8.7.2"
33
coilSvg = "2.7.0"
4-
compose = "1.7.6"
54
dotsindicator = "5.1.0"
65
dragdropswipeRecyclerview = "1.2.0"
76
firebaseMessagingKtx = "24.1.0"
@@ -29,7 +28,6 @@ workRuntimeKtx = "2.9.1" # Doesn't build when bumped (waiting for Android SDK 35
2928

3029
[libraries]
3130
coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coilSvg" }
32-
compose-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "compose" }
3331
dotsindicator = { module = "com.tbuonomo:dotsindicator", version.ref = "dotsindicator" }
3432
dragdropswipe-recyclerview = { module = "com.ernestoyaquello.dragdropswiperecyclerview:drag-drop-swipe-recyclerview", version.ref = "dragdropswipeRecyclerview" }
3533
firebase-messaging-ktx = { module = "com.google.firebase:firebase-messaging-ktx", version.ref = "firebaseMessagingKtx" }

0 commit comments

Comments
 (0)