From 217516ad59ade6e997acee2bc229d48e9559e8b9 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Mon, 5 Jun 2017 16:38:58 -0400 Subject: [PATCH] Create android-pickers module --- android-pickers/.gitignore | 1 + android-pickers/build.gradle | 27 +++++ android-pickers/proguard-rules.pro | 25 +++++ android-pickers/src/main/AndroidManifest.xml | 2 + .../colorpicker/ColorPickerDialog.java | 17 ++-- .../colorpicker/ColorPickerPalette.java | 20 ++-- .../colorpicker/ColorPickerSwatch.java | 12 +-- .../colorpicker/ColorStateDrawable.java | 0 .../colorpicker/HsvColorComparator.java | 0 .../AccessibleLinearLayout.java | 0 .../datetimepicker/AccessibleTextView.java | 0 .../HapticFeedbackController.java | 0 .../com/android/datetimepicker/Utils.java | 0 .../date/AccessibleDateAnimator.java | 0 .../date/DatePickerController.java | 0 .../datetimepicker/date/DatePickerDialog.java | 47 ++++----- .../datetimepicker/date/DayPickerView.java | 0 .../datetimepicker/date/MonthAdapter.java | 0 .../datetimepicker/date/MonthView.java | 48 ++++----- .../date/SimpleDayPickerView.java | 0 .../date/SimpleMonthAdapter.java | 0 .../datetimepicker/date/SimpleMonthView.java | 0 .../date/TextViewWithCircularIndicator.java | 16 ++- .../datetimepicker/date/YearPickerView.java | 30 +++--- .../datetimepicker/time/AmPmCirclesView.java | 21 ++-- .../datetimepicker/time/CircleView.java | 16 +-- .../time/RadialPickerLayout.java | 38 +++---- .../time/RadialSelectorView.java | 25 ++--- .../datetimepicker/time/RadialTextsView.java | 25 ++--- .../datetimepicker/time/TimePickerDialog.java | 46 ++++----- .../main/res/color/date_picker_selector.xml | 0 .../res/color/date_picker_year_selector.xml | 0 .../ic_colorpicker_swatch_selected.png | Bin 0 -> 2414 bytes .../ic_colorpicker_swatch_selected.png | Bin 0 -> 1662 bytes .../ic_colorpicker_swatch_selected.png | Bin 0 -> 3241 bytes .../main/res/drawable/color_picker_swatch.xml | 16 +++ .../res/drawable/done_background_color.xml | 25 +++++ .../drawable/done_background_color_dark.xml | 25 +++++ .../main/res/layout/color_picker_dialog.xml | 0 .../main/res/layout/color_picker_swatch.xml | 0 .../main/res/layout/date_picker_dialog.xml | 0 .../res/layout/date_picker_done_button.xml | 0 .../res/layout/date_picker_header_view.xml | 0 .../res/layout/date_picker_selected_date.xml | 0 .../res/layout/date_picker_view_animator.xml | 0 .../src/main/res/layout/time_header_label.xml | 0 .../main/res/layout/time_picker_dialog.xml | 0 .../main/res/layout/year_label_text_view.xml | 0 .../src/main/res/values/pickers.xml | 93 +++++++++++++++--- .../src/main/res/values/strings.xml | 9 ++ settings.gradle | 2 +- uhabits-android/build.gradle | 1 + .../src/main/res/values/colors.xml | 43 -------- .../src/main/res/values/styles.xml | 16 --- 54 files changed, 353 insertions(+), 293 deletions(-) create mode 100644 android-pickers/.gitignore create mode 100644 android-pickers/build.gradle create mode 100644 android-pickers/proguard-rules.pro create mode 100644 android-pickers/src/main/AndroidManifest.xml rename {uhabits-android => android-pickers}/src/main/java/com/android/colorpicker/ColorPickerDialog.java (94%) rename {uhabits-android => android-pickers}/src/main/java/com/android/colorpicker/ColorPickerPalette.java (94%) rename {uhabits-android => android-pickers}/src/main/java/com/android/colorpicker/ColorPickerSwatch.java (91%) rename {uhabits-android => android-pickers}/src/main/java/com/android/colorpicker/ColorStateDrawable.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/colorpicker/HsvColorComparator.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/AccessibleTextView.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/HapticFeedbackController.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/Utils.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/DatePickerController.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java (94%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/DayPickerView.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/MonthAdapter.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/MonthView.java (95%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java (100%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java (89%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/date/YearPickerView.java (89%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java (95%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/time/CircleView.java (94%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java (97%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java (97%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/time/RadialTextsView.java (96%) rename {uhabits-android => android-pickers}/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java (97%) rename {uhabits-android => android-pickers}/src/main/res/color/date_picker_selector.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/color/date_picker_year_selector.xml (100%) create mode 100644 android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png create mode 100644 android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png create mode 100644 android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png create mode 100644 android-pickers/src/main/res/drawable/color_picker_swatch.xml create mode 100644 android-pickers/src/main/res/drawable/done_background_color.xml create mode 100644 android-pickers/src/main/res/drawable/done_background_color_dark.xml rename {uhabits-android => android-pickers}/src/main/res/layout/color_picker_dialog.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/color_picker_swatch.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/date_picker_dialog.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/date_picker_done_button.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/date_picker_header_view.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/date_picker_selected_date.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/date_picker_view_animator.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/time_header_label.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/time_picker_dialog.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/layout/year_label_text_view.xml (100%) rename {uhabits-android => android-pickers}/src/main/res/values/pickers.xml (55%) create mode 100644 android-pickers/src/main/res/values/strings.xml diff --git a/android-pickers/.gitignore b/android-pickers/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/android-pickers/.gitignore @@ -0,0 +1 @@ +/build diff --git a/android-pickers/build.gradle b/android-pickers/build.gradle new file mode 100644 index 000000000..68ee1e42d --- /dev/null +++ b/android-pickers/build.gradle @@ -0,0 +1,27 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.3" + + + defaultConfig { + minSdkVersion 19 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation 'com.android.support:appcompat-v7:25.3.1' +} diff --git a/android-pickers/proguard-rules.pro b/android-pickers/proguard-rules.pro new file mode 100644 index 000000000..2d5885450 --- /dev/null +++ b/android-pickers/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /gemini-b/opt/android-sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# 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 diff --git a/android-pickers/src/main/AndroidManifest.xml b/android-pickers/src/main/AndroidManifest.xml new file mode 100644 index 000000000..c8e4c8bd3 --- /dev/null +++ b/android-pickers/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java similarity index 94% rename from uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java rename to android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java index 114c5fed5..1060faf5b 100644 --- a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java +++ b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java @@ -16,18 +16,15 @@ package com.android.colorpicker; -import android.app.Activity; -import android.app.Dialog; -import android.os.Bundle; +import android.app.*; +import android.os.*; import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatDialogFragment; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ProgressBar; +import android.support.v7.app.*; +import android.view.*; +import android.widget.*; -import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener; - -import org.isoron.uhabits.R; +import com.android.*; +import com.android.colorpicker.ColorPickerSwatch.*; /** * A dialog which takes in as input an array of palette and creates a palette allowing the user to diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java similarity index 94% rename from uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java rename to android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java index add5ba86e..0e7102ad9 100644 --- a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java +++ b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java @@ -16,18 +16,14 @@ package com.android.colorpicker; -import org.isoron.uhabits.R; - -import android.content.Context; -import android.content.res.Resources; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TableLayout; -import android.widget.TableRow; - -import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener; +import android.content.*; +import android.content.res.*; +import android.util.*; +import android.view.*; +import android.widget.*; + +import com.android.*; +import com.android.colorpicker.ColorPickerSwatch.*; /** * A color picker custom view which creates an grid of color squares. The number of squares per diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java similarity index 91% rename from uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java rename to android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java index fb15a84ab..a7598ca3b 100644 --- a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java +++ b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java @@ -16,14 +16,12 @@ package com.android.colorpicker; -import org.isoron.uhabits.R; +import android.content.*; +import android.graphics.drawable.*; +import android.view.*; +import android.widget.*; -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.FrameLayout; -import android.widget.ImageView; +import com.android.*; /** * Creates a circular swatch of a specified color. Adds a checkmark if marked as checked. diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorStateDrawable.java b/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java similarity index 100% rename from uhabits-android/src/main/java/com/android/colorpicker/ColorStateDrawable.java rename to android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java diff --git a/uhabits-android/src/main/java/com/android/colorpicker/HsvColorComparator.java b/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java similarity index 100% rename from uhabits-android/src/main/java/com/android/colorpicker/HsvColorComparator.java rename to android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java b/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java rename to android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java b/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java rename to android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/HapticFeedbackController.java b/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/HapticFeedbackController.java rename to android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/Utils.java b/android-pickers/src/main/java/com/android/datetimepicker/Utils.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/Utils.java rename to android-pickers/src/main/java/com/android/datetimepicker/Utils.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java b/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerController.java b/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerController.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java b/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java similarity index 94% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java index b6581ecf9..dd4e06942 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java @@ -16,36 +16,23 @@ package com.android.datetimepicker.date; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Locale; - -import org.isoron.uhabits.R; - -import android.animation.ObjectAnimator; -import android.app.Activity; -import android.app.DialogFragment; -import android.content.res.Resources; -import android.os.Bundle; -import android.text.format.DateUtils; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; -import android.view.animation.AlphaAnimation; -import android.view.animation.Animation; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.android.datetimepicker.HapticFeedbackController; -import com.android.datetimepicker.Utils; -import com.android.datetimepicker.date.MonthAdapter.CalendarDay; +import android.animation.*; +import android.app.*; +import android.content.res.*; +import android.os.*; +import android.text.format.*; +import android.util.*; +import android.view.*; +import android.view.View.*; +import android.view.animation.*; +import android.widget.*; + +import com.android.*; +import com.android.datetimepicker.*; +import com.android.datetimepicker.date.MonthAdapter.*; + +import java.text.*; +import java.util.*; /** * Dialog allowing users to select a date. diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthAdapter.java b/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/MonthAdapter.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java similarity index 95% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java index 8b5defab2..eff8b8186 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java @@ -16,37 +16,25 @@ package com.android.datetimepicker.date; -import java.security.InvalidParameterException; -import java.util.Calendar; +import android.content.*; +import android.content.res.*; +import android.graphics.*; +import android.graphics.Paint.*; +import android.os.*; +import android.support.v4.view.*; +import android.support.v4.view.accessibility.*; +import android.support.v4.widget.*; +import android.text.format.*; +import android.view.*; +import android.view.accessibility.*; + +import com.android.*; +import com.android.datetimepicker.*; +import com.android.datetimepicker.date.MonthAdapter.*; + +import java.security.*; +import java.util.*; import java.util.Formatter; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; - -import org.isoron.uhabits.R; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Align; -import android.graphics.Paint.Style; -import android.graphics.Rect; -import android.graphics.Typeface; -import android.os.Bundle; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat; -import android.support.v4.widget.ExploreByTouchHelper; -import android.text.format.DateFormat; -import android.text.format.DateUtils; -import android.text.format.Time; -import android.view.MotionEvent; -import android.view.View; -import android.view.accessibility.AccessibilityEvent; -import android.view.accessibility.AccessibilityNodeInfo; - -import com.android.datetimepicker.Utils; -import com.android.datetimepicker.date.MonthAdapter.CalendarDay; /** * A calendar-like view displaying a specified month and the appropriate selectable day numbers diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java b/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java similarity index 100% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java b/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java similarity index 89% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java index 64d6404e7..148f2faf2 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java @@ -16,16 +16,14 @@ package com.android.datetimepicker.date; -import org.isoron.uhabits.R; +import android.content.*; +import android.content.res.*; +import android.graphics.*; +import android.graphics.Paint.*; +import android.util.*; +import android.widget.*; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Align; -import android.graphics.Paint.Style; -import android.util.AttributeSet; -import android.widget.TextView; +import com.android.*; /** * A text view which, when pressed or activated, displays a blue circle around the text. diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java similarity index 89% rename from uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java rename to android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java index 5abc4ca1a..b2c33f6b5 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java @@ -16,24 +16,18 @@ package com.android.datetimepicker.date; -import java.util.ArrayList; -import java.util.List; - -import org.isoron.uhabits.R; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.drawable.StateListDrawable; -import android.view.View; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityEvent; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.ArrayAdapter; -import android.widget.ListView; -import android.widget.TextView; - -import com.android.datetimepicker.date.DatePickerDialog.OnDateChangedListener; +import android.content.*; +import android.content.res.*; +import android.graphics.drawable.*; +import android.view.*; +import android.view.accessibility.*; +import android.widget.*; +import android.widget.AdapterView.*; + +import com.android.*; +import com.android.datetimepicker.date.DatePickerDialog.*; + +import java.util.*; /** * Displays a selectable list of years. diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java similarity index 95% rename from uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java rename to android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java index 993ea0c91..f310a1d85 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java @@ -16,20 +16,17 @@ package com.android.datetimepicker.time; -import java.text.DateFormatSymbols; +import android.content.*; +import android.content.res.*; +import android.graphics.*; +import android.graphics.Paint.*; +import android.util.*; +import android.view.*; -import org.isoron.uhabits.R; +import com.android.*; +import com.android.datetimepicker.*; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Align; -import android.graphics.Typeface; -import android.util.Log; -import android.view.View; - -import com.android.datetimepicker.Utils; +import java.text.*; /** * Draw the two smaller AM and PM circles next to where the larger circle will be. diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java similarity index 94% rename from uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java rename to android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java index bd0ccc99c..1765bff93 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java @@ -16,14 +16,14 @@ package com.android.datetimepicker.time; -import org.isoron.uhabits.R; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.util.Log; -import android.view.View; + +import android.content.*; +import android.content.res.*; +import android.graphics.*; +import android.util.*; +import android.view.*; + +import com.android.*; /** * Draws a simple white circle on which the numbers will be drawn. diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java similarity index 97% rename from uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java rename to android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java index 3ada25315..265b98cf8 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java @@ -16,30 +16,20 @@ package com.android.datetimepicker.time; -import org.isoron.uhabits.R; - -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.annotation.SuppressLint; -import android.content.Context; -import android.content.res.Resources; -import android.os.Bundle; -import android.os.Handler; -import android.text.format.DateUtils; -import android.text.format.Time; -import android.util.AttributeSet; -import android.util.Log; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnTouchListener; -import android.view.ViewConfiguration; -import android.view.ViewGroup; -import android.view.accessibility.AccessibilityEvent; -import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.AccessibilityNodeInfo; -import android.widget.FrameLayout; - -import com.android.datetimepicker.HapticFeedbackController; +import android.animation.*; +import android.annotation.*; +import android.content.*; +import android.content.res.*; +import android.os.*; +import android.text.format.*; +import android.util.*; +import android.view.*; +import android.view.View.*; +import android.view.accessibility.*; +import android.widget.*; + +import com.android.*; +import com.android.datetimepicker.*; /** * The primary layout to hold the circular picker, and the am/pm buttons. This view well measure diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java similarity index 97% rename from uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java rename to android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java index 1ccf511c1..48e4385b5 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java @@ -16,21 +16,16 @@ package com.android.datetimepicker.time; -import org.isoron.uhabits.R; - -import android.animation.Keyframe; -import android.animation.ObjectAnimator; -import android.animation.PropertyValuesHolder; -import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.util.Log; -import android.view.View; - -import com.android.datetimepicker.Utils; +import android.animation.*; +import android.animation.ValueAnimator.*; +import android.content.*; +import android.content.res.*; +import android.graphics.*; +import android.util.*; +import android.view.*; + +import com.android.*; +import com.android.datetimepicker.*; /** * View to show what number is selected. This will draw a blue circle over the number, with a blue diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java similarity index 96% rename from uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java rename to android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java index e6a99a657..a944901bf 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java @@ -16,21 +16,16 @@ package com.android.datetimepicker.time; -import org.isoron.uhabits.R; - -import android.animation.Keyframe; -import android.animation.ObjectAnimator; -import android.animation.PropertyValuesHolder; -import android.animation.ValueAnimator; -import android.animation.ValueAnimator.AnimatorUpdateListener; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.Paint.Align; -import android.graphics.Typeface; -import android.util.Log; -import android.view.View; +import android.animation.*; +import android.animation.ValueAnimator.*; +import android.content.*; +import android.content.res.*; +import android.graphics.*; +import android.graphics.Paint.*; +import android.util.*; +import android.view.*; + +import com.android.*; /** * A view to show a series of numbers in a circular pattern. diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java similarity index 97% rename from uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java rename to android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java index 8f22206f4..0bbb741e2 100644 --- a/uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java +++ b/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java @@ -16,37 +16,25 @@ package com.android.datetimepicker.time; -import java.text.DateFormatSymbols; -import java.util.ArrayList; -import java.util.Locale; - -import org.isoron.uhabits.R; - -import android.animation.ObjectAnimator; -import android.annotation.SuppressLint; +import android.animation.*; +import android.annotation.*; +import android.app.ActionBar.*; import android.app.*; -import android.app.ActionBar; -import android.app.ActionBar.LayoutParams; -import android.content.Context; -import android.content.res.ColorStateList; -import android.content.res.Resources; -import android.os.Bundle; +import android.content.*; +import android.content.res.*; +import android.os.*; import android.support.v7.app.*; -import android.util.Log; -import android.view.KeyCharacterMap; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnKeyListener; -import android.view.ViewGroup; -import android.view.Window; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import com.android.datetimepicker.HapticFeedbackController; -import com.android.datetimepicker.Utils; -import com.android.datetimepicker.time.RadialPickerLayout.OnValueSelectedListener; +import android.util.*; +import android.view.*; +import android.view.View.*; +import android.widget.*; + +import com.android.*; +import com.android.datetimepicker.*; +import com.android.datetimepicker.time.RadialPickerLayout.*; + +import java.text.*; +import java.util.*; /** * Dialog to set a time. diff --git a/uhabits-android/src/main/res/color/date_picker_selector.xml b/android-pickers/src/main/res/color/date_picker_selector.xml similarity index 100% rename from uhabits-android/src/main/res/color/date_picker_selector.xml rename to android-pickers/src/main/res/color/date_picker_selector.xml diff --git a/uhabits-android/src/main/res/color/date_picker_year_selector.xml b/android-pickers/src/main/res/color/date_picker_year_selector.xml similarity index 100% rename from uhabits-android/src/main/res/color/date_picker_year_selector.xml rename to android-pickers/src/main/res/color/date_picker_year_selector.xml diff --git a/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..3cbfe1a840d085dc922421217f0fc590d4681b5c GIT binary patch literal 2414 zcmZ`*Yg7{07Cs;#VG>S=MoN0~5sn&aK2pb^RG`K}e57T*0=0ahkq@vUA2n*BX@i>M zql_`l@sXM~YHCG}i&1NQXOU)VKFGRCrRI2Pe%!V0kGs#>=R0Sg{jG1Wb$;xf&Nxg} zN8wQb0ChUenW;qDH%B6ryO+G4ssval#f<_$U6$I{Ah_}lIm4vx2i3hgv&xI!NgC4) z0G<&5f>Z!jl_9}90M3#Cmwrdk z8DaZMZTuE@^j-u}FXs-{-K7+0!LDJ`QK_G{VtM@;YU4R}t%jpLxQacyAcZ3d3w5D~ zclT~Cwtg#_+{QmOv-@h5UGbUXrNWuLGkbTd*u}p6n14}><{-e zOq0wO3#$;Gs)4#bRKKelU3Lrn4%er)-b0awdIa)zp9?3cG&5t(KQkS7#mV-Wki$Fu z+Hf2}@E?OIQ{KeyQH>~ul}}085K?Han{#x{!Q<3LKQUa8=85$BGj^{qrEAi6f%2{_ z1Swg*6(T@p97t>&$25&yO>!z(T1h%IS~KRom28jESRi^y_zA_vm6es@Lsgx!Hoooc z{@E*f$jnB{V8l}1h@U2T75O~Xq$gdOm8=KIyuiS5TWS_zeeCLX+qm1zinnuvcjraT z){NjYi3;z)`Yq&Iynt)h&9bz%vH7GJ`t5l8ySceHLp1>#QjVQt;`*vW)v2V0BAQ|z z-{lh}QaP@9$D|bF(;GDZhh)i7!{wSmZg*N;UER*-VarmbNTp++N7I;GRvYxVx2Mo{ zUrXZB^zGsK-#oCA1P6HLcPPEcU(eU;KTVM|o#_9mi36kPr8@@)ak_Z-Y=@T{bC{<`C-%?Om1cPM)8o+d{J zMj1DtAJZlfWc&}~ogAA&x0Ut3<5ywDGwH7vjnkdqD5j)&7q(|g&TkO9e^cM`TVs$&>*~W#y{=eULYYRSEP7J`F z9T7ndGJ>@PXUmV2$aZ9Xs|$W0r2_KTz~Ad@Cqc5Zl5!&>qbqtBK)LcOwZMx5HyIB& zT=I?r2+JlH*WsG>S%|#O+?DZ&n2{r^5AB;~>>5CeV&+qzs^pI=Nj=wSZ)cQVW_J93 zk}mr4sS_t&jX9};lAe&zOP4OKA`pm&ThjJF%-bDM-Oy)|p;CCd)n-yXWB_I3euArb zCXYLF&oq?B<2?xaY`22mJ*488Op1q9X zxww{!pav#{^T6+Yz)Ww^{9TN&u1GC#EtI`CZ4@)v@hE~mwUlUrOrD?ZFE2=NJb$;T zDLxZX!GKm^d+R4ACLW&b5}q4=`O=T5qf3L5Wt)Ain4LJOs4YOm{zmK0HI9Ds@rzv7 zAx;6swZZqVS~eb>9yE!GimGPXtvZ^j=hB14EqLiA-%SRe%cxm@ z<>ux#-H#l*?}e2#+8Z3Kh*k0)*ZC|IibNtKwQ(R(wavnt=646`Dl%s5>~E*1r!Nl- z49JU%i;pNPJVZ2m*?wVzwg?ik4rJh)qct=7& zenG(sKR!O5#pA688+^ACuCx!5Of8gHWM-wIei&`!f&ZSlh|V7w{gB}3caxDl_Tt5t zqc#4-j9bl?1)Cc&Xw~~MU#fEUSB?1gq+AVSS1@)l@}!bOIWW*F;ehGE4aofDX*6x0 z|50x>O_z(6mD%iVxW^Nny=q>qtwDpbB!nbalP!-O8Mk&E=}gn|#)eJJ3OD-%ymgI4 zTfE~~g5pVP!q>E9UH^Xz5CFyt8gG9_H|x5XWw$5L#-6vYccL39Xdb;W1BwSYCeXvQ|*3TAy2?VyB<9=Kkr_|83cbb*=K6RO6NB z(T2*g!jS9Y!(|0=+4d)6*-8MGBnvAulBJo2rKcsyo@8ZjX>CTbvnP?9@RvsZhY%Uf zIu(-m{|QH^PAny1+cyP|=n!svP%IlzSkb|3J$htND4WR+VkO3Ov%k$ffbMeGxq5$K G@_zuE;6>m7 literal 0 HcmV?d00001 diff --git a/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..acbdecac269ea57935434357d986e8b974c10351 GIT binary patch literal 1662 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 literal 0 HcmV?d00001 diff --git a/android-pickers/src/main/res/drawable/color_picker_swatch.xml b/android-pickers/src/main/res/drawable/color_picker_swatch.xml new file mode 100644 index 000000000..db71091aa --- /dev/null +++ b/android-pickers/src/main/res/drawable/color_picker_swatch.xml @@ -0,0 +1,16 @@ + + + \ No newline at end of file diff --git a/android-pickers/src/main/res/drawable/done_background_color.xml b/android-pickers/src/main/res/drawable/done_background_color.xml new file mode 100644 index 000000000..19a386134 --- /dev/null +++ b/android-pickers/src/main/res/drawable/done_background_color.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/android-pickers/src/main/res/drawable/done_background_color_dark.xml b/android-pickers/src/main/res/drawable/done_background_color_dark.xml new file mode 100644 index 000000000..1665eee3f --- /dev/null +++ b/android-pickers/src/main/res/drawable/done_background_color_dark.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/uhabits-android/src/main/res/layout/color_picker_dialog.xml b/android-pickers/src/main/res/layout/color_picker_dialog.xml similarity index 100% rename from uhabits-android/src/main/res/layout/color_picker_dialog.xml rename to android-pickers/src/main/res/layout/color_picker_dialog.xml diff --git a/uhabits-android/src/main/res/layout/color_picker_swatch.xml b/android-pickers/src/main/res/layout/color_picker_swatch.xml similarity index 100% rename from uhabits-android/src/main/res/layout/color_picker_swatch.xml rename to android-pickers/src/main/res/layout/color_picker_swatch.xml diff --git a/uhabits-android/src/main/res/layout/date_picker_dialog.xml b/android-pickers/src/main/res/layout/date_picker_dialog.xml similarity index 100% rename from uhabits-android/src/main/res/layout/date_picker_dialog.xml rename to android-pickers/src/main/res/layout/date_picker_dialog.xml diff --git a/uhabits-android/src/main/res/layout/date_picker_done_button.xml b/android-pickers/src/main/res/layout/date_picker_done_button.xml similarity index 100% rename from uhabits-android/src/main/res/layout/date_picker_done_button.xml rename to android-pickers/src/main/res/layout/date_picker_done_button.xml diff --git a/uhabits-android/src/main/res/layout/date_picker_header_view.xml b/android-pickers/src/main/res/layout/date_picker_header_view.xml similarity index 100% rename from uhabits-android/src/main/res/layout/date_picker_header_view.xml rename to android-pickers/src/main/res/layout/date_picker_header_view.xml diff --git a/uhabits-android/src/main/res/layout/date_picker_selected_date.xml b/android-pickers/src/main/res/layout/date_picker_selected_date.xml similarity index 100% rename from uhabits-android/src/main/res/layout/date_picker_selected_date.xml rename to android-pickers/src/main/res/layout/date_picker_selected_date.xml diff --git a/uhabits-android/src/main/res/layout/date_picker_view_animator.xml b/android-pickers/src/main/res/layout/date_picker_view_animator.xml similarity index 100% rename from uhabits-android/src/main/res/layout/date_picker_view_animator.xml rename to android-pickers/src/main/res/layout/date_picker_view_animator.xml diff --git a/uhabits-android/src/main/res/layout/time_header_label.xml b/android-pickers/src/main/res/layout/time_header_label.xml similarity index 100% rename from uhabits-android/src/main/res/layout/time_header_label.xml rename to android-pickers/src/main/res/layout/time_header_label.xml diff --git a/uhabits-android/src/main/res/layout/time_picker_dialog.xml b/android-pickers/src/main/res/layout/time_picker_dialog.xml similarity index 100% rename from uhabits-android/src/main/res/layout/time_picker_dialog.xml rename to android-pickers/src/main/res/layout/time_picker_dialog.xml diff --git a/uhabits-android/src/main/res/layout/year_label_text_view.xml b/android-pickers/src/main/res/layout/year_label_text_view.xml similarity index 100% rename from uhabits-android/src/main/res/layout/year_label_text_view.xml rename to android-pickers/src/main/res/layout/year_label_text_view.xml diff --git a/uhabits-android/src/main/res/values/pickers.xml b/android-pickers/src/main/res/values/pickers.xml similarity index 55% rename from uhabits-android/src/main/res/values/pickers.xml rename to android-pickers/src/main/res/values/pickers.xml index c83a58066..0e6021524 100644 --- a/uhabits-android/src/main/res/values/pickers.xml +++ b/android-pickers/src/main/res/values/pickers.xml @@ -24,16 +24,36 @@ 8dip 4dip - 0.82 - 0.85 - 0.16 - 0.19 - 0.81 - 0.60 - 0.83 - 0.17 - 0.14 - 0.11 + + 0.82 + + + 0.85 + + + 0.16 + + + 0.19 + + + 0.81 + + + 0.60 + + + 0.83 + + + 0.17 + + + 0.14 + + + 0.11 + 60sp -30dp @@ -64,8 +84,8 @@ 64dp 22dp - Color %1$d - Color %1$d selected + Color %1$d + Color %1$d selected Hours circular slider @@ -74,11 +94,56 @@ Year list Select month and day Select year - %1$s selected - %1$s deleted + %1$s selected + %1$s deleted -- : sans-serif sans-serif sans-serif + + + #f2f2f2 + #cccccc + #8c8c8c + #000000 + #cccccc + #8c8c8c + #00000000 + #7f000000 + #33b5e5 + #c1e8f7 + #33999999 + #0099cc + #ff999999 + #999999 + #f2f2f2 + #ffd1d2d4 + #888888 + #888888 + #ffffff + #000000 + + + #ff3333 + #853333 + #404040 + #363636 + #808080 + + + + + + \ No newline at end of file diff --git a/android-pickers/src/main/res/values/strings.xml b/android-pickers/src/main/res/values/strings.xml new file mode 100644 index 000000000..9e6581a37 --- /dev/null +++ b/android-pickers/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 7180450d1..bbd1aad49 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':uhabits-android', ':uhabits-core', ':android-base' +include ':uhabits-android', ':uhabits-core', ':android-base', ':android-pickers' diff --git a/uhabits-android/build.gradle b/uhabits-android/build.gradle index 79fcfe202..121a2245b 100644 --- a/uhabits-android/build.gradle +++ b/uhabits-android/build.gradle @@ -54,6 +54,7 @@ android { dependencies { implementation project(":uhabits-core") implementation project(":android-base") + implementation project(":android-pickers") implementation 'com.android.support:appcompat-v7:25.3.1' implementation 'com.android.support:design:25.3.1' diff --git a/uhabits-android/src/main/res/values/colors.xml b/uhabits-android/src/main/res/values/colors.xml index 49338f051..1e65dade9 100644 --- a/uhabits-android/src/main/res/values/colors.xml +++ b/uhabits-android/src/main/res/values/colors.xml @@ -1,21 +1,5 @@ - - @color/red_700 @color/deep_orange_700 @@ -84,31 +68,4 @@ @color/black_aa @color/black_aa - - - #f2f2f2 - #cccccc - #8c8c8c - #000000 - #cccccc - #8c8c8c - #00000000 - #7f000000 - #33b5e5 - #c1e8f7 - #33999999 - #0099cc - #ff999999 - #999999 - #f2f2f2 - #ffd1d2d4 - #888888 - #888888 - - - #ff3333 - #853333 - #404040 - #363636 - #808080 \ No newline at end of file diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml index 829fef4f3..976ddf172 100644 --- a/uhabits-android/src/main/res/values/styles.xml +++ b/uhabits-android/src/main/res/values/styles.xml @@ -154,18 +154,6 @@ 0.25 - - - - - -