From c6f0da396f68913d2dd841cfbe78b6fe0e63aab9 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 14 Sep 2023 23:12:46 +0200 Subject: [PATCH] merge :core:graph to :core:main to speedup build --- .../nightscout/rx/events/EventFoodChanged.kt | 3 --- .../rx/events/EventFoodDatabaseChanged.kt | 3 +++ app/build.gradle | 1 - core/graph/.gitignore | 1 - core/graph/build.gradle | 27 ------------------- core/graph/consumer-rules.pro | 0 core/graph/proguard-rules.pro | 21 --------------- core/graph/src/main/AndroidManifest.xml | 4 --- core/main/build.gradle | 3 ++- .../nightscout/core/graph/ActivityGraph.kt | 0 .../core/graph/BasalProfileGraph.kt | 0 .../nightscout/core/graph/IcProfileGraph.kt | 0 .../nightscout/core/graph/IsfProfileGraph.kt | 0 .../nightscout/core/graph/OverviewData.kt | 0 .../core/graph/TargetBgProfileGraph.kt | 0 .../core/graph/data/AreaGraphSeries.java | 0 .../core/graph/data/BolusDataPoint.kt | 0 .../core/graph/data/CarbsDataPoint.kt | 2 +- .../graph/data/DataPointWithLabelInterface.kt | 0 .../core/graph/data/DeviationDataPoint.kt | 0 .../core/graph/data/DoubleDataPoint.kt | 0 .../data/EffectiveProfileSwitchDataPoint.kt | 0 .../core/graph/data/ExtendedBolusDataPoint.kt | 0 .../core/graph/data/FixedLineGraphSeries.java | 0 .../core/graph/data/GlucoseValueDataPoint.kt | 0 .../core/graph/data/HeartRateDataPoint.kt | 0 .../data/InMemoryGlucoseValueDataPoint.kt | 0 .../data/PointsWithLabelGraphSeries.java | 2 +- .../info/nightscout/core/graph/data/Scale.kt | 0 .../core/graph/data/ScaledDataPoint.kt | 0 .../core/graph/data/TherapyEventDataPoint.kt | 0 .../graph/data/TimeAsXAxisLabelFormatter.java | 0 .../main/res/drawable/ic_ribbon_profile.xml | 0 .../src/main/res/values-af-rZA/strings.xml | 0 .../src/main/res/values-bg-rBG/strings.xml | 0 .../src/main/res/values-ca-rES/strings.xml | 0 .../src/main/res/values-cs-rCZ/strings.xml | 0 .../src/main/res/values-da-rDK/strings.xml | 0 .../src/main/res/values-de-rDE/strings.xml | 0 .../src/main/res/values-el-rGR/strings.xml | 0 .../src/main/res/values-es-rES/strings.xml | 0 .../src/main/res/values-fr-rFR/strings.xml | 0 .../src/main/res/values-ga-rIE/strings.xml | 0 .../src/main/res/values-hr-rHR/strings.xml | 0 .../src/main/res/values-hu-rHU/strings.xml | 0 .../src/main/res/values-it-rIT/strings.xml | 0 .../src/main/res/values-iw-rIL/strings.xml | 0 .../src/main/res/values-ja-rJP/strings.xml | 0 .../src/main/res/values-ko-rKR/strings.xml | 0 .../src/main/res/values-lt-rLT/strings.xml | 0 .../src/main/res/values-nl-rNL/strings.xml | 0 .../src/main/res/values-no-rNO/strings.xml | 0 .../src/main/res/values-pl-rPL/strings.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rPT/strings.xml | 0 .../src/main/res/values-ro-rRO/strings.xml | 0 .../src/main/res/values-ru-rRU/strings.xml | 0 .../src/main/res/values-sk-rSK/strings.xml | 0 .../src/main/res/values-sr-rCS/strings.xml | 0 .../src/main/res/values-sv-rSE/strings.xml | 0 .../src/main/res/values-tr-rTR/strings.xml | 0 .../src/main/res/values-uk-rUA/strings.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values/strings.xml | 0 .../data/InMemoryGlucoseValueDataPointTest.kt | 0 crowdin.yml | 4 +-- implementation/build.gradle | 1 - .../implementation/db/CompatDBHelper.kt | 4 +-- .../queue/commands/CommandBolus.kt | 2 +- .../stats/TotalDailyDoseExtension.kt | 6 +++-- plugins/configuration/build.gradle | 3 +-- plugins/insulin/build.gradle | 2 +- plugins/main/build.gradle | 3 +-- .../plugins/general/food/FoodFragment.kt | 4 +-- .../general/overview/OverviewFragment.kt | 2 +- settings.gradle | 1 - ui/build.gradle | 3 +-- .../ui/activities/QuickWizardListActivity.kt | 4 +-- .../fragments/TreatmentsBolusCarbsFragment.kt | 4 +-- .../info/nightscout/ui/dialogs/CarbsDialog.kt | 2 +- .../nightscout/ui/dialogs/TreatmentDialog.kt | 3 ++- .../nightscout/ui/dialogs/WizardDialog.kt | 3 ++- workflow/build.gradle | 3 +-- 83 files changed, 33 insertions(+), 88 deletions(-) delete mode 100644 app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodChanged.kt create mode 100644 app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt delete mode 100644 core/graph/.gitignore delete mode 100644 core/graph/build.gradle delete mode 100644 core/graph/consumer-rules.pro delete mode 100644 core/graph/proguard-rules.pro delete mode 100644 core/graph/src/main/AndroidManifest.xml rename core/{graph => main}/src/main/java/info/nightscout/core/graph/ActivityGraph.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/OverviewData.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.java (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt (96%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.java (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java (99%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/Scale.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt (100%) rename core/{graph => main}/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java (100%) rename core/{graph => main}/src/main/res/drawable/ic_ribbon_profile.xml (100%) rename core/{graph => main}/src/main/res/values-af-rZA/strings.xml (100%) rename core/{graph => main}/src/main/res/values-bg-rBG/strings.xml (100%) rename core/{graph => main}/src/main/res/values-ca-rES/strings.xml (100%) rename core/{graph => main}/src/main/res/values-cs-rCZ/strings.xml (100%) rename core/{graph => main}/src/main/res/values-da-rDK/strings.xml (100%) rename core/{graph => main}/src/main/res/values-de-rDE/strings.xml (100%) rename core/{graph => main}/src/main/res/values-el-rGR/strings.xml (100%) rename core/{graph => main}/src/main/res/values-es-rES/strings.xml (100%) rename core/{graph => main}/src/main/res/values-fr-rFR/strings.xml (100%) rename core/{graph => main}/src/main/res/values-ga-rIE/strings.xml (100%) rename core/{graph => main}/src/main/res/values-hr-rHR/strings.xml (100%) rename core/{graph => main}/src/main/res/values-hu-rHU/strings.xml (100%) rename core/{graph => main}/src/main/res/values-it-rIT/strings.xml (100%) rename core/{graph => main}/src/main/res/values-iw-rIL/strings.xml (100%) rename core/{graph => main}/src/main/res/values-ja-rJP/strings.xml (100%) rename core/{graph => main}/src/main/res/values-ko-rKR/strings.xml (100%) rename core/{graph => main}/src/main/res/values-lt-rLT/strings.xml (100%) rename core/{graph => main}/src/main/res/values-nl-rNL/strings.xml (100%) rename core/{graph => main}/src/main/res/values-no-rNO/strings.xml (100%) rename core/{graph => main}/src/main/res/values-pl-rPL/strings.xml (100%) rename core/{graph => main}/src/main/res/values-pt-rBR/strings.xml (100%) rename core/{graph => main}/src/main/res/values-pt-rPT/strings.xml (100%) rename core/{graph => main}/src/main/res/values-ro-rRO/strings.xml (100%) rename core/{graph => main}/src/main/res/values-ru-rRU/strings.xml (100%) rename core/{graph => main}/src/main/res/values-sk-rSK/strings.xml (100%) rename core/{graph => main}/src/main/res/values-sr-rCS/strings.xml (100%) rename core/{graph => main}/src/main/res/values-sv-rSE/strings.xml (100%) rename core/{graph => main}/src/main/res/values-tr-rTR/strings.xml (100%) rename core/{graph => main}/src/main/res/values-uk-rUA/strings.xml (100%) rename core/{graph => main}/src/main/res/values-zh-rCN/strings.xml (100%) rename core/{graph => main}/src/main/res/values/strings.xml (100%) rename core/{graph => main}/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt (100%) diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodChanged.kt deleted file mode 100644 index 6121d315cd..0000000000 --- a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodChanged.kt +++ /dev/null @@ -1,3 +0,0 @@ -package info.nightscout.rx.events - -class EventFoodChanged : Event() \ No newline at end of file diff --git a/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt new file mode 100644 index 0000000000..845df25de7 --- /dev/null +++ b/app-wear-shared/shared/src/main/java/info/nightscout/rx/events/EventFoodDatabaseChanged.kt @@ -0,0 +1,3 @@ +package info.nightscout.rx.events + +class EventFoodDatabaseChanged : Event() \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 3d40f22310..53ed090fee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -184,7 +184,6 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':app-wear-shared:shared-impl') implementation project(':core:main') - implementation project(':core:graph') implementation project(':core:graphview') implementation project(':core:interfaces') implementation project(':core:libraries') diff --git a/core/graph/.gitignore b/core/graph/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/core/graph/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/graph/build.gradle b/core/graph/build.gradle deleted file mode 100644 index 52672807b8..0000000000 --- a/core/graph/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'kotlin-allopen' -} - -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" -apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" -apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" -apply from: "${project.rootDir}/core/main/test_dependencies.gradle" -apply from: "${project.rootDir}/core/main/jacoco_global.gradle" - -dependencies { - implementation project(':core:graphview') - implementation project(':app-wear-shared:shared') - implementation project(':database:entities') - implementation project(':core:interfaces') - implementation project(':core:ui') - - api "com.google.android.material:material:$material_version" -} - -android { - namespace 'info.nightscout.core.graph' -} diff --git a/core/graph/consumer-rules.pro b/core/graph/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/graph/proguard-rules.pro b/core/graph/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/core/graph/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/graph/src/main/AndroidManifest.xml b/core/graph/src/main/AndroidManifest.xml deleted file mode 100644 index 44008a4332..0000000000 --- a/core/graph/src/main/AndroidManifest.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/main/build.gradle b/core/main/build.gradle index adf7679114..cc5c7b7392 100644 --- a/core/main/build.gradle +++ b/core/main/build.gradle @@ -15,7 +15,7 @@ apply from: "${project.rootDir}/core/main/jacoco_global.gradle" dependencies { implementation project(':app-wear-shared:shared') implementation project(':database:entities') - implementation project(':core:graph') + implementation project(':core:graphview') implementation project(':core:interfaces') implementation project(':core:ui') implementation project(':core:utils') @@ -28,6 +28,7 @@ dependencies { api "androidx.activity:activity-ktx:$activity_version" api "androidx.appcompat:appcompat:$appcompat_version" + api "com.google.android.material:material:$material_version" api "com.google.dagger:dagger-android:$dagger_version" api "com.google.dagger:dagger-android-support:$dagger_version" diff --git a/core/graph/src/main/java/info/nightscout/core/graph/ActivityGraph.kt b/core/main/src/main/java/info/nightscout/core/graph/ActivityGraph.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/ActivityGraph.kt rename to core/main/src/main/java/info/nightscout/core/graph/ActivityGraph.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt b/core/main/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt rename to core/main/src/main/java/info/nightscout/core/graph/BasalProfileGraph.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt b/core/main/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt rename to core/main/src/main/java/info/nightscout/core/graph/IcProfileGraph.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt b/core/main/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt rename to core/main/src/main/java/info/nightscout/core/graph/IsfProfileGraph.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/OverviewData.kt b/core/main/src/main/java/info/nightscout/core/graph/OverviewData.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/OverviewData.kt rename to core/main/src/main/java/info/nightscout/core/graph/OverviewData.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt b/core/main/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt rename to core/main/src/main/java/info/nightscout/core/graph/TargetBgProfileGraph.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.java b/core/main/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.java similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.java rename to core/main/src/main/java/info/nightscout/core/graph/data/AreaGraphSeries.java diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/BolusDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt similarity index 96% rename from core/graph/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt index 934e49bc8c..2c0e58dde3 100644 --- a/core/graph/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt +++ b/core/main/src/main/java/info/nightscout/core/graph/data/CarbsDataPoint.kt @@ -2,7 +2,7 @@ package info.nightscout.core.graph.data import android.content.Context import android.graphics.Paint -import info.nightscout.core.graph.R +import info.nightscout.core.main.R import info.nightscout.database.entities.Carbs import info.nightscout.shared.interfaces.ResourceHelper diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt b/core/main/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/DataPointWithLabelInterface.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/DeviationDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/DoubleDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/EffectiveProfileSwitchDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/ExtendedBolusDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.java b/core/main/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.java similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.java rename to core/main/src/main/java/info/nightscout/core/graph/data/FixedLineGraphSeries.java diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/GlucoseValueDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/HeartRateDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java b/core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java similarity index 99% rename from core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java rename to core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java index 4eafcd9423..c0510e4a10 100644 --- a/core/graph/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java +++ b/core/main/src/main/java/info/nightscout/core/graph/data/PointsWithLabelGraphSeries.java @@ -17,7 +17,7 @@ import com.jjoe64.graphview.series.BaseSeries; import java.util.Iterator; -import info.nightscout.core.graph.R; +import info.nightscout.core.main.R; /** * Series that plots the data as points. diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/Scale.kt b/core/main/src/main/java/info/nightscout/core/graph/data/Scale.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/Scale.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/Scale.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/ScaledDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt b/core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt rename to core/main/src/main/java/info/nightscout/core/graph/data/TherapyEventDataPoint.kt diff --git a/core/graph/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java b/core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java similarity index 100% rename from core/graph/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java rename to core/main/src/main/java/info/nightscout/core/graph/data/TimeAsXAxisLabelFormatter.java diff --git a/core/graph/src/main/res/drawable/ic_ribbon_profile.xml b/core/main/src/main/res/drawable/ic_ribbon_profile.xml similarity index 100% rename from core/graph/src/main/res/drawable/ic_ribbon_profile.xml rename to core/main/src/main/res/drawable/ic_ribbon_profile.xml diff --git a/core/graph/src/main/res/values-af-rZA/strings.xml b/core/main/src/main/res/values-af-rZA/strings.xml similarity index 100% rename from core/graph/src/main/res/values-af-rZA/strings.xml rename to core/main/src/main/res/values-af-rZA/strings.xml diff --git a/core/graph/src/main/res/values-bg-rBG/strings.xml b/core/main/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from core/graph/src/main/res/values-bg-rBG/strings.xml rename to core/main/src/main/res/values-bg-rBG/strings.xml diff --git a/core/graph/src/main/res/values-ca-rES/strings.xml b/core/main/src/main/res/values-ca-rES/strings.xml similarity index 100% rename from core/graph/src/main/res/values-ca-rES/strings.xml rename to core/main/src/main/res/values-ca-rES/strings.xml diff --git a/core/graph/src/main/res/values-cs-rCZ/strings.xml b/core/main/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from core/graph/src/main/res/values-cs-rCZ/strings.xml rename to core/main/src/main/res/values-cs-rCZ/strings.xml diff --git a/core/graph/src/main/res/values-da-rDK/strings.xml b/core/main/src/main/res/values-da-rDK/strings.xml similarity index 100% rename from core/graph/src/main/res/values-da-rDK/strings.xml rename to core/main/src/main/res/values-da-rDK/strings.xml diff --git a/core/graph/src/main/res/values-de-rDE/strings.xml b/core/main/src/main/res/values-de-rDE/strings.xml similarity index 100% rename from core/graph/src/main/res/values-de-rDE/strings.xml rename to core/main/src/main/res/values-de-rDE/strings.xml diff --git a/core/graph/src/main/res/values-el-rGR/strings.xml b/core/main/src/main/res/values-el-rGR/strings.xml similarity index 100% rename from core/graph/src/main/res/values-el-rGR/strings.xml rename to core/main/src/main/res/values-el-rGR/strings.xml diff --git a/core/graph/src/main/res/values-es-rES/strings.xml b/core/main/src/main/res/values-es-rES/strings.xml similarity index 100% rename from core/graph/src/main/res/values-es-rES/strings.xml rename to core/main/src/main/res/values-es-rES/strings.xml diff --git a/core/graph/src/main/res/values-fr-rFR/strings.xml b/core/main/src/main/res/values-fr-rFR/strings.xml similarity index 100% rename from core/graph/src/main/res/values-fr-rFR/strings.xml rename to core/main/src/main/res/values-fr-rFR/strings.xml diff --git a/core/graph/src/main/res/values-ga-rIE/strings.xml b/core/main/src/main/res/values-ga-rIE/strings.xml similarity index 100% rename from core/graph/src/main/res/values-ga-rIE/strings.xml rename to core/main/src/main/res/values-ga-rIE/strings.xml diff --git a/core/graph/src/main/res/values-hr-rHR/strings.xml b/core/main/src/main/res/values-hr-rHR/strings.xml similarity index 100% rename from core/graph/src/main/res/values-hr-rHR/strings.xml rename to core/main/src/main/res/values-hr-rHR/strings.xml diff --git a/core/graph/src/main/res/values-hu-rHU/strings.xml b/core/main/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from core/graph/src/main/res/values-hu-rHU/strings.xml rename to core/main/src/main/res/values-hu-rHU/strings.xml diff --git a/core/graph/src/main/res/values-it-rIT/strings.xml b/core/main/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from core/graph/src/main/res/values-it-rIT/strings.xml rename to core/main/src/main/res/values-it-rIT/strings.xml diff --git a/core/graph/src/main/res/values-iw-rIL/strings.xml b/core/main/src/main/res/values-iw-rIL/strings.xml similarity index 100% rename from core/graph/src/main/res/values-iw-rIL/strings.xml rename to core/main/src/main/res/values-iw-rIL/strings.xml diff --git a/core/graph/src/main/res/values-ja-rJP/strings.xml b/core/main/src/main/res/values-ja-rJP/strings.xml similarity index 100% rename from core/graph/src/main/res/values-ja-rJP/strings.xml rename to core/main/src/main/res/values-ja-rJP/strings.xml diff --git a/core/graph/src/main/res/values-ko-rKR/strings.xml b/core/main/src/main/res/values-ko-rKR/strings.xml similarity index 100% rename from core/graph/src/main/res/values-ko-rKR/strings.xml rename to core/main/src/main/res/values-ko-rKR/strings.xml diff --git a/core/graph/src/main/res/values-lt-rLT/strings.xml b/core/main/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from core/graph/src/main/res/values-lt-rLT/strings.xml rename to core/main/src/main/res/values-lt-rLT/strings.xml diff --git a/core/graph/src/main/res/values-nl-rNL/strings.xml b/core/main/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from core/graph/src/main/res/values-nl-rNL/strings.xml rename to core/main/src/main/res/values-nl-rNL/strings.xml diff --git a/core/graph/src/main/res/values-no-rNO/strings.xml b/core/main/src/main/res/values-no-rNO/strings.xml similarity index 100% rename from core/graph/src/main/res/values-no-rNO/strings.xml rename to core/main/src/main/res/values-no-rNO/strings.xml diff --git a/core/graph/src/main/res/values-pl-rPL/strings.xml b/core/main/src/main/res/values-pl-rPL/strings.xml similarity index 100% rename from core/graph/src/main/res/values-pl-rPL/strings.xml rename to core/main/src/main/res/values-pl-rPL/strings.xml diff --git a/core/graph/src/main/res/values-pt-rBR/strings.xml b/core/main/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from core/graph/src/main/res/values-pt-rBR/strings.xml rename to core/main/src/main/res/values-pt-rBR/strings.xml diff --git a/core/graph/src/main/res/values-pt-rPT/strings.xml b/core/main/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from core/graph/src/main/res/values-pt-rPT/strings.xml rename to core/main/src/main/res/values-pt-rPT/strings.xml diff --git a/core/graph/src/main/res/values-ro-rRO/strings.xml b/core/main/src/main/res/values-ro-rRO/strings.xml similarity index 100% rename from core/graph/src/main/res/values-ro-rRO/strings.xml rename to core/main/src/main/res/values-ro-rRO/strings.xml diff --git a/core/graph/src/main/res/values-ru-rRU/strings.xml b/core/main/src/main/res/values-ru-rRU/strings.xml similarity index 100% rename from core/graph/src/main/res/values-ru-rRU/strings.xml rename to core/main/src/main/res/values-ru-rRU/strings.xml diff --git a/core/graph/src/main/res/values-sk-rSK/strings.xml b/core/main/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from core/graph/src/main/res/values-sk-rSK/strings.xml rename to core/main/src/main/res/values-sk-rSK/strings.xml diff --git a/core/graph/src/main/res/values-sr-rCS/strings.xml b/core/main/src/main/res/values-sr-rCS/strings.xml similarity index 100% rename from core/graph/src/main/res/values-sr-rCS/strings.xml rename to core/main/src/main/res/values-sr-rCS/strings.xml diff --git a/core/graph/src/main/res/values-sv-rSE/strings.xml b/core/main/src/main/res/values-sv-rSE/strings.xml similarity index 100% rename from core/graph/src/main/res/values-sv-rSE/strings.xml rename to core/main/src/main/res/values-sv-rSE/strings.xml diff --git a/core/graph/src/main/res/values-tr-rTR/strings.xml b/core/main/src/main/res/values-tr-rTR/strings.xml similarity index 100% rename from core/graph/src/main/res/values-tr-rTR/strings.xml rename to core/main/src/main/res/values-tr-rTR/strings.xml diff --git a/core/graph/src/main/res/values-uk-rUA/strings.xml b/core/main/src/main/res/values-uk-rUA/strings.xml similarity index 100% rename from core/graph/src/main/res/values-uk-rUA/strings.xml rename to core/main/src/main/res/values-uk-rUA/strings.xml diff --git a/core/graph/src/main/res/values-zh-rCN/strings.xml b/core/main/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from core/graph/src/main/res/values-zh-rCN/strings.xml rename to core/main/src/main/res/values-zh-rCN/strings.xml diff --git a/core/graph/src/main/res/values/strings.xml b/core/main/src/main/res/values/strings.xml similarity index 100% rename from core/graph/src/main/res/values/strings.xml rename to core/main/src/main/res/values/strings.xml diff --git a/core/graph/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt b/core/main/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt similarity index 100% rename from core/graph/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt rename to core/main/src/test/java/info/nightscout/core/graph/data/InMemoryGlucoseValueDataPointTest.kt diff --git a/crowdin.yml b/crowdin.yml index 1058944a26..34356aa616 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -37,8 +37,8 @@ files: translation: /plugins/sync/src/main/res/values-%android_code%/oh_strings.xml - source: /plugins/constraints/src/main/res/values/strings.xml translation: /plugins/constraints/src/main/res/values-%android_code%/strings.xml - - source: /core/graph/src/main/res/values/strings.xml - translation: /core/graph/src/main/res/values-%android_code%/strings.xml + - source: /core/main/src/main/res/values/strings.xml + translation: /core/main/src/main/res/values-%android_code%/strings.xml - source: /core/interfaces/src/main/res/values/strings.xml translation: /core/interfaces/src/main/res/values-%android_code%/strings.xml - source: /core/utils/src/main/res/values/strings.xml diff --git a/implementation/build.gradle b/implementation/build.gradle index d68e50c106..177a3b439f 100644 --- a/implementation/build.gradle +++ b/implementation/build.gradle @@ -19,7 +19,6 @@ dependencies { implementation project(':database:entities') implementation project(':database:impl') implementation project(':core:main') - implementation project(':core:graph') implementation project(':core:graphview') implementation project(':core:interfaces') implementation project(':core:ui') diff --git a/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt b/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt index 8ae06882a8..22751eca68 100644 --- a/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt +++ b/implementation/src/main/java/info/nightscout/implementation/db/CompatDBHelper.kt @@ -19,7 +19,7 @@ import info.nightscout.rx.bus.RxBus import info.nightscout.rx.events.EventDeviceStatusChange import info.nightscout.rx.events.EventEffectiveProfileSwitchChanged import info.nightscout.rx.events.EventExtendedBolusChange -import info.nightscout.rx.events.EventFoodChanged +import info.nightscout.rx.events.EventFoodDatabaseChanged import info.nightscout.rx.events.EventNewBG import info.nightscout.rx.events.EventNewHistoryData import info.nightscout.rx.events.EventOfflineChange @@ -101,7 +101,7 @@ class CompatDBHelper @Inject constructor( } it.filterIsInstance().firstOrNull()?.let { food -> aapsLogger.debug(LTag.DATABASE, "Firing EventFoodDatabaseChanged $food") - rxBus.send(EventFoodChanged()) + rxBus.send(EventFoodDatabaseChanged()) } it.filterIsInstance().firstOrNull()?.let { ps -> aapsLogger.debug(LTag.DATABASE, "Firing EventProfileSwitchChanged $ps") diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt index 27c83b843b..9645df6318 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt @@ -39,7 +39,7 @@ class CommandBolus( override fun log(): String { return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(info.nightscout.interfaces.R.string.format_insulin_units, detailedBolusInfo.insulin) else "") + - if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(info.nightscout.core.graph.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else "" + if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(info.nightscout.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else "" } override fun cancel() { diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt index 13b35f3255..6ca8875275 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt @@ -42,7 +42,8 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: Da row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.interfaces.R.string.format_insulin_units1, basalAmount) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, basalPct) }) if (includeCarbs) - row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbs.toInt()) }) + row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs + .toInt()) }) } } @@ -59,6 +60,7 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = rh.gs(info.nightscout.interfaces.R.string.format_insulin_units1, basalAmount) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, basalPct) }) if (includeCarbs) - row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbs.toInt()) }) + row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs + .toInt()) }) } } diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle index 02c536861b..8b66f55e8e 100644 --- a/plugins/configuration/build.gradle +++ b/plugins/configuration/build.gradle @@ -18,9 +18,8 @@ android { dependencies { implementation project(':app-wear-shared:shared') implementation project(':database:entities') - implementation project(':core:main') - implementation project(':core:graph') implementation project(':core:interfaces') + implementation project(':core:main') implementation project(':core:ns-sdk') implementation project(':core:utils') implementation project(':core:ui') diff --git a/plugins/insulin/build.gradle b/plugins/insulin/build.gradle index ba6f35582b..74d0c33bc4 100644 --- a/plugins/insulin/build.gradle +++ b/plugins/insulin/build.gradle @@ -17,9 +17,9 @@ android { dependencies { implementation project(':app-wear-shared:shared') - implementation project(':core:graph') implementation project(':core:graphview') implementation project(':core:interfaces') + implementation project(':core:main') implementation project(':core:ui') implementation project(':core:utils') implementation project(':core:validators') diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle index c329c74dd4..07d9669272 100644 --- a/plugins/main/build.gradle +++ b/plugins/main/build.gradle @@ -18,10 +18,9 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') - implementation project(':core:main') - implementation project(':core:graph') implementation project(':core:graphview') implementation project(':core:interfaces') + implementation project(':core:main') implementation project(':core:ns-sdk') implementation project(':core:ui') implementation project(':core:utils') diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt index 223ab1b841..b9e3f6a094 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt @@ -28,7 +28,7 @@ import info.nightscout.plugins.databinding.FoodFragmentBinding import info.nightscout.plugins.databinding.FoodItemBinding import info.nightscout.rx.AapsSchedulers import info.nightscout.rx.bus.RxBus -import info.nightscout.rx.events.EventFoodChanged +import info.nightscout.rx.events.EventFoodDatabaseChanged import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.LTag import info.nightscout.shared.extensions.toVisibility @@ -92,7 +92,7 @@ class FoodFragment : DaggerFragment() { override fun onResume() { super.onResume() disposable += rxBus - .toObservable(EventFoodChanged::class.java) + .toObservable(EventFoodDatabaseChanged::class.java) .observeOn(aapsSchedulers.main) .debounce(1L, TimeUnit.SECONDS) .subscribe({ swapAdapter() }, fabricPrivacy::logException) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt index 842bbcabc4..81dd5a1174 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt @@ -543,7 +543,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (quickWizardEntry != null && lastBG != null && profile != null && pump.isInitialized() && !pump.isSuspended() && !loop.isDisconnected) { binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE val wizard = quickWizardEntry.doCalc(profile, profileName, lastBG) - binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(info.nightscout.core.graph.R.string.format_carbs, quickWizardEntry.carbs()) + + binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(info.nightscout.core.main.R.string.format_carbs, quickWizardEntry.carbs()) + " " + rh.gs(info.nightscout.interfaces.R.string.format_insulin_units, wizard.calculatedTotalInsulin) if (wizard.calculatedTotalInsulin <= 0) binding.buttonsLayout.quickWizardButton.visibility = View.GONE } else binding.buttonsLayout.quickWizardButton.visibility = View.GONE diff --git a/settings.gradle b/settings.gradle index 9acd60359b..19da8bf565 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ include ':app-wear-shared:shared-impl' include ':app-wear-shared:shared-tests' include ':core:main' include ':core:graphview' -include ':core:graph' include ':core:interfaces' include ':core:libraries' include ':core:ns-sdk' diff --git a/ui/build.gradle b/ui/build.gradle index 88263da7bd..65f2b951c7 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -20,9 +20,8 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') - implementation project(':core:main') implementation project(':core:interfaces') - implementation project(':core:graph') + implementation project(':core:main') implementation project(':core:ui') implementation project(':core:utils') diff --git a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt index 0cda822fd9..d89a38c967 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt @@ -74,7 +74,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag holder.binding.from.text = dateUtil.timeString(entry.validFromDate()) holder.binding.to.text = dateUtil.timeString(entry.validToDate()) holder.binding.buttonText.text = entry.buttonText() - holder.binding.carbs.text = rh.gs(info.nightscout.core.graph.R.string.format_carbs, entry.carbs()) + holder.binding.carbs.text = rh.gs(info.nightscout.core.main.R.string.format_carbs, entry.carbs()) if (entry.device() == QuickWizardEntry.DEVICE_ALL) { holder.binding.device.visibility = View.GONE } else { @@ -194,7 +194,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val entry = selectedItems.valueAt(0) - return "${rh.gs(info.nightscout.core.ui.R.string.remove_button)} ${entry.buttonText()} ${rh.gs(info.nightscout.core.graph.R.string.format_carbs, entry.carbs())}\n" + + return "${rh.gs(info.nightscout.core.ui.R.string.remove_button)} ${entry.buttonText()} ${rh.gs(info.nightscout.core.main.R.string.format_carbs, entry.carbs())}\n" + "${dateUtil.timeString(entry.validFromDate())} - ${dateUtil.timeString(entry.validToDate())}" } return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt index fbf769c577..52874bc468 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -257,7 +257,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider { holder.binding.carbsLayout.visibility = (ml.carbs != null && (ml.carbs.isValid || showInvalidated)).toVisibility() ml.carbs?.let { carbs -> holder.binding.carbsTime.text = dateUtil.timeString(carbs.timestamp) - holder.binding.carbs.text = rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbs.amount.toInt()) + holder.binding.carbs.text = rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs.amount.toInt()) holder.binding.carbsDuration.text = if (carbs.duration > 0) rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else "" holder.binding.carbsNs.visibility = (carbs.interfaceIDs.nightscoutId != null).toVisibility() holder.binding.carbsPump.visibility = (carbs.interfaceIDs.pumpId != null).toVisibility() @@ -441,7 +441,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider { rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(bolus.timestamp) val carbs = mealLink.carbs if (carbs != null) - return rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbs.amount.toInt()) + "\n" + + return rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbs.amount.toInt()) + "\n" + rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(carbs.timestamp) } return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index 1ce19dceee..6d250a5ab4 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -278,7 +278,7 @@ class CarbsDialog : DialogFragmentWithDate() { if (duration > 0) actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(info.nightscout.shared.R.string.shorthour)) if (carbsAfterConstraints > 0) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "" + rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbsAfterConstraints) + "") + actions.add(rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "" + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints) + "") if (carbsAfterConstraints != carbs) actions.add("" + rh.gs(R.string.carbs_constraint_applied) + "") } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt index 1ed791a7a7..c48c1fbe5d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt @@ -157,7 +157,8 @@ class TreatmentDialog : DialogFragmentWithDate() { ) } if (carbsAfterConstraints > 0) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbsAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.carbsColor)) + actions.add(rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor(context, rh, info.nightscout + .core.ui.R.attr.carbsColor)) if (carbsAfterConstraints != carbs) actions.add(rh.gs(R.string.carbs_constraint_applied).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt index a574168fe9..f7aec305ff 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt @@ -516,7 +516,8 @@ class WizardDialog : DaggerDialogFragment() { if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) { val insulinText = if (wizard.calculatedTotalInsulin > 0.0) rh.gs(info.nightscout.interfaces.R.string.format_insulin_units, wizard.calculatedTotalInsulin).formatColor(context, rh, info.nightscout.core.ui.R.attr.bolusColor) else "" - val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(info.nightscout.core.graph.R.string.format_carbs, carbsAfterConstraint).formatColor(context, rh, info.nightscout.core.ui.R.attr.carbsColor) else "" + val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(info.nightscout.core.main.R.string.format_carbs, carbsAfterConstraint).formatColor(context, rh, info.nightscout.core.ui.R.attr + .carbsColor) else "" binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.result_insulin_carbs, insulinText, carbsText)) binding.okcancel.ok.visibility = View.VISIBLE } else { diff --git a/workflow/build.gradle b/workflow/build.gradle index 220cf075f1..823e355efe 100644 --- a/workflow/build.gradle +++ b/workflow/build.gradle @@ -20,9 +20,8 @@ dependencies { implementation project(':app-wear-shared:shared') implementation project(':database:entities') implementation project(':database:impl') - implementation project(':core:main') implementation project(':core:interfaces') - implementation project(':core:graph') + implementation project(':core:main') implementation project(':core:ui') implementation project(':core:utils') } \ No newline at end of file