From 4826d49e416dd4cd487f0946e46c309a9daebd8b Mon Sep 17 00:00:00 2001 From: Evgeny Timofeev Date: Mon, 6 Nov 2017 11:07:43 +0300 Subject: [PATCH] Refactor, bug fix, removed night images, added tint in xml --- .../birdays/activities/DetailActivity.java | 22 +++++++++--------- .../birdays/activities/EditActivity.java | 2 +- .../birdays/activities/SettingsActivity.java | 4 ++-- .../main/java/com/djonique/birdays/ad/Ad.java | 2 +- .../adapters/MonthFragmentAdapter.java | 23 ++++++++----------- .../djonique/birdays/alarm/AlarmHelper.java | 9 -------- .../djonique/birdays/alarm/AlarmReceiver.java | 6 ----- .../djonique/birdays/backup/ExportHelper.java | 2 +- .../com/djonique/birdays/models/Person.java | 16 +++++++++---- .../birdays/utils/DatePickerManager.java | 4 ---- .../ic_calendar_blue_green_24dp.xml | 11 --------- .../ic_calendar_range_blue_green_24dp.xml | 10 -------- .../ic_call_blue_green_24dp.xml | 11 --------- .../ic_chat_blue_green_24dp.xml | 11 --------- .../ic_contacts_blue_green_24dp.xml | 10 -------- .../ic_email_blue_green_24dp.xml | 10 -------- .../ic_person_blue_green_24dp.xml | 10 -------- ...een_24dp.xml => ic_calendar_blue_24dp.xml} | 0 ...dp.xml => ic_calendar_range_blue_24dp.xml} | 0 ...e_green_24dp.xml => ic_call_blue_24dp.xml} | 0 ...e_green_24dp.xml => ic_chat_blue_24dp.xml} | 0 ...een_24dp.xml => ic_contacts_blue_24dp.xml} | 0 ..._green_24dp.xml => ic_email_blue_24dp.xml} | 0 ...green_24dp.xml => ic_person_blue_24dp.xml} | 0 app/src/main/res/layout/activity_detail.xml | 15 ++++++++---- app/src/main/res/layout/activity_edit.xml | 10 ++++---- .../res/layout/add_from_contacts_button.xml | 3 ++- .../main/res/layout/description_card_view.xml | 13 ++++++++--- app/src/main/res/values-sw600dp/dimens.xml | 1 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/styles.xml | 2 +- 31 files changed, 69 insertions(+), 139 deletions(-) delete mode 100644 app/src/main/res/drawable-night/ic_calendar_blue_green_24dp.xml delete mode 100644 app/src/main/res/drawable-night/ic_calendar_range_blue_green_24dp.xml delete mode 100644 app/src/main/res/drawable-night/ic_call_blue_green_24dp.xml delete mode 100644 app/src/main/res/drawable-night/ic_chat_blue_green_24dp.xml delete mode 100644 app/src/main/res/drawable-night/ic_contacts_blue_green_24dp.xml delete mode 100644 app/src/main/res/drawable-night/ic_email_blue_green_24dp.xml delete mode 100644 app/src/main/res/drawable-night/ic_person_blue_green_24dp.xml rename app/src/main/res/drawable/{ic_calendar_blue_green_24dp.xml => ic_calendar_blue_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_calendar_range_blue_green_24dp.xml => ic_calendar_range_blue_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_call_blue_green_24dp.xml => ic_call_blue_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_chat_blue_green_24dp.xml => ic_chat_blue_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_contacts_blue_green_24dp.xml => ic_contacts_blue_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_email_blue_green_24dp.xml => ic_email_blue_24dp.xml} (100%) rename app/src/main/res/drawable/{ic_person_blue_green_24dp.xml => ic_person_blue_24dp.xml} (100%) diff --git a/app/src/main/java/com/djonique/birdays/activities/DetailActivity.java b/app/src/main/java/com/djonique/birdays/activities/DetailActivity.java index 11c9ca3..da06595 100644 --- a/app/src/main/java/com/djonique/birdays/activities/DetailActivity.java +++ b/app/src/main/java/com/djonique/birdays/activities/DetailActivity.java @@ -193,7 +193,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } /** - * Sets up UI depending on person's data + * Set up UI depending on person's data */ private void setupUI() { setSeasonImage(); @@ -260,7 +260,7 @@ void starEditActivity() { } /** - * Sets up image depending on month + * Set up image depending on month */ private void setSeasonImage() { Calendar calendar = Calendar.getInstance(); @@ -324,21 +324,21 @@ void makeCall() { @OnClick(R.id.imagebutton_detail_chat) void sendMessage() { mFirebaseAnalytics.logEvent(Constants.SEND_MESSAGE, new Bundle()); - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setType(Constants.TYPE_SMS); - intent.putExtra(Constants.ADDRESS, phoneNumber); - intent.setData(Uri.parse(Constants.SMSTO + phoneNumber)); + Intent intent = new Intent(Intent.ACTION_VIEW) + .setType(Constants.TYPE_SMS) + .putExtra(Constants.ADDRESS, phoneNumber) + .setData(Uri.parse(Constants.SMSTO + phoneNumber)); startActivity(Intent.createChooser(intent, null)); } @OnClick(R.id.imagebutton_detail_email) void sendEmail() { mFirebaseAnalytics.logEvent(Constants.SEND_EMAIL, new Bundle()); - Intent intent = new Intent(Intent.ACTION_SENDTO); - intent.setType(Constants.TYPE_EMAIL); - intent.putExtra(Intent.EXTRA_EMAIL, new String[]{email}); - intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.happy_birthday)); - intent.setData(Uri.parse(Constants.MAILTO + email)); + Intent intent = new Intent(Intent.ACTION_SENDTO) + .setType(Constants.TYPE_EMAIL) + .putExtra(Intent.EXTRA_EMAIL, new String[]{email}) + .putExtra(Intent.EXTRA_SUBJECT, getString(R.string.happy_birthday)) + .setData(Uri.parse(Constants.MAILTO + email)); startActivity(Intent.createChooser(intent, null)); } } \ No newline at end of file diff --git a/app/src/main/java/com/djonique/birdays/activities/EditActivity.java b/app/src/main/java/com/djonique/birdays/activities/EditActivity.java index 5823772..a62a9f7 100644 --- a/app/src/main/java/com/djonique/birdays/activities/EditActivity.java +++ b/app/src/main/java/com/djonique/birdays/activities/EditActivity.java @@ -120,7 +120,7 @@ public void onBackPressed() { } /** - * Sets up UI depending on person's data + * Set up UI depending on person's data */ private void setupUI() { etName.setText(person.getName()); diff --git a/app/src/main/java/com/djonique/birdays/activities/SettingsActivity.java b/app/src/main/java/com/djonique/birdays/activities/SettingsActivity.java index 03b5275..f27a97c 100644 --- a/app/src/main/java/com/djonique/birdays/activities/SettingsActivity.java +++ b/app/src/main/java/com/djonique/birdays/activities/SettingsActivity.java @@ -194,7 +194,7 @@ public void onCreate(Bundle savedInstanceState) { preferences = PreferenceManager.getDefaultSharedPreferences(getActivity()); /* - * Sets summary for additional notification + * Set summary for additional notification */ findPreference(Constants.ADDITIONAL_NOTIFICATION_KEY).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override @@ -206,7 +206,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { }); /* - * Sets summary for ringtone + * Set summary for ringtone */ Preference ringtonePreference = findPreference(Constants.RINGTONE_KEY); try { diff --git a/app/src/main/java/com/djonique/birdays/ad/Ad.java b/app/src/main/java/com/djonique/birdays/ad/Ad.java index fe58e45..b04a110 100644 --- a/app/src/main/java/com/djonique/birdays/ad/Ad.java +++ b/app/src/main/java/com/djonique/birdays/ad/Ad.java @@ -45,7 +45,7 @@ public void onAdLoaded() { } /** - * Sets up bottom padding of view under AdMob banner + * Set up bottom padding of view under AdMob banner */ private static void setupContentViewPadding(View view, int padding) { view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), diff --git a/app/src/main/java/com/djonique/birdays/adapters/MonthFragmentAdapter.java b/app/src/main/java/com/djonique/birdays/adapters/MonthFragmentAdapter.java index a3d8137..7aedaf6 100644 --- a/app/src/main/java/com/djonique/birdays/adapters/MonthFragmentAdapter.java +++ b/app/src/main/java/com/djonique/birdays/adapters/MonthFragmentAdapter.java @@ -111,8 +111,8 @@ public void onBindViewHolder(final CardViewHolder holder, int position) { holder.relativeLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(context, DetailActivity.class); - intent.putExtra(Constants.TIME_STAMP, person.getTimeStamp()); + Intent intent = new Intent(context, DetailActivity.class) + .putExtra(Constants.TIME_STAMP, person.getTimeStamp()); context.startActivity(intent); if (context instanceof MainActivity) { ((MainActivity) context).overridePendingTransition(R.anim.activity_secondary_in, R.anim.activity_primary_out); @@ -126,10 +126,10 @@ public void onClick(View v) { @Override public void onClick(View v) { mFirebaseAnalytics.logEvent(Constants.SEND_EMAIL, new Bundle()); - Intent intent = new Intent(Intent.ACTION_SENDTO); - intent.setType(Constants.TYPE_EMAIL); - intent.putExtra(Intent.EXTRA_EMAIL, new String[]{email}); - intent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.happy_birthday)); + Intent intent = new Intent(Intent.ACTION_SENDTO) + .setType(Constants.TYPE_EMAIL) + .putExtra(Intent.EXTRA_EMAIL, new String[]{email}) + .putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.happy_birthday)); intent.setData(Uri.parse(Constants.MAILTO + email)); context.startActivity(Intent.createChooser(intent, null)); } @@ -154,10 +154,10 @@ public void onClick(View v) { @Override public void onClick(View v) { mFirebaseAnalytics.logEvent(Constants.SEND_MESSAGE, new Bundle()); - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setType(Constants.TYPE_SMS); - intent.putExtra(Constants.ADDRESS, phoneNumber); - intent.setData(Uri.parse(Constants.SMSTO + phoneNumber)); + Intent intent = new Intent(Intent.ACTION_VIEW) + .setType(Constants.TYPE_SMS) + .putExtra(Constants.ADDRESS, phoneNumber) + .setData(Uri.parse(Constants.SMSTO + phoneNumber)); context.startActivity(Intent.createChooser(intent, null)); } }); @@ -247,11 +247,8 @@ static class CardViewHolder extends RecyclerView.ViewHolder { tvAge = itemView.findViewById(R.id.textview_card_age); tvDaysLeft = itemView.findViewById(R.id.textview_card_left); btnEmail = itemView.findViewById(R.id.imagebutton_card_email); - btnEmail.setImageResource(R.drawable.ic_email_blue_green_24dp); btnChat = itemView.findViewById(R.id.imagebutton_card_chat); - btnChat.setImageResource(R.drawable.ic_chat_blue_green_24dp); btnCall = itemView.findViewById(R.id.imagebutton_card_call); - btnCall.setImageResource(R.drawable.ic_call_blue_green_24dp); } } } \ No newline at end of file diff --git a/app/src/main/java/com/djonique/birdays/alarm/AlarmHelper.java b/app/src/main/java/com/djonique/birdays/alarm/AlarmHelper.java index f7ac3b0..f6c79ba 100644 --- a/app/src/main/java/com/djonique/birdays/alarm/AlarmHelper.java +++ b/app/src/main/java/com/djonique/birdays/alarm/AlarmHelper.java @@ -51,7 +51,6 @@ public AlarmHelper(Context context) { /** * Set up both alarms main and additional */ - public void setAlarms(Person person) { try { setAlarm(person); @@ -67,7 +66,6 @@ public void setAlarms(Person person) { /** * Set up main alarm */ - private void setAlarm(Person person) { Intent intent = new Intent(context, AlarmReceiver.class); intent.putExtra(Constants.NAME, person.getName()); @@ -85,7 +83,6 @@ private void setAlarm(Person person) { /** * Set up additional alarm */ - private void setAdditionalAlarm(Person person) { additionalNotificationOffset = Long.parseLong(preferences.getString(Constants.ADDITIONAL_NOTIFICATION_KEY, "0")); @@ -107,7 +104,6 @@ private void setAdditionalAlarm(Person person) { /** * Set up correct alarm for Android API 19 (without delay) and Android API 23+ with Doze */ - private void setAlarmDependingOnApi(AlarmManager alarmManager, long triggerAtMillis, PendingIntent pendingIntent) { @@ -123,7 +119,6 @@ private void setAlarmDependingOnApi(AlarmManager alarmManager, /** * Configures text for additional notification */ - private String setWhen(long offset) { String[] dates = context.getResources().getStringArray(R.array.additional_notification_delay); String[] entryValues = context.getResources().getStringArray(R.array.additional_notification_entry_values); @@ -139,7 +134,6 @@ private String setWhen(long offset) { /** * Removes all alarms */ - public void removeAlarms(long timeStamp) { removeAlarm(timeStamp); additionalNotificationOffset = Long.parseLong(preferences.getString(Constants.ADDITIONAL_NOTIFICATION_KEY, "0")); @@ -151,7 +145,6 @@ public void removeAlarms(long timeStamp) { /** * Removes main alarm */ - private void removeAlarm(long timeStamp) { Intent intent = new Intent(context, AlarmReceiver.class); @@ -164,7 +157,6 @@ private void removeAlarm(long timeStamp) { /** * Removes additional alarm */ - private void removeAdditionalAlarm(long timeStamp) { Intent intent = new Intent(context, AlarmReceiver.class); @@ -179,7 +171,6 @@ private void removeAdditionalAlarm(long timeStamp) { /** * Set up time for triggering alarm */ - private long setupCalendarYear(Person person, long offset) { long now = Calendar.getInstance().getTimeInMillis(); long notificationTime = preferences.getLong(Constants.NOTIFICATION_TIME_KEY, defaultNotificationTime); diff --git a/app/src/main/java/com/djonique/birdays/alarm/AlarmReceiver.java b/app/src/main/java/com/djonique/birdays/alarm/AlarmReceiver.java index c480bfa..d0051af 100644 --- a/app/src/main/java/com/djonique/birdays/alarm/AlarmReceiver.java +++ b/app/src/main/java/com/djonique/birdays/alarm/AlarmReceiver.java @@ -75,7 +75,6 @@ public void onReceive(Context context, Intent intent) { /** * Creates intent to open DetailActivity on notification click */ - private Intent getResultIntent(Context context, long timeStamp, Intent intent) { Intent resultIntent = new Intent(context, DetailActivity.class); resultIntent.putExtra(Constants.TIME_STAMP, timeStamp); @@ -89,7 +88,6 @@ private Intent getResultIntent(Context context, long timeStamp, Intent intent) { /** * Creates notification channel for Android API 26+ */ - private void createNotificationChannel(Context context) { if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationChannel channel = new NotificationChannel(CHANNEL_ID, @@ -106,7 +104,6 @@ private void createNotificationChannel(Context context) { /** * Builds default notification */ - private NotificationCompat.Builder buildNotification(Context context, String title, String text) { NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID); builder.setContentTitle(title); @@ -122,7 +119,6 @@ private NotificationCompat.Builder buildNotification(Context context, String tit /** * Avoids FileUriExposedException on Android API 24+ */ - private void setDefaultsAndRingtone(NotificationCompat.Builder builder, Uri ringtoneUri) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { try { @@ -138,7 +134,6 @@ private void setDefaultsAndRingtone(NotificationCompat.Builder builder, Uri ring /** * Set up notification tone, vibration and lights for notification */ - private void setRingtone(NotificationCompat.Builder builder, Uri ringtoneUri) { builder.setDefaults(NotificationCompat.DEFAULT_VIBRATE | NotificationCompat.DEFAULT_LIGHTS); builder.setSound(ringtoneUri); @@ -147,7 +142,6 @@ private void setRingtone(NotificationCompat.Builder builder, Uri ringtoneUri) { /** * Returns URI for picked in the settings notification tone */ - private Uri getRingtoneUri(Context context) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); String ringtone = preferences.getString(Constants.RINGTONE_KEY, diff --git a/app/src/main/java/com/djonique/birdays/backup/ExportHelper.java b/app/src/main/java/com/djonique/birdays/backup/ExportHelper.java index e3a04e4..86f5d04 100644 --- a/app/src/main/java/com/djonique/birdays/backup/ExportHelper.java +++ b/app/src/main/java/com/djonique/birdays/backup/ExportHelper.java @@ -99,7 +99,7 @@ private String writeXml(List persons) { xmlSerializer.startTag(null, DATE); xmlSerializer.text(String.valueOf(person.getDate())); xmlSerializer.endTag(null, DATE); - // unknown year + // year unknown xmlSerializer.startTag(null, YEAR_UNKNOWN); xmlSerializer.text(String.valueOf(person.isYearUnknown())); xmlSerializer.endTag(null, YEAR_UNKNOWN); diff --git a/app/src/main/java/com/djonique/birdays/models/Person.java b/app/src/main/java/com/djonique/birdays/models/Person.java index 6439bdb..1611995 100644 --- a/app/src/main/java/com/djonique/birdays/models/Person.java +++ b/app/src/main/java/com/djonique/birdays/models/Person.java @@ -25,18 +25,24 @@ public class Person implements Item { private long date, timeStamp; private boolean yearUnknown; - // Default constructor + /** + * Default constructor + */ public Person() { this.timeStamp = new Date().getTime(); } - // Constructor for database with famous persons + /** + * Constructor for database with famous persons + */ public Person(String name, long date) { this.name = name; this.date = date; } - // Constructor for importing from Contacts + /** + * Constructor for importing from Contacts + */ public Person(String name, long date, boolean yearUnknown, String phoneNumber, String email) { this.name = name; this.date = date; @@ -46,7 +52,9 @@ public Person(String name, long date, boolean yearUnknown, String phoneNumber, S this.timeStamp = new Date().getTime(); } - // Constructor for DbQueryManager + /** + * Constructor for DbQueryManager + */ public Person(String name, long date, boolean yearUnknown, String phoneNumber, String email, long timeStamp) { this.name = name; diff --git a/app/src/main/java/com/djonique/birdays/utils/DatePickerManager.java b/app/src/main/java/com/djonique/birdays/utils/DatePickerManager.java index 0ab3e41..1ae50fd 100644 --- a/app/src/main/java/com/djonique/birdays/utils/DatePickerManager.java +++ b/app/src/main/java/com/djonique/birdays/utils/DatePickerManager.java @@ -42,7 +42,6 @@ public DatePickerManager(Activity activity, Calendar calendar) { /** * Shows material calendar on API 24 devices instead of spinner */ - public void showDialog(DatePickerDialog.OnDateSetListener androidCallback, com.wdullaer.materialdatetimepicker.date.DatePickerDialog.OnDateSetListener libCallback) { if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N) { @@ -55,7 +54,6 @@ public void showDialog(DatePickerDialog.OnDateSetListener androidCallback, /** * Configures android DatePickerDialog */ - private void showDatePickerDialog(DatePickerDialog.OnDateSetListener callback) { android.app.DatePickerDialog datePickerDialog = new android.app.DatePickerDialog( activity, @@ -70,7 +68,6 @@ private void showDatePickerDialog(DatePickerDialog.OnDateSetListener callback) { /** * Configures DatePickerDialog by Wouter Dullaert */ - private void showMdtpDialog(com.wdullaer.materialdatetimepicker.date.DatePickerDialog.OnDateSetListener callback) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); com.wdullaer.materialdatetimepicker.date.DatePickerDialog dpd = @@ -87,7 +84,6 @@ private void showMdtpDialog(com.wdullaer.materialdatetimepicker.date.DatePickerD /** * Set correct theme for day/night modes */ - private int setTheme(boolean nightMode) { if (nightMode) { return AlertDialog.THEME_HOLO_DARK; diff --git a/app/src/main/res/drawable-night/ic_calendar_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_calendar_blue_green_24dp.xml deleted file mode 100644 index 551368d..0000000 --- a/app/src/main/res/drawable-night/ic_calendar_blue_green_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_calendar_range_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_calendar_range_blue_green_24dp.xml deleted file mode 100644 index 62dca22..0000000 --- a/app/src/main/res/drawable-night/ic_calendar_range_blue_green_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_call_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_call_blue_green_24dp.xml deleted file mode 100644 index 5ac7f64..0000000 --- a/app/src/main/res/drawable-night/ic_call_blue_green_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_chat_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_chat_blue_green_24dp.xml deleted file mode 100644 index 4030761..0000000 --- a/app/src/main/res/drawable-night/ic_chat_blue_green_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_contacts_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_contacts_blue_green_24dp.xml deleted file mode 100644 index f63666d..0000000 --- a/app/src/main/res/drawable-night/ic_contacts_blue_green_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_email_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_email_blue_green_24dp.xml deleted file mode 100644 index 156e595..0000000 --- a/app/src/main/res/drawable-night/ic_email_blue_green_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_person_blue_green_24dp.xml b/app/src/main/res/drawable-night/ic_person_blue_green_24dp.xml deleted file mode 100644 index b01670a..0000000 --- a/app/src/main/res/drawable-night/ic_person_blue_green_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_calendar_blue_green_24dp.xml b/app/src/main/res/drawable/ic_calendar_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_calendar_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_calendar_blue_24dp.xml diff --git a/app/src/main/res/drawable/ic_calendar_range_blue_green_24dp.xml b/app/src/main/res/drawable/ic_calendar_range_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_calendar_range_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_calendar_range_blue_24dp.xml diff --git a/app/src/main/res/drawable/ic_call_blue_green_24dp.xml b/app/src/main/res/drawable/ic_call_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_call_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_call_blue_24dp.xml diff --git a/app/src/main/res/drawable/ic_chat_blue_green_24dp.xml b/app/src/main/res/drawable/ic_chat_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_chat_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_chat_blue_24dp.xml diff --git a/app/src/main/res/drawable/ic_contacts_blue_green_24dp.xml b/app/src/main/res/drawable/ic_contacts_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_contacts_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_contacts_blue_24dp.xml diff --git a/app/src/main/res/drawable/ic_email_blue_green_24dp.xml b/app/src/main/res/drawable/ic_email_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_email_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_email_blue_24dp.xml diff --git a/app/src/main/res/drawable/ic_person_blue_green_24dp.xml b/app/src/main/res/drawable/ic_person_blue_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_person_blue_green_24dp.xml rename to app/src/main/res/drawable/ic_person_blue_24dp.xml diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index 82f02cc..40ab9e8 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -103,7 +103,8 @@ + android:tint="@color/blue_to_green" + app:srcCompat="@drawable/ic_calendar_blue_24dp" /> + android:tint="@color/blue_to_green" + app:srcCompat="@drawable/ic_calendar_range_blue_24dp" /> + android:tint="@color/blue_to_green" + app:srcCompat="@drawable/ic_call_blue_24dp" /> + android:tint="@color/blue_to_green" + app:srcCompat="@drawable/ic_chat_blue_24dp" /> + android:tint="@color/blue_to_green" + app:srcCompat="@drawable/ic_email_blue_24dp" /> + app:srcCompat="@drawable/ic_person_blue_24dp" /> + app:srcCompat="@drawable/ic_calendar_blue_24dp" /> + app:srcCompat="@drawable/ic_call_blue_24dp" /> + app:srcCompat="@drawable/ic_email_blue_24dp" /> + app:srcCompat="@drawable/ic_contacts_blue_24dp" />