DPMS-11800 Remove core folder inside of Core module (Part3) (oxeanbit…

…s#17) * Add auxiliar anvil components to do renderization * Remove redundant core folder inside of core module * Fix name of package patch of aux anvil components
rodiguif · Apr 15, 2020 · 784e3c3 · 784e3c3
1 parent 52f6373
commit 784e3c3
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 36 deletions.
diff --git a/app/src/main/java/com/oxeanbits/forecastchart/ui/MainExample.kt b/app/src/main/java/com/oxeanbits/forecastchart/ui/MainExample.kt
@@ -5,7 +5,7 @@ import android.view.View
 import android.widget.LinearLayout
 import androidx.appcompat.app.AppCompatActivity
 import com.jakewharton.threetenabp.AndroidThreeTen
-import com.oxeanbits.forecastchart.core.ui.component.forecastChartComponent
+import com.oxeanbits.forecastchart.ui.component.forecastChartComponent
 import com.oxeanbits.forecastchart.util.SetupChartExample
 import trikita.anvil.BaseDSL.MATCH
 import trikita.anvil.BaseDSL.size

diff --git a/app/src/main/java/com/oxeanbits/forecastchart/util/SetupChartExample.kt b/app/src/main/java/com/oxeanbits/forecastchart/util/SetupChartExample.kt
@@ -4,8 +4,7 @@ import android.graphics.Color
 import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.utils.ColorTemplate
-import com.oxeanbits.forecastchart.core.model.Line
-import com.oxeanbits.forecastchart.core.util.DateFormatter
+import com.oxeanbits.forecastchart.model.Line
 import java.text.DecimalFormat
 
 object SetupChartExample{

diff --git a/core/src/main/java/com/oxeanbits/forecastchart/core/ui/anvil/RenderListener.kt b/core/src/main/java/com/oxeanbits/forecastchart/core/ui/anvil/RenderListener.kt
diff --git a/...oxeanbits/forecastchart/core/model/Bar.kt → .../com/oxeanbits/forecastchart/model/Bar.kt b/...oxeanbits/forecastchart/core/model/Bar.kt → .../com/oxeanbits/forecastchart/model/Bar.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.model
+package com.oxeanbits.forecastchart.model
 
 import com.github.mikephil.charting.data.BarEntry
 

diff --git a/...xeanbits/forecastchart/core/model/Line.kt → ...com/oxeanbits/forecastchart/model/Line.kt b/...xeanbits/forecastchart/core/model/Line.kt → ...com/oxeanbits/forecastchart/model/Line.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.model
+package com.oxeanbits.forecastchart.model
 
 import com.github.mikephil.charting.data.Entry
 

diff --git a/...rt/core/ui/anvil/LayoutComponentHelper.kt → ...stchart/ui/anvil/LayoutComponentHelper.kt b/...rt/core/ui/anvil/LayoutComponentHelper.kt → ...stchart/ui/anvil/LayoutComponentHelper.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.ui.anvil
+package com.oxeanbits.forecastchart.ui.anvil
 
 import android.os.Handler
 import android.os.Looper

diff --git a/...rt/core/ui/anvil/LinearLayoutComponent.kt → ...stchart/ui/anvil/LinearLayoutComponent.kt b/...rt/core/ui/anvil/LinearLayoutComponent.kt → ...stchart/ui/anvil/LinearLayoutComponent.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.ui.anvil
+package com.oxeanbits.forecastchart.ui.anvil
 
 import android.content.Context
 import android.widget.LinearLayout

diff --git a/core/src/main/java/com/oxeanbits/forecastchart/ui/anvil/RenderListener.kt b/core/src/main/java/com/oxeanbits/forecastchart/ui/anvil/RenderListener.kt
@@ -0,0 +1,5 @@
+package com.oxeanbits.forecastchart.ui.anvil
+
+interface RenderListener {
+    fun render()
+}
diff --git a/...astchart/core/ui/anvil/UiRenderHandler.kt → ...forecastchart/ui/anvil/UiRenderHandler.kt b/...astchart/core/ui/anvil/UiRenderHandler.kt → ...forecastchart/ui/anvil/UiRenderHandler.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.ui.anvil
+package com.oxeanbits.forecastchart.ui.anvil
 
 import android.os.Handler
 import android.os.Looper

diff --git a/...tchart/core/ui/component/ComponentsDSL.kt → ...recastchart/ui/component/ComponentsDSL.kt b/...tchart/core/ui/component/ComponentsDSL.kt → ...recastchart/ui/component/ComponentsDSL.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.ui.component
+package com.oxeanbits.forecastchart.ui.component
 
 import android.view.View
 import trikita.anvil.Anvil

diff --git a/...re/ui/component/ForecastChartComponent.kt → ...rt/ui/component/ForecastChartComponent.kt b/...re/ui/component/ForecastChartComponent.kt → ...rt/ui/component/ForecastChartComponent.kt
@@ -1,15 +1,15 @@
-package com.oxeanbits.forecastchart.core.ui.component
+package com.oxeanbits.forecastchart.ui.component
 
 import android.content.Context
 import android.graphics.Typeface.BOLD
 import com.github.mikephil.charting.charts.CombinedChart
 import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.data.Entry
-import com.oxeanbits.forecastchart.core.model.Line
-import com.oxeanbits.forecastchart.core.ui.anvil.LinearLayoutComponent
-import com.oxeanbits.forecastchart.core.util.Colors
-import com.oxeanbits.forecastchart.core.util.DateFormatter.DEFAULT_DATE_FORMAT
-import com.oxeanbits.forecastchart.core.util.ForecastChart
+import com.oxeanbits.forecastchart.model.Line
+import com.oxeanbits.forecastchart.ui.anvil.LinearLayoutComponent
+import com.oxeanbits.forecastchart.util.Colors
+import com.oxeanbits.forecastchart.util.DateFormatter.DEFAULT_DATE_FORMAT
+import com.oxeanbits.forecastchart.util.ForecastChart
 import trikita.anvil.Anvil.currentView
 import trikita.anvil.BaseDSL.MATCH
 import trikita.anvil.BaseDSL.WRAP
@@ -42,7 +42,7 @@ class ForecastChartComponent(context: Context) : LinearLayoutComponent(context)
     private var detailsEnable: Boolean = false
 
     override fun view() {
-        size(MATCH, MATCH)
+        size(MATCH, WRAP)
         orientation(VERTICAL)
 
         if(detailsEnable) {
@@ -192,4 +192,4 @@ class ForecastChartComponent(context: Context) : LinearLayoutComponent(context)
     fun detailsEnable(detailsEnable: Boolean){
         this.detailsEnable = detailsEnable
     }
-}
+}
diff --git a/...hart/core/ui/marker/ForecastMarkerView.kt → ...castchart/ui/marker/ForecastMarkerView.kt b/...hart/core/ui/marker/ForecastMarkerView.kt → ...castchart/ui/marker/ForecastMarkerView.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.ui.marker
+package com.oxeanbits.forecastchart.ui.marker
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -8,7 +8,7 @@ import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.utils.MPPointF
 import com.oxeanbits.forecastchart.core.R
-import com.oxeanbits.forecastchart.core.util.DateFormatter
+import com.oxeanbits.forecastchart.util.DateFormatter
 import java.text.DecimalFormat
 
 @SuppressLint("ViewConstructor")

diff --git a/...eanbits/forecastchart/core/util/Colors.kt → ...om/oxeanbits/forecastchart/util/Colors.kt b/...eanbits/forecastchart/core/util/Colors.kt → ...om/oxeanbits/forecastchart/util/Colors.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.util
+package com.oxeanbits.forecastchart.util
 
 import android.graphics.Color
 

diff --git a/.../forecastchart/core/util/DateFormatter.kt → ...nbits/forecastchart/util/DateFormatter.kt b/.../forecastchart/core/util/DateFormatter.kt → ...nbits/forecastchart/util/DateFormatter.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.util
+package com.oxeanbits.forecastchart.util
 
 import org.threeten.bp.Instant
 import org.threeten.bp.LocalDate

diff --git a/.../forecastchart/core/util/ForecastChart.kt → ...nbits/forecastchart/util/ForecastChart.kt b/.../forecastchart/core/util/ForecastChart.kt → ...nbits/forecastchart/util/ForecastChart.kt
@@ -1,4 +1,4 @@
-package com.oxeanbits.forecastchart.core.util
+package com.oxeanbits.forecastchart.util
 
 import android.content.Context
 import android.graphics.Color
@@ -7,11 +7,11 @@ import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.data.CombinedData
 import com.github.mikephil.charting.data.LineData
-import com.oxeanbits.forecastchart.core.model.Bar
-import com.oxeanbits.forecastchart.core.model.Line
-import com.oxeanbits.forecastchart.core.util.SetupChart.configChart
-import com.oxeanbits.forecastchart.core.util.SetupChart.setupEndBarDataSet
-import com.oxeanbits.forecastchart.core.util.SetupChart.setupLineDataSet
+import com.oxeanbits.forecastchart.model.Bar
+import com.oxeanbits.forecastchart.model.Line
+import com.oxeanbits.forecastchart.util.SetupChart.configChart
+import com.oxeanbits.forecastchart.util.SetupChart.setupEndBarDataSet
+import com.oxeanbits.forecastchart.util.SetupChart.setupLineDataSet
 import java.text.DecimalFormat
 
 object ForecastChart{

diff --git a/...its/forecastchart/core/util/SetupChart.kt → ...xeanbits/forecastchart/util/SetupChart.kt b/...its/forecastchart/core/util/SetupChart.kt → ...xeanbits/forecastchart/util/SetupChart.kt
@@ -1,14 +1,14 @@
-package com.oxeanbits.forecastchart.core.util
+package com.oxeanbits.forecastchart.util
 
 import android.content.Context
 import com.github.mikephil.charting.charts.CombinedChart
 import com.github.mikephil.charting.components.Legend
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.LineDataSet
 import com.oxeanbits.forecastchart.core.R
-import com.oxeanbits.forecastchart.core.model.Bar
-import com.oxeanbits.forecastchart.core.model.Line
-import com.oxeanbits.forecastchart.core.ui.marker.ForecastMarkerView
+import com.oxeanbits.forecastchart.model.Bar
+import com.oxeanbits.forecastchart.model.Line
+import com.oxeanbits.forecastchart.ui.marker.ForecastMarkerView
 import java.text.DecimalFormat
 
 object SetupChart{