Commit 38578034 authored by Amirhossein Naghshzan's avatar Amirhossein Naghshzan Committed by Adrien Béraud

styles: change style of buttons

Change-Id: Id6b77c7d4c3f14178a6373b86739630154fbf0ad
parent 5535b46e
......@@ -4,5 +4,5 @@
<corners
android:topLeftRadius="@dimen/bottom_sheet_radius"
android:topRightRadius="@dimen/bottom_sheet_radius" />
<solid android:color="@color/background_bottom_sheet" />
<solid android:color="@color/background" />
</shape>
\ No newline at end of file
......@@ -11,11 +11,12 @@
android:id="@+id/qr_code"
android:layout_width="300dp"
android:layout_height="wrap_content"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/ButtonOutLined"
android:layout_toLeftOf="@+id/separator"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
app:cardCornerRadius="@dimen/button_corner_radius"
android:layout_marginTop="?actionBarSize"
android:visibility="gone"
tools:visibility="visible" >
......
......@@ -63,7 +63,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_import_account"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/ButtonOutLined"
android:layout_width="@dimen/wizard_button_width"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -71,12 +71,13 @@
android:text="@string/account_link_archive_button"
android:textSize="@dimen/wizard_button_text_size"
android:padding="@dimen/wizard_button_padding"
android:drawableTint="@color/color_primary_dark"
android:drawableLeft="@drawable/baseline_backup_black_36"
android:drawableRight="@drawable/baseline_arrow_forward_black_18"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/account_connect_server"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/ButtonOutLined"
android:layout_width="@dimen/wizard_button_width"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -84,6 +85,7 @@
android:textSize="@dimen/wizard_button_text_size"
android:padding="@dimen/wizard_button_padding"
android:text="@string/account_connect_server_button"
android:drawableTint="@color/color_primary_dark"
android:drawableLeft="@drawable/baseline_router_black_36"
android:drawableRight="@drawable/baseline_arrow_forward_black_18"/>
......
......@@ -105,7 +105,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/skip"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wizard_username_skip"
......
......@@ -140,7 +140,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/skip_create_account"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wizard_profile_skip"
......
......@@ -187,7 +187,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<com.google.android.material.button.MaterialButton
android:id="@+id/export_account_btn"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/ButtonOutLined"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......@@ -197,7 +197,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<com.google.android.material.button.MaterialButton
android:id="@+id/change_password_btn"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/ButtonOutLined"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
......@@ -228,12 +228,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<com.google.android.material.button.MaterialButton
android:id="@+id/register_name_btn"
style="@style/Widget.MaterialComponents.Button"
style="@style/ButtonColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:backgroundTint="@color/colorPrimary"
android:text="@string/register_name" />
</LinearLayout>
......@@ -341,7 +342,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_add_device"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -395,7 +396,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_start_export"
style="@style/Widget.MaterialComponents.Button"
style="@style/ButtonColored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......@@ -406,7 +407,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_end_export"
style="@style/Widget.MaterialComponents.Button.TextButton"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
......
......@@ -28,6 +28,6 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/share_your_account_information"
android:theme="@style/Widget.MaterialComponents.Button.OutlinedButton" />
style="@style/ButtonColored" />
</LinearLayout>
\ No newline at end of file
......@@ -30,9 +30,10 @@ along with this program; if not, write to the Free Software
android:id="@+id/qr_code"
android:layout_width="@dimen/wizard_button_width"
android:layout_height="wrap_content"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
style="@style/ButtonOutLined"
android:layout_centerHorizontal="true"
android:layout_marginTop="8dp"
app:cardCornerRadius="@dimen/button_corner_radius"
android:visibility="gone"
tools:visibility="visible" >
......
......@@ -22,6 +22,4 @@
<color name="conversation_primary_background">@color/blue_600</color>
<color name="conversation_secondary_background">@color/grey_700</color>
<color name="background_bottom_sheet">@color/bottom_navigation</color>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="color_primary_light">#28B1ED</color>
<color name="color_primary_dark">#000747</color>
<color name="color_primary_dark">#0f426b</color>
<color name="color_primary_light_translucent">#B028B1ED</color>
<color name="color_primary_dark_translucent">#B0000747</color>
<color name="color_primary_dark_translucent">#B00f426b</color>
</resources>
\ No newline at end of file
......@@ -43,6 +43,4 @@
<color name="background_status_recommended">#8ee0d0</color>
<color name="background_status_required">#fee4e9</color>
<color name="background_bottom_sheet">@color/background</color>
</resources>
......@@ -78,15 +78,19 @@ along with this program; if not, write to the Free Software
<dimen name="call_preview_margin_big">65dp</dimen>
<dimen name="call_preview_margin_handle">12dp</dimen>
<!-- Buttons -->
<dimen name="button_padding">12dp</dimen>
<dimen name="button_corner_radius">12dp</dimen>
<!-- Wizard -->
<dimen name="wizard_button_width">340dp</dimen>
<dimen name="wizard_button_corner_radius">12dp</dimen>
<dimen name="wizard_button_corner_radius">@dimen/button_corner_radius</dimen>
<dimen name="wizard_button_text_size">12sp</dimen>
<dimen name="wizard_button_padding">12dp</dimen>
<dimen name="wizard_button_padding">@dimen/button_padding</dimen>
<dimen name="wizard_card_width">330dp</dimen>
<dimen name="wizard_card_height">420dp</dimen>
<dimen name="wizard_image_background">300dp</dimen>
<dimen name="wizard_card_radius">12dp</dimen>
<dimen name="wizard_card_radius">@dimen/button_corner_radius</dimen>
<dimen name="wizard_card_padding">22dp</dimen>
<dimen name="wizard_text_size">14sp</dimen>
<dimen name="wizard_card_button_width">250dp</dimen>
......
......@@ -145,8 +145,27 @@
</style>
<style name="ButtonColored" parent="Widget.MaterialComponents.Button">
<!-- <item name="colorButtonNormal">@color/color_primary_light</item>
<item name="android:textColor">@color/text_color_primary_dark</item>-->
<item name="android:textColor">@color/colorOnPrimary</item>
<item name="cornerRadius">@dimen/button_corner_radius</item>
<item name="android:paddingTop">@dimen/button_padding</item>
<item name="android:paddingBottom">@dimen/button_padding</item>
</style>
<style name="ButtonOutLined" parent="Widget.MaterialComponents.Button.OutlinedButton">
<item name="cornerRadius">@dimen/button_corner_radius</item>
<item name="android:paddingTop">@dimen/button_padding</item>
<item name="android:paddingBottom">@dimen/button_padding</item>
</style>
<style name="TextButton" parent="Widget.MaterialComponents.Button.TextButton">
<item name="cornerRadius">@dimen/button_corner_radius</item>
<item name="android:paddingTop">@dimen/button_padding</item>
<item name="android:paddingBottom">@dimen/button_padding</item>
</style>
<style name="WizardButton" parent="ButtonColored">
<item name="android:padding">@dimen/wizard_button_padding</item>
<item name="android:backgroundTint">@drawable/wizard_button_background_selector</item>
</style>
<!-- AndroidTV Style -->
......@@ -292,13 +311,6 @@
<item name="colorControlActivated">@color/conversation_primary_selection_handles</item>
</style>
<style name="WizardButton" parent="Widget.MaterialComponents.Button">
<item name="cornerRadius">@dimen/wizard_button_corner_radius</item>
<item name="android:padding">@dimen/wizard_button_padding</item>
<item name="android:backgroundTint">@drawable/wizard_button_background_selector</item>
<item name="android:textSize">@dimen/wizard_text_size</item>
</style>
<style name="BottomSheetDialogTheme" parent="BaseBottomSheetDialog">
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@color/background</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment