From 32640e0796359f1b50a6ebc1fed609b3824a7995 Mon Sep 17 00:00:00 2001
From: Damian Czupryn <60961958+Daxxxis@users.noreply.github.com>
Date: Mon, 3 May 2021 18:23:09 +0200
Subject: [PATCH] Change mobile devices item order (#1324)

* Change more items order

* Resolve conflicts
---
 .../wulkanowy/ui/modules/more/MoreFragment.kt      | 14 +++++++-------
 .../wulkanowy/ui/modules/more/MorePresenter.kt     |  4 ++--
 .../github/wulkanowy/ui/modules/more/MoreView.kt   |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
index a7ed550ac..f5ba23ab2 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
@@ -51,9 +51,6 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val luckyNumberRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) }
 
-    override val mobileDevicesRes: Pair<String, Drawable?>?
-        get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
-
     override val conferencesRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.conferences_title) to getCompatDrawable(R.drawable.ic_more_conferences) }
 
@@ -63,6 +60,9 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
     override val schoolAndTeachersRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.schoolandteachers_title) to getCompatDrawable((R.drawable.ic_more_schoolandteachers)) }
 
+    override val mobileDevicesRes: Pair<String, Drawable?>?
+        get() = context?.run { getString(R.string.mobile_devices_title) to getCompatDrawable(R.drawable.ic_more_mobile_devices) }
+
     override val settingsRes: Pair<String, Drawable?>?
         get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) }
 
@@ -108,10 +108,6 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         (activity as? MainActivity)?.pushView(LuckyNumberFragment.newInstance())
     }
 
-    override fun openMobileDevicesView() {
-        (activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
-    }
-
     override fun openSchoolAnnouncementView() {
         (activity as? MainActivity)?.pushView(SchoolAnnouncementFragment.newInstance())
     }
@@ -124,6 +120,10 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
         (activity as? MainActivity)?.pushView(SchoolAndTeachersFragment.newInstance())
     }
 
+    override fun openMobileDevicesView() {
+        (activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
+    }
+
     override fun openSettingsView() {
         (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
     }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
index aa778115d..4a31aaf73 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
@@ -26,10 +26,10 @@ class MorePresenter @Inject constructor(
                 homeworkRes?.first -> openHomeworkView()
                 noteRes?.first -> openNoteView()
                 luckyNumberRes?.first -> openLuckyNumberView()
-                mobileDevicesRes?.first -> openMobileDevicesView()
                 conferencesRes?.first -> openConferencesView()
                 schoolAnnouncementRes?.first -> openSchoolAnnouncementView()
                 schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
+                mobileDevicesRes?.first -> openMobileDevicesView()
                 settingsRes?.first -> openSettingsView()
             }
         }
@@ -48,10 +48,10 @@ class MorePresenter @Inject constructor(
                 homeworkRes,
                 noteRes,
                 luckyNumberRes,
-                mobileDevicesRes,
                 conferencesRes,
                 schoolAnnouncementRes,
                 schoolAndTeachersRes,
+                mobileDevicesRes,
                 settingsRes
             ))
         }
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
index d003efbd3..6cf88043b 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
@@ -13,14 +13,14 @@ interface MoreView : BaseView {
 
     val luckyNumberRes: Pair<String, Drawable?>?
 
-    val mobileDevicesRes: Pair<String, Drawable?>?
-
     val conferencesRes: Pair<String, Drawable?>?
 
     val schoolAnnouncementRes: Pair<String, Drawable?>?
 
     val schoolAndTeachersRes: Pair<String, Drawable?>?
 
+    val mobileDevicesRes: Pair<String, Drawable?>?
+
     val settingsRes: Pair<String, Drawable?>?
 
     fun initView()
@@ -39,11 +39,11 @@ interface MoreView : BaseView {
 
     fun openLuckyNumberView()
 
-    fun openMobileDevicesView()
-
     fun openSchoolAnnouncementView()
 
     fun openConferencesView()
 
     fun openSchoolAndTeachersView()
+
+    fun openMobileDevicesView()
 }