From 39c7c507c581ccc2ff6103b467cdb193e8d5249a Mon Sep 17 00:00:00 2001 From: Avior Date: Wed, 20 Jul 2022 18:28:27 +0200 Subject: [PATCH] misc: Update some things --- app/build.gradle | 4 ++-- app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- app/src/debug/res/values/ic_launcher_background.xml | 2 +- app/src/main/res/drawable/logo_background_color.xml | 10 ++++++++++ app/src/main/res/layout/fragment_steps_home.xml | 3 +-- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- build.gradle | 2 +- charts/build.gradle | 2 +- .../java/com/dzeio/charts/builders/ChartBuilder.kt | 4 ++++ .../dzeio/charts/{BarView.kt => views/BarChartView.kt} | 4 ++-- 10 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/logo_background_color.xml create mode 100644 charts/src/main/java/com/dzeio/charts/builders/ChartBuilder.kt rename charts/src/main/java/com/dzeio/charts/{BarView.kt => views/BarChartView.kt} (98%) diff --git a/app/build.gradle b/app/build.gradle index ecd2cc8..0d69db6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,7 +31,7 @@ android { } } - compileSdk 33 + compileSdk 32 defaultConfig { // App ID @@ -41,7 +41,7 @@ android { minSdk 21 // Android 12 - targetSdk 33 + targetSdk 32 // Semantic Versioning versionName "1.0.0" diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml index 7353dbd..5b8b5d6 100644 --- a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/debug/res/values/ic_launcher_background.xml b/app/src/debug/res/values/ic_launcher_background.xml index c5d5899..0dba80f 100644 --- a/app/src/debug/res/values/ic_launcher_background.xml +++ b/app/src/debug/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #FFFFFF + ?backgroundColor \ No newline at end of file diff --git a/app/src/main/res/drawable/logo_background_color.xml b/app/src/main/res/drawable/logo_background_color.xml new file mode 100644 index 0000000..3b634f6 --- /dev/null +++ b/app/src/main/res/drawable/logo_background_color.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_steps_home.xml b/app/src/main/res/layout/fragment_steps_home.xml index e6c9260..8f61f90 100644 --- a/app/src/main/res/layout/fragment_steps_home.xml +++ b/app/src/main/res/layout/fragment_steps_home.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index f373b5c..92a624f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40.5' // Safe Navigation - classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2' + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0' } } diff --git a/charts/build.gradle b/charts/build.gradle index 75a307e..c986e2b 100644 --- a/charts/build.gradle +++ b/charts/build.gradle @@ -31,7 +31,7 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'com.google.android.material:material:1.6.1' testImplementation 'junit:junit:4.13.2' diff --git a/charts/src/main/java/com/dzeio/charts/builders/ChartBuilder.kt b/charts/src/main/java/com/dzeio/charts/builders/ChartBuilder.kt new file mode 100644 index 0000000..99be12f --- /dev/null +++ b/charts/src/main/java/com/dzeio/charts/builders/ChartBuilder.kt @@ -0,0 +1,4 @@ +package com.dzeio.charts.builders + +class ChartBuilder { +} \ No newline at end of file diff --git a/charts/src/main/java/com/dzeio/charts/BarView.kt b/charts/src/main/java/com/dzeio/charts/views/BarChartView.kt similarity index 98% rename from charts/src/main/java/com/dzeio/charts/BarView.kt rename to charts/src/main/java/com/dzeio/charts/views/BarChartView.kt index a397137..201a03f 100644 --- a/charts/src/main/java/com/dzeio/charts/BarView.kt +++ b/charts/src/main/java/com/dzeio/charts/views/BarChartView.kt @@ -1,4 +1,4 @@ -package com.dzeio.charts +package com.dzeio.charts.views import android.content.Context import android.graphics.Canvas @@ -10,7 +10,7 @@ import android.util.Log import android.view.View import kotlin.math.abs -class BarView @JvmOverloads constructor(context: Context?, attrs: AttributeSet? = null) : +class BarChartView @JvmOverloads constructor(context: Context?, attrs: AttributeSet? = null) : View(context, attrs) { companion object {