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

Merge branch 'release/1.6.2'

Browse Source
This commit is contained in:
Mikołaj Pich 2022-04-10 20:37:17 +02:00
commit d5e0ae7b37
6 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -22,8 +22,8 @@ android {
testApplicationId "io.github.tests.wulkanowy"
minSdkVersion 21
targetSdkVersion 31
versionCode 105
versionName "1.6.1"
versionCode 106
versionName "1.6.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resValue "string", "app_name", "Wulkanowy"
@ -153,7 +153,7 @@ play {
defaultToAppBundles = false
track = 'production'
releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
userFraction = 0.25d
userFraction = 0.50d
updatePriority = 1
enabled.set(false)
}

58
app/src/main/java/io/github/wulkanowy/ui/modules/Destination.kt
View File

@ -21,15 +21,15 @@ import kotlinx.serialization.Serializable
import java.time.LocalDate
@Serializable
sealed class Destination private constructor() : Parcelable {
sealed class Destination : Parcelable {
/*
Type in children classes have to be as getter to avoid null in enums
https://stackoverflow.com/questions/68866453/kotlin-enum-val-is-returning-null-despite-being-set-at-compile-time
*/
abstract val type: Type
abstract val destinationType: Type
abstract val fragment: Fragment
abstract val destinationFragment: Fragment
enum class Type(val defaultDestination: Destination) {
DASHBOARD(Dashboard),
@ -50,29 +50,29 @@ sealed class Destination private constructor() : Parcelable {
@Parcelize
@Serializable
object Dashboard : Destination() {
override val type get() = Type.DASHBOARD
override val fragment get() = DashboardFragment.newInstance()
override val destinationType get() = Type.DASHBOARD
override val destinationFragment get() = DashboardFragment.newInstance()
}
@Parcelize
@Serializable
object Grade : Destination() {
override val type get() = Type.GRADE
override val fragment get() = GradeFragment.newInstance()
override val destinationType get() = Type.GRADE
override val destinationFragment get() = GradeFragment.newInstance()
}
@Parcelize
@Serializable
object Attendance : Destination() {
override val type get() = Type.ATTENDANCE
override val fragment get() = AttendanceFragment.newInstance()
override val destinationType get() = Type.ATTENDANCE
override val destinationFragment get() = AttendanceFragment.newInstance()
}
@Parcelize
@Serializable
object Exam : Destination() {
override val type get() = Type.EXAM
override val fragment get() = ExamFragment.newInstance()
override val destinationType get() = Type.EXAM
override val destinationFragment get() = ExamFragment.newInstance()
}
@Parcelize
@ -81,63 +81,63 @@ sealed class Destination private constructor() : Parcelable {
@Serializable(with = LocalDateSerializer::class)
private val date: LocalDate? = null
) : Destination() {
override val type get() = Type.TIMETABLE
override val fragment get() = TimetableFragment.newInstance(date)
override val destinationType get() = Type.TIMETABLE
override val destinationFragment get() = TimetableFragment.newInstance(date)
}
@Parcelize
@Serializable
object Homework : Destination() {
override val type get() = Type.HOMEWORK
override val fragment get() = HomeworkFragment.newInstance()
override val destinationType get() = Type.HOMEWORK
override val destinationFragment get() = HomeworkFragment.newInstance()
}
@Parcelize
@Serializable
object Note : Destination() {
override val type get() = Type.NOTE
override val fragment get() = NoteFragment.newInstance()
override val destinationType get() = Type.NOTE
override val destinationFragment get() = NoteFragment.newInstance()
}
@Parcelize
@Serializable
object Conference : Destination() {
override val type get() = Type.CONFERENCE
override val fragment get() = ConferenceFragment.newInstance()
override val destinationType get() = Type.CONFERENCE
override val destinationFragment get() = ConferenceFragment.newInstance()
}
@Parcelize
@Serializable
object SchoolAnnouncement : Destination() {
override val type get() = Type.SCHOOL_ANNOUNCEMENT
override val fragment get() = SchoolAnnouncementFragment.newInstance()
override val destinationType get() = Type.SCHOOL_ANNOUNCEMENT
override val destinationFragment get() = SchoolAnnouncementFragment.newInstance()
}
@Parcelize
@Serializable
object School : Destination() {
override val type get() = Type.SCHOOL
override val fragment get() = SchoolFragment.newInstance()
override val destinationType get() = Type.SCHOOL
override val destinationFragment get() = SchoolFragment.newInstance()
}
@Parcelize
@Serializable
object LuckyNumber : Destination() {
override val type get() = Type.LUCKY_NUMBER
override val fragment get() = LuckyNumberFragment.newInstance()
override val destinationType get() = Type.LUCKY_NUMBER
override val destinationFragment get() = LuckyNumberFragment.newInstance()
}
@Parcelize
@Serializable
object More : Destination() {
override val type get() = Type.MORE
override val fragment get() = MoreFragment.newInstance()
override val destinationType get() = Type.MORE
override val destinationFragment get() = MoreFragment.newInstance()
}
@Parcelize
@Serializable
object Message : Destination() {
override val type get() = Type.MESSAGE
override val fragment get() = MessageFragment.newInstance()
override val destinationType get() = Type.MESSAGE
override val destinationFragment get() = MessageFragment.newInstance()
}
}

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

@ -129,7 +129,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
)
}
fragmentHideStrategy = HIDE
rootFragments = rootDestinations.map { it.fragment }
rootFragments = rootDestinations.map { it.destinationFragment }
initialize(startMenuIndex, savedInstanceState)
}
@ -230,7 +230,7 @@ class MainActivity : BaseActivity<MainPresenter, ActivityMainBinding>(), MainVie
}
override fun openMoreDestination(destination: Destination) {
pushView(destination.fragment)
pushView(destination.destinationFragment)
}
override fun notifyMenuViewReselected() {

6
app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
View File

@ -45,8 +45,8 @@ class MainPresenter @Inject constructor(
private val Destination?.startMenuIndex
get() = when {
this == null -> prefRepository.startMenuIndex
type in rootDestinationTypeList -> {
rootDestinationTypeList.indexOf(type)
destinationType in rootDestinationTypeList -> {
rootDestinationTypeList.indexOf(destinationType)
}
else -> 4
}
@ -56,7 +56,7 @@ class MainPresenter @Inject constructor(
val startMenuIndex = initDestination.startMenuIndex
val destinations = rootDestinationTypeList.map {
if (it == initDestination?.type) initDestination else it.defaultDestination
if (it == initDestination?.destinationType) initDestination else it.defaultDestination
}
view.initView(startMenuIndex, destinations)

2
app/src/main/java/io/github/wulkanowy/ui/modules/notificationscenter/NotificationsCenterFragment.kt
View File

@ -43,7 +43,7 @@ class NotificationsCenterFragment :
override fun initView() {
notificationsCenterAdapter.onItemClickListener = { notification ->
(requireActivity() as MainActivity).pushView(notification.destination.fragment)
(requireActivity() as MainActivity).pushView(notification.destination.destinationFragment)
}
with(binding.notificationsCenterRecycler) {

2
app/src/main/play/release-notes/pl-PL/default.txt
View File

@ -1,4 +1,4 @@
Wersja 1.6.0
Wersja 1.6.2
- dodaliśmy możliwość usuwania wielu wiadomości jednocześnie
- dodaliśmy opcję szybkiego dodawania sprawdzianów do kalendarza