From 116e8b3e08ba6c9023ea6186f8621d5944531b4f Mon Sep 17 00:00:00 2001 From: Hasan Date: Tue, 22 Oct 2024 21:16:31 +0600 Subject: [PATCH] Package renamed and library version update --- .../screen/home/BongabdoCalculation.kt | 10 +++++----- .../screen/home/HindiLocalisationConfig.kt | 2 +- bongabdo/build.gradle.kts | 2 +- .../java/com/hellohasan/bongabdo/api/Bongabdo.kt | 10 +++++----- .../BengaliLocalizationConfig.kt | 2 +- .../BongabdoLocalizationConfig.kt | 2 +- .../EnglishLocalizationConfig.kt | 2 +- .../banglaAcademy}/BanglaAcademyBongabdo.kt | 13 +++++-------- .../banglaAcademy}/BanglaAcademyConfig.kt | 2 +- .../IndianDrikSiddhantaBongabdo.kt | 16 +++++++++------- gradle/libs.versions.toml | 4 ++-- 11 files changed, 32 insertions(+), 33 deletions(-) rename bongabdo/src/main/java/com/hellohasan/bongabdo/{localization_config => localization}/BengaliLocalizationConfig.kt (95%) rename bongabdo/src/main/java/com/hellohasan/bongabdo/{localization_config => localization}/BongabdoLocalizationConfig.kt (95%) rename bongabdo/src/main/java/com/hellohasan/bongabdo/{localization_config => localization}/EnglishLocalizationConfig.kt (93%) rename bongabdo/src/main/java/com/hellohasan/bongabdo/{bongabdo_method/bangla_academy => methods/banglaAcademy}/BanglaAcademyBongabdo.kt (85%) rename bongabdo/src/main/java/com/hellohasan/bongabdo/{bongabdo_method/bangla_academy => methods/banglaAcademy}/BanglaAcademyConfig.kt (89%) rename bongabdo/src/main/java/com/hellohasan/bongabdo/{bongabdo_method/indian_drik_siddhanta => methods/indianDrikSiddhanta}/IndianDrikSiddhantaBongabdo.kt (97%) diff --git a/app/src/main/java/com/hellohasan/bongabdosample/screen/home/BongabdoCalculation.kt b/app/src/main/java/com/hellohasan/bongabdosample/screen/home/BongabdoCalculation.kt index 8aa81ba..0b19f7c 100644 --- a/app/src/main/java/com/hellohasan/bongabdosample/screen/home/BongabdoCalculation.kt +++ b/app/src/main/java/com/hellohasan/bongabdosample/screen/home/BongabdoCalculation.kt @@ -3,9 +3,9 @@ package com.hellohasan.bongabdosample.screen.home import android.icu.util.Calendar import com.hellohasan.bongabdo.api.Bongabdo import com.hellohasan.bongabdo.api.BongabdoMethod -import com.hellohasan.bongabdo.localization_config.BengaliLocalizationConfig -import com.hellohasan.bongabdo.localization_config.BongabdoLocalizationConfig -import com.hellohasan.bongabdo.localization_config.EnglishLocalizationConfig +import com.hellohasan.bongabdo.localization.BengaliLocalizationConfig +import com.hellohasan.bongabdo.localization.BongabdoLocalizationConfig +import com.hellohasan.bongabdo.localization.EnglishLocalizationConfig import com.hellohasan.bongabdosample.screen.settings.LocaleManager import java.text.SimpleDateFormat import java.util.Locale @@ -19,7 +19,7 @@ object BongabdoCalculation { */ fun getBanglaAcademyBongabdo(calendar: Calendar): String { val bongabdo = Bongabdo.getInstance(BongabdoMethod.BANGLA_ACADEMY) - bongabdo.mLocalizationConfig = getLocalizationConfig() + bongabdo.localizationConfig = getLocalizationConfig() val bongabdoDate = bongabdo.getBongabdoData( calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), @@ -30,7 +30,7 @@ object BongabdoCalculation { fun getDrikShiddhantaBongabdo(calendar: Calendar): String { val bongabdo = Bongabdo.getInstance(BongabdoMethod.INDIAN_DRIK_SIDDHANTA) - bongabdo.mLocalizationConfig = getLocalizationConfig() + bongabdo.localizationConfig = getLocalizationConfig() val bongabdoDate = bongabdo.getBongabdoData( calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), diff --git a/app/src/main/java/com/hellohasan/bongabdosample/screen/home/HindiLocalisationConfig.kt b/app/src/main/java/com/hellohasan/bongabdosample/screen/home/HindiLocalisationConfig.kt index 042bbb0..9f2f090 100644 --- a/app/src/main/java/com/hellohasan/bongabdosample/screen/home/HindiLocalisationConfig.kt +++ b/app/src/main/java/com/hellohasan/bongabdosample/screen/home/HindiLocalisationConfig.kt @@ -1,6 +1,6 @@ package com.hellohasan.bongabdosample.screen.home -import com.hellohasan.bongabdo.localization_config.BongabdoLocalizationConfig +import com.hellohasan.bongabdo.localization.BongabdoLocalizationConfig class HindiLocalisationConfig : BongabdoLocalizationConfig() { override val digitMap: Map diff --git a/bongabdo/build.gradle.kts b/bongabdo/build.gradle.kts index 144bf94..aae15ef 100644 --- a/bongabdo/build.gradle.kts +++ b/bongabdo/build.gradle.kts @@ -23,7 +23,7 @@ publishing { create("maven") { groupId = "com.github.hasancse91" artifactId = "bongabdo" - version = "1.0.1" + version = "1.0.2" from(components["kotlin"]) } } diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/api/Bongabdo.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/api/Bongabdo.kt index 9ee041f..f4cc2c5 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/api/Bongabdo.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/api/Bongabdo.kt @@ -1,13 +1,13 @@ package com.hellohasan.bongabdo.api -import com.hellohasan.bongabdo.bongabdo_method.bangla_academy.BanglaAcademyBongabdo -import com.hellohasan.bongabdo.bongabdo_method.indian_drik_siddhanta.IndianDrikSiddhantaBongabdo -import com.hellohasan.bongabdo.localization_config.BengaliLocalizationConfig -import com.hellohasan.bongabdo.localization_config.BongabdoLocalizationConfig +import com.hellohasan.bongabdo.localization.BengaliLocalizationConfig +import com.hellohasan.bongabdo.localization.BongabdoLocalizationConfig +import com.hellohasan.bongabdo.methods.banglaAcademy.BanglaAcademyBongabdo +import com.hellohasan.bongabdo.methods.indianDrikSiddhanta.IndianDrikSiddhantaBongabdo abstract class Bongabdo { - var mLocalizationConfig: BongabdoLocalizationConfig = BengaliLocalizationConfig() + var localizationConfig: BongabdoLocalizationConfig = BengaliLocalizationConfig() companion object { diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/BengaliLocalizationConfig.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/localization/BengaliLocalizationConfig.kt similarity index 95% rename from bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/BengaliLocalizationConfig.kt rename to bongabdo/src/main/java/com/hellohasan/bongabdo/localization/BengaliLocalizationConfig.kt index 1b2a043..8496547 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/BengaliLocalizationConfig.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/localization/BengaliLocalizationConfig.kt @@ -1,4 +1,4 @@ -package com.hellohasan.bongabdo.localization_config +package com.hellohasan.bongabdo.localization class BengaliLocalizationConfig : BongabdoLocalizationConfig() { diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/BongabdoLocalizationConfig.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/localization/BongabdoLocalizationConfig.kt similarity index 95% rename from bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/BongabdoLocalizationConfig.kt rename to bongabdo/src/main/java/com/hellohasan/bongabdo/localization/BongabdoLocalizationConfig.kt index 716e98f..555264a 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/BongabdoLocalizationConfig.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/localization/BongabdoLocalizationConfig.kt @@ -1,4 +1,4 @@ -package com.hellohasan.bongabdo.localization_config +package com.hellohasan.bongabdo.localization /** * To take implementation inspiration check [BengaliLocalizationConfig] class. diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/EnglishLocalizationConfig.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/localization/EnglishLocalizationConfig.kt similarity index 93% rename from bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/EnglishLocalizationConfig.kt rename to bongabdo/src/main/java/com/hellohasan/bongabdo/localization/EnglishLocalizationConfig.kt index 244df83..a2842e5 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/localization_config/EnglishLocalizationConfig.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/localization/EnglishLocalizationConfig.kt @@ -1,4 +1,4 @@ -package com.hellohasan.bongabdo.localization_config +package com.hellohasan.bongabdo.localization class EnglishLocalizationConfig : BongabdoLocalizationConfig() { diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/bangla_academy/BanglaAcademyBongabdo.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/methods/banglaAcademy/BanglaAcademyBongabdo.kt similarity index 85% rename from bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/bangla_academy/BanglaAcademyBongabdo.kt rename to bongabdo/src/main/java/com/hellohasan/bongabdo/methods/banglaAcademy/BanglaAcademyBongabdo.kt index 27b5d52..98fe503 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/bangla_academy/BanglaAcademyBongabdo.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/methods/banglaAcademy/BanglaAcademyBongabdo.kt @@ -1,4 +1,4 @@ -package com.hellohasan.bongabdo.bongabdo_method.bangla_academy +package com.hellohasan.bongabdo.methods.banglaAcademy import com.hellohasan.bongabdo.api.Bongabdo import com.hellohasan.bongabdo.api.BongabdoData @@ -7,9 +7,6 @@ import kotlinx.datetime.LocalDateTime import kotlinx.datetime.TimeZone import kotlinx.datetime.toInstant import kotlinx.datetime.until -import java.util.Calendar -import java.util.concurrent.TimeUnit -import kotlin.math.abs import kotlin.math.floor internal class BanglaAcademyBongabdo : Bongabdo() { @@ -33,10 +30,10 @@ internal class BanglaAcademyBongabdo : Bongabdo() { month = bongabdoMonthIndex, day = bongabdoDate, season = seasonIndex, - seasonName = mLocalizationConfig.seasonNameList[seasonIndex], - yearName = mLocalizationConfig.toLocalizedNumber(bongabdoYear), - monthName = mLocalizationConfig.monthNameList[bongabdoMonthIndex], - dayName = mLocalizationConfig.toLocalizedNumber(bongabdoDate), + seasonName = localizationConfig.seasonNameList[seasonIndex], + yearName = localizationConfig.toLocalizedNumber(bongabdoYear), + monthName = localizationConfig.monthNameList[bongabdoMonthIndex], + dayName = localizationConfig.toLocalizedNumber(bongabdoDate), calendar = localDateTime ) } diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/bangla_academy/BanglaAcademyConfig.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/methods/banglaAcademy/BanglaAcademyConfig.kt similarity index 89% rename from bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/bangla_academy/BanglaAcademyConfig.kt rename to bongabdo/src/main/java/com/hellohasan/bongabdo/methods/banglaAcademy/BanglaAcademyConfig.kt index 751cdbc..357820c 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/bangla_academy/BanglaAcademyConfig.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/methods/banglaAcademy/BanglaAcademyConfig.kt @@ -1,4 +1,4 @@ -package com.hellohasan.bongabdo.bongabdo_method.bangla_academy +package com.hellohasan.bongabdo.methods.banglaAcademy internal class BanglaAcademyConfig { diff --git a/bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/indian_drik_siddhanta/IndianDrikSiddhantaBongabdo.kt b/bongabdo/src/main/java/com/hellohasan/bongabdo/methods/indianDrikSiddhanta/IndianDrikSiddhantaBongabdo.kt similarity index 97% rename from bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/indian_drik_siddhanta/IndianDrikSiddhantaBongabdo.kt rename to bongabdo/src/main/java/com/hellohasan/bongabdo/methods/indianDrikSiddhanta/IndianDrikSiddhantaBongabdo.kt index 1d9426f..b7b4931 100644 --- a/bongabdo/src/main/java/com/hellohasan/bongabdo/bongabdo_method/indian_drik_siddhanta/IndianDrikSiddhantaBongabdo.kt +++ b/bongabdo/src/main/java/com/hellohasan/bongabdo/methods/indianDrikSiddhanta/IndianDrikSiddhantaBongabdo.kt @@ -1,8 +1,11 @@ -package com.hellohasan.bongabdo.bongabdo_method.indian_drik_siddhanta +package com.hellohasan.bongabdo.methods.indianDrikSiddhanta import com.hellohasan.bongabdo.api.Bongabdo import com.hellohasan.bongabdo.api.BongabdoData -import java.util.Calendar +import kotlinx.datetime.LocalDateTime +import kotlinx.datetime.TimeZone +import kotlinx.datetime.offsetAt +import kotlinx.datetime.toInstant import kotlin.math.PI import kotlin.math.abs import kotlin.math.atan @@ -11,7 +14,6 @@ import kotlin.math.floor import kotlin.math.sin import kotlin.math.sqrt import kotlin.math.tan -import kotlinx.datetime.* /** @@ -181,10 +183,10 @@ internal class IndianDrikSiddhantaBongabdo : Bongabdo() { val (bongabdoDate: Int, bongabdoMonthIndex: Int, bongabdoYear: Int) = banglaMas(bjd) val seasonIndex = (floor(bongabdoMonthIndex / 2.0).toInt()) % 6 - val seasonName = mLocalizationConfig.seasonNameList[seasonIndex] - val yearName = mLocalizationConfig.toLocalizedNumber(bongabdoYear) - val monthName = mLocalizationConfig.monthNameList[bongabdoMonthIndex] - val dayName = mLocalizationConfig.toLocalizedNumber(bongabdoDate) + val seasonName = localizationConfig.seasonNameList[seasonIndex] + val yearName = localizationConfig.toLocalizedNumber(bongabdoYear) + val monthName = localizationConfig.monthNameList[bongabdoMonthIndex] + val dayName = localizationConfig.toLocalizedNumber(bongabdoDate) val bongabdoData = BongabdoData( year = bongabdoYear, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76c13a4..1e34700 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,14 +2,14 @@ agp = "8.7.1" kotlin = "2.0.21" coreKtx = "1.13.1" -junitJupiter = "5.8.2" +junitJupiter = "5.10.3" junitVersion = "1.2.1" espressoCore = "3.6.1" kotlinxDatetime = "0.6.1" lifecycleRuntimeKtx = "2.8.6" activityCompose = "1.9.3" composeBom = "2024.10.00" -jetbrainsKotlinJvm = "1.9.0" +jetbrainsKotlinJvm = "1.9.25" materialIconsExtended = "1.7.4" navigationCompose = "2.8.3" appcompat = "1.7.0"