Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify the way enums are defined #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,35 +1,24 @@
package com.pouyaheydari.calendar.core.pojo

import android.content.Context
import androidx.annotation.StringRes
import com.pouyaheydari.calendar.core.R

enum class GregorianMonths(val monthNumber: Int) {
January(1),
February(2),
March(3),
April(4),
May(5),
Jun(6),
July(7),
August(8),
September(9),
October(10),
November(11),
December(12);
enum class GregorianMonths(@StringRes private val nameStringId: Int) {
January(R.string.january),
February(R.string.february),
March(R.string.march),
April(R.string.april),
May(R.string.may),
Jun(R.string.jun),
July(R.string.july),
August(R.string.august),
September(R.string.september),
October(R.string.october),
November(R.string.november),
December(R.string.december);

fun getName(context: Context): String = when (monthNumber) {
January.monthNumber -> context.getString(R.string.january)
February.monthNumber -> context.getString(R.string.february)
March.monthNumber -> context.getString(R.string.march)
April.monthNumber -> context.getString(R.string.april)
May.monthNumber -> context.getString(R.string.may)
Jun.monthNumber -> context.getString(R.string.jun)
July.monthNumber -> context.getString(R.string.july)
August.monthNumber -> context.getString(R.string.august)
September.monthNumber -> context.getString(R.string.september)
October.monthNumber -> context.getString(R.string.october)
November.monthNumber -> context.getString(R.string.november)
December.monthNumber -> context.getString(R.string.december)
else -> throw IllegalArgumentException("Month number is grater than 12")
}
val monthNumber: Int get() = this.ordinal + 1

fun getName(context: Context): String = context.getString(this.nameStringId)
}
Original file line number Diff line number Diff line change
@@ -1,35 +1,24 @@
package com.pouyaheydari.calendar.core.pojo

import android.content.Context
import androidx.annotation.StringRes
import com.pouyaheydari.calendar.core.R

enum class ShamsiMonths(val monthNumber: Int) {
Farwarding(1),
Ordibehesht(2),
Khordad(3),
Tir(4),
Mordad(5),
Shahrivar(6),
Mehr(7),
Aban(8),
Azar(9),
Dey(10),
Bahman(11),
Esfand(12);
enum class ShamsiMonths(@StringRes private val nameStringId: Int) {
Farwarding(R.string.farvardin),
Ordibehesht(R.string.ordibehesht),
Khordad(R.string.khordad),
Tir(R.string.tir),
Mordad(R.string.mordad),
Shahrivar(R.string.shahrivar),
Mehr(R.string.mehr),
Aban(R.string.aban),
Azar(R.string.azar),
Dey(R.string.dey),
Bahman(R.string.bahman),
Esfand(R.string.esfand);

fun getName(context: Context): String = when (monthNumber) {
Farwarding.monthNumber -> context.getString(R.string.farvardin)
Ordibehesht.monthNumber -> context.getString(R.string.ordibehesht)
Khordad.monthNumber -> context.getString(R.string.khordad)
Tir.monthNumber -> context.getString(R.string.tir)
Mordad.monthNumber -> context.getString(R.string.mordad)
Shahrivar.monthNumber -> context.getString(R.string.shahrivar)
Mehr.monthNumber -> context.getString(R.string.mehr)
Aban.monthNumber -> context.getString(R.string.aban)
Azar.monthNumber -> context.getString(R.string.azar)
Dey.monthNumber -> context.getString(R.string.dey)
Bahman.monthNumber -> context.getString(R.string.bahman)
Esfand.monthNumber -> context.getString(R.string.esfand)
else -> throw IllegalArgumentException("Month number is grater than 12: $this")
}
val monthNumber: Int get() = this.ordinal + 1

fun getName(context: Context): String = context.getString(this.nameStringId)
}
31 changes: 13 additions & 18 deletions core/src/main/java/com/pouyaheydari/calendar/core/pojo/WeekDay.kt
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
package com.pouyaheydari.calendar.core.pojo

import android.content.Context
import androidx.annotation.StringRes
import com.pouyaheydari.calendar.core.R

enum class WeekDay(val weekDayNumber: Int, val distanceFromFirstDayOfWeek: Int) {
Monday(0, 2),
Tuesday(1, 3),
Wednesday(2, 4),
Thursday(3, 5),
Friday(4, 6),
Saturday(5, 0),
Sunday(6, 1);
enum class WeekDay(@StringRes private val nameStringId: Int) {
Monday(R.string.monday),
Tuesday(R.string.tuesday),
Wednesday(R.string.wednesdays),
Thursday(R.string.thursday),
Friday(R.string.friday),
Saturday(R.string.saturday),
Sunday(R.string.sunday);

fun getName(context: Context): String = when (weekDayNumber) {
Monday.weekDayNumber -> context.getString(R.string.monday)
Tuesday.weekDayNumber -> context.getString(R.string.tuesday)
Wednesday.weekDayNumber -> context.getString(R.string.wednesdays)
Thursday.weekDayNumber -> context.getString(R.string.thursday)
Friday.weekDayNumber -> context.getString(R.string.friday)
Saturday.weekDayNumber -> context.getString(R.string.saturday)
Sunday.weekDayNumber -> context.getString(R.string.sunday)
else -> throw IllegalArgumentException("Week day number is grater than 6: $this")
}
val weekDayNumber: Int get() = this.ordinal
val distanceFromFirstDayOfWeek: Int get() = (this.ordinal + 2) % 7

fun getName(context: Context): String = context.getString(this.nameStringId)
}