Implement reminder time picker; customize picker color

android/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java

@@ -41,8 +41,8 @@ public class AmPmCirclesView extends View {
     private final Paint mPaint = new Paint();
     private int mSelectedAlpha;
     private int mUnselectedColor;
-    private int mAmPmTextColor;
-    private int mSelectedColor;
+    protected int mAmPmTextColor = Color.WHITE;
+    protected int mSelectedColor = Color.BLUE;
     private float mCircleRadiusMultiplier;
     private float mAmPmCircleRadiusMultiplier;
     private String mAmText;
@@ -73,8 +73,8 @@ public class AmPmCirclesView extends View {
 
         Resources res = context.getResources();
         mUnselectedColor = res.getColor(R.color.white);
-        mSelectedColor = res.getColor(R.color.blue);
-        mAmPmTextColor = res.getColor(R.color.ampm_text_color);
+        //mSelectedColor = res.getColor(R.color.blue);
+        //mAmPmTextColor = res.getColor(R.color.ampm_text_color);
         mSelectedAlpha = SELECTED_ALPHA;
         String typefaceFamily = res.getString(R.string.sans_serif);
         Typeface tf = Typeface.create(typefaceFamily, Typeface.NORMAL);
@@ -105,8 +105,8 @@ public class AmPmCirclesView extends View {
             mSelectedAlpha = SELECTED_ALPHA_THEME_DARK;
         } else {
             mUnselectedColor = res.getColor(R.color.white);
-            mSelectedColor = res.getColor(R.color.blue);
-            mAmPmTextColor = res.getColor(R.color.ampm_text_color);
+            //mSelectedColor = res.getColor(R.color.blue);
+            //mAmPmTextColor = res.getColor(R.color.ampm_text_color);
             mSelectedAlpha = SELECTED_ALPHA;
         }
     }

android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java

@@ -84,6 +84,14 @@ public class RadialPickerLayout extends FrameLayout implements OnTouchListener {
     private AnimatorSet mTransition;
     private Handler mHandler = new Handler();
 
+    public void setColor(int selectedColor)
+    {
+        mHourRadialSelectorView.mPaint.setColor(selectedColor);
+        mMinuteRadialSelectorView.mPaint.setColor(selectedColor);
+        mAmPmCirclesView.mSelectedColor = selectedColor;
+        mAmPmCirclesView.mAmPmTextColor = selectedColor;
+    }
+
     public interface OnValueSelectedListener {
         void onValueSelected(int pickerIndex, int newValue, boolean autoAdvance);
     }

android/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java

@@ -40,7 +40,7 @@ public class RadialSelectorView extends View {
     // Alpha level for the line.
     private static final int FULL_ALPHA = Utils.FULL_ALPHA;
 
-    private final Paint mPaint = new Paint();
+    protected final Paint mPaint = new Paint();
 
     private boolean mIsInitialized;
     private boolean mDrawValuesReady;
@@ -96,8 +96,6 @@ public class RadialSelectorView extends View {
 
         Resources res = context.getResources();
 
-        int blue = res.getColor(R.color.blue);
-        mPaint.setColor(blue);
         mPaint.setAntiAlias(true);
         mSelectionAlpha = SELECTED_ALPHA;
 
@@ -139,15 +137,11 @@ public class RadialSelectorView extends View {
 
     /* package */ void setTheme(Context context, boolean themeDark) {
         Resources res = context.getResources();
-        int color;
         if (themeDark) {
-            color = res.getColor(R.color.red);
             mSelectionAlpha = SELECTED_ALPHA_THEME_DARK;
         } else {
-            color = res.getColor(R.color.blue);
             mSelectionAlpha = SELECTED_ALPHA;
         }
-        mPaint.setColor(color);
     }
 
     /**

android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java

@@ -23,7 +23,9 @@ import android.app.*;
 import android.content.*;
 import android.content.res.*;
 import android.os.*;
+
 import androidx.appcompat.app.*;
+
 import android.util.*;
 import android.view.*;
 import android.view.View.*;
@@ -39,7 +41,8 @@ import java.util.*;
 /**
  * Dialog to set a time.
  */
-public class TimePickerDialog extends AppCompatDialogFragment implements OnValueSelectedListener{
+public class TimePickerDialog extends AppCompatDialogFragment implements OnValueSelectedListener
+{
     private static final String TAG = "TimePickerDialog";
 
     private static final String KEY_HOUR_OF_DAY = "hour_of_day";
@@ -108,7 +111,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
      * The callback interface used to indicate the user is done filling in
      * the time (they clicked on the 'Set' button).
      */
-    public interface OnTimeSetListener {
+    public interface OnTimeSetListener
+    {
 
         /**
          * @param view      The view associated with this listener.
@@ -117,28 +121,40 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
          */
         void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute);
 
-        default void onTimeCleared(RadialPickerLayout view) {}
+        default void onTimeCleared(RadialPickerLayout view)
+        {
+        }
     }
 
-    public TimePickerDialog() {
+    public TimePickerDialog()
+    {
         // Empty constructor required for dialog fragment.
     }
 
     @SuppressLint("Java")
     public TimePickerDialog(Context context, int theme, OnTimeSetListener callback,
-            int hourOfDay, int minute, boolean is24HourMode) {
+                            int hourOfDay, int minute, boolean is24HourMode)
+    {
         // Empty constructor required for dialog fragment.
     }
 
     public static TimePickerDialog newInstance(OnTimeSetListener callback,
-            int hourOfDay, int minute, boolean is24HourMode) {
+                                               int hourOfDay,
+                                               int minute,
+                                               boolean is24HourMode,
+                                               int color)
+    {
         TimePickerDialog ret = new TimePickerDialog();
-        ret.initialize(callback, hourOfDay, minute, is24HourMode);
+        ret.initialize(callback, hourOfDay, minute, is24HourMode, color);
         return ret;
     }
 
     public void initialize(OnTimeSetListener callback,
-            int hourOfDay, int minute, boolean is24HourMode) {
+                           int hourOfDay,
+                           int minute,
+                           boolean is24HourMode,
+                           int color)
+    {
         mCallback = callback;
 
         mInitialHourOfDay = hourOfDay;
@@ -146,31 +162,37 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         mIs24HourMode = is24HourMode;
         mInKbMode = false;
         mThemeDark = false;
+        mSelectedColor = color;
     }
 
     /**
      * Set a dark or light theme. NOTE: this will only take effect for the next onCreateView.
      */
-    public void setThemeDark(boolean dark) {
+    public void setThemeDark(boolean dark)
+    {
         mThemeDark = dark;
     }
 
-    public boolean isThemeDark() {
+    public boolean isThemeDark()
+    {
         return mThemeDark;
     }
 
-    public void setOnTimeSetListener(OnTimeSetListener callback) {
+    public void setOnTimeSetListener(OnTimeSetListener callback)
+    {
         mCallback = callback;
     }
 
-    public void setStartTime(int hourOfDay, int minute) {
+    public void setStartTime(int hourOfDay, int minute)
+    {
         mInitialHourOfDay = hourOfDay;
         mInitialMinute = minute;
         mInKbMode = false;
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null && savedInstanceState.containsKey(KEY_HOUR_OF_DAY)
                 && savedInstanceState.containsKey(KEY_MINUTE)
@@ -191,7 +213,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState)
+    {
         getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
 
         View view = inflater.inflate(R.layout.time_picker_dialog, null);
@@ -203,7 +226,7 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         mSelectHours = res.getString(R.string.select_hours);
         mMinutePickerDescription = res.getString(R.string.minute_picker_description);
         mSelectMinutes = res.getString(R.string.select_minutes);
-        mSelectedColor = res.getColor(mThemeDark? R.color.red : R.color.blue);
+        //mSelectedColor = res.getColor(mThemeDark ? R.color.red : R.color.blue);
         mUnselectedColor = res.getColor(mThemeDark ? R.color.white : R.color.numbers_text_color);
 
         mHourView = (TextView) view.findViewById(R.id.hours);
@@ -223,6 +246,7 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         mTimePicker = (RadialPickerLayout) view.findViewById(R.id.time_picker);
         mTimePicker.setOnValueSelectedListener(this);
         mTimePicker.setOnKeyListener(keyboardListener);
+        mTimePicker.setColor(mSelectedColor);
         mTimePicker.initialize(getActivity(), mHapticFeedbackController, mInitialHourOfDay,
                                mInitialMinute, mIs24HourMode);
 
@@ -234,25 +258,31 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         setCurrentItemShowing(currentItemShowing, false, true, true);
         mTimePicker.invalidate();
 
-        mHourView.setOnClickListener(new OnClickListener() {
+        mHourView.setOnClickListener(new OnClickListener()
+        {
             @Override
-            public void onClick(View v) {
+            public void onClick(View v)
+            {
                 setCurrentItemShowing(HOUR_INDEX, true, false, true);
                 tryVibrate();
             }
         });
-        mMinuteView.setOnClickListener(new OnClickListener() {
+        mMinuteView.setOnClickListener(new OnClickListener()
+        {
             @Override
-            public void onClick(View v) {
+            public void onClick(View v)
+            {
                 setCurrentItemShowing(MINUTE_INDEX, true, false, true);
                 tryVibrate();
             }
         });
 
         mDoneButton = (TextView) view.findViewById(R.id.done_button);
-        mDoneButton.setOnClickListener(new OnClickListener() {
+        mDoneButton.setOnClickListener(new OnClickListener()
+        {
             @Override
-            public void onClick(View v) {
+            public void onClick(View v)
+            {
                 if (mInKbMode && isTypedTimeFullyLegal()) {
                     finishKbMode(false);
                 } else {
@@ -294,9 +324,11 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         } else {
             mAmPmTextView.setVisibility(View.VISIBLE);
             updateAmPmDisplay(mInitialHourOfDay < 12 ? AM : PM);
-            mAmPmHitspace.setOnClickListener(new OnClickListener() {
+            mAmPmHitspace.setOnClickListener(new OnClickListener()
+            {
                 @Override
-                public void onClick(View v) {
+                public void onClick(View v)
+                {
                     tryVibrate();
                     int amOrPm = mTimePicker.getIsCurrentlyAmOrPm();
                     if (amOrPm == AM) {
@@ -328,51 +360,56 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
             mTypedTimes = new ArrayList<Integer>();
         }
 
-        // Set the theme at the end so that the initialize()s above don't counteract the theme.
-        mTimePicker.setTheme(getActivity().getApplicationContext(), mThemeDark);
-        // Prepare some palette to use.
-        int white = res.getColor(R.color.white);
-        int circleBackground = res.getColor(R.color.circle_background);
-        int line = res.getColor(R.color.line_background);
-        int timeDisplay = res.getColor(R.color.numbers_text_color);
-        ColorStateList doneTextColor = res.getColorStateList(R.color.done_text_color);
-        int doneBackground = R.drawable.done_background_color;
 
-        int darkGray = res.getColor(R.color.dark_gray);
-        int lightGray = res.getColor(R.color.light_gray);
-        int darkLine = res.getColor(R.color.line_dark);
-        ColorStateList darkDoneTextColor = res.getColorStateList(R.color.done_text_color_dark);
-        int darkDoneBackground = R.drawable.done_background_color_dark;
+//        // Set the theme at the end so that the initialize()s above don't counteract the theme.
+//        mTimePicker.setTheme(getActivity().getApplicationContext(), mThemeDark);
+//        // Prepare some palette to use.
+//        int white = res.getColor(R.color.white);
+//        int circleBackground = res.getColor(R.color.circle_background);
+//        int line = res.getColor(R.color.line_background);
+//        int timeDisplay = res.getColor(R.color.numbers_text_color);
+//        ColorStateList doneTextColor = res.getColorStateList(R.color.done_text_color);
+//        int doneBackground = R.drawable.done_background_color;
+//
+//        int darkGray = res.getColor(R.color.dark_gray);
+//        int lightGray = res.getColor(R.color.light_gray);
+//        int darkLine = res.getColor(R.color.line_dark);
+//        ColorStateList darkDoneTextColor = res.getColorStateList(R.color.done_text_color_dark);
+//        int darkDoneBackground = R.drawable.done_background_color_dark;
 
         // Set the palette for each view based on the theme.
-        view.findViewById(R.id.time_display_background).setBackgroundColor(mThemeDark? darkGray : white);
-        view.findViewById(R.id.time_display).setBackgroundColor(mThemeDark? darkGray : white);
-        ((TextView) view.findViewById(R.id.separator)).setTextColor(mThemeDark? white : timeDisplay);
-        ((TextView) view.findViewById(R.id.ampm_label)).setTextColor(mThemeDark? white : timeDisplay);
-        view.findViewById(R.id.line).setBackgroundColor(mThemeDark? darkLine : line);
-        mDoneButton.setTextColor(mThemeDark? darkDoneTextColor : doneTextColor);
-        mTimePicker.setBackgroundColor(mThemeDark? lightGray : circleBackground);
-        mDoneButton.setBackgroundResource(mThemeDark? darkDoneBackground : doneBackground);
+//        view.findViewById(R.id.time_display_background).setBackgroundColor(mThemeDark? darkGray : white);
+//        view.findViewById(R.id.time_display).setBackgroundColor(mThemeDark? darkGray : white);
+//        ((TextView) view.findViewById(R.id.separator)).setTextColor(mThemeDark? white : timeDisplay);
+//        ((TextView) view.findViewById(R.id.ampm_label)).setTextColor(mThemeDark? white : timeDisplay);
+//        view.findViewById(R.id.line).setBackgroundColor(mThemeDark? darkLine : line);
+//        mDoneButton.setTextColor(mThemeDark? darkDoneTextColor : doneTextColor);
+//        mTimePicker.setBackgroundColor(mThemeDark? lightGray : circleBackground);
+//        mDoneButton.setBackgroundResource(mThemeDark? darkDoneBackground : doneBackground);
         return view;
     }
 
     @Override
-    public void onResume() {
+    public void onResume()
+    {
         super.onResume();
         mHapticFeedbackController.start();
     }
 
     @Override
-    public void onPause() {
+    public void onPause()
+    {
         super.onPause();
         mHapticFeedbackController.stop();
     }
 
-    public void tryVibrate() {
+    public void tryVibrate()
+    {
         mHapticFeedbackController.tryVibrate();
     }
 
-    private void updateAmPmDisplay(int amOrPm) {
+    private void updateAmPmDisplay(int amOrPm)
+    {
         if (amOrPm == AM) {
             mAmPmTextView.setText(mAmText);
             Utils.tryAccessibilityAnnounce(mTimePicker, mAmText);
@@ -387,7 +424,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
+    public void onSaveInstanceState(Bundle outState)
+    {
         if (mTimePicker != null) {
             outState.putInt(KEY_HOUR_OF_DAY, mTimePicker.getHours());
             outState.putInt(KEY_MINUTE, mTimePicker.getMinutes());
@@ -405,7 +443,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
      * Called by the picker for updating the header display.
      */
     @Override
-    public void onValueSelected(int pickerIndex, int newValue, boolean autoAdvance) {
+    public void onValueSelected(int pickerIndex, int newValue, boolean autoAdvance)
+    {
         if (pickerIndex == HOUR_INDEX) {
             setHour(newValue, false);
             String announcement = String.format("%d", newValue);
@@ -430,7 +469,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    private void setHour(int value, boolean announce) {
+    private void setHour(int value, boolean announce)
+    {
         String format;
         if (mIs24HourMode) {
             format = "%02d";
@@ -450,7 +490,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    private void setMinute(int value) {
+    private void setMinute(int value)
+    {
         if (value == 60) {
             value = 0;
         }
@@ -462,7 +503,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
 
     // Show either Hours or Minutes.
     private void setCurrentItemShowing(int index, boolean animateCircle, boolean delayLabelAnimate,
-            boolean announce) {
+                                       boolean announce)
+    {
         mTimePicker.setCurrentItemShowing(index, animateCircle);
 
         TextView labelToAnimate;
@@ -499,10 +541,12 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
 
     /**
      * For keyboard mode, processes key events.
+     *
      * @param keyCode the pressed key.
      * @return true if the key was successfully processed, false otherwise.
      */
-    private boolean processKeyUp(int keyCode) {
+    private boolean processKeyUp(int keyCode)
+    {
         if (keyCode == KeyEvent.KEYCODE_ESCAPE || keyCode == KeyEvent.KEYCODE_BACK) {
             dismiss();
             return true;
@@ -572,11 +616,13 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
     /**
      * Try to start keyboard mode with the specified key, as long as the timepicker is not in the
      * middle of a touch-event.
+     *
      * @param keyCode The key to use as the first press. Keyboard mode will not be started if the
      *                key is not legal to start with. Or, pass in -1 to get into keyboard mode without a starting
      *                key.
      */
-    private void tryStartingKbMode(int keyCode) {
+    private void tryStartingKbMode(int keyCode)
+    {
         if (mTimePicker.trySettingInputEnabled(false) &&
                 (keyCode == -1 || addKeyIfLegal(keyCode))) {
             mInKbMode = true;
@@ -585,7 +631,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    private boolean addKeyIfLegal(int keyCode) {
+    private boolean addKeyIfLegal(int keyCode)
+    {
         // If we're in 24hour mode, we'll need to check if the input is full. If in AM/PM mode,
         // we'll need to see if AM/PM have been typed.
         if ((mIs24HourMode && mTypedTimes.size() == 4) ||
@@ -617,7 +664,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
      * Traverse the tree to see if the keys that have been typed so far are legal as is,
      * or may become legal as more keys are typed (excluding backspace).
      */
-    private boolean isTypedTimeLegalSoFar() {
+    private boolean isTypedTimeLegalSoFar()
+    {
         Node node = mLegalTimesTree;
         for (int keyCode : mTypedTimes) {
             node = node.canReach(keyCode);
@@ -631,7 +679,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
     /**
      * Check if the time that has been typed so far is completely legal, as is.
      */
-    private boolean isTypedTimeFullyLegal() {
+    private boolean isTypedTimeFullyLegal()
+    {
         if (mIs24HourMode) {
             // For 24-hour mode, the time is legal if the hours and minutes are each legal. Note:
             // getEnteredTime() will ONLY call isTypedTimeFullyLegal() when NOT in 24hour mode.
@@ -645,7 +694,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    private int deleteLastTypedKey() {
+    private int deleteLastTypedKey()
+    {
         int deleted = mTypedTimes.remove(mTypedTimes.size() - 1);
         if (!isTypedTimeFullyLegal()) {
             mDoneButton.setEnabled(false);
@@ -655,9 +705,11 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
 
     /**
      * Get out of keyboard mode. If there is nothing in typedTimes, revert to TimePicker's time.
+     *
      * @param changeDisplays If true, update the displays with the relevant time.
      */
-    private void finishKbMode(boolean updateDisplays) {
+    private void finishKbMode(boolean updateDisplays)
+    {
         mInKbMode = false;
         if (!mTypedTimes.isEmpty()) {
             int values[] = getEnteredTime(null);
@@ -677,10 +729,12 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
      * Update the hours, minutes, and AM/PM displays with the typed times. If the typedTimes is
      * empty, either show an empty display (filled with the placeholder text), or update from the
      * timepicker's values.
+     *
      * @param allowEmptyDisplay if true, then if the typedTimes is empty, use the placeholder text.
      *                          Otherwise, revert to the timepicker's values.
      */
-    private void updateDisplay(boolean allowEmptyDisplay) {
+    private void updateDisplay(boolean allowEmptyDisplay)
+    {
         if (!allowEmptyDisplay && mTypedTimes.isEmpty()) {
             int hour = mTimePicker.getHours();
             int minute = mTimePicker.getMinutes();
@@ -712,7 +766,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    private static int getValFromKeyCode(int keyCode) {
+    private static int getValFromKeyCode(int keyCode)
+    {
         switch (keyCode) {
             case KeyEvent.KEYCODE_0:
                 return 0;
@@ -741,13 +796,15 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
 
     /**
      * Get the currently-entered time, as integer values of the hours and minutes typed.
+     *
      * @param enteredZeros A size-2 boolean array, which the caller should initialize, and which
      *                     may then be used for the caller to know whether zeros had been explicitly entered as either
      *                     hours of minutes. This is helpful for deciding whether to show the dashes, or actual 0's.
      * @return A size-3 int array. The first value will be the hours, the second value will be the
      * minutes, and the third will be either TimePickerDialog.AM or TimePickerDialog.PM.
      */
-    private int[] getEnteredTime(Boolean[] enteredZeros) {
+    private int[] getEnteredTime(Boolean[] enteredZeros)
+    {
         int amOrPm = -1;
         int startIndex = 1;
         if (!mIs24HourMode && isTypedTimeFullyLegal()) {
@@ -787,7 +844,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
     /**
      * Get the keycode value for AM and PM in the current language.
      */
-    private int getAmOrPmKeyCode(int amOrPm) {
+    private int getAmOrPmKeyCode(int amOrPm)
+    {
         // Cache the codes.
         if (mAmKeyCode == -1 || mPmKeyCode == -1) {
             // Find the first character in the AM/PM text that is unique.
@@ -822,7 +880,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
     /**
      * Create a tree for deciding what keys can legally be typed.
      */
-    private void generateLegalTimesTree() {
+    private void generateLegalTimesTree()
+    {
         // Create a quick cache of numbers to their keycodes.
         int k0 = KeyEvent.KEYCODE_0;
         int k1 = KeyEvent.KEYCODE_1;
@@ -955,20 +1014,24 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
      * mLegalKeys represents the keys that can be typed to get to the node.
      * mChildren are the children that can be reached from this node.
      */
-    private class Node {
+    private class Node
+    {
         private int[] mLegalKeys;
         private ArrayList<Node> mChildren;
 
-        public Node(int... legalKeys) {
+        public Node(int... legalKeys)
+        {
             mLegalKeys = legalKeys;
             mChildren = new ArrayList<Node>();
         }
 
-        public void addChild(Node child) {
+        public void addChild(Node child)
+        {
             mChildren.add(child);
         }
 
-        public boolean containsKey(int key) {
+        public boolean containsKey(int key)
+        {
             for (int i = 0; i < mLegalKeys.length; i++) {
                 if (mLegalKeys[i] == key) {
                     return true;
@@ -977,7 +1040,8 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
             return false;
         }
 
-        public Node canReach(int key) {
+        public Node canReach(int key)
+        {
             if (mChildren == null) {
                 return null;
             }
@@ -990,9 +1054,11 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    private class KeyboardListener implements OnKeyListener {
+    private class KeyboardListener implements OnKeyListener
+    {
         @Override
-        public boolean onKey(View v, int keyCode, KeyEvent event) {
+        public boolean onKey(View v, int keyCode, KeyEvent event)
+        {
             if (event.getAction() == KeyEvent.ACTION_UP) {
                 return processKeyUp(keyCode);
             }
@@ -1000,12 +1066,14 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
         }
     }
 
-    public void setDismissListener( DialogInterface.OnDismissListener listener ) {
+    public void setDismissListener(DialogInterface.OnDismissListener listener)
+    {
         dismissListener = listener;
     }
 
     @Override
-    public void onDismiss(DialogInterface dialog) {
+    public void onDismiss(DialogInterface dialog)
+    {
         super.onDismiss(dialog);
         if (dismissListener != null)
             dismissListener.onDismiss(dialog);

android/android-pickers/src/main/res/layout/time_picker_dialog.xml

@@ -49,33 +49,33 @@
         android:layout_height="1dip"
         android:background="@color/line_background" />
 
-    <LinearLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         style="?android:attr/buttonBarStyle"
         android:layout_width="@dimen/date_picker_component_width"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
+            style="?android:attr/buttonBarButtonStyle"
             android:id="@+id/clear_button"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/done_background_color"
             android:minHeight="48dp"
+            android:textColor="#333"
             android:text="@string/clear_label"
-            android:textColor="@color/done_text_color"
             android:textSize="@dimen/done_label_size" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
+            style="?android:attr/buttonBarButtonStyle"
             android:id="@+id/done_button"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/done_background_color"
             android:minHeight="48dp"
+            android:textColor="#333"
             android:text="@string/done_label"
-            android:textColor="@color/done_text_color"
             android:textSize="@dimen/done_label_size" />
-    </LinearLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 </LinearLayout>

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt

@@ -22,8 +22,11 @@ package org.isoron.uhabits.activities.habits.edit
 import android.content.res.*
 import android.graphics.*
 import android.os.*
+import android.text.format.*
 import androidx.appcompat.app.*
+import com.android.datetimepicker.time.*
 import org.isoron.androidbase.utils.*
+import org.isoron.uhabits.*
 import org.isoron.uhabits.activities.*
 import org.isoron.uhabits.activities.common.dialogs.*
 import org.isoron.uhabits.core.preferences.*
@@ -38,8 +41,12 @@ class EditHabitActivity : AppCompatActivity() {
     private lateinit var binding: ActivityEditHabitBinding
 
     var paletteColor = 11
+    var androidColor = 0
+
     var freqNum = 1
     var freqDen = 1
+    var reminderHour = -1
+    var reminderMin = -1
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -77,25 +84,53 @@ class EditHabitActivity : AppCompatActivity() {
             dialog.show(supportFragmentManager, "frequencyPicker")
         }
 
+        binding.reminderTimePicker.setOnClickListener {
+            val currentHour = if (reminderHour >= 0) reminderHour else 8
+            val currentMin = if (reminderMin >= 0) reminderMin else 0
+            val is24HourMode = DateFormat.is24HourFormat(this)
+            val dialog = TimePickerDialog.newInstance(object : TimePickerDialog.OnTimeSetListener {
+                override fun onTimeSet(view: RadialPickerLayout?, hourOfDay: Int, minute: Int) {
+                    reminderHour = hourOfDay
+                    reminderMin = minute
+                    populateReminder()
+                }
+                override fun onTimeCleared(view: RadialPickerLayout?) {
+                    reminderHour = -1
+                    reminderMin = -1
+                    populateReminder()
+                }
+            }, currentHour, currentMin, is24HourMode, androidColor)
+            dialog.show(supportFragmentManager, "timePicker")
+        }
+
         binding.buttonSave.setOnClickListener {
             finish()
         }
     }
 
+    private fun populateReminder() {
+        if (reminderHour < 0) {
+            binding.reminderTimePicker.text = getString(R.string.reminder_off)
+        } else {
+            val time = AndroidDateUtils.formatTime(this, reminderHour, reminderMin)
+            binding.reminderTimePicker.text = time
+        }
+    }
+
     private fun populateFrequency() {
         val label = when {
-            freqNum == 1 && freqDen == 1 -> "Every day"
-            freqNum == 1 && freqDen == 7 -> "Every week"
-            freqNum == 1 && freqDen > 1 -> "Every $freqDen days"
-            freqDen == 7 -> "$freqNum times per week"
-            freqDen == 31 -> "$freqNum times per month"
+            freqNum == 1 && freqDen == 1 -> getString(R.string.every_day)
+            freqNum == 1 && freqDen == 7 -> getString(R.string.every_week)
+            freqNum == 1 && freqDen > 1 -> getString(R.string.every_x_days, freqDen)
+            freqDen == 7 -> getString(R.string.x_times_per_week, freqNum)
+            freqDen == 31 -> getString(R.string.x_times_per_month, freqNum)
             else -> "Unknown"
         }
         binding.frequencyPicker.text = label
     }
 
     private fun updateColors() {
-        val androidColor = PaletteUtils.getColor(this, paletteColor)
+        androidColor = PaletteUtils.getColor(this, paletteColor)
         binding.colorButton.backgroundTintList = ColorStateList.valueOf(androidColor)
         if (!themeSwitcher.isNightMode) {
             val darkerAndroidColor = ColorUtils.mixColors(Color.BLACK, androidColor, 0.15f)

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits.activities.habits.edit;
 
 import android.app.*;
 import android.content.*;
+import android.graphics.*;
 import android.os.*;
 
 import androidx.annotation.NonNull;
@@ -265,7 +266,7 @@ public class EditHabitDialog extends AppCompatDialogFragment
                 boolean is24HourMode = DateFormat.is24HourFormat(getContext());
                 timePicker =
                     TimePickerDialog.newInstance(reminderPanel, currentHour,
-                        currentMin, is24HourMode);
+                                                 currentMin, is24HourMode, Color.BLUE);
                 timePicker.show(getFragmentManager(), "timePicker");
             }
 

android/uhabits-android/src/main/java/org/isoron/uhabits/notifications/SnoozeDelayPickerActivity.java

@@ -2,6 +2,7 @@ package org.isoron.uhabits.notifications;
 
 
 import android.app.*;
+import android.graphics.*;
 import android.os.*;
 
 import androidx.annotation.Nullable;
@@ -66,7 +67,8 @@ public class SnoozeDelayPickerActivity extends FragmentActivity
             },
             calendar.get(Calendar.HOUR_OF_DAY),
             calendar.get(Calendar.MINUTE),
-            DateFormat.is24HourFormat(this));
+            DateFormat.is24HourFormat(this),
+            Color.BLUE);
         dialog.show(getSupportFragmentManager(), "timePicker");
     }
 

android/uhabits-android/src/main/res/layout/activity_edit_habit.xml

@@ -48,8 +48,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingTop="8dp">
 
 
             <!-- Title and color -->
@@ -85,16 +85,16 @@
                             android:background="?attr/highContrastReverseTextColor"
                             android:paddingStart="8dp"
                             android:paddingEnd="8dp"
-                                android:textSize="@dimen/smallTextSize"
-                                android:text="@string/name" />
+                            android:text="@string/name"
+                            android:textSize="@dimen/smallTextSize" />
 
                         <EditText
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:background="@color/transparent"
-                                android:textSize="@dimen/regularTextSize"
+                            android:hint="e.g. Exercise"
                             android:padding="16dp"
-                                android:hint="e.g. Exercise" />
+                            android:textSize="@dimen/regularTextSize" />
                     </LinearLayout>
                 </FrameLayout>
 
@@ -102,11 +102,11 @@
                 <FrameLayout
                     android:layout_width="80dp"
                     android:layout_height="match_parent"
-                        android:paddingStart="0dp"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:orientation="vertical"
-                        android:padding="8dp">
+                    android:padding="8dp"
+                    android:paddingStart="0dp">
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -125,16 +125,16 @@
                             android:background="?attr/highContrastReverseTextColor"
                             android:paddingStart="8dp"
                             android:paddingEnd="8dp"
-                                android:textSize="@dimen/smallTextSize"
-                                android:text="Color" />
+                            android:text="Color"
+                            android:textSize="@dimen/smallTextSize" />
 
                         <androidx.appcompat.widget.AppCompatButton
                             android:id="@+id/colorButton"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_marginLeft="16dp"
-                                android:layout_marginRight="16dp"
                             android:layout_marginTop="8dp"
+                            android:layout_marginRight="16dp"
                             android:layout_marginBottom="8dp"
                             android:backgroundTint="#E23673" />
 
@@ -172,17 +172,17 @@
                         android:background="?attr/highContrastReverseTextColor"
                         android:paddingStart="8dp"
                         android:paddingEnd="8dp"
-                            android:textSize="@dimen/smallTextSize"
-                            android:text="@string/question" />
+                        android:text="@string/question"
+                        android:textSize="@dimen/smallTextSize" />
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@color/transparent"
-                            android:textSize="@dimen/regularTextSize"
                         android:hint="@string/example_question_boolean"
                         android:padding="16dp"
-                            android:text="" />
+                        android:text=""
+                        android:textSize="@dimen/regularTextSize" />
                 </LinearLayout>
             </FrameLayout>
 
@@ -211,20 +211,20 @@
                         android:layout_marginTop="-17dp"
                         android:layout_marginBottom="-4dp"
                         android:background="?attr/highContrastReverseTextColor"
-                            android:textSize="@dimen/smallTextSize"
                         android:paddingStart="8dp"
                         android:paddingEnd="8dp"
-                            android:text="@string/frequency" />
+                        android:text="@string/frequency"
+                        android:textSize="@dimen/smallTextSize" />
 
                     <TextView
                         android:id="@+id/frequencyPicker"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:drawableEnd="@drawable/ic_arrow_drop_down_dark"
-                            android:textSize="@dimen/regularTextSize"
                         android:padding="16dp"
                         android:text="@string/every_day"
-                            android:textColor="?attr/highContrastTextColor" />
+                        android:textColor="?attr/highContrastTextColor"
+                        android:textSize="@dimen/regularTextSize" />
                 </LinearLayout>
             </FrameLayout>
 
@@ -252,20 +252,20 @@
                         android:layout_marginTop="-17dp"
                         android:layout_marginBottom="-4dp"
                         android:background="?attr/highContrastReverseTextColor"
-                            android:textSize="@dimen/smallTextSize"
                         android:paddingStart="8dp"
                         android:paddingEnd="8dp"
-                            android:text="@string/reminder" />
+                        android:text="@string/reminder"
+                        android:textSize="@dimen/smallTextSize" />
 
                     <TextView
+                        android:id="@+id/reminderTimePicker"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                            android:background="?attr/selectableItemBackground"
                         android:drawableEnd="@drawable/ic_arrow_drop_down_dark"
-                            android:textSize="@dimen/regularTextSize"
-                            android:textColor="?attr/highContrastTextColor"
                         android:padding="16dp"
-                            android:text="@string/reminder_off" />
+                        android:text="@string/reminder_off"
+                        android:textColor="?attr/highContrastTextColor"
+                        android:textSize="@dimen/regularTextSize" />
                 </LinearLayout>
             </FrameLayout>
 
@@ -294,19 +294,19 @@
                         android:layout_marginTop="-17dp"
                         android:layout_marginBottom="-4dp"
                         android:background="?attr/highContrastReverseTextColor"
-                            android:textSize="@dimen/smallTextSize"
                         android:paddingStart="8dp"
                         android:paddingEnd="8dp"
-                            android:text="Notes" />
+                        android:text="Notes"
+                        android:textSize="@dimen/smallTextSize" />
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@color/transparent"
-                            android:textSize="@dimen/regularTextSize"
-                            android:textColor="?attr/highContrastTextColor"
+                        android:hint="(Optional)"
                         android:padding="16dp"
-                            android:hint="(Optional)" />
+                        android:textColor="?attr/highContrastTextColor"
+                        android:textSize="@dimen/regularTextSize" />
                 </LinearLayout>
             </FrameLayout>
         </LinearLayout>

android/uhabits-android/src/main/res/values/strings.xml

@@ -252,5 +252,7 @@
     <string name="measurable_example">e.g. How many miles did you run today? How many pages did you read? How many calories did you eat?</string>
     <string name="subjective">Subjective</string>
     <string name="subjective_example">e.g. Are you felling happy today? Definitely, somewhat, not at all? How frequently did you snack? Very often, sometimes, never?</string>
+    <string name="x_times_per_week">%d times per week</string>
+    <string name="x_times_per_month">%d times per month</string>
 
 </resources>