Skip to content

Commit 859db41

Browse files
KevinBoulongneKevinBoulongne
committed
Rename menu package into menuDrawer + Move some files to new move package
1 parent 00a748a commit 859db41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+91
-96
lines changed

‎app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ import com.infomaniak.mail.data.models.draft.Draft.DraftAction
6262
import com.infomaniak.mail.databinding.ActivityMainBinding
6363
import com.infomaniak.mail.firebase.RegisterFirebaseBroadcastReceiver
6464
import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
65-
import com.infomaniak.mail.ui.alertDialogs.TitleAlertDialog
6665
import com.infomaniak.mail.ui.main.SnackbarManager
6766
import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
68-
import com.infomaniak.mail.ui.main.menu.MenuDrawerFragment
67+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerFragment
6968
import com.infomaniak.mail.ui.main.onboarding.PermissionsOnboardingPagerFragment
7069
import com.infomaniak.mail.ui.main.search.SearchFragmentArgs
7170
import com.infomaniak.mail.ui.newMessage.NewMessageActivity
@@ -139,9 +138,6 @@ class MainActivity : BaseActivity() {
139138
@Inject
140139
lateinit var descriptionDialog: DescriptionAlertDialog
141140

142-
@Inject
143-
lateinit var titleDialog: TitleAlertDialog
144-
145141
@Inject
146142
lateinit var permissionUtils: PermissionUtils
147143

‎app/src/main/java/com/infomaniak/mail/ui/main/MailboxListFragment.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.infomaniak.lib.core.utils.safeNavigate
2323
import com.infomaniak.mail.R
2424
import com.infomaniak.mail.data.models.mailbox.Mailbox
2525
import com.infomaniak.mail.ui.bottomSheetDialogs.LockedMailboxBottomSheetDialogArgs
26-
import com.infomaniak.mail.ui.main.menu.MailboxesAdapter
26+
import com.infomaniak.mail.ui.main.menuDrawer.MailboxesAdapter
2727
import com.infomaniak.mail.utils.AccountUtils
2828
import kotlinx.coroutines.launch
2929

@@ -49,7 +49,7 @@ interface MailboxListFragment {
4949
)
5050
}
5151

52-
fun Fragment.onValidMailboxClicked(mailboxId: Int) {
53-
lifecycleScope.launch { AccountUtils.switchToMailbox(mailboxId) }
52+
fun Fragment.onValidMailboxClicked(mailboxId: Int) = lifecycleScope.launch {
53+
AccountUtils.switchToMailbox(mailboxId)
5454
}
5555
}

