From 667fc7a1a35e43ae23f4071a511c9579cd897dba Mon Sep 17 00:00:00 2001 From: James Morris Date: Mon, 28 Sep 2015 11:57:42 -0700 Subject: [PATCH 1/9] Refactor to the new library layout --- .idea/workspace.xml | 736 +++++++++++------- app/build.gradle | 13 +- app/src/main/AndroidManifest.xml | 5 +- .../randremind/activities/MainActivity.java | 143 +++- .../com/randremind/app/App.java | 22 - .../dialogHelper/EditTimesRequest.java | 2 +- .../ExportReminderLogRequest.java | 9 + .../dialogHelper/ReminderLogRequest.java | 17 + .../editReminder/EditReminderMessage.java | 16 +- .../EditReminderNotification.java | 24 +- .../editReminder/EditReminderRepeat.java | 20 +- .../editReminder/EditReminderSnooze.java | 8 +- .../editReminder/EditReminderTiming.java | 26 +- .../fragments/AddReminderFragment.java | 6 +- .../randremind/fragments/EditTimesDialog.java | 6 +- .../fragments/IconPickerDialogBuilder.java | 2 +- .../fragments/MainListFragment.java | 6 +- .../fragments/ReminderLogDialog.java | 109 +++ .../randremind/fragments/SummaryFragment.java | 22 +- .../listAdapters/EditReminderViewHolder.java | 18 +- .../listAdapters/ReminderViewHolder.java | 16 +- .../listAdapters/SummaryViewHolder.java | 65 +- .../randremind/receiver/AlarmReceiver.java | 59 +- .../receiver/NotificationReceiver.java | 142 ++-- .../com/randremind/reminder/ReminderItem.java | 223 +++--- .../com/randremind/reminder/ReminderList.java | 20 +- .../com/randremind/reminder/ReminderLog.java | 50 +- .../randremind/reminder/ReminderLogDay.java | 125 ++- .../randremind/reminder/ReminderLogItem.java | 35 + .../com/randremind/reminder/Scheduler.java | 62 +- .../ic_import_export_white_24dp.png | Bin 0 -> 414 bytes .../res/layout/edit_reminder_line_item.xml | 2 +- .../main/res/layout/edit_reminder_repeat.xml | 14 +- app/src/main/res/layout/edit_times_item.xml | 2 +- .../main/res/layout/reminder_line_item.xml | 14 +- .../main/res/layout/reminder_log_dialog.xml | 32 + app/src/main/res/layout/reminder_log_item.xml | 38 + .../main/res/layout/summary_header_item.xml | 16 +- app/src/main/res/layout/summary_line_item.xml | 162 ++-- app/src/main/res/menu/menu_summary.xml | 7 + app/src/main/res/values-ar/strings.xml | 46 -- app/src/main/res/values-bg/strings.xml | 46 -- app/src/main/res/values-ca/strings.xml | 46 -- app/src/main/res/values-cs/strings.xml | 46 -- app/src/main/res/values-da/strings.xml | 46 -- app/src/main/res/values-de/strings.xml | 46 -- app/src/main/res/values-el/strings.xml | 46 -- app/src/main/res/values-es/strings.xml | 46 -- app/src/main/res/values-fi/strings.xml | 46 -- app/src/main/res/values-fr/strings.xml | 46 -- app/src/main/res/values-he/strings.xml | 46 -- app/src/main/res/values-hi/strings.xml | 46 -- app/src/main/res/values-hr/strings.xml | 46 -- app/src/main/res/values-hu/strings.xml | 46 -- app/src/main/res/values-id/strings.xml | 46 -- app/src/main/res/values-it/strings.xml | 46 -- app/src/main/res/values-ja/strings.xml | 46 -- app/src/main/res/values-ko/strings.xml | 46 -- app/src/main/res/values-lt/strings.xml | 46 -- app/src/main/res/values-lv/strings.xml | 46 -- app/src/main/res/values-nl/strings.xml | 46 -- app/src/main/res/values-no/strings.xml | 46 -- app/src/main/res/values-pl/strings.xml | 46 -- app/src/main/res/values-pt/strings.xml | 46 -- app/src/main/res/values-ro/strings.xml | 46 -- app/src/main/res/values-ru/strings.xml | 46 -- app/src/main/res/values-sk/strings.xml | 46 -- app/src/main/res/values-sl/strings.xml | 46 -- app/src/main/res/values-sr/strings.xml | 46 -- app/src/main/res/values-sv/strings.xml | 46 -- app/src/main/res/values-th/strings.xml | 46 -- app/src/main/res/values-tr/strings.xml | 46 -- app/src/main/res/values-uk/strings.xml | 46 -- app/src/main/res/values-vi/strings.xml | 46 -- app/src/main/res/values-zh/strings.xml | 46 -- app/src/main/res/values/settings.xml | 20 +- app/src/main/res/values/strings.xml | 46 -- .../main/res/values/strings_no_translate.xml | 8 - app/src/main/res/values/strings_override.xml | 8 + app/src/main/res/values/styles.xml | 27 - 80 files changed, 1566 insertions(+), 2447 deletions(-) delete mode 100644 app/src/main/java/jamesmorrisstudios/com/randremind/app/App.java create mode 100644 app/src/main/java/jamesmorrisstudios/com/randremind/dialogHelper/ExportReminderLogRequest.java create mode 100644 app/src/main/java/jamesmorrisstudios/com/randremind/dialogHelper/ReminderLogRequest.java create mode 100644 app/src/main/java/jamesmorrisstudios/com/randremind/fragments/ReminderLogDialog.java create mode 100644 app/src/main/java/jamesmorrisstudios/com/randremind/reminder/ReminderLogItem.java create mode 100644 app/src/main/res/drawable-xxhdpi/ic_import_export_white_24dp.png create mode 100644 app/src/main/res/layout/reminder_log_dialog.xml create mode 100644 app/src/main/res/layout/reminder_log_item.xml delete mode 100644 app/src/main/res/values-ar/strings.xml delete mode 100644 app/src/main/res/values-bg/strings.xml delete mode 100644 app/src/main/res/values-ca/strings.xml delete mode 100644 app/src/main/res/values-cs/strings.xml delete mode 100644 app/src/main/res/values-da/strings.xml delete mode 100644 app/src/main/res/values-de/strings.xml delete mode 100644 app/src/main/res/values-el/strings.xml delete mode 100644 app/src/main/res/values-es/strings.xml delete mode 100644 app/src/main/res/values-fi/strings.xml delete mode 100644 app/src/main/res/values-fr/strings.xml delete mode 100644 app/src/main/res/values-he/strings.xml delete mode 100644 app/src/main/res/values-hi/strings.xml delete mode 100644 app/src/main/res/values-hr/strings.xml delete mode 100644 app/src/main/res/values-hu/strings.xml delete mode 100644 app/src/main/res/values-id/strings.xml delete mode 100644 app/src/main/res/values-it/strings.xml delete mode 100644 app/src/main/res/values-ja/strings.xml delete mode 100644 app/src/main/res/values-ko/strings.xml delete mode 100644 app/src/main/res/values-lt/strings.xml delete mode 100644 app/src/main/res/values-lv/strings.xml delete mode 100644 app/src/main/res/values-nl/strings.xml delete mode 100644 app/src/main/res/values-no/strings.xml delete mode 100644 app/src/main/res/values-pl/strings.xml delete mode 100644 app/src/main/res/values-pt/strings.xml delete mode 100644 app/src/main/res/values-ro/strings.xml delete mode 100644 app/src/main/res/values-ru/strings.xml delete mode 100644 app/src/main/res/values-sk/strings.xml delete mode 100644 app/src/main/res/values-sl/strings.xml delete mode 100644 app/src/main/res/values-sr/strings.xml delete mode 100644 app/src/main/res/values-sv/strings.xml delete mode 100644 app/src/main/res/values-th/strings.xml delete mode 100644 app/src/main/res/values-tr/strings.xml delete mode 100644 app/src/main/res/values-uk/strings.xml delete mode 100644 app/src/main/res/values-vi/strings.xml delete mode 100644 app/src/main/res/values-zh/strings.xml delete mode 100644 app/src/main/res/values/strings.xml delete mode 100644 app/src/main/res/values/strings_no_translate.xml delete mode 100644 app/src/main/res/values/styles.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3347a5a..03daa3a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -22,7 +22,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -61,24 +138,13 @@ - - - - - - - - - - - - + @@ -1474,44 +1540,44 @@