Fix font for text buttons; fix secondary button name

This commit is contained in:
Alex Sytnyk 2018-06-27 17:16:01 +03:00
parent bcae09f8ae
commit 4c4236fcc3
2 changed files with 6 additions and 2 deletions

View file

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/primary_btn_container" android:id="@+id/primary_btn_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/primary_btn_bg"> android:background="?attr/primary_btn_bg">
<TextView <net.osmand.telegram.ui.views.TextViewEx
android:id="@+id/primary_btn" android:id="@+id/primary_btn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height" android:layout_height="@dimen/dialog_button_height"
@ -19,6 +20,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?attr/primary_btn_text_color" android:textColor="?attr/primary_btn_text_color"
android:textSize="@dimen/text_button_text_size" android:textSize="@dimen/text_button_text_size"
app:typeface="@string/font_roboto_medium"
tools:ignore="UnusedAttribute" tools:ignore="UnusedAttribute"
tools:text="Primary button"/> tools:text="Primary button"/>

View file

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/secondary_btn_container" android:id="@+id/secondary_btn_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/secondary_btn_bg"> android:background="?attr/secondary_btn_bg">
<TextView <net.osmand.telegram.ui.views.TextViewEx
android:id="@+id/secondary_btn" android:id="@+id/secondary_btn"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height" android:layout_height="@dimen/dialog_button_height"
@ -19,6 +20,7 @@
android:maxLines="1" android:maxLines="1"
android:textColor="?attr/ctrl_active_color" android:textColor="?attr/ctrl_active_color"
android:textSize="@dimen/text_button_text_size" android:textSize="@dimen/text_button_text_size"
app:typeface="@string/font_roboto_medium"
tools:ignore="UnusedAttribute" tools:ignore="UnusedAttribute"
tools:text="Secondary button"/> tools:text="Secondary button"/>