From 3ba503604b0fd37c58b404a782f04547a020f13c Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Tue, 23 Jun 2020 06:19:08 -0500 Subject: [PATCH] Show target in SubtitleCard; replace some bitmap icons by FontAwesome --- .../habits/show/views/SubtitleCard.java | 121 ------------------ .../habits/show/views/SubtitleCard.kt | 104 +++++++++++++++ .../main/res/drawable-hdpi/ic_alarm_black.png | Bin 610 -> 0 bytes .../main/res/drawable-hdpi/ic_alarm_white.png | Bin 610 -> 0 bytes .../res/drawable-hdpi/ic_repeat_black.png | Bin 183 -> 0 bytes .../res/drawable-hdpi/ic_repeat_white.png | Bin 198 -> 0 bytes .../main/res/drawable-mdpi/ic_alarm_black.png | Bin 388 -> 0 bytes .../main/res/drawable-mdpi/ic_alarm_white.png | Bin 403 -> 0 bytes .../res/drawable-mdpi/ic_repeat_black.png | Bin 122 -> 0 bytes .../res/drawable-mdpi/ic_repeat_white.png | Bin 133 -> 0 bytes .../res/drawable-xhdpi/ic_alarm_black.png | Bin 798 -> 0 bytes .../res/drawable-xhdpi/ic_alarm_white.png | Bin 821 -> 0 bytes .../res/drawable-xhdpi/ic_repeat_black.png | Bin 168 -> 0 bytes .../res/drawable-xhdpi/ic_repeat_white.png | Bin 185 -> 0 bytes .../res/drawable-xxhdpi/ic_alarm_black.png | Bin 1162 -> 0 bytes .../res/drawable-xxhdpi/ic_alarm_white.png | Bin 1201 -> 0 bytes .../res/drawable-xxhdpi/ic_repeat_black.png | Bin 214 -> 0 bytes .../res/drawable-xxhdpi/ic_repeat_white.png | Bin 234 -> 0 bytes .../res/drawable-xxxhdpi/ic_alarm_black.png | Bin 1606 -> 0 bytes .../res/drawable-xxxhdpi/ic_alarm_white.png | Bin 1668 -> 0 bytes .../res/drawable-xxxhdpi/ic_repeat_black.png | Bin 243 -> 0 bytes .../res/drawable-xxxhdpi/ic_repeat_white.png | Bin 257 -> 0 bytes .../main/res/layout/show_habit_subtitle.xml | 54 +++++--- .../src/main/res/values/attrs.xml | 2 - .../src/main/res/values/fontawesome.xml | 12 +- .../src/main/res/values/styles.xml | 4 - 26 files changed, 147 insertions(+), 150 deletions(-) delete mode 100644 android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java create mode 100644 android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt delete mode 100644 android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-mdpi/ic_alarm_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_alarm_white.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_black.png delete mode 100644 android/uhabits-android/src/main/res/drawable-xxxhdpi/ic_repeat_white.png diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java deleted file mode 100644 index 4fc43031f..000000000 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (C) 2016 Álinson Santos Xavier - * - * This file is part of Loop Habit Tracker. - * - * Loop Habit Tracker is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Loop Habit Tracker is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -package org.isoron.uhabits.activities.habits.show.views; - -import android.annotation.*; -import android.content.*; -import android.content.res.*; -import android.util.*; -import android.widget.*; - -import org.isoron.uhabits.R; -import org.isoron.uhabits.core.models.*; -import org.isoron.uhabits.core.tasks.*; -import org.isoron.uhabits.utils.*; - -import butterknife.*; - -public class SubtitleCard extends HabitCard -{ - @BindView(R.id.questionLabel) - TextView questionLabel; - - @BindView(R.id.frequencyLabel) - TextView frequencyLabel; - - @BindView(R.id.reminderLabel) - TextView reminderLabel; - - public SubtitleCard(Context context, AttributeSet attrs) - { - super(context, attrs); - init(); - } - - @Override - protected void refreshData() - { - Habit habit = getHabit(); - int color = PaletteUtils.getColor(getContext(), habit.getColor()); - - reminderLabel.setText(getResources().getString(R.string.reminder_off)); - questionLabel.setVisibility(VISIBLE); - - questionLabel.setTextColor(color); - questionLabel.setText(habit.getQuestion()); - frequencyLabel.setText(toText(habit.getFrequency())); - - if (habit.hasReminder()) updateReminderText(habit.getReminder()); - - if (habit.getQuestion().isEmpty()) questionLabel.setVisibility(GONE); - - invalidate(); - } - - private void init() - { - inflate(getContext(), R.layout.show_habit_subtitle, this); - ButterKnife.bind(this); - - if (isInEditMode()) initEditMode(); - } - - @SuppressLint("SetTextI18n") - private void initEditMode() - { - questionLabel.setTextColor(PaletteUtils.getAndroidTestColor(1)); - questionLabel.setText("Have you meditated today?"); - reminderLabel.setText("08:00"); - } - - private String toText(Frequency freq) - { - Resources resources = getResources(); - Integer num = freq.getNumerator(); - Integer den = freq.getDenominator(); - - if (num.equals(den)) return resources.getString(R.string.every_day); - - if (num == 1) - { - if (den == 7) return resources.getString(R.string.every_week); - if (den % 7 == 0) - return resources.getString(R.string.every_x_weeks, den / 7); - return resources.getString(R.string.every_x_days, den); - } - - String times_every = resources.getString(R.string.times_every); - return String.format("%d %s %d %s", num, times_every, den, - resources.getString(R.string.days)); - } - - private void updateReminderText(Reminder reminder) - { - reminderLabel.setText( - AndroidDateUtils.formatTime(getContext(), reminder.getHour(), - reminder.getMinute())); - } - - @Override - protected Task createRefreshTask() { - // Never called - throw new IllegalStateException(); - } -} diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt new file mode 100644 index 000000000..869b86fa9 --- /dev/null +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCard.kt @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2016 Álinson Santos Xavier + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ +package org.isoron.uhabits.activities.habits.show.views + +import android.annotation.* +import android.content.* +import android.util.* +import android.view.* +import org.isoron.androidbase.utils.* +import org.isoron.uhabits.* +import org.isoron.uhabits.activities.habits.list.views.* +import org.isoron.uhabits.core.models.* +import org.isoron.uhabits.core.tasks.* +import org.isoron.uhabits.databinding.* +import org.isoron.uhabits.utils.* +import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor +import org.isoron.uhabits.utils.PaletteUtils.getColor +import java.util.* + +class SubtitleCard(context: Context?, attrs: AttributeSet?) : HabitCard(context, attrs) { + + init { + init() + } + + private lateinit var binding: ShowHabitSubtitleBinding + + public override fun refreshData() { + val habit = habit + val color = getColor(context, habit.color) + if (habit.isNumerical) { + binding.targetText.text = "${habit.targetValue.toShortString()} ${habit.unit}" + } else { + binding.targetIcon.visibility = View.GONE + binding.targetText.visibility = View.GONE + } + binding.reminderLabel.text = resources.getString(R.string.reminder_off) + binding.questionLabel.visibility = View.VISIBLE + binding.questionLabel.setTextColor(color) + binding.questionLabel.text = habit.question + binding.frequencyLabel.text = toText(habit.frequency) + if (habit.hasReminder()) updateReminderText(habit.reminder) + if (habit.question.isEmpty()) binding.questionLabel.visibility = View.GONE + invalidate() + } + + private fun init() { + val fontAwesome = InterfaceUtils.getFontAwesome(context) + binding = ShowHabitSubtitleBinding.inflate(LayoutInflater.from(context), this) + binding.targetIcon.typeface = fontAwesome + binding.frequencyIcon.typeface = fontAwesome + binding.reminderIcon.typeface = fontAwesome + if (isInEditMode) initEditMode() + } + + @SuppressLint("SetTextI18n") + private fun initEditMode() { + binding.questionLabel.setTextColor(getAndroidTestColor(1)) + binding.questionLabel.text = "Have you meditated today?" + binding.reminderLabel.text = "08:00" + } + + private fun toText(freq: Frequency): String { + val resources = resources + val num = freq.numerator + val den = freq.denominator + if (num == den) return resources.getString(R.string.every_day) + if (num == 1) { + if (den == 7) return resources.getString(R.string.every_week) + if (den % 7 == 0) return resources.getString(R.string.every_x_weeks, den / 7) + return if (den >= 30) resources.getString(R.string.every_month) else resources.getString(R.string.every_x_days, den) + } + val times_every = resources.getString(R.string.times_every) + return String.format(Locale.US, "%d %s %d %s", num, times_every, den, + resources.getString(R.string.days)) + } + + private fun updateReminderText(reminder: Reminder) { + binding.reminderLabel.text = AndroidDateUtils.formatTime(context, reminder.hour, + reminder.minute) + } + + override fun createRefreshTask(): Task { + // Never called + throw IllegalStateException() + } + +} \ No newline at end of file diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_alarm_black.png deleted file mode 100644 index 907491104f2d62e8ac4fa6cde5bd970dc087921c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 610 zcmV-o0-gPdP)1C;@O89{mUmJFt5qYmLxf6QL7s)iYH5_mt2vUR&vo# zqGHdx9@MU0y>qe(Fd&9BVqb@vSRH{ZBQTxNa zvh>@F&bkJfUXRLOdWA49v5XM<>_=}(hIU6$c#_;fJR7}3w@Nh=@#oYWRPtqXUzIAp zmir3~Vj#LdNYNe9uDU{luJwEL?^NaS2o@+bh>xTHs46c;Fk5)gT=ZX1Wh{b;)Ilq% zO+^2tv%OJbUT5kXJzsoBH+jdg#J+J2MRs&9g5T7s*5m6)zcW<(tFal;1JaZ{Z8!3l z!Jrr{)pUek$kOa>Wt}MbO5BiAwW&n>lx!{Fx#%6bMTWSw?dy~0E(g(@l&L}7)b{kt za-VW^R$VX0?f=}6Z)#5Y72a|Z`Ib&KT(BvLQ}(`xbf|Zo4nschr$~ISTLG;WB{^q7 wi^3kZmO5nBpfkH{%CapL6Q@5$p3i|w;6QI0y3Pb((*r_y$hZYt4jtO^jWL&n@UY(i zBMOyJvo8RP&I>(Oq-M#p!X17BeD2I~=qtdqX1AJ?H?z*U$t+;*ICMn`V+!uK4%qdv zr?hI+s8y#=6al}wSA!{(JX*PU%XYxqLg)h5L<$-M--(P` ze5j~hDEI-4q@nXl;3bjSSs}az4&0W8!UWjUA#!@eJ{T5RP?Hs~>uM(RxFT3|V>T4- zv<=GM*OK@teBcOdXs`88d!IEx(Wjo)rqK=BboYtmqb?K|k0wldT1B8K8ou`XqNCo5DD;s$aDDb#klx_`_ zXbrTHTD+n2^0MFRPj`K|Yk!hu(e2$!7kVt6ywHnx3csOgs73VIkd<>8wfNs&$$BdP zO`StRo{3GNLW#k#LUH-O(7M{+%{*&aOiDudj`&my80j79`7W)QQZZ@5eyMX`_@$Y( g7!J0!yy(0mch&rQWwgEuC(tDfp00i_>zopr0QQ?eKL7v# diff --git a/android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-hdpi/ic_repeat_white.png deleted file mode 100644 index 81c5be7932f75ac7eac8d186de1b4f1748ff51d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ucwP+h{y4_S2prC81T3Rx}DVM zIiz7OwRpqH<&FUhcWW$jD0mtFr+6F?hQAxvXr&g85(q^nV6D}>JefJOm zI!ftX-?(8DcBMquluY4JdRG9#Ge99F_T{Vyr^aanOga~qWctD?%>b+m+cGCYIWp)8 z$1=4rHZo`nS29&2_~iC=!9bV+z3%O}~6|7aPKs%(8H1LhhD# zI%yZeBDn)$SAksNgRrNe>rzTg8rG5C{V+|_f|NM7uBV+gYr}=~Zr%u8`$E1w)2_8- i+p(*(BU={zcYgpZK#QRwn5Y2&0000P)y1m+Dq@92*+w*|zMK*Wi_U2|i)qv6chm?Q42wh>s19OLR;KWs|z-Yr35uU2}krnoxunqnj@FLJz)cz z87$+}q)6TIL8Is#iy4G{bk&4h%?@^j3^eu8H6@fa?BK$56@&$SoLSd4UNmdNIWEkL x1V%OOA#c~T$RM|5%aN<1Lz@;wF8re#gWsjqtDV&K+(ZBX002ovPDHLkV1oIUvK#;a diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_black.png deleted file mode 100644 index c00a24ebfc314fde45d92335916a8bd2c31886cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1M^6{WkP61L=Pz zwXg=uyTd>JE+|^0uv&Gl$Mw_d3)Fl4r3C~YIOJu?aF{AwX}Iv!W=4mWNTkID=INF3 VE7uk_ZvYy`;OXk;vd$@?2>^)PDIov= diff --git a/android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-mdpi/ic_repeat_white.png deleted file mode 100644 index b1c2e04ab82255ecbc5099098c4e93ddecbd4856..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1A5Ry@5R21SCp&U6CYJ9cx}G~D3Q5O)U}`>JW%m=2qMU{`!qWvkusk3VgXz_T6c@g5VM hHox+}p1S7{!>RD&j<;6+RREgH;OXk;vd$@?2>?yNFI@lt diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_black.png deleted file mode 100644 index e37eab0e4451141424c29f8e070f18c19fe0a2f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 798 zcmV+(1L6FMP)OM5@AoHK+NQPibYR+p6--6%K+q9Xba3i4-RY7kaL zg>_NpC>w3KB3G-Zy9#CGRc*4Jr<;e*h3@&WQ#XOH&)xU?{+tiz`}}f4^IEJ?)*2Nn z)a`v!x|C5f?Hx7ByTvyWiPI{IRJk#(jb z|Ce2IRlFpLI;jIN=xL`+n{(Awb1pbxkA6Ux)6vuLyi8r*7D3N}RUS1V$*374{ z#j3Y-EdN(0#b31(+~;RWLH%G9JZ2%*Ce&T$^Vt5~5Nh6#l&nKKG3-*ToOPW|uEgy| z-LxdC;Zyqz>(!=BpKbO#t0595^{0Ptm&Qpnl64aM+SKDm_^3 zBa235*s6k>3(+>?c6m0NjqKMtP&J~!v1s{FO_6SABLA8a?iD|;Re*H;TCHM)yA@a! zr$3`csR4AyL4B_(*CTOhZ=>`8hT?KRC{H}K2U*boj>glSV<7JP{uK`xjOSv5OncMF zXRLSt=hFQrWjdKg_BA!&K)U~?Eb)36Zfd|tx<4h;TpH#h4;cdEKmJToYJ57D-E&*fd z`f-__iVt3%ejiBEI%S=d@pSD8nKs5L56Jg`U$1%h+^UiGu9xF{+ICoxPA{6*uodun z+Bq)Q?liV!vtk4G0`7=c-7dMR@#&b=t*q7YnYyS&fqNurozbd{R-Z)A4ka8BBXlcr zlaC|+s!}>lMayi#wb9WyVi8jN7Tje_*3MPMC7pf_axrI_`1n c-SEHg59>@WyzgrQ-2eap07*qoM6N<$g7veCw*UYD diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_alarm_white.png deleted file mode 100644 index 280e09df3c0e63f5ec2ef852d9044357ecd24974..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 821 zcmV-51Iqk~P)fKf6TN=vY(nuKH?A%{66&VI)gZ+$idTxvsYedP` zs1%(mIIPEqCUlE*s;0cBsyyIU--5F$B2mQ$VA3sRfxG+xU^odp58yXjr2%`*0=TFz z39K^#;JQ7Hfr?iEa9XEWYLjQ3F=fWQc{3)RvQNKQs@qurnHP(JZtnufydZ>C9yg|F zE_g(%Q1L1N-qC3#V4ZOQ*X}U!Y1WXhIGl1TvfEwUx zF)$BkZwlxD%>7qjTl2sSpsyj2Ic9Bhw`dZuvjBL|FMvNixBR7G7hpWSrUykqonG=6 z;5&BTei-BhVBceF{J_2yYy8QSk;HhF@BOo&%8upN1m%V##lYz|oVjx@u92JSW zylhrxyIAT?z^G^h>;){^B9aZ*FP6Gf2H4XWXjKQ)^@x(KHVwF>r7;lh18`28kgm;V z0PYbfARHqn(%<4Hp8|MYNCUb|0H`N^i*0@aFs7p%5PIbwv*@@@1^;0uECRUfW+4sa z#5e#l=N&SrrbCCCU51Uy0PuBw`I12BazxpAO@~k($Qx3ZnoIfSGy#NGkNV0#PiE9^ zEuv{4Z=-!qnQ+ydSyzlZ=}GHFy72#Y14#Eb@1%;*CbMxa00000NkvXXu0mjfw`*YS diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_black.png deleted file mode 100644 index 75ecb04629f53b5f1369703b9db5e73e6aa28869..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dd`}n0kP61PmkhaB6d8_Qkg+xY zADw6GksxvAeeHrz6Z3?&&x-I}qZTGy?e!+%+5rRhd&REo{W6SBoE)kOQyK!8oVW{k z?&RhFE#20zh9yN+L7Op>^Msc}*@hoK-Y_;M Q1FdH8boFyt=akR{07Z8<`2YX_ diff --git a/android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-xhdpi/ic_repeat_white.png deleted file mode 100644 index ad8b8c0df4c4759139fca80684c6195a174d0332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D22U5qkP61PR~@q&0wj(+u&m0P zmv=|(h}nXqXAJUtw*UD4weQH^Z9nCMvm913E@hh{6>yHRzEdio=z*QTNc|^PhH$1G zLILSPa6Y1KWvFFJf#S2!g1+ z=#^|s7c^+mi(tKMxG99I=G=M{W@@wbur|Tm^z2x91>GorE{=NN*L@j5=kt4~=eqbE zulw?}OKrBlcn!~@oI+{oAtI{m;3PLu z%j5<rqqGsxFCY3}eR;K9)z_N_7VPCGl+Rq_ z1r{`u@poMA=9V^Kf-Shp=|>sn9Gh`H&ae8JOC3x4MEmdsHsWfLRShyt6R!KYqW$hu zmb8{Z@xhNM0>I%YDo5_n%V8R*AV!1;F)C=}2#^M<1lXN}&*!k+)R`&vu|hc7l~cP>&LM0?$q&ZxUE51oB?_J{~zt ziear*3$=-vujAlJLf+9?Z?#YfSuuMJo}|Q(Ua(pS`aGV!!f`R=u=PUn$+`>Q-=V>J zp*=qT{=m2xQenMNrI>vTPvkikvtB4J-`?d7@A%BPv02nOZ2vHV<`9{n-f@A&~l)}s=9%T^+Q6jBD zUKD4kA*h7h#$tlPV6W1{#0VnJ2uh?G-yChTVSr*x6>A&kXYFjq3=qRaT&puh8HV%? zt6^&JE1@lxB1r)HmR^PwA-oE6P~VZ|Edt2B={ZC_UhLuuN=r9^<=z$^q>U1m5~H0< zC_VHL!UBhPQ8|*Ok2HIzBu6)zh6 zduoDaR#B98Mm?7qp_M{box_uK^V_mju5*H|IQ)woYI%h&dKu#;S+d+0VsRt*8+rM_W%F@07*qoM6N<$f?EwCcmMzZ diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_alarm_white.png deleted file mode 100644 index 75e5a46ee3ae8e23bb2eb6042d56f920ce42e3e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1201 zcmV;i1Wx;jP)oK!C1DYn9vp$gK+7PX9>FTFtrnMF6s&h)hsda%{a_VjOgmOs%=vw!WNuh3m(Yx+t9vjj22q4aNh zlw0V&UOQ+beIR{7UV8Q0Sj_@moT7$OqJ#+(rIcDu)6D{_`7nKxZ{iY2H`$cw9(sr| z0G4Q#@9EE3=?5Cwj96nH;3(Hw=`(T=2(tJH0QiGP$oyBvQ_Pc;A8=@uoIds;3}!$5 zE0g4-;0;pD^Nh)Js8;!BZRqA`Aq!zR*~CbC7fxQ?&C7mYt_|pZq8#CKDi}cbitWp_ zgjrPIQGl?RLV8jC&33z>9#76j#HzC_j#y*zxr(aWCg_M~u?i5@L4rch!Zr8}itsx~ zbCe?j1qmuig7h0MZo7!tNWFE8^)jouiAVD>% z=gfo7YcC1mEJ)A?(x;|DA*MiTbQ;tI(l{Zrpem3S*z7c@fJKlh%z|Pdbs?Mv2@)W+ zm<62$>6G)JI7sbgK?#s*oCno`)MXYl0#d2-pfZq#&4Q*tiaHM}0%^i5CejFa*7y4br|6{C`1pcUh=JT z^0|iUvYX?WUdvCZ$dfbeeXZCZSPfX*OH~Y_s}J)3Wo_t^#C$viayY>Px(^UmK^YD` z`>8g{IlwKvIuQ0jnU00~Xv%Pe6{VRQtkg+%@E}2mk6Fzk3F6dIMiCJr6j4SUae7GM zB^N7TkepYUA&6<}5iWxSB_yzQnPP;)AUUryhF_!VQ`vQpAVM=km>Q&!T!i}|eL_4> z2Y->tIOo_UHy9Q{Hd&RtMLS&#Gsz;0OfXCr?X-CJ%JxC-XFX^=Xg%m(XF{7Vc$$S@ P00000NkvXXu0mjfEk!fo diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_black.png deleted file mode 100644 index 965a319ff923a1ed47a882a18c6d1cbc575c8617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6bp~hEy=Vz2eC0VkmGpz?uKE zPG@B8>aO+!)>{(Se)Vt+%UyEIW9!5$<*RP1dPAgFhA)Y`E4tDw$X6i=B>ncE052Q=mf`JYD@<);T3K0RZ>pP{05H diff --git a/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png b/android/uhabits-android/src/main/res/drawable-xxhdpi/ic_repeat_white.png deleted file mode 100644 index 5de7a295132a9e53e15257eebbbea9250eab6cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 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 j9gTe~DWM4fWffW) diff --git a/android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml b/android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml index 9533a5f54..7fa3445d8 100644 --- a/android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml +++ b/android/uhabits-android/src/main/res/layout/show_habit_subtitle.xml @@ -24,6 +24,7 @@ tools:orientation="vertical" tools:layout_width="match_parent" tools:layout_height="wrap_content"> + - + + + + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/fa_calendar" + android:textColor="?mediumContrastTextColor" + android:textSize="@dimen/smallTextSize" /> - + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/fa_bell_o" + android:textColor="?mediumContrastTextColor" + android:textSize="@dimen/smallTextSize" /> diff --git a/android/uhabits-android/src/main/res/values/attrs.xml b/android/uhabits-android/src/main/res/values/attrs.xml index a6a431075..4fb100075 100644 --- a/android/uhabits-android/src/main/res/values/attrs.xml +++ b/android/uhabits-android/src/main/res/values/attrs.xml @@ -41,8 +41,6 @@ - - diff --git a/android/uhabits-android/src/main/res/values/fontawesome.xml b/android/uhabits-android/src/main/res/values/fontawesome.xml index 964b03954..ff6aef460 100644 --- a/android/uhabits-android/src/main/res/values/fontawesome.xml +++ b/android/uhabits-android/src/main/res/values/fontawesome.xml @@ -21,11 +21,16 @@ - + + + + + + @@ -131,13 +136,11 @@ - - @@ -174,7 +177,6 @@ - @@ -182,7 +184,6 @@ - @@ -238,7 +239,6 @@ - diff --git a/android/uhabits-android/src/main/res/values/styles.xml b/android/uhabits-android/src/main/res/values/styles.xml index 7f4f4291c..0e7035784 100644 --- a/android/uhabits-android/src/main/res/values/styles.xml +++ b/android/uhabits-android/src/main/res/values/styles.xml @@ -58,8 +58,6 @@ @drawable/ic_action_unarchive_dark @drawable/ic_action_color_dark @drawable/ic_action_filter_dark - @drawable/ic_repeat_black - @drawable/ic_alarm_black @drawable/ic_action_color_light @style/ThemeOverlay.AppCompat.Light @@ -112,8 +110,6 @@ @drawable/ic_action_filter_dark @drawable/ic_action_color_dark @drawable/ic_action_color_dark - @drawable/ic_repeat_white - @drawable/ic_alarm_white @style/ThemeOverlay.AppCompat