sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-21 05:09:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change badge color from red to purple + improved badge layout

Browse source 
Previously with the padding in the badge shape, it didn't handle large
numbers well (partly cut off) and also the shape wasn't round with small
numbers. Using minWidth & center gravity without padding fixes both issues.
This commit is contained in:
Carl Vuorinen 2019-04-17 08:31:34 +03:00
parent 81516734f5
commit edc54be6a4
4 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Habitica/res/drawable/badge_circle.xml
View file

@ -4,10 +4,5 @@
<corners
android:radius="10dip"/>
<solid
android:color="@color/red_50" />
<padding
android:left="5dip"
android:right="5dip"
android:top="5dip"
android:bottom="5dip" />
android:color="@color/brand_400" />
</shape>

6
Habitica/res/drawable/badge_gray.xml
View file

@ -2,12 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:radius="12dip"/>
android:radius="100dip"/>
<solid
android:color="@color/gray_600" />
<padding
android:left="6dip"
android:right="6dip"
android:top="3dip"
android:bottom="5dip" />
android:right="6dip" />
</shape>

52
Habitica/res/layout/drawer_main.xml
View file

@ -70,21 +70,24 @@
android:src="@drawable/menu_notifications"
android:layout_centerVertical="true"
android:clickable="false" />
<TextView
android:id="@+id/notificationsBadge"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:paddingTop="0dp"
android:layout_alignTop="@id/notificationsButton"
android:layout_alignLeft="@id/notificationsButton"
tools:text="1"
android:layout_alignTop="@id/notificationsButton"
android:layout_marginLeft="13dp"
android:layout_marginTop="-13dp"
android:background="@drawable/badge_circle"
android:gravity="center"
android:minWidth="20dp"
android:paddingTop="0dp"
android:textColor="#FFF"
android:textSize="12sp"
android:background="@drawable/badge_circle"
android:layout_marginTop="-12dp"
android:layout_marginLeft="13dp"
android:visibility="gone"
tools:visibility="visible"/>
tools:text="1"
tools:visibility="visible" />
</RelativeLayout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/messagesButtonWrapper"
@ -99,21 +102,24 @@
android:src="@drawable/menu_messages"
android:layout_centerVertical="true"
android:clickable="false" />
<TextView
android:id="@+id/messagesBadge"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:paddingTop="0dp"
android:layout_alignTop="@id/messagesButton"
android:layout_alignLeft="@id/messagesButton"
tools:text="1"
android:layout_alignTop="@id/messagesButton"
android:layout_marginLeft="13dp"
android:layout_marginTop="-12dp"
android:background="@drawable/badge_circle"
android:gravity="center"
android:minWidth="20dp"
android:paddingTop="0dp"
android:textColor="#FFF"
android:textSize="12sp"
android:background="@drawable/badge_circle"
android:layout_marginTop="-12dp"
android:layout_marginLeft="13dp"
android:visibility="gone"
tools:visibility="visible"/>
tools:text="1"
tools:visibility="visible" />
</RelativeLayout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/settingsButtonWrapper"
@ -127,21 +133,25 @@
android:background="@color/transparent"
android:src="@drawable/menu_settings"
android:layout_centerVertical="true"/>
<TextView
android:id="@+id/settingsBadge"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:paddingTop="0dp"
android:layout_alignTop="@id/settingsButton"
android:layout_alignLeft="@id/settingsButton"
tools:text="1"
android:layout_alignTop="@id/settingsButton"
android:layout_centerVertical="true"
android:layout_marginLeft="13dp"
android:layout_marginTop="-12dp"
android:background="@drawable/badge_circle"
android:gravity="center"
android:minWidth="20dp"
android:paddingTop="0dp"
android:textColor="#FFF"
android:textSize="12sp"
android:background="@drawable/badge_circle"
android:layout_marginTop="-12dp"
android:layout_marginLeft="13dp"
android:visibility="gone"
tools:visibility="visible"/>
tools:text="1"
tools:visibility="visible" />
</RelativeLayout>
</LinearLayout>

4
Habitica/res/layout/notifications_header.xml
View file

@ -31,9 +31,11 @@
<TextView
android:id="@+id/notifications_title_badge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="24dp"
android:layout_marginLeft="10dp"
android:background="@drawable/badge_gray"
android:gravity="center"
android:minWidth="24dp"
android:textColor="@color/gray_300"
android:textSize="12sp"
tools:text="1" />