mirror of
https://github.com/oxen-io/session-android.git
synced 2025-01-11 21:43:38 +00:00
Adjustments for branded popup button styles.
This commit is contained in:
parent
156b2687b8
commit
3236fde416
@ -15,7 +15,6 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Change Device Name"
|
android:text="Change Device Name"
|
||||||
android:textColor="@color/text"
|
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textSize="@dimen/medium_font_size" />
|
android:textSize="@dimen/medium_font_size" />
|
||||||
|
|
||||||
|
@ -53,14 +53,13 @@
|
|||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textSize="@dimen/large_font_size"
|
android:textSize="@dimen/large_font_size"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textColor="@color/text"
|
|
||||||
android:layout_marginBottom="32dp" />
|
android:layout_marginBottom="32dp" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/fingerprint_auth_container"
|
android:id="@+id/fingerprint_auth_container"
|
||||||
android:src="@drawable/ic_fingerprint_white_48dp"
|
android:src="@drawable/ic_fingerprint_white_48dp"
|
||||||
android:background="@drawable/circle_tintable"
|
android:background="@drawable/circle_tintable"
|
||||||
android:backgroundTint="@color/accent"
|
android:backgroundTint="?colorAccent"
|
||||||
android:padding="20dp"
|
android:padding="20dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -1,32 +1,33 @@
|
|||||||
<?xml version='1.0' encoding='UTF-8'?>
|
<?xml version='1.0' encoding='UTF-8'?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<!-- Session -->
|
<!-- Session -->
|
||||||
<color name="accent">#5df299</color>
|
<color name="accent">#5df299</color>
|
||||||
<color name="text">#000000</color>
|
<color name="text">#000000</color>
|
||||||
<color name="unimportant">#606060</color>
|
<color name="destructive">#f26f55</color>
|
||||||
<color name="cell_background">#FCFCFC</color>
|
<color name="unimportant">#606060</color>
|
||||||
<color name="cell_selected">#DFDFDF</color>
|
<color name="cell_background">#FCFCFC</color>
|
||||||
<color name="navigation_bar_background">#FCFCFC</color>
|
<color name="cell_selected">#DFDFDF</color>
|
||||||
<color name="separator">#B0B0B0</color>
|
<color name="navigation_bar_background">#FCFCFC</color>
|
||||||
<color name="unimportant_button_background">#1000</color>
|
<color name="separator">#B0B0B0</color>
|
||||||
<color name="unimportant_dialog_button_background">@color/dialog_background</color>
|
<color name="unimportant_button_background">#E8E8E8</color>
|
||||||
<color name="dialog_background">#FCFCFC</color>
|
<color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
|
||||||
<color name="dialog_border">#212121</color>
|
<color name="dialog_background">#FCFCFC</color>
|
||||||
<color name="compose_view_background">#FCFCFC</color>
|
<color name="dialog_border">#212121</color>
|
||||||
<color name="compose_text_view_background">#EDEDED</color>
|
<color name="compose_view_background">#FCFCFC</color>
|
||||||
<color name="new_conversation_button_collapsed_background">#F5F5F5</color>
|
<color name="compose_text_view_background">#EDEDED</color>
|
||||||
<color name="pn_option_background">#FCFCFC</color>
|
<color name="new_conversation_button_collapsed_background">#F5F5F5</color>
|
||||||
<color name="fake_chat_bubble_background">#F5F5F5</color>
|
<color name="pn_option_background">#FCFCFC</color>
|
||||||
|
<color name="fake_chat_bubble_background">#F5F5F5</color>
|
||||||
|
|
||||||
|
|
||||||
<color name="default_background_start">#ffffff</color>
|
<color name="default_background_start">#ffffff</color>
|
||||||
<color name="default_background_end">#fcfcfd</color>
|
<color name="default_background_end">#fcfcfd</color>
|
||||||
<color name="action_bar_background">#fcfcfd</color>
|
<color name="action_bar_background">#fcfcfd</color>
|
||||||
|
|
||||||
|
|
||||||
<color name="app_icon_background">#333132</color>
|
<color name="app_icon_background">#333132</color>
|
||||||
<color name="progress_bar_background">#0AFFFFFF</color>
|
<color name="progress_bar_background">#0AFFFFFF</color>
|
||||||
<color name="quote_not_found_background">#99FFFFFF</color>
|
<color name="quote_not_found_background">#99FFFFFF</color>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
@ -4,7 +4,7 @@
|
|||||||
<!-- Session -->
|
<!-- Session -->
|
||||||
<color name="accent">#00F782</color>
|
<color name="accent">#00F782</color>
|
||||||
<color name="text">#FFFFFF</color>
|
<color name="text">#FFFFFF</color>
|
||||||
<color name="destructive">#FF453A</color>
|
<color name="destructive">#E46351</color>
|
||||||
<color name="unimportant">#D8D8D8</color>
|
<color name="unimportant">#D8D8D8</color>
|
||||||
<color name="border">#979797</color>
|
<color name="border">#979797</color>
|
||||||
<color name="cell_background">#1B1B1B</color>
|
<color name="cell_background">#1B1B1B</color>
|
||||||
@ -15,7 +15,7 @@
|
|||||||
<color name="unimportant_button_background">#323232</color>
|
<color name="unimportant_button_background">#323232</color>
|
||||||
<color name="dialog_background">#101011</color>
|
<color name="dialog_background">#101011</color>
|
||||||
<color name="dialog_border">#212121</color>
|
<color name="dialog_border">#212121</color>
|
||||||
<color name="unimportant_dialog_button_background">#1B1B1B</color>
|
<color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
|
||||||
<color name="fake_chat_bubble_background">#3F4146</color>
|
<color name="fake_chat_bubble_background">#3F4146</color>
|
||||||
<color name="fake_chat_bubble_text">#000000</color>
|
<color name="fake_chat_bubble_text">#000000</color>
|
||||||
<color name="app_icon_background">#333132</color>
|
<color name="app_icon_background">#333132</color>
|
||||||
|
@ -104,10 +104,12 @@
|
|||||||
|
|
||||||
<style name="Widget.Session.Button.Dialog.Prominent">
|
<style name="Widget.Session.Button.Dialog.Prominent">
|
||||||
<item name="android:background">@drawable/prominent_dialog_button_background</item>
|
<item name="android:background">@drawable/prominent_dialog_button_background</item>
|
||||||
|
<item name="android:textColor">#222</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Widget.Session.Button.Dialog.Destructive">
|
<style name="Widget.Session.Button.Dialog.Destructive">
|
||||||
<item name="android:background">@drawable/destructive_dialog_button_background</item>
|
<item name="android:background">@drawable/destructive_dialog_button_background</item>
|
||||||
|
<item name="android:textColor">@android:color/white</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="SessionIDTextView">
|
<style name="SessionIDTextView">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user