diff --git a/app/build.gradle b/app/build.gradle index 1be3c32..7acff2f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,4 +1,6 @@ -apply plugin: 'com.android.application' +plugins { + alias(libs.plugins.androidApplication) +} def keystoreFile = rootProject.file("app/sp.jks") @@ -72,20 +74,20 @@ android { } dependencies { - implementation 'androidx.biometric:biometric:1.1.0' - implementation 'androidx.multidex:multidex:2.0.1' - playImplementation 'com.android.billingclient:billing:7.1.1' + api(project(":colorpicker")) + implementation libs.biometric + implementation libs.multidex + playImplementation libs.billing - def sCommon_Version = 'efc9dce669' - implementation "com.github.sunilpaulmathew.sCommon:adapters:${sCommon_Version}" - implementation "com.github.sunilpaulmathew.sCommon:credits:${sCommon_Version}" - implementation "com.github.sunilpaulmathew.sCommon:crashreporter:${sCommon_Version}" - implementation "com.github.sunilpaulmathew.sCommon:fileutils:${sCommon_Version}" - implementation "com.github.sunilpaulmathew.sCommon:permissionutils:${sCommon_Version}" - implementation "com.github.sunilpaulmathew.sCommon:themeutils:${sCommon_Version}" - implementation "com.github.sunilpaulmathew.sCommon:translatorutils:${sCommon_Version}" + implementation libs.adapters + implementation libs.credits + implementation libs.crashreporter + implementation libs.fileutils + implementation libs.permissionutils + implementation libs.themeutils + implementation libs.translatorutils - implementation "com.google.android.material:material:1.12.0" - implementation "com.google.code.gson:gson:2.10.1" - implementation 'me.dm7.barcodescanner:zxing:1.9.8' + implementation libs.material + implementation libs.gson + implementation libs.zxing } \ No newline at end of file diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/activities/ColorCustomizationsActivity.java b/app/src/main/java/com/sunilpaulmathew/snotz/activities/ColorCustomizationsActivity.java index 38a0356..6e1593c 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/activities/ColorCustomizationsActivity.java +++ b/app/src/main/java/com/sunilpaulmathew/snotz/activities/ColorCustomizationsActivity.java @@ -13,13 +13,13 @@ import com.google.android.material.textview.MaterialTextView; import com.sunilpaulmathew.snotz.R; import com.sunilpaulmathew.snotz.adapters.ColorCustomizationsAdapter; -import com.sunilpaulmathew.snotz.colorpicker.ColorPickerDialog; import com.sunilpaulmathew.snotz.utils.Security; import com.sunilpaulmathew.snotz.utils.sNotzColor; import com.sunilpaulmathew.snotz.utils.serializableItems.CheckListItems; import java.util.ArrayList; +import in.sunilpaulmathew.colorpicker.ColorPickerDialog; import in.sunilpaulmathew.sCommon.CommonUtils.sCommonUtils; /* diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/activities/CreateWidgetActivity.java b/app/src/main/java/com/sunilpaulmathew/snotz/activities/CreateWidgetActivity.java index baa5042..eff6e93 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/activities/CreateWidgetActivity.java +++ b/app/src/main/java/com/sunilpaulmathew/snotz/activities/CreateWidgetActivity.java @@ -26,7 +26,6 @@ import com.google.android.material.textview.MaterialTextView; import com.sunilpaulmathew.snotz.R; import com.sunilpaulmathew.snotz.adapters.CheckListAdapter; -import com.sunilpaulmathew.snotz.colorpicker.ColorPickerDialog; import com.sunilpaulmathew.snotz.utils.AppSettings; import com.sunilpaulmathew.snotz.utils.CheckLists; import com.sunilpaulmathew.snotz.utils.Utils; @@ -38,6 +37,7 @@ import java.util.List; import java.util.Objects; +import in.sunilpaulmathew.colorpicker.ColorPickerDialog; import in.sunilpaulmathew.sCommon.CommonUtils.sCommonUtils; /* diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/activities/NoteActivity.java b/app/src/main/java/com/sunilpaulmathew/snotz/activities/NoteActivity.java index 123a67d..be070d4 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/activities/NoteActivity.java +++ b/app/src/main/java/com/sunilpaulmathew/snotz/activities/NoteActivity.java @@ -35,7 +35,6 @@ import com.google.gson.JsonObject; import com.sunilpaulmathew.snotz.R; import com.sunilpaulmathew.snotz.adapters.CheckListAdapter; -import com.sunilpaulmathew.snotz.colorpicker.ColorPickerDialog; import com.sunilpaulmathew.snotz.utils.AppSettings; import com.sunilpaulmathew.snotz.utils.CheckLists; import com.sunilpaulmathew.snotz.utils.Utils; @@ -49,6 +48,7 @@ import java.util.List; import java.util.Objects; +import in.sunilpaulmathew.colorpicker.ColorPickerDialog; import in.sunilpaulmathew.sCommon.CommonUtils.sCommonUtils; import in.sunilpaulmathew.sCommon.CommonUtils.sExecutor; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/activities/SettingsActivity.java b/app/src/main/java/com/sunilpaulmathew/snotz/activities/SettingsActivity.java index e1e17b7..dd79d12 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/activities/SettingsActivity.java +++ b/app/src/main/java/com/sunilpaulmathew/snotz/activities/SettingsActivity.java @@ -22,7 +22,6 @@ import com.sunilpaulmathew.snotz.BuildConfig; import com.sunilpaulmathew.snotz.R; import com.sunilpaulmathew.snotz.adapters.SettingsAdapter; -import com.sunilpaulmathew.snotz.colorpicker.ColorPickerDialog; import com.sunilpaulmathew.snotz.utils.AppSettings; import com.sunilpaulmathew.snotz.utils.Billing; import com.sunilpaulmathew.snotz.utils.CheckLists; @@ -43,6 +42,7 @@ import java.util.Objects; import java.util.concurrent.Executor; +import in.sunilpaulmathew.colorpicker.ColorPickerDialog; import in.sunilpaulmathew.sCommon.CommonUtils.sCommonUtils; import in.sunilpaulmathew.sCommon.Credits.sCreditsUtils; import in.sunilpaulmathew.sCommon.FileUtils.sFileUtils; diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d90986e..0a28468 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,12 +13,6 @@ true - - + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2d3d18a..2bbe0c4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,4 @@ -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:8.3.2' - } -} - -allprojects { - repositories { - google() - mavenCentral() - maven { - url "https://jitpack.io" - } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir +plugins { + alias(libs.plugins.androidApplication) apply false + alias(libs.plugins.androidLibrary) apply false } \ No newline at end of file diff --git a/colorpicker/.gitignore b/colorpicker/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/colorpicker/.gitignore @@ -0,0 +1 @@ +/build diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle new file mode 100644 index 0000000..91b4753 --- /dev/null +++ b/colorpicker/build.gradle @@ -0,0 +1,17 @@ +plugins { + alias(libs.plugins.androidLibrary) +} + +android { + namespace 'in.sunilpaulmathew.colorpicker' + compileSdk 34 + + defaultConfig { + minSdk 19 + consumerProguardFiles("proguard-rules.pro") + } +} + +dependencies { + implementation libs.material +} \ No newline at end of file diff --git a/colorpicker/src/main/AndroidManifest.xml b/colorpicker/src/main/AndroidManifest.xml new file mode 100644 index 0000000..568741e --- /dev/null +++ b/colorpicker/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/ColorPickerDialog.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/ColorPickerDialog.java similarity index 92% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/ColorPickerDialog.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/ColorPickerDialog.java index cd3dfd1..0b52d40 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/ColorPickerDialog.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/ColorPickerDialog.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker; +package in.sunilpaulmathew.colorpicker; import android.content.Context; import android.content.DialogInterface; @@ -9,12 +9,12 @@ import androidx.appcompat.widget.LinearLayoutCompat; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import com.sunilpaulmathew.snotz.R; -import com.sunilpaulmathew.snotz.colorpicker.interfaces.ColorPickerClickListener; -import com.sunilpaulmathew.snotz.colorpicker.interfaces.OnColorSelectedListener; -import com.sunilpaulmathew.snotz.colorpicker.views.AlphaSlider; -import com.sunilpaulmathew.snotz.colorpicker.views.ColorPickerView; -import com.sunilpaulmathew.snotz.colorpicker.views.LightnessSlider; + +import in.sunilpaulmathew.colorpicker.interfaces.ColorPickerClickListener; +import in.sunilpaulmathew.colorpicker.interfaces.OnColorSelectedListener; +import in.sunilpaulmathew.colorpicker.views.AlphaSlider; +import in.sunilpaulmathew.colorpicker.views.ColorPickerView; +import in.sunilpaulmathew.colorpicker.views.LightnessSlider; public class ColorPickerDialog { diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/License.md b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/License.md similarity index 100% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/License.md rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/License.md diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/ColorPickerClickListener.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/ColorPickerClickListener.java similarity index 74% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/ColorPickerClickListener.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/ColorPickerClickListener.java index cd1d187..d8760da 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/ColorPickerClickListener.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/ColorPickerClickListener.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.interfaces; +package in.sunilpaulmathew.colorpicker.interfaces; import android.content.DialogInterface; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/ColorWheelRenderer.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/ColorWheelRenderer.java similarity index 70% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/ColorWheelRenderer.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/ColorWheelRenderer.java index ba7f044..f535adc 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/ColorWheelRenderer.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/ColorWheelRenderer.java @@ -1,8 +1,8 @@ -package com.sunilpaulmathew.snotz.colorpicker.interfaces; +package in.sunilpaulmathew.colorpicker.interfaces; import android.graphics.Canvas; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorCircle; +import in.sunilpaulmathew.colorpicker.utils.ColorCircle; import java.util.List; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/OnColorSelectedListener.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/OnColorSelectedListener.java similarity index 60% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/OnColorSelectedListener.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/OnColorSelectedListener.java index 4fedeeb..246116b 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/OnColorSelectedListener.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/OnColorSelectedListener.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.interfaces; +package in.sunilpaulmathew.colorpicker.interfaces; public interface OnColorSelectedListener { void onColorSelected(int selectedColor); diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/OnValueChangedListener.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/OnValueChangedListener.java similarity index 57% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/OnValueChangedListener.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/OnValueChangedListener.java index 262085f..892fa35 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/interfaces/OnValueChangedListener.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/interfaces/OnValueChangedListener.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.interfaces; +package in.sunilpaulmathew.colorpicker.interfaces; public interface OnValueChangedListener { void onValueChanged(float value); diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/renderer/FlowerColorWheelRenderer.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/renderer/FlowerColorWheelRenderer.java similarity index 88% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/renderer/FlowerColorWheelRenderer.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/renderer/FlowerColorWheelRenderer.java index adaf874..dfc0926 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/renderer/FlowerColorWheelRenderer.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/renderer/FlowerColorWheelRenderer.java @@ -1,12 +1,12 @@ -package com.sunilpaulmathew.snotz.colorpicker.renderer; +package in.sunilpaulmathew.colorpicker.renderer; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import com.sunilpaulmathew.snotz.colorpicker.interfaces.ColorWheelRenderer; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorCircle; -import com.sunilpaulmathew.snotz.colorpicker.utils.PaintBuilder; +import in.sunilpaulmathew.colorpicker.interfaces.ColorWheelRenderer; +import in.sunilpaulmathew.colorpicker.utils.ColorCircle; +import in.sunilpaulmathew.colorpicker.utils.PaintBuilder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorCircle.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorCircle.java similarity index 94% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorCircle.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorCircle.java index 10135c2..fb5052b 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorCircle.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorCircle.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.utils; +package in.sunilpaulmathew.colorpicker.utils; import android.graphics.Color; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorCircleDrawable.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorCircleDrawable.java similarity index 95% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorCircleDrawable.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorCircleDrawable.java index c1c5751..74de4f5 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorCircleDrawable.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorCircleDrawable.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.utils; +package in.sunilpaulmathew.colorpicker.utils; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorPickerUtils.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorPickerUtils.java similarity index 94% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorPickerUtils.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorPickerUtils.java index 82839dd..383c822 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/ColorPickerUtils.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/ColorPickerUtils.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.utils; +package in.sunilpaulmathew.colorpicker.utils; import android.graphics.Color; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/PaintBuilder.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/PaintBuilder.java similarity index 97% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/PaintBuilder.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/PaintBuilder.java index c3a7287..7ecedba 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/utils/PaintBuilder.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/utils/PaintBuilder.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.utils; +package in.sunilpaulmathew.colorpicker.utils; import android.graphics.Bitmap; import android.graphics.BitmapShader; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/AbsCustomSlider.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/AbsCustomSlider.java similarity index 96% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/AbsCustomSlider.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/AbsCustomSlider.java index 437b41b..61fb0aa 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/AbsCustomSlider.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/AbsCustomSlider.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.views; +package in.sunilpaulmathew.colorpicker.views; import android.content.Context; import android.content.res.TypedArray; @@ -12,8 +12,8 @@ import androidx.annotation.DimenRes; import androidx.annotation.NonNull; -import com.sunilpaulmathew.snotz.R; -import com.sunilpaulmathew.snotz.colorpicker.interfaces.OnValueChangedListener; +import in.sunilpaulmathew.colorpicker.R; +import in.sunilpaulmathew.colorpicker.interfaces.OnValueChangedListener; public abstract class AbsCustomSlider extends View { protected Bitmap bitmap; diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/AlphaSlider.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/AlphaSlider.java similarity index 94% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/AlphaSlider.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/AlphaSlider.java index 5ca118f..c1d0cd1 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/AlphaSlider.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/AlphaSlider.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.views; +package in.sunilpaulmathew.colorpicker.views; import android.content.Context; import android.graphics.Bitmap; @@ -7,8 +7,8 @@ import android.graphics.PorterDuff; import android.util.AttributeSet; -import com.sunilpaulmathew.snotz.colorpicker.utils.PaintBuilder; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorPickerUtils; +import in.sunilpaulmathew.colorpicker.utils.PaintBuilder; +import in.sunilpaulmathew.colorpicker.utils.ColorPickerUtils; public class AlphaSlider extends AbsCustomSlider { diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/ColorPickerView.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/ColorPickerView.java similarity index 94% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/ColorPickerView.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/ColorPickerView.java index 86b25d1..8cf86a5 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/ColorPickerView.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/ColorPickerView.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.views; +package in.sunilpaulmathew.colorpicker.views; import android.annotation.SuppressLint; import android.content.Context; @@ -16,17 +16,18 @@ import androidx.appcompat.widget.AppCompatImageView; import com.google.android.material.textfield.TextInputEditText; -import com.sunilpaulmathew.snotz.R; -import com.sunilpaulmathew.snotz.colorpicker.utils.PaintBuilder; -import com.sunilpaulmathew.snotz.colorpicker.interfaces.ColorWheelRenderer; -import com.sunilpaulmathew.snotz.colorpicker.interfaces.OnColorSelectedListener; -import com.sunilpaulmathew.snotz.colorpicker.renderer.FlowerColorWheelRenderer; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorCircle; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorCircleDrawable; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorPickerUtils; import java.util.ArrayList; +import in.sunilpaulmathew.colorpicker.R; +import in.sunilpaulmathew.colorpicker.interfaces.ColorWheelRenderer; +import in.sunilpaulmathew.colorpicker.interfaces.OnColorSelectedListener; +import in.sunilpaulmathew.colorpicker.renderer.FlowerColorWheelRenderer; +import in.sunilpaulmathew.colorpicker.utils.ColorCircle; +import in.sunilpaulmathew.colorpicker.utils.ColorCircleDrawable; +import in.sunilpaulmathew.colorpicker.utils.ColorPickerUtils; +import in.sunilpaulmathew.colorpicker.utils.PaintBuilder; + public class ColorPickerView extends View { private static final float STROKE_RATIO = 1.5f; @@ -98,9 +99,9 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto super.onLayout(changed, left, top, right, bottom); if (alphaSliderViewId != 0) - setAlphaSlider((AlphaSlider) getRootView().findViewById(alphaSliderViewId)); + setAlphaSlider(getRootView().findViewById(alphaSliderViewId)); if (lightnessSliderViewId != 0) - setLightnessSlider((LightnessSlider) getRootView().findViewById(lightnessSliderViewId)); + setLightnessSlider(getRootView().findViewById(lightnessSliderViewId)); updateColorWheel(); currentColorCircle = findNearestByColor(initialColor); diff --git a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/LightnessSlider.java b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/LightnessSlider.java similarity index 91% rename from app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/LightnessSlider.java rename to colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/LightnessSlider.java index ab4262a..14770cb 100644 --- a/app/src/main/java/com/sunilpaulmathew/snotz/colorpicker/views/LightnessSlider.java +++ b/colorpicker/src/main/java/in/sunilpaulmathew/colorpicker/views/LightnessSlider.java @@ -1,4 +1,4 @@ -package com.sunilpaulmathew.snotz.colorpicker.views; +package in.sunilpaulmathew.colorpicker.views; import android.content.Context; import android.graphics.Canvas; @@ -7,8 +7,8 @@ import android.graphics.PorterDuff; import android.util.AttributeSet; -import com.sunilpaulmathew.snotz.colorpicker.utils.PaintBuilder; -import com.sunilpaulmathew.snotz.colorpicker.utils.ColorPickerUtils; +import in.sunilpaulmathew.colorpicker.utils.PaintBuilder; +import in.sunilpaulmathew.colorpicker.utils.ColorPickerUtils; public class LightnessSlider extends AbsCustomSlider { private int color; diff --git a/app/src/main/res/values/attrs.xml b/colorpicker/src/main/res/values/attrs.xml similarity index 62% rename from app/src/main/res/values/attrs.xml rename to colorpicker/src/main/res/values/attrs.xml index 6662196..bc997e5 100644 --- a/app/src/main/res/values/attrs.xml +++ b/colorpicker/src/main/res/values/attrs.xml @@ -2,17 +2,11 @@ + - - - - - - - diff --git a/app/src/main/res/values/dimens.xml b/colorpicker/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to colorpicker/src/main/res/values/dimens.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..8cf09f8 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,29 @@ +[versions] +adapters = "efc9dce669" +agp = "8.3.2" +billing = "7.1.1" +biometric = "1.1.0" +common = "fcb1b0c0ef" +gson = "2.10.1" +material = "1.12.0" +multidex = "2.0.1" +zxing = "1.9.8" + +[libraries] +adapters = { module = "com.github.sunilpaulmathew.sCommon:adapters", version.ref = "adapters" } +billing = { module = "com.android.billingclient:billing", version.ref = "billing" } +biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" } +crashreporter = { module = "com.github.sunilpaulmathew.sCommon:crashreporter", version.ref = "common" } +credits = { module = "com.github.sunilpaulmathew.sCommon:credits", version.ref = "common" } +fileutils = { module = "com.github.sunilpaulmathew.sCommon:fileutils", version.ref = "common" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +permissionutils = { module = "com.github.sunilpaulmathew.sCommon:permissionutils", version.ref = "common" } +themeutils = { module = "com.github.sunilpaulmathew.sCommon:themeutils", version.ref = "common" } +translatorutils = { module = "com.github.sunilpaulmathew.sCommon:translatorutils", version.ref = "common" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" } +zxing = { module = "me.dm7.barcodescanner:zxing", version.ref = "zxing" } + +[plugins] +androidApplication = { id = "com.android.application", version.ref = "agp" } +androidLibrary = { id = "com.android.library", version.ref = "agp" } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0608898..2867bba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,26 @@ -include ':app' +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { + url "https://jitpack.io" + } + } +} + +include(":app", ":colorpicker") rootProject.name = "sNotz" \ No newline at end of file