TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Button style adjustments.

Browse Source
This commit is contained in:
Anton Chekulaev 2020-09-02 23:01:29 +10:00
parent 7ee88ca0b2
commit 07692c8081
6 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/drawable-notnight/prominent_filled_button_medium_background.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?android:colorControlNormal" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="?android:colorControlNormal" />
</shape>

11
res/drawable-notnight/unimportant_filled_button_medium_background.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/unimportant_button_background" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="?android:textColorPrimary" />
</shape>

2
res/layout-sw400dp/fragment_enter_chat_url.xml
View File

@ -23,7 +23,7 @@
android:layout_weight="1" /> android:layout_weight="1" />
<Button <Button
style="@style/Widget.Session.Button.Common.ProminentOutline" style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/joinPublicChatButton" android:id="@+id/joinPublicChatButton"
android:layout_width="196dp" android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height" android:layout_height="@dimen/medium_button_height"

5
res/layout-sw400dp/fragment_enter_public_key.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/contentView" android:id="@+id/contentView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -54,7 +55,7 @@
android:textColor="@color/text" android:textColor="@color/text"
android:fontFamily="@font/space_mono_regular" android:fontFamily="@font/space_mono_regular"
android:textAlignment="center" android:textAlignment="center"
android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" /> tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -89,7 +90,7 @@
android:layout_weight="1" /> android:layout_weight="1" />
<Button <Button
style="@style/Widget.Session.Button.Common.ProminentOutline" style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/createPrivateChatButton" android:id="@+id/createPrivateChatButton"
android:layout_width="196dp" android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height" android:layout_height="@dimen/medium_button_height"

2
res/values-notnight-v21/colors.xml
View File

@ -11,7 +11,7 @@
<color name="cell_selected">#DFDFDF</color> <color name="cell_selected">#DFDFDF</color>
<color name="navigation_bar_background">#FCFCFC</color> <color name="navigation_bar_background">#FCFCFC</color>
<color name="separator">#B0B0B0</color> <color name="separator">#B0B0B0</color>
<color name="unimportant_button_background">#E8E8E8</color> <color name="unimportant_button_background">@android:color/transparent</color>
<color name="unimportant_dialog_button_background">@color/unimportant_button_background</color> <color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
<color name="dialog_background">#FCFCFC</color> <color name="dialog_background">#FCFCFC</color>
<color name="dialog_border">#212121</color> <color name="dialog_border">#212121</color>

5
res/values-notnight-v21/styles.xml
View File

@ -6,4 +6,9 @@
<item name="android:textColor">?android:textColorPrimary</item> <item name="android:textColor">?android:textColorPrimary</item>
</style> </style>
<style name="Widget.Session.Button.Common.ProminentFilled">
<item name="android:background">@drawable/prominent_filled_button_medium_background</item>
<item name="android:textColor">@android:color/white</item>
</style>
</resources> </resources>