diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 000000000..c8d4626b3 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 000000000..f842fe0c3 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 22 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "org.isoron.uhabits" + minSdkVersion 21 + targetSdkVersion 22 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} + +dependencies { + compile 'com.android.support:support-v4:22.0.0' + compile files('libs/ActiveAndroid.jar') +} diff --git a/libs/ActiveAndroid.jar b/app/libs/ActiveAndroid.jar similarity index 100% rename from libs/ActiveAndroid.jar rename to app/libs/ActiveAndroid.jar diff --git a/app/lint.xml b/app/lint.xml new file mode 100644 index 000000000..8423c0ef9 --- /dev/null +++ b/app/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/assets/fontawesome-webfont.ttf b/app/src/main/assets/fontawesome-webfont.ttf old mode 100755 new mode 100644 similarity index 100% rename from assets/fontawesome-webfont.ttf rename to app/src/main/assets/fontawesome-webfont.ttf diff --git a/assets/migrations/5.sql b/app/src/main/assets/migrations/5.sql similarity index 100% rename from assets/migrations/5.sql rename to app/src/main/assets/migrations/5.sql diff --git a/assets/migrations/6.sql b/app/src/main/assets/migrations/6.sql similarity index 100% rename from assets/migrations/6.sql rename to app/src/main/assets/migrations/6.sql diff --git a/src/com/android/colorpicker/ColorPickerDialog.java b/app/src/main/java/com/android/colorpicker/ColorPickerDialog.java similarity index 97% rename from src/com/android/colorpicker/ColorPickerDialog.java rename to app/src/main/java/com/android/colorpicker/ColorPickerDialog.java index a4dc4f557..a47e39d43 100644 --- a/src/com/android/colorpicker/ColorPickerDialog.java +++ b/app/src/main/java/com/android/colorpicker/ColorPickerDialog.java @@ -30,7 +30,7 @@ import android.widget.ProgressBar; import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener; /** - * A dialog which takes in as input an array of colors and creates a palette allowing the user to + * A dialog which takes in as input an array of palette and creates a palette allowing the user to * select a specific color swatch, which invokes a listener. */ public class ColorPickerDialog extends DialogFragment implements OnColorSelectedListener { @@ -41,7 +41,7 @@ public class ColorPickerDialog extends DialogFragment implements OnColorSelected protected AlertDialog mAlertDialog; protected static final String KEY_TITLE_ID = "title_id"; - protected static final String KEY_COLORS = "colors"; + protected static final String KEY_COLORS = "palette"; protected static final String KEY_SELECTED_COLOR = "selected_color"; protected static final String KEY_COLUMNS = "columns"; protected static final String KEY_SIZE = "size"; diff --git a/src/com/android/colorpicker/ColorPickerPalette.java b/app/src/main/java/com/android/colorpicker/ColorPickerPalette.java similarity index 97% rename from src/com/android/colorpicker/ColorPickerPalette.java rename to app/src/main/java/com/android/colorpicker/ColorPickerPalette.java index 66eb76876..add5ba86e 100644 --- a/src/com/android/colorpicker/ColorPickerPalette.java +++ b/app/src/main/java/com/android/colorpicker/ColorPickerPalette.java @@ -93,7 +93,7 @@ public class ColorPickerPalette extends TableLayout { int rowElements = 0; int rowNumber = 0; - // Fills the table with swatches based on the array of colors. + // Fills the table with swatches based on the array of palette. TableRow row = createTableRow(); for (int color : colors) { tableElements++; @@ -135,8 +135,8 @@ public class ColorPickerPalette extends TableLayout { } /** - * Add a content description to the specified swatch view. Because the colors get added in a - * snaking form, every other row will need to compensate for the fact that the colors are added + * Add a content description to the specified swatch view. Because the palette get added in a + * snaking form, every other row will need to compensate for the fact that the palette are added * in an opposite direction from their left->right/top->bottom order, which is how the system * will arrange them for accessibility purposes. */ diff --git a/src/com/android/colorpicker/ColorPickerSwatch.java b/app/src/main/java/com/android/colorpicker/ColorPickerSwatch.java similarity index 100% rename from src/com/android/colorpicker/ColorPickerSwatch.java rename to app/src/main/java/com/android/colorpicker/ColorPickerSwatch.java diff --git a/src/com/android/colorpicker/ColorStateDrawable.java b/app/src/main/java/com/android/colorpicker/ColorStateDrawable.java similarity index 100% rename from src/com/android/colorpicker/ColorStateDrawable.java rename to app/src/main/java/com/android/colorpicker/ColorStateDrawable.java diff --git a/src/com/android/colorpicker/HsvColorComparator.java b/app/src/main/java/com/android/colorpicker/HsvColorComparator.java similarity index 100% rename from src/com/android/colorpicker/HsvColorComparator.java rename to app/src/main/java/com/android/colorpicker/HsvColorComparator.java diff --git a/src/com/android/datetimepicker/AccessibleLinearLayout.java b/app/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java similarity index 100% rename from src/com/android/datetimepicker/AccessibleLinearLayout.java rename to app/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java diff --git a/src/com/android/datetimepicker/AccessibleTextView.java b/app/src/main/java/com/android/datetimepicker/AccessibleTextView.java similarity index 100% rename from src/com/android/datetimepicker/AccessibleTextView.java rename to app/src/main/java/com/android/datetimepicker/AccessibleTextView.java diff --git a/src/com/android/datetimepicker/HapticFeedbackController.java b/app/src/main/java/com/android/datetimepicker/HapticFeedbackController.java similarity index 100% rename from src/com/android/datetimepicker/HapticFeedbackController.java rename to app/src/main/java/com/android/datetimepicker/HapticFeedbackController.java diff --git a/src/com/android/datetimepicker/Utils.java b/app/src/main/java/com/android/datetimepicker/Utils.java similarity index 100% rename from src/com/android/datetimepicker/Utils.java rename to app/src/main/java/com/android/datetimepicker/Utils.java diff --git a/src/com/android/datetimepicker/date/AccessibleDateAnimator.java b/app/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java similarity index 100% rename from src/com/android/datetimepicker/date/AccessibleDateAnimator.java rename to app/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java diff --git a/src/com/android/datetimepicker/date/DatePickerController.java b/app/src/main/java/com/android/datetimepicker/date/DatePickerController.java similarity index 100% rename from src/com/android/datetimepicker/date/DatePickerController.java rename to app/src/main/java/com/android/datetimepicker/date/DatePickerController.java diff --git a/src/com/android/datetimepicker/date/DatePickerDialog.java b/app/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java similarity index 100% rename from src/com/android/datetimepicker/date/DatePickerDialog.java rename to app/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java diff --git a/src/com/android/datetimepicker/date/DayPickerView.java b/app/src/main/java/com/android/datetimepicker/date/DayPickerView.java similarity index 100% rename from src/com/android/datetimepicker/date/DayPickerView.java rename to app/src/main/java/com/android/datetimepicker/date/DayPickerView.java diff --git a/src/com/android/datetimepicker/date/MonthAdapter.java b/app/src/main/java/com/android/datetimepicker/date/MonthAdapter.java similarity index 100% rename from src/com/android/datetimepicker/date/MonthAdapter.java rename to app/src/main/java/com/android/datetimepicker/date/MonthAdapter.java diff --git a/src/com/android/datetimepicker/date/MonthView.java b/app/src/main/java/com/android/datetimepicker/date/MonthView.java similarity index 100% rename from src/com/android/datetimepicker/date/MonthView.java rename to app/src/main/java/com/android/datetimepicker/date/MonthView.java diff --git a/src/com/android/datetimepicker/date/SimpleDayPickerView.java b/app/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java similarity index 100% rename from src/com/android/datetimepicker/date/SimpleDayPickerView.java rename to app/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java diff --git a/src/com/android/datetimepicker/date/SimpleMonthAdapter.java b/app/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java similarity index 100% rename from src/com/android/datetimepicker/date/SimpleMonthAdapter.java rename to app/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java diff --git a/src/com/android/datetimepicker/date/SimpleMonthView.java b/app/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java similarity index 100% rename from src/com/android/datetimepicker/date/SimpleMonthView.java rename to app/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java diff --git a/src/com/android/datetimepicker/date/TextViewWithCircularIndicator.java b/app/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java similarity index 100% rename from src/com/android/datetimepicker/date/TextViewWithCircularIndicator.java rename to app/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java diff --git a/src/com/android/datetimepicker/date/YearPickerView.java b/app/src/main/java/com/android/datetimepicker/date/YearPickerView.java similarity index 100% rename from src/com/android/datetimepicker/date/YearPickerView.java rename to app/src/main/java/com/android/datetimepicker/date/YearPickerView.java diff --git a/src/com/android/datetimepicker/time/AmPmCirclesView.java b/app/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java similarity index 100% rename from src/com/android/datetimepicker/time/AmPmCirclesView.java rename to app/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java diff --git a/src/com/android/datetimepicker/time/CircleView.java b/app/src/main/java/com/android/datetimepicker/time/CircleView.java similarity index 100% rename from src/com/android/datetimepicker/time/CircleView.java rename to app/src/main/java/com/android/datetimepicker/time/CircleView.java diff --git a/src/com/android/datetimepicker/time/RadialPickerLayout.java b/app/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java similarity index 100% rename from src/com/android/datetimepicker/time/RadialPickerLayout.java rename to app/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java diff --git a/src/com/android/datetimepicker/time/RadialSelectorView.java b/app/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java similarity index 100% rename from src/com/android/datetimepicker/time/RadialSelectorView.java rename to app/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java diff --git a/src/com/android/datetimepicker/time/RadialTextsView.java b/app/src/main/java/com/android/datetimepicker/time/RadialTextsView.java similarity index 100% rename from src/com/android/datetimepicker/time/RadialTextsView.java rename to app/src/main/java/com/android/datetimepicker/time/RadialTextsView.java diff --git a/src/com/android/datetimepicker/time/TimePickerDialog.java b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java similarity index 99% rename from src/com/android/datetimepicker/time/TimePickerDialog.java rename to app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java index eff74c130..db3ed7890 100644 --- a/src/com/android/datetimepicker/time/TimePickerDialog.java +++ b/app/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java @@ -331,7 +331,7 @@ public class TimePickerDialog extends DialogFragment implements OnValueSelectedL // Set the theme at the end so that the initialize()s above don't counteract the theme. mTimePicker.setTheme(getActivity().getApplicationContext(), mThemeDark); - // Prepare some colors to use. + // 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); @@ -345,7 +345,7 @@ public class TimePickerDialog extends DialogFragment implements OnValueSelectedL ColorStateList darkDoneTextColor = res.getColorStateList(R.color.done_text_color_dark); int darkDoneBackground = R.drawable.done_background_color_dark; - // Set the colors for each view based on the theme. + // 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); diff --git a/src/com/mobeta/android/dslv/DragSortController.java b/app/src/main/java/com/mobeta/android/dslv/DragSortController.java similarity index 100% rename from src/com/mobeta/android/dslv/DragSortController.java rename to app/src/main/java/com/mobeta/android/dslv/DragSortController.java diff --git a/src/com/mobeta/android/dslv/DragSortCursorAdapter.java b/app/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java similarity index 100% rename from src/com/mobeta/android/dslv/DragSortCursorAdapter.java rename to app/src/main/java/com/mobeta/android/dslv/DragSortCursorAdapter.java diff --git a/src/com/mobeta/android/dslv/DragSortItemView.java b/app/src/main/java/com/mobeta/android/dslv/DragSortItemView.java similarity index 100% rename from src/com/mobeta/android/dslv/DragSortItemView.java rename to app/src/main/java/com/mobeta/android/dslv/DragSortItemView.java diff --git a/src/com/mobeta/android/dslv/DragSortItemViewCheckable.java b/app/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java similarity index 100% rename from src/com/mobeta/android/dslv/DragSortItemViewCheckable.java rename to app/src/main/java/com/mobeta/android/dslv/DragSortItemViewCheckable.java diff --git a/src/com/mobeta/android/dslv/DragSortListView.java b/app/src/main/java/com/mobeta/android/dslv/DragSortListView.java similarity index 100% rename from src/com/mobeta/android/dslv/DragSortListView.java rename to app/src/main/java/com/mobeta/android/dslv/DragSortListView.java diff --git a/src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java b/app/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java similarity index 100% rename from src/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java rename to app/src/main/java/com/mobeta/android/dslv/ResourceDragSortCursorAdapter.java diff --git a/src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java b/app/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java similarity index 100% rename from src/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java rename to app/src/main/java/com/mobeta/android/dslv/SimpleDragSortCursorAdapter.java diff --git a/src/com/mobeta/android/dslv/SimpleFloatViewManager.java b/app/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java similarity index 100% rename from src/com/mobeta/android/dslv/SimpleFloatViewManager.java rename to app/src/main/java/com/mobeta/android/dslv/SimpleFloatViewManager.java diff --git a/src/org/isoron/helpers/ColorHelper.java b/app/src/main/java/org/isoron/helpers/ColorHelper.java similarity index 59% rename from src/org/isoron/helpers/ColorHelper.java rename to app/src/main/java/org/isoron/helpers/ColorHelper.java index e6ddb00bc..4396fe3b6 100644 --- a/src/org/isoron/helpers/ColorHelper.java +++ b/app/src/main/java/org/isoron/helpers/ColorHelper.java @@ -1,8 +1,18 @@ package org.isoron.helpers; +import android.graphics.Color; + public class ColorHelper { - public static int mixColors(int color1, int color2, float amount) + public static final int[] palette = { Color.parseColor("#900000"), + Color.parseColor("#c54100"), Color.parseColor("#c0ab00"), + Color.parseColor("#8db600"), Color.parseColor("#117209"), + Color.parseColor("#06965b"), Color.parseColor("#069a95"), + Color.parseColor("#114896"), Color.parseColor("#501394"), + Color.parseColor("#872086"), Color.parseColor("#c31764"), + Color.parseColor("#000000"), Color.parseColor("#aaaaaa") }; + + public static int mixColors(int color1, int color2, float amount) { final byte ALPHA_CHANNEL = 24; final byte RED_CHANNEL = 16; diff --git a/src/org/isoron/helpers/Command.java b/app/src/main/java/org/isoron/helpers/Command.java similarity index 100% rename from src/org/isoron/helpers/Command.java rename to app/src/main/java/org/isoron/helpers/Command.java diff --git a/src/org/isoron/helpers/DateHelper.java b/app/src/main/java/org/isoron/helpers/DateHelper.java similarity index 100% rename from src/org/isoron/helpers/DateHelper.java rename to app/src/main/java/org/isoron/helpers/DateHelper.java diff --git a/src/org/isoron/helpers/DialogHelper.java b/app/src/main/java/org/isoron/helpers/DialogHelper.java similarity index 100% rename from src/org/isoron/helpers/DialogHelper.java rename to app/src/main/java/org/isoron/helpers/DialogHelper.java diff --git a/app/src/main/java/org/isoron/uhabits/MainActivity.java b/app/src/main/java/org/isoron/uhabits/MainActivity.java new file mode 100644 index 000000000..abe2d3745 --- /dev/null +++ b/app/src/main/java/org/isoron/uhabits/MainActivity.java @@ -0,0 +1,185 @@ +package org.isoron.uhabits; + +import android.app.Activity; +import android.app.AlarmManager; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; +import android.widget.Toast; + +import org.isoron.helpers.Command; +import org.isoron.uhabits.dialogs.ListHabitsFragment; +import org.isoron.uhabits.models.Habit; + +import java.text.DateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.LinkedList; + +public class MainActivity extends Activity +{ + private static int MAX_UNDO_LEVEL = 15; + private ListHabitsFragment listHabitsFragment; + private LinkedList undoList; + private LinkedList redoList; + + private Toast toast; + + public static void createReminderAlarms(Context context) + { + for (Habit habit : Habit.getHabitsWithReminder()) + createReminderAlarm(context, habit, null); + } + + public static void createReminderAlarm(Context context, Habit habit, Long reminderTime) + { + Uri uri = Uri.parse("content://org.isoron.uhabits/habit/" + habit.getId()); + + if (reminderTime == null) + { + Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(System.currentTimeMillis()); + calendar.set(Calendar.HOUR_OF_DAY, habit.reminder_hour); + calendar.set(Calendar.MINUTE, habit.reminder_min); + calendar.set(Calendar.SECOND, 0); + + reminderTime = calendar.getTimeInMillis(); + + if (System.currentTimeMillis() > reminderTime) + { + reminderTime += AlarmManager.INTERVAL_DAY; + } + } + + Intent alarmIntent = new Intent(context, ReminderAlarmReceiver.class); + alarmIntent.setAction(ReminderAlarmReceiver.ACTION_REMIND); + alarmIntent.setData(uri); + + PendingIntent pendingIntent = PendingIntent.getBroadcast(context, + ((int) (habit.getId() % Integer.MAX_VALUE)) + 1, + alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT); + + AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); + if (Build.VERSION.SDK_INT >= 19) + { + manager.setExact(AlarmManager.RTC_WAKEUP, reminderTime, pendingIntent); + } else + { + manager.set(AlarmManager.RTC_WAKEUP, reminderTime, pendingIntent); + } + + Log.d("Alarm", String.format("Setting alarm (%s): %s", DateFormat.getDateTimeInstance() + .format(new Date(reminderTime)), habit.name)); + } + + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + + getActionBar().setElevation(5); + + setContentView(R.layout.list_habits_activity); + + listHabitsFragment = (ListHabitsFragment) getFragmentManager().findFragmentById( + R.id.fragment1); + + Log.d("MainActivity", "Creating activity"); + + undoList = new LinkedList<>(); + redoList = new LinkedList<>(); + + createReminderAlarms(MainActivity.this); + } + + @Override + protected void onStart() + { + super.onStart(); + listHabitsFragment.notifyDataSetChanged(); + Log.d("MainActivity", "Starting activity"); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) + { + getMenuInflater().inflate(R.menu.main_activity, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + int id = item.getItemId(); + if (id == R.id.action_settings) + { + return true; + } + return super.onOptionsItemSelected(item); + } + + public void executeCommand(Command command, boolean datasetChanged) + { + executeCommand(command, datasetChanged, true); + } + + public void executeCommand(Command command, boolean datasetChanged, boolean clearRedoStack) + { + undoList.push(command); + if (undoList.size() > MAX_UNDO_LEVEL) + undoList.removeLast(); + if (clearRedoStack) + redoList.clear(); + command.execute(); + + showToast(command.getExecuteStringId()); + if (datasetChanged) + { + listHabitsFragment.notifyDataSetChanged(); + } + } + + public void undo() + { + if (undoList.isEmpty()) + { + showToast(R.string.toast_nothing_to_undo); + return; + } + + Command last = undoList.pop(); + redoList.push(last); + last.undo(); + showToast(last.getUndoStringId()); + + listHabitsFragment.notifyDataSetChanged(); + } + + public void redo() + { + if (redoList.isEmpty()) + { + showToast(R.string.toast_nothing_to_redo); + return; + } + Command last = redoList.pop(); + executeCommand(last, true, false); + } + + private void showToast(Integer stringId) + { + if (stringId == null) + return; + if (toast == null) + toast = Toast.makeText(this, stringId, Toast.LENGTH_SHORT); + else + toast.setText(stringId); + toast.show(); + } +} diff --git a/src/org/isoron/uhabits/ReminderAlarmReceiver.java b/app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java similarity index 100% rename from src/org/isoron/uhabits/ReminderAlarmReceiver.java rename to app/src/main/java/org/isoron/uhabits/ReminderAlarmReceiver.java diff --git a/src/org/isoron/uhabits/ShowHabitActivity.java b/app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java similarity index 100% rename from src/org/isoron/uhabits/ShowHabitActivity.java rename to app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java diff --git a/src/org/isoron/uhabits/dialogs/EditHabitFragment.java b/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java similarity index 95% rename from src/org/isoron/uhabits/dialogs/EditHabitFragment.java rename to app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java index d2b1e8a4b..e9d8290dc 100644 --- a/src/org/isoron/uhabits/dialogs/EditHabitFragment.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java @@ -1,5 +1,6 @@ package org.isoron.uhabits.dialogs; +import org.isoron.helpers.ColorHelper; import org.isoron.helpers.Command; import org.isoron.helpers.DialogHelper.OnSavedListener; import org.isoron.uhabits.R; @@ -8,8 +9,6 @@ import org.isoron.uhabits.models.Habit; import android.app.DialogFragment; import android.graphics.Color; import android.graphics.ColorMatrix; -import android.graphics.ColorMatrixColorFilter; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -85,8 +84,8 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener tvFreqDen = (TextView) view.findViewById(R.id.input_freq_den); tvInputReminder = (TextView) view.findViewById(R.id.input_reminder_time); - Button buttonSave = (Button) view.findViewById(R.id.button_save); - Button buttonDiscard = (Button) view.findViewById(R.id.button_discard); + Button buttonSave = (Button) view.findViewById(R.id.buttonSave); + Button buttonDiscard = (Button) view.findViewById(R.id.buttonDiscard); buttonSave.setOnClickListener(this); buttonDiscard.setOnClickListener(this); @@ -125,7 +124,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener { ColorPickerDialog picker = ColorPickerDialog.newInstance( R.string.color_picker_default_title, - Habit.colors, modified_habit.color, 4, ColorPickerDialog.SIZE_SMALL); + ColorHelper.palette, modified_habit.color, 4, ColorPickerDialog.SIZE_SMALL); picker.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() { @@ -216,7 +215,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener } /* Save button */ - if(id == R.id.button_save) + if(id == R.id.buttonSave) { Command command = null; @@ -255,7 +254,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener } /* Discard button */ - if(id == R.id.button_discard) + if(id == R.id.buttonDiscard) { dismiss(); } diff --git a/src/org/isoron/uhabits/dialogs/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java similarity index 99% rename from src/org/isoron/uhabits/dialogs/ListHabitsFragment.java rename to app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java index 6bf546d19..e7a53dd84 100644 --- a/src/org/isoron/uhabits/dialogs/ListHabitsFragment.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java @@ -22,7 +22,6 @@ import android.graphics.Typeface; import android.net.Uri; import android.os.Bundle; import android.os.Vibrator; -import android.text.format.Time; import android.transition.Explode; import android.util.DisplayMetrics; import android.util.Log; @@ -226,7 +225,7 @@ public class ListHabitsFragment extends Fragment implements OnSavedListener, OnI public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.list_habits, container, false); + View view = inflater.inflate(R.layout.list_habits_fragment, container, false); DisplayMetrics dm = getResources().getDisplayMetrics(); int width = (int) (dm.widthPixels / dm.density); diff --git a/src/org/isoron/uhabits/dialogs/ShowHabitFragment.java b/app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java similarity index 100% rename from src/org/isoron/uhabits/dialogs/ShowHabitFragment.java rename to app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java diff --git a/src/org/isoron/uhabits/models/Habit.java b/app/src/main/java/org/isoron/uhabits/models/Habit.java similarity index 95% rename from src/org/isoron/uhabits/models/Habit.java rename to app/src/main/java/org/isoron/uhabits/models/Habit.java index 1a0546b88..54ec3f0e2 100644 --- a/src/org/isoron/uhabits/models/Habit.java +++ b/app/src/main/java/org/isoron/uhabits/models/Habit.java @@ -2,13 +2,12 @@ package org.isoron.uhabits.models; import java.util.List; +import org.isoron.helpers.ColorHelper; import org.isoron.helpers.Command; import org.isoron.helpers.DateHelper; import org.isoron.uhabits.R; import android.annotation.SuppressLint; -import android.graphics.Color; -import android.util.Log; import com.activeandroid.Model; import com.activeandroid.annotation.Column; @@ -27,15 +26,7 @@ public class Habit extends Model * Fields * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - public static final int colors[] = { Color.parseColor("#900000"), - Color.parseColor("#c54100"), Color.parseColor("#c0ab00"), - Color.parseColor("#8db600"), Color.parseColor("#117209"), - Color.parseColor("#06965b"), Color.parseColor("#069a95"), - Color.parseColor("#114896"), Color.parseColor("#501394"), - Color.parseColor("#872086"), Color.parseColor("#c31764"), - Color.parseColor("#000000"), Color.parseColor("#aaaaaa") }; - - public static final int HALF_STAR_CUTOFF = 5999000; + public static final int HALF_STAR_CUTOFF = 5999000; public static final int FULL_STAR_CUTOFF = 12973000; public static final int MAX_SCORE = 19259500; @@ -207,7 +198,7 @@ public class Habit extends Model public Habit() { - this.color = colors[11]; + this.color = ColorHelper.palette[11]; this.position = Habit.getCount(); this.highlight = 0; } diff --git a/src/org/isoron/uhabits/models/Repetition.java b/app/src/main/java/org/isoron/uhabits/models/Repetition.java similarity index 100% rename from src/org/isoron/uhabits/models/Repetition.java rename to app/src/main/java/org/isoron/uhabits/models/Repetition.java diff --git a/src/org/isoron/uhabits/models/Score.java b/app/src/main/java/org/isoron/uhabits/models/Score.java similarity index 100% rename from src/org/isoron/uhabits/models/Score.java rename to app/src/main/java/org/isoron/uhabits/models/Score.java diff --git a/src/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java similarity index 100% rename from src/org/isoron/uhabits/views/HabitHistoryView.java rename to app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java diff --git a/res/color/date_picker_selector.xml b/app/src/main/res/color/date_picker_selector.xml similarity index 100% rename from res/color/date_picker_selector.xml rename to app/src/main/res/color/date_picker_selector.xml diff --git a/res/color/date_picker_year_selector.xml b/app/src/main/res/color/date_picker_year_selector.xml similarity index 100% rename from res/color/date_picker_year_selector.xml rename to app/src/main/res/color/date_picker_year_selector.xml diff --git a/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png diff --git a/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png diff --git a/res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png diff --git a/res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png diff --git a/res/drawable-hdpi/ic_action_add.png b/app/src/main/res/drawable-hdpi/ic_action_add.png similarity index 100% rename from res/drawable-hdpi/ic_action_add.png rename to app/src/main/res/drawable-hdpi/ic_action_add.png diff --git a/res/drawable-hdpi/ic_action_add_dark.png b/app/src/main/res/drawable-hdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_dark.png rename to app/src/main/res/drawable-hdpi/ic_action_add_dark.png diff --git a/res/drawable-hdpi/ic_action_check.png b/app/src/main/res/drawable-hdpi/ic_action_check.png similarity index 100% rename from res/drawable-hdpi/ic_action_check.png rename to app/src/main/res/drawable-hdpi/ic_action_check.png diff --git a/res/drawable-hdpi/ic_action_dismiss.png b/app/src/main/res/drawable-hdpi/ic_action_dismiss.png similarity index 100% rename from res/drawable-hdpi/ic_action_dismiss.png rename to app/src/main/res/drawable-hdpi/ic_action_dismiss.png diff --git a/res/drawable-hdpi/ic_action_pick_color.png b/app/src/main/res/drawable-hdpi/ic_action_pick_color.png similarity index 100% rename from res/drawable-hdpi/ic_action_pick_color.png rename to app/src/main/res/drawable-hdpi/ic_action_pick_color.png diff --git a/res/drawable-hdpi/ic_action_snooze.png b/app/src/main/res/drawable-hdpi/ic_action_snooze.png similarity index 100% rename from res/drawable-hdpi/ic_action_snooze.png rename to app/src/main/res/drawable-hdpi/ic_action_snooze.png diff --git a/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/app/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png similarity index 100% rename from res/drawable-hdpi/ic_colorpicker_swatch_selected.png rename to app/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png diff --git a/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png similarity index 100% rename from res/drawable-hdpi/ic_notification.png rename to app/src/main/res/drawable-hdpi/ic_notification.png diff --git a/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png diff --git a/res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png diff --git a/res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png diff --git a/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png diff --git a/res/drawable-mdpi/ic_action_add.png b/app/src/main/res/drawable-mdpi/ic_action_add.png similarity index 100% rename from res/drawable-mdpi/ic_action_add.png rename to app/src/main/res/drawable-mdpi/ic_action_add.png diff --git a/res/drawable-mdpi/ic_action_add_dark.png b/app/src/main/res/drawable-mdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_dark.png rename to app/src/main/res/drawable-mdpi/ic_action_add_dark.png diff --git a/res/drawable-mdpi/ic_action_check.png b/app/src/main/res/drawable-mdpi/ic_action_check.png similarity index 100% rename from res/drawable-mdpi/ic_action_check.png rename to app/src/main/res/drawable-mdpi/ic_action_check.png diff --git a/res/drawable-mdpi/ic_action_dismiss.png b/app/src/main/res/drawable-mdpi/ic_action_dismiss.png similarity index 100% rename from res/drawable-mdpi/ic_action_dismiss.png rename to app/src/main/res/drawable-mdpi/ic_action_dismiss.png diff --git a/res/drawable-mdpi/ic_action_pick_color.png b/app/src/main/res/drawable-mdpi/ic_action_pick_color.png similarity index 100% rename from res/drawable-mdpi/ic_action_pick_color.png rename to app/src/main/res/drawable-mdpi/ic_action_pick_color.png diff --git a/res/drawable-mdpi/ic_action_snooze.png b/app/src/main/res/drawable-mdpi/ic_action_snooze.png similarity index 100% rename from res/drawable-mdpi/ic_action_snooze.png rename to app/src/main/res/drawable-mdpi/ic_action_snooze.png diff --git a/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/app/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png similarity index 100% rename from res/drawable-mdpi/ic_colorpicker_swatch_selected.png rename to app/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png diff --git a/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png similarity index 100% rename from res/drawable-mdpi/ic_notification.png rename to app/src/main/res/drawable-mdpi/ic_notification.png diff --git a/res/drawable-v21/habits_item_check_normal.xml b/app/src/main/res/drawable-v21/habits_item_check_normal.xml similarity index 100% rename from res/drawable-v21/habits_item_check_normal.xml rename to app/src/main/res/drawable-v21/habits_item_check_normal.xml diff --git a/res/drawable-v21/habits_item_check_pressed.xml b/app/src/main/res/drawable-v21/habits_item_check_pressed.xml similarity index 100% rename from res/drawable-v21/habits_item_check_pressed.xml rename to app/src/main/res/drawable-v21/habits_item_check_pressed.xml diff --git a/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png diff --git a/res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png diff --git a/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png diff --git a/res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png diff --git a/res/drawable-xhdpi/ic_action_add.png b/app/src/main/res/drawable-xhdpi/ic_action_add.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add.png rename to app/src/main/res/drawable-xhdpi/ic_action_add.png diff --git a/res/drawable-xhdpi/ic_action_add_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_dark.png rename to app/src/main/res/drawable-xhdpi/ic_action_add_dark.png diff --git a/res/drawable-xhdpi/ic_action_check.png b/app/src/main/res/drawable-xhdpi/ic_action_check.png similarity index 100% rename from res/drawable-xhdpi/ic_action_check.png rename to app/src/main/res/drawable-xhdpi/ic_action_check.png diff --git a/res/drawable-xhdpi/ic_action_dismiss.png b/app/src/main/res/drawable-xhdpi/ic_action_dismiss.png similarity index 100% rename from res/drawable-xhdpi/ic_action_dismiss.png rename to app/src/main/res/drawable-xhdpi/ic_action_dismiss.png diff --git a/res/drawable-xhdpi/ic_action_pick_color.png b/app/src/main/res/drawable-xhdpi/ic_action_pick_color.png similarity index 100% rename from res/drawable-xhdpi/ic_action_pick_color.png rename to app/src/main/res/drawable-xhdpi/ic_action_pick_color.png diff --git a/res/drawable-xhdpi/ic_action_snooze.png b/app/src/main/res/drawable-xhdpi/ic_action_snooze.png similarity index 100% rename from res/drawable-xhdpi/ic_action_snooze.png rename to app/src/main/res/drawable-xhdpi/ic_action_snooze.png diff --git a/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/app/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png similarity index 100% rename from res/drawable-xhdpi/ic_colorpicker_swatch_selected.png rename to app/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png similarity index 100% rename from res/drawable-xhdpi/ic_notification.png rename to app/src/main/res/drawable-xhdpi/ic_notification.png diff --git a/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png diff --git a/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png diff --git a/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png diff --git a/res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png diff --git a/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png similarity index 100% rename from res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png rename to app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png diff --git a/res/drawable-xxhdpi/ic_action_add.png b/app/src/main/res/drawable-xxhdpi/ic_action_add.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_add.png rename to app/src/main/res/drawable-xxhdpi/ic_action_add.png diff --git a/res/drawable-xxhdpi/ic_action_add_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_add_dark.png rename to app/src/main/res/drawable-xxhdpi/ic_action_add_dark.png diff --git a/res/drawable-xxhdpi/ic_action_check.png b/app/src/main/res/drawable-xxhdpi/ic_action_check.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_check.png rename to app/src/main/res/drawable-xxhdpi/ic_action_check.png diff --git a/res/drawable-xxhdpi/ic_action_dismiss.png b/app/src/main/res/drawable-xxhdpi/ic_action_dismiss.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_dismiss.png rename to app/src/main/res/drawable-xxhdpi/ic_action_dismiss.png diff --git a/res/drawable-xxhdpi/ic_action_pick_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_pick_color.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_pick_color.png rename to app/src/main/res/drawable-xxhdpi/ic_action_pick_color.png diff --git a/res/drawable-xxhdpi/ic_action_snooze.png b/app/src/main/res/drawable-xxhdpi/ic_action_snooze.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_snooze.png rename to app/src/main/res/drawable-xxhdpi/ic_action_snooze.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png similarity index 100% rename from res/drawable-xxhdpi/ic_notification.png rename to app/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/res/drawable/apptheme_edit_text_holo_light.xml b/app/src/main/res/drawable/apptheme_edit_text_holo_light.xml similarity index 100% rename from res/drawable/apptheme_edit_text_holo_light.xml rename to app/src/main/res/drawable/apptheme_edit_text_holo_light.xml diff --git a/res/drawable/color_picker_swatch.xml b/app/src/main/res/drawable/color_picker_swatch.xml similarity index 100% rename from res/drawable/color_picker_swatch.xml rename to app/src/main/res/drawable/color_picker_swatch.xml diff --git a/res/drawable/done_background_color.xml b/app/src/main/res/drawable/done_background_color.xml similarity index 100% rename from res/drawable/done_background_color.xml rename to app/src/main/res/drawable/done_background_color.xml diff --git a/res/drawable/done_background_color_dark.xml b/app/src/main/res/drawable/done_background_color_dark.xml similarity index 100% rename from res/drawable/done_background_color_dark.xml rename to app/src/main/res/drawable/done_background_color_dark.xml diff --git a/res/drawable/habits_header.xml b/app/src/main/res/drawable/habits_header.xml similarity index 93% rename from res/drawable/habits_header.xml rename to app/src/main/res/drawable/habits_header.xml index a935ad4de..e1c4cfc84 100644 --- a/res/drawable/habits_header.xml +++ b/app/src/main/res/drawable/habits_header.xml @@ -1,4 +1,4 @@ - + diff --git a/res/drawable/habits_header_check.xml b/app/src/main/res/drawable/habits_header_check.xml similarity index 100% rename from res/drawable/habits_header_check.xml rename to app/src/main/res/drawable/habits_header_check.xml diff --git a/res/drawable/habits_item.xml b/app/src/main/res/drawable/habits_item.xml similarity index 87% rename from res/drawable/habits_item.xml rename to app/src/main/res/drawable/habits_item.xml index a2f83e48b..4ba72d44f 100644 --- a/res/drawable/habits_item.xml +++ b/app/src/main/res/drawable/habits_item.xml @@ -1,4 +1,4 @@ - + diff --git a/res/drawable/habits_item_check.xml b/app/src/main/res/drawable/habits_item_check.xml similarity index 100% rename from res/drawable/habits_item_check.xml rename to app/src/main/res/drawable/habits_item_check.xml diff --git a/res/drawable/habits_item_check_normal.xml b/app/src/main/res/drawable/habits_item_check_normal.xml similarity index 100% rename from res/drawable/habits_item_check_normal.xml rename to app/src/main/res/drawable/habits_item_check_normal.xml diff --git a/res/drawable/habits_item_check_pressed.xml b/app/src/main/res/drawable/habits_item_check_pressed.xml similarity index 100% rename from res/drawable/habits_item_check_pressed.xml rename to app/src/main/res/drawable/habits_item_check_pressed.xml diff --git a/res/drawable/ripple_background.xml b/app/src/main/res/drawable/ripple_background.xml similarity index 100% rename from res/drawable/ripple_background.xml rename to app/src/main/res/drawable/ripple_background.xml diff --git a/res/layout/color_picker_dialog.xml b/app/src/main/res/layout/color_picker_dialog.xml similarity index 100% rename from res/layout/color_picker_dialog.xml rename to app/src/main/res/layout/color_picker_dialog.xml diff --git a/res/layout/color_picker_swatch.xml b/app/src/main/res/layout/color_picker_swatch.xml similarity index 100% rename from res/layout/color_picker_swatch.xml rename to app/src/main/res/layout/color_picker_swatch.xml diff --git a/res/layout/date_picker_dialog.xml b/app/src/main/res/layout/date_picker_dialog.xml similarity index 100% rename from res/layout/date_picker_dialog.xml rename to app/src/main/res/layout/date_picker_dialog.xml diff --git a/res/layout/date_picker_done_button.xml b/app/src/main/res/layout/date_picker_done_button.xml similarity index 100% rename from res/layout/date_picker_done_button.xml rename to app/src/main/res/layout/date_picker_done_button.xml diff --git a/res/layout/date_picker_header_view.xml b/app/src/main/res/layout/date_picker_header_view.xml similarity index 100% rename from res/layout/date_picker_header_view.xml rename to app/src/main/res/layout/date_picker_header_view.xml diff --git a/res/layout/date_picker_selected_date.xml b/app/src/main/res/layout/date_picker_selected_date.xml similarity index 100% rename from res/layout/date_picker_selected_date.xml rename to app/src/main/res/layout/date_picker_selected_date.xml diff --git a/res/layout/date_picker_view_animator.xml b/app/src/main/res/layout/date_picker_view_animator.xml similarity index 100% rename from res/layout/date_picker_view_animator.xml rename to app/src/main/res/layout/date_picker_view_animator.xml diff --git a/app/src/main/res/layout/edit_habit.xml b/app/src/main/res/layout/edit_habit.xml new file mode 100644 index 000000000..2430609a2 --- /dev/null +++ b/app/src/main/res/layout/edit_habit.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +