diff --git a/app/src/main/res/drawable-hdpi/ic_action_dismiss.png b/app/src/main/res/drawable-hdpi/ic_action_dismiss.png deleted file mode 100644 index ea21b1bf2..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_dismiss.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_pick_color.png b/app/src/main/res/drawable-hdpi/ic_action_pick_color.png deleted file mode 100644 index 69c1085a3..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_pick_color.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_dismiss.png b/app/src/main/res/drawable-mdpi/ic_action_dismiss.png deleted file mode 100644 index cfb167994..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_dismiss.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_pick_color.png b/app/src/main/res/drawable-mdpi/ic_action_pick_color.png deleted file mode 100644 index 70891e87d..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_pick_color.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_dismiss.png b/app/src/main/res/drawable-xhdpi/ic_action_dismiss.png deleted file mode 100644 index 0aaf7e2df..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_dismiss.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_pick_color.png b/app/src/main/res/drawable-xhdpi/ic_action_pick_color.png deleted file mode 100644 index cda4f1376..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_pick_color.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_dismiss.png b/app/src/main/res/drawable-xxhdpi/ic_action_dismiss.png deleted file mode 100644 index 61817c96b..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_dismiss.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_pick_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_pick_color.png deleted file mode 100644 index ec00751d8..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_pick_color.png and /dev/null differ diff --git a/app/src/main/res/drawable/habits_header.xml b/app/src/main/res/drawable/habits_header.xml deleted file mode 100644 index e1c4cfc84..000000000 --- a/app/src/main/res/drawable/habits_header.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/habits_header_check.xml b/app/src/main/res/drawable/habits_header_check.xml deleted file mode 100644 index 101e22dcb..000000000 --- a/app/src/main/res/drawable/habits_header_check.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/habits_item.xml b/app/src/main/res/drawable/habits_item.xml deleted file mode 100644 index 4ba72d44f..000000000 --- a/app/src/main/res/drawable/habits_item.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/habits_item_check.xml b/app/src/main/res/drawable/habits_item_check.xml deleted file mode 100644 index e217a4e9c..000000000 --- a/app/src/main/res/drawable/habits_item_check.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 8b43fe2c7..1c98c7aac 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -30,7 +30,6 @@ Criar hábito dias Deletar - Descrição Pergunta (por ex., \"você meditou hoje?\") Cancelar Editar @@ -66,7 +65,6 @@ Hábitos restaurados. Nada para refazer. Nada para desfazer. - Marcado. Desarquivar Você pode ter no máximo uma repetição por dia. Nome não pode ficar em branco. diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 856e83fc3..e1a260566 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -17,7 +17,6 @@ Nothing to redo. 习惯修改了. 取消了修改. - Repetition toggled. 习惯存档成功. 习惯取消存档成功. @@ -31,7 +30,6 @@ 习惯强度 历史 取消 - 描叙 提醒问题（你xxx了吗） 重复 次每 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index bd3296cf7..6748fdb6c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -18,11 +18,9 @@ #37474f #263238 - #9a4000 #e6e6e6 #ffffff - #cccccc #f2f2f2 @@ -50,281 +48,278 @@ #404040 #363636 #808080 - #ffffff - #888888 - #bfbfbf - #FFEBEE - #FFCDD2 - #EF9A9A - #E57373 - #EF5350 - #F44336 - #E53935 - #D32F2F - #C62828 - #B71C1C - #FF8A80 - #FF5252 - #FF1744 - #D50000 + + + + + + + + + + + + + + - #EDE7F6 - #D1C4E9 - #B39DDB - #9575CD - #7E57C2 - #673AB7 - #5E35B1 - #512DA8 - #4527A0 - #311B92 - #B388FF - #7C4DFF - #651FFF - #6200EA + + + + + + + + + + + + + + - #E1F5FE - #B3E5FC - #81D4FA - #4FC3F7 - #29B6F6 - #03A9F4 - #039BE5 - #0288D1 - #0277BD - #01579B - #80D8FF - #40C4FF - #00B0FF - #0091EA + + + + + + + + + + + + + + - #E8F5E9 - #C8E6C9 - #A5D6A7 - #81C784 - #66BB6A - #4CAF50 - #43A047 - #388E3C - #2E7D32 - #1B5E20 - #B9F6CA - #69F0AE - #00E676 - #00C853 + + + + + + + + + + + + + + - #FFFDE7 - #FFF9C4 - #FFF59D - #FFF176 - #FFEE58 - #FFEB3B - #FDD835 - #FBC02D - #F9A825 - #F57F17 - #FFFF8D - #FFFF00 - #FFEA00 - #FFD600 + + + + + + + + + + + + + + - #FBE9E7 - #FFCCBC - #FFAB91 - #FF8A65 - #FF7043 - #FF5722 - #F4511E - #E64A19 - #D84315 - #BF360C - #FF9E80 - #FF6E40 - #FF3D00 - #DD2C00 + + + + + + + + + + + + + + - #ECEFF1 - #CFD8DC - #B0BEC5 - #90A4AE - #78909C - #607D8B - #546E7A - #455A64 - #37474F - #263238 + + + + + + + + + + - #FCE4EC - #F8BBD0 - #F48FB1 - #F06292 - #EC407A - #E91E63 - #D81B60 - #C2185B - #AD1457 - #880E4F - #FF80AB - #FF4081 - #F50057 - #C51162 + + + + + + + + + + + + + + - #E8EAF6 - #C5CAE9 - #9FA8DA - #7986CB - #5C6BC0 + + + + + #3F51B5 - #3949AB - #303F9F - #283593 - #1A237E - #8C9EFF - #536DFE - #3D5AFE - #304FFE + + + + + + + + - #E0F7FA - #B2EBF2 - #80DEEA - #4DD0E1 - #26C6DA - #00BCD4 - #00ACC1 - #0097A7 - #00838F - #006064 - #84FFFF - #18FFFF - #00E5FF - #00B8D4 + + + + + + + + + + + + + + - #F1F8E9 - #DCEDC8 - #C5E1A5 - #AED581 - #9CCC65 - #8BC34A - #7CB342 - #689F38 - #558B2F - #33691E - #CCFF90 - #B2FF59 - #76FF03 - #64DD17 + + + + + + + + + + + + + + - #FFF8E1 - #FFECB3 - #FFE082 - #FFD54F - #FFCA28 - #FFC107 - #FFB300 - #FFA000 - #FF8F00 - #FF6F00 - #FFE57F - #FFD740 - #FFC400 - #FFAB00 + + + + + + + + + + + + + + - #EFEBE9 - #D7CCC8 - #BCAAA4 - #A1887F - #8D6E63 - #795548 - #6D4C41 - #5D4037 - #4E342E - #3E2723 + + + + + + + + + + - #F3E5F5 - #E1BEE7 - #CE93D8 - #BA68C8 - #AB47BC - #9C27B0 - #8E24AA - #7B1FA2 - #6A1B9A - #4A148C - #EA80FC - #E040FB - #D500F9 - #AA00FF + + + + + + + + + + + + + + - #E3F2FD - #BBDEFB - #90CAF9 - #64B5F6 - #42A5F5 - #2196F3 - #1E88E5 - #1976D2 - #1565C0 - #0D47A1 - #82B1FF - #448AFF - #2979FF - #2962FF + + + + + + + + + + + + + + - #E0F2F1 - #B2DFDB - #80CBC4 - #4DB6AC - #26A69A - #009688 - #00897B - #00796B - #00695C - #004D40 - #A7FFEB - #64FFDA - #1DE9B6 - #00BFA5 + + + + + + + + + + + + + + - #F9FBE7 - #F0F4C3 - #E6EE9C - #DCE775 - #D4E157 - #CDDC39 - #C0CA33 - #AFB42B - #9E9D24 - #827717 - #F4FF81 - #EEFF41 - #C6FF00 - #AEEA00 + + + + + + + + + + + + + + - #FFF3E0 - #FFE0B2 - #FFCC80 - #FFB74D - #FFA726 - #FF9800 - #FB8C00 - #F57C00 - #EF6C00 - #E65100 - #FFD180 - #FFAB40 - #FF9100 - #FF6D00 + + + + + + + + + + + + + + - #FAFAFA + #F5F5F5 - #EEEEEE - #E0E0E0 - #BDBDBD + + + #9E9E9E - #757575 - #616161 - #424242 - #212121 + + + + \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 6e8b2f009..045683958 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,6 +1,4 @@ - 16dp - 16dp 20dp 42dp diff --git a/app/src/main/res/values/fontawesome.xml b/app/src/main/res/values/fontawesome.xml index 8b20b647d..d760dbfe0 100644 --- a/app/src/main/res/values/fontawesome.xml +++ b/app/src/main/res/values/fontawesome.xml @@ -1,372 +1,373 @@ - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 21e79bef6..ab899a754 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,6 @@ Nothing to redo. Habit changed. Habit changed back. - Repetition toggled. Habits archived. Habits unarchived. @@ -49,7 +48,6 @@ Habit strength History Clear - Description Question (Did you … today?) Repeat times in