sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Change mobile devices item order (#1324)

Browse Source 
* Change more items order

* Resolve conflicts
This commit is contained in:
Damian Czupryn 2021-05-03 18:23:09 +02:00 committed by GitHub
parent 4e80441167
commit 32640e0796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreFragment.kt
View File

@ -51,9 +51,6 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
override val luckyNumberRes: Pair<String, Drawable?>? override val luckyNumberRes: Pair<String, Drawable?>?
get() = context?.run { getString(R.string.lucky_number_title) to getCompatDrawable(R.drawable.ic_more_lucky_number) } 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?>? override val conferencesRes: Pair<String, Drawable?>?
get() = context?.run { getString(R.string.conferences_title) to getCompatDrawable(R.drawable.ic_more_conferences) } 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?>? override val schoolAndTeachersRes: Pair<String, Drawable?>?
get() = context?.run { getString(R.string.schoolandteachers_title) to getCompatDrawable((R.drawable.ic_more_schoolandteachers)) } 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?>? override val settingsRes: Pair<String, Drawable?>?
get() = context?.run { getString(R.string.settings_title) to getCompatDrawable(R.drawable.ic_more_settings) } 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()) (activity as? MainActivity)?.pushView(LuckyNumberFragment.newInstance())
} }
override fun openMobileDevicesView() {
(activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
}
override fun openSchoolAnnouncementView() { override fun openSchoolAnnouncementView() {
(activity as? MainActivity)?.pushView(SchoolAnnouncementFragment.newInstance()) (activity as? MainActivity)?.pushView(SchoolAnnouncementFragment.newInstance())
} }
@ -124,6 +120,10 @@ class MoreFragment : BaseFragment<FragmentMoreBinding>(R.layout.fragment_more),
(activity as? MainActivity)?.pushView(SchoolAndTeachersFragment.newInstance()) (activity as? MainActivity)?.pushView(SchoolAndTeachersFragment.newInstance())
} }
override fun openMobileDevicesView() {
(activity as? MainActivity)?.pushView(MobileDeviceFragment.newInstance())
}
override fun openSettingsView() { override fun openSettingsView() {
(activity as? MainActivity)?.pushView(SettingsFragment.newInstance()) (activity as? MainActivity)?.pushView(SettingsFragment.newInstance())
} }

4
app/src/main/java/io/github/wulkanowy/ui/modules/more/MorePresenter.kt
View File

@ -26,10 +26,10 @@ class MorePresenter @Inject constructor(
homeworkRes?.first -> openHomeworkView() homeworkRes?.first -> openHomeworkView()
noteRes?.first -> openNoteView() noteRes?.first -> openNoteView()
luckyNumberRes?.first -> openLuckyNumberView() luckyNumberRes?.first -> openLuckyNumberView()
mobileDevicesRes?.first -> openMobileDevicesView()
conferencesRes?.first -> openConferencesView() conferencesRes?.first -> openConferencesView()
schoolAnnouncementRes?.first -> openSchoolAnnouncementView() schoolAnnouncementRes?.first -> openSchoolAnnouncementView()
schoolAndTeachersRes?.first -> openSchoolAndTeachersView() schoolAndTeachersRes?.first -> openSchoolAndTeachersView()
mobileDevicesRes?.first -> openMobileDevicesView()
settingsRes?.first -> openSettingsView() settingsRes?.first -> openSettingsView()
} }
} }
@ -48,10 +48,10 @@ class MorePresenter @Inject constructor(
homeworkRes, homeworkRes,
noteRes, noteRes,
luckyNumberRes, luckyNumberRes,
mobileDevicesRes,
conferencesRes, conferencesRes,
schoolAnnouncementRes, schoolAnnouncementRes,
schoolAndTeachersRes, schoolAndTeachersRes,
mobileDevicesRes,
settingsRes settingsRes
)) ))
} }

8
app/src/main/java/io/github/wulkanowy/ui/modules/more/MoreView.kt
View File

@ -13,14 +13,14 @@ interface MoreView : BaseView {
val luckyNumberRes: Pair<String, Drawable?>? val luckyNumberRes: Pair<String, Drawable?>?
val mobileDevicesRes: Pair<String, Drawable?>?
val conferencesRes: Pair<String, Drawable?>? val conferencesRes: Pair<String, Drawable?>?
val schoolAnnouncementRes: Pair<String, Drawable?>? val schoolAnnouncementRes: Pair<String, Drawable?>?
val schoolAndTeachersRes: Pair<String, Drawable?>? val schoolAndTeachersRes: Pair<String, Drawable?>?
val mobileDevicesRes: Pair<String, Drawable?>?
val settingsRes: Pair<String, Drawable?>? val settingsRes: Pair<String, Drawable?>?
fun initView() fun initView()
@ -39,11 +39,11 @@ interface MoreView : BaseView {
fun openLuckyNumberView() fun openLuckyNumberView()
fun openMobileDevicesView()
fun openSchoolAnnouncementView() fun openSchoolAnnouncementView()
fun openConferencesView() fun openConferencesView()
fun openSchoolAndTeachersView() fun openSchoolAndTeachersView()
fun openMobileDevicesView()
} }