‎app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListAdapter.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,16 @@ class ThreadListAdapter @Inject constructor(
174174

175175
override fun onBindViewHolder(item: Any, viewHolder: ThreadListViewHolder, position: Int) = with(viewHolder.binding) {
176176
when (getItemViewType(position)) {
177-
DisplayType.THREAD.layout ->{
177+
DisplayType.THREAD.layout -> {
178178
(this as CardviewThreadItemBinding).displayThread(item as Thread, position)
179179
}
180-
DisplayType.DATE_SEPARATOR.layout ->{
180+
DisplayType.DATE_SEPARATOR.layout -> {
181181
(this as ItemThreadDateSeparatorBinding).displayDateSeparator(item as String)
182182
}
183-
DisplayType.FLUSH_FOLDER_BUTTON.layout ->{
183+
DisplayType.FLUSH_FOLDER_BUTTON.layout -> {
184184
(this as ItemBannerWithActionViewBinding).displayFlushFolderButton(item as FolderRole)
185185
}
186-
DisplayType.LOAD_MORE_BUTTON.layout ->{
186+
DisplayType.LOAD_MORE_BUTTON.layout -> {
187187
(this as ItemThreadLoadMoreButtonBinding).displayLoadMoreButton()
188188
}
189189
}

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MailboxesAdapter.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MailboxesAdapter.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import android.view.LayoutInflater
2121
import android.view.View.OnClickListener
@@ -29,9 +29,9 @@ import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
2929
import com.infomaniak.mail.R
3030
import com.infomaniak.mail.data.models.mailbox.Mailbox
3131
import com.infomaniak.mail.databinding.ItemInvalidMailboxBinding
32-
import com.infomaniak.mail.databinding.ItemMailboxMenuDrawerBinding
32+
import com.infomaniak.mail.databinding.ItemMenuDrawerMailboxBinding
3333
import com.infomaniak.mail.databinding.ItemSelectableMailboxBinding
34-
import com.infomaniak.mail.ui.main.menu.MailboxesAdapter.MailboxesViewHolder
34+
import com.infomaniak.mail.ui.main.menuDrawer.MailboxesAdapter.MailboxesViewHolder
3535
import com.infomaniak.mail.utils.AccountUtils
3636
import com.infomaniak.mail.utils.Utils.runCatchingRealm
3737
import com.infomaniak.mail.views.itemViews.DecoratedItemView.SelectionStyle
@@ -50,7 +50,7 @@ class MailboxesAdapter(
5050
val layoutInflater = LayoutInflater.from(parent.context)
5151
val binding = when (viewType) {
5252
DisplayType.SIMPLE_MAILBOX.layout -> ItemSelectableMailboxBinding.inflate(layoutInflater, parent, false)
53-
DisplayType.MENU_DRAWER_MAILBOX.layout -> ItemMailboxMenuDrawerBinding.inflate(layoutInflater, parent, false)
53+
DisplayType.MENU_DRAWER_MAILBOX.layout -> ItemMenuDrawerMailboxBinding.inflate(layoutInflater, parent, false)
5454
else -> ItemInvalidMailboxBinding.inflate(layoutInflater, parent, false)
5555
}
5656

@@ -67,7 +67,7 @@ class MailboxesAdapter(
6767
(this as ItemSelectableMailboxBinding).displaySimpleMailbox(mailbox, isCurrentMailbox)
6868
}
6969
DisplayType.MENU_DRAWER_MAILBOX.layout -> {
70-
(this as ItemMailboxMenuDrawerBinding).displayMenuDrawerMailbox(mailbox, isCurrentMailbox)
70+
(this as ItemMenuDrawerMailboxBinding).displayMenuDrawerMailbox(mailbox, isCurrentMailbox)
7171
}
7272
DisplayType.INVALID_MAILBOX.layout -> (this as ItemInvalidMailboxBinding).displayInvalidMailbox(mailbox)
7373
}
@@ -94,7 +94,7 @@ class MailboxesAdapter(
9494
setSelectedState(isCurrentMailbox)
9595
}
9696

97-
private fun ItemMailboxMenuDrawerBinding.displayMenuDrawerMailbox(mailbox: Mailbox, isCurrentMailbox: Boolean) = with(root) {
97+
private fun ItemMenuDrawerMailboxBinding.displayMenuDrawerMailbox(mailbox: Mailbox, isCurrentMailbox: Boolean) = with(root) {
9898
displayValidMailbox(mailbox, isCurrentMailbox) { context.trackMenuDrawerEvent(SWITCH_MAILBOX_NAME) }
9999

100100
unreadCount = mailbox.unreadCountDisplay.count
@@ -141,7 +141,7 @@ class MailboxesAdapter(
141141

142142
private enum class DisplayType(val layout: Int) {
143143
INVALID_MAILBOX(R.layout.item_invalid_mailbox),
144-
MENU_DRAWER_MAILBOX(R.layout.item_mailbox_menu_drawer),
144+
MENU_DRAWER_MAILBOX(R.layout.item_menu_drawer_mailbox),
145145
SIMPLE_MAILBOX(R.layout.item_selectable_mailbox),
146146
}
147147

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MenuDrawerDropdownView.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerDropdownView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import android.content.Context
2121
import android.util.AttributeSet

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MenuDrawerFragment.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import android.annotation.SuppressLint
2121
import android.content.Intent

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MenuDrawerViewModel.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import androidx.lifecycle.ViewModel
2121
import androidx.lifecycle.asLiveData

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MenuFoldersFragment.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuFoldersFragment.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import android.os.Bundle
2121
import android.view.View
@@ -26,6 +26,7 @@ import com.infomaniak.mail.R
2626
import com.infomaniak.mail.data.cache.mailboxContent.FolderController
2727
import com.infomaniak.mail.ui.MainViewModel
2828
import com.infomaniak.mail.ui.alertDialogs.InputAlertDialog
29+
import com.infomaniak.mail.ui.main.move.FolderAdapter
2930
import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
3031
import dagger.hilt.android.AndroidEntryPoint
3132
import javax.inject.Inject

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/RestoreEmailsBottomSheetDialog.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/RestoreEmailsBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import android.os.Bundle
2121
import android.view.LayoutInflater

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/RestoreEmailsViewModel.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/RestoreEmailsViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import androidx.lifecycle.LiveData
2121
import androidx.lifecycle.ViewModel

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/SimpleSettingView.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/SimpleSettingView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.menuDrawer
1919

2020
import android.content.Context
2121
import android.util.AttributeSet

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/FolderAdapter.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/move/FolderAdapter.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.move
1919

2020
import android.annotation.SuppressLint
2121
import android.view.LayoutInflater
@@ -30,9 +30,9 @@ import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
3030
import com.infomaniak.mail.R
3131
import com.infomaniak.mail.data.models.Folder
3232
import com.infomaniak.mail.data.models.Folder.FolderRole
33-
import com.infomaniak.mail.databinding.ItemFolderMenuDrawerBinding
33+
import com.infomaniak.mail.databinding.ItemMenuDrawerFolderBinding
3434
import com.infomaniak.mail.databinding.ItemSelectableFolderBinding
35-
import com.infomaniak.mail.ui.main.menu.FolderAdapter.FolderViewHolder
35+
import com.infomaniak.mail.ui.main.move.FolderAdapter.FolderViewHolder
3636
import com.infomaniak.mail.utils.UiUtils
3737
import com.infomaniak.mail.utils.UnreadDisplay
3838
import com.infomaniak.mail.utils.Utils.runCatchingRealm
@@ -79,7 +79,7 @@ class FolderAdapter @Inject constructor(
7979
val binding = if (viewType == DisplayType.SELECTABLE_FOLDER.layout) {
8080
ItemSelectableFolderBinding.inflate(layoutInflater, parent, false)
8181
} else {
82-
ItemFolderMenuDrawerBinding.inflate(layoutInflater, parent, false)
82+
ItemMenuDrawerFolderBinding.inflate(layoutInflater, parent, false)
8383
}
8484

8585
return FolderViewHolder(binding)
@@ -103,7 +103,7 @@ class FolderAdapter @Inject constructor(
103103

104104
when (getItemViewType(position)) {
105105
DisplayType.SELECTABLE_FOLDER.layout -> (this as ItemSelectableFolderBinding).root.displayFolder(folder)
106-
DisplayType.MENU_DRAWER.layout -> (this as ItemFolderMenuDrawerBinding).root.displayMenuDrawerFolder(folder)
106+
DisplayType.MENU_DRAWER.layout -> (this as ItemMenuDrawerFolderBinding).root.displayMenuDrawerFolder(folder)
107107
}
108108
}
109109

@@ -229,7 +229,7 @@ class FolderAdapter @Inject constructor(
229229

230230
private enum class DisplayType(val layout: Int) {
231231
SELECTABLE_FOLDER(R.layout.item_selectable_folder),
232-
MENU_DRAWER(R.layout.item_folder_menu_drawer),
232+
MENU_DRAWER(R.layout.item_menu_drawer_folder),
233233
}
234234

235235
companion object {

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/move/MoveFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.move
1919

2020
import android.graphics.drawable.InsetDrawable
2121
import android.os.Bundle

‎app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveViewModel.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/move/MoveViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.infomaniak.mail.ui.main.menu
18+
package com.infomaniak.mail.ui.main.move
1919

2020
import android.app.Application
2121
import androidx.lifecycle.*

‎app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/MessageActionsBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import com.infomaniak.mail.R
3838
import com.infomaniak.mail.data.models.Folder.FolderRole
3939
import com.infomaniak.mail.data.models.draft.Draft.DraftMode
4040
import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
41-
import com.infomaniak.mail.ui.main.menu.MoveFragmentArgs
41+
import com.infomaniak.mail.ui.main.move.MoveFragmentArgs
4242
import com.infomaniak.mail.ui.main.thread.PrintMailFragmentArgs
4343
import com.infomaniak.mail.utils.extensions.animatedNavigation
4444
import com.infomaniak.mail.utils.extensions.deleteWithConfirmationPopup

‎app/src/main/java/com/infomaniak/mail/ui/main/thread/actions/ThreadActionsBottomSheetDialog.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import com.infomaniak.mail.data.models.Folder.FolderRole
4242
import com.infomaniak.mail.data.models.draft.Draft.DraftMode
4343
import com.infomaniak.mail.data.models.thread.Thread
4444
import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
45-
import com.infomaniak.mail.ui.main.menu.MoveFragmentArgs
45+
import com.infomaniak.mail.ui.main.move.MoveFragmentArgs
4646
import com.infomaniak.mail.utils.extensions.animatedNavigation
4747
import com.infomaniak.mail.utils.extensions.deleteWithConfirmationPopup
4848
import com.infomaniak.mail.utils.extensions.notYetImplemented

‎app/src/main/java/com/infomaniak/mail/ui/main/user/AccountFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import com.infomaniak.mail.ui.MainActivity
4141
import com.infomaniak.mail.ui.MainViewModel
4242
import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
4343
import com.infomaniak.mail.ui.main.MailboxListFragment
44-
import com.infomaniak.mail.ui.main.menu.MailboxesAdapter
44+
import com.infomaniak.mail.ui.main.menuDrawer.MailboxesAdapter
4545
import com.infomaniak.mail.utils.AccountUtils
4646
import com.infomaniak.mail.utils.ConfettiUtils
4747
import com.infomaniak.mail.utils.ConfettiUtils.ConfettiType

‎app/src/main/java/com/infomaniak/mail/ui/noValidMailboxes/NoValidMailboxesFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.infomaniak.mail.MatomoMail.trackNoValidMailboxesEvent
3131
import com.infomaniak.mail.R
3232
import com.infomaniak.mail.databinding.FragmentNoValidMailboxesBinding
3333
import com.infomaniak.mail.ui.main.MailboxListFragment
34-
import com.infomaniak.mail.ui.main.menu.MailboxesAdapter
34+
import com.infomaniak.mail.ui.main.menuDrawer.MailboxesAdapter
3535
import dagger.hilt.android.AndroidEntryPoint
3636

3737
@AndroidEntryPoint

‎app/src/main/java/com/infomaniak/mail/utils/extensions/Extensions.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,7 @@ fun List<Folder>.getMenuFolders(): Pair<List<Folder>, List<Folder>> {
301301
}
302302
}
303303

304-
fun List<Folder>.getDefaultMenuFolders(): List<Folder> {
305-
return sortedBy { it.role?.order }.flattenFolderChildren()
306-
}
304+
fun List<Folder>.getDefaultMenuFolders(): List<Folder> = sortedBy { it.role?.order }.flattenFolderChildren()
307305

308306
fun List<Folder>.getCustomMenuFolders(dismissHiddenChildren: Boolean = false): List<Folder> {
309307
return flattenFolderChildren(dismissHiddenChildren)

‎app/src/main/java/com/infomaniak/mail/views/BottomSheetScaffoldingView.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import com.infomaniak.lib.core.utils.getAttributes
3131
import com.infomaniak.lib.core.utils.setMarginsRelative
3232
import com.infomaniak.mail.R
3333
import com.infomaniak.mail.databinding.ViewBottomSheetScaffoldingBinding
34-
import com.infomaniak.mail.ui.main.menu.SimpleSettingView
34+
import com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView
3535
import com.infomaniak.lib.core.R as RCore
3636

3737
class BottomSheetScaffoldingView @JvmOverloads constructor(

‎app/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
<androidx.fragment.app.FragmentContainerView
4848
android:id="@+id/menuDrawerFragmentContainer"
49-
android:name="com.infomaniak.mail.ui.main.menu.MenuDrawerFragment"
49+
android:name="com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerFragment"
5050
android:layout_width="match_parent"
5151
android:layout_height="match_parent" />
5252

‎app/src/main/res/layout/bottom_sheet_restore_emails.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
xmlns:tools="http://schemas.android.com/tools"
2020
android:layout_width="match_parent"
2121
android:layout_height="match_parent"
22-
tools:context=".ui.main.menu.RestoreEmailsBottomSheetDialog">
22+
tools:context=".ui.main.menuDrawer.RestoreEmailsBottomSheetDialog">
2323

2424
<TextView
2525
android:id="@+id/title"

‎app/src/main/res/layout/fragment_accent_color_setting.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ You should have received a copy of the GNU General Public License
1616
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
-->
18-
<com.infomaniak.mail.ui.main.menu.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
18+
<com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
@@ -66,4 +66,4 @@
6666
</com.infomaniak.mail.ui.main.settings.SettingRadioGroupView>
6767
</LinearLayout>
6868
</androidx.core.widget.NestedScrollView>
69-
</com.infomaniak.mail.ui.main.menu.SimpleSettingView>
69+
</com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView>

‎app/src/main/res/layout/fragment_account.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ You should have received a copy of the GNU General Public License
1616
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
-->
18-
<com.infomaniak.mail.ui.main.menu.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
18+
<com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
@@ -156,4 +156,4 @@
156156

157157
</androidx.constraintlayout.widget.ConstraintLayout>
158158
</LinearLayout>
159-
</com.infomaniak.mail.ui.main.menu.SimpleSettingView>
159+
</com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView>

‎app/src/main/res/layout/fragment_ai_engine_setting.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ You should have received a copy of the GNU General Public License
1616
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
-->
18-
<com.infomaniak.mail.ui.main.menu.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
18+
<com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
@@ -40,4 +40,4 @@
4040

4141
</LinearLayout>
4242
</androidx.core.widget.NestedScrollView>
43-
</com.infomaniak.mail.ui.main.menu.SimpleSettingView>
43+
</com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView>

‎app/src/main/res/layout/fragment_attach_mailbox.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ You should have received a copy of the GNU General Public License
1616
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
-->
18-
<com.infomaniak.mail.ui.main.menu.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
18+
<com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
@@ -108,4 +108,4 @@
108108
app:layout_constraintStart_toStartOf="parent" />
109109
</androidx.constraintlayout.widget.ConstraintLayout>
110110
</androidx.core.widget.NestedScrollView>
111-
</com.infomaniak.mail.ui.main.menu.SimpleSettingView>
111+
</com.infomaniak.mail.ui.main.menuDrawer.SimpleSettingView>

0 commit comments

Comments
 (0)