TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dividers for home screen conversation items.

Browse Source 
Themed common/dialog button styles.
This commit is contained in:
Anton Chekulaev 2020-08-24 16:46:12 +10:00
parent 1191353fde
commit afe90200f1
48 changed files with 182 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/drawable/prominent_filled_button_medium_background.xml
View File

@ -3,9 +3,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/accent" />
<solid android:color="?colorAccent" />
<corners android:radius="22dp" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
<stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
</shape>

4
res/drawable/prominent_outline_button_medium_background.xml
View File

@ -5,7 +5,7 @@
<solid android:color="@color/transparent" />
<corners android:radius="22dp" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
<stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
</shape>

2
res/drawable/unimportant_filled_button_medium_background.xml
View File

@ -5,7 +5,7 @@
<solid android:color="@color/unimportant_button_background" />
<corners android:radius="22dp" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="@color/unimportant_button_background" />
</shape>

4
res/drawable/unimportant_outline_button_medium_background.xml
View File

@ -5,7 +5,7 @@
<solid android:color="@color/transparent" />
<corners android:radius="22dp" />
<corners android:radius="@dimen/medium_button_corner_radius" />
<stroke android:width="@dimen/border_thickness" android:color="@color/text" />
<stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
</shape>

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

@ -49,7 +49,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

4
res/layout-sw400dp/activity_landing.xml
View File

@ -32,7 +32,7 @@
android:layout_weight="1" />
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
@ -41,7 +41,7 @@
android:text="@string/activity_landing_register_button_title" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/restoreButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

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

@ -103,7 +103,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

4
res/layout-sw400dp/activity_register.xml
View File

@ -46,7 +46,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
@ -55,7 +55,7 @@
android:text="@string/continue_2" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

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

@ -48,7 +48,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/restoreButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

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

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

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

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

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

@ -65,7 +65,7 @@
android:orientation="horizontal">
<Button
style="@style/MediumUnimportantFilledButton"
style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/copyButton"
android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"
@ -73,7 +73,7 @@
android:text="@string/copy" />
<Button
style="@style/MediumUnimportantFilledButton"
style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/shareButton"
android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"
@ -89,7 +89,7 @@
android:layout_weight="1" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/createPrivateChatButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

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

@ -58,7 +58,7 @@
android:layout_marginLeft="4dp" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="28dp"

2
res/layout-sw420dp/fragment_enter_session_id.xml
View File

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

2
res/layout/activity_create_closed_group.xml
View File

@ -49,7 +49,7 @@
android:text="@string/activity_create_closed_group_empty_state_message" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/btnCreateNewPrivateChat"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

2
res/layout/activity_display_name.xml
View File

@ -47,7 +47,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

5
res/layout/activity_edit_closed_group.xml
View File

@ -110,7 +110,7 @@
<Button
android:id="@+id/addMembersClosedGroupButton"
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:layout_width="wrap_content"
android:layout_height="@dimen/small_button_height"
android:layout_marginTop="@dimen/small_spacing"
@ -131,7 +131,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
tools:listitem="@layout/view_user"/>
</LinearLayout>

5
res/layout/activity_home.xml
View File

@ -74,7 +74,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="172dp"
android:clipToPadding="false" />
android:clipToPadding="false"
tools:listitem="@layout/view_conversation"/>
<View
android:id="@+id/gradientView"
@ -106,7 +107,7 @@
android:text="@string/activity_home_empty_state_message" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/btnCreateNewPrivateChat"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

4
res/layout/activity_landing.xml
View File

@ -32,7 +32,7 @@
android:layout_weight="1" />
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
@ -41,7 +41,7 @@
android:text="@string/activity_landing_register_button_title" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/restoreButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

2
res/layout/activity_linked_devices.xml
View File

@ -25,7 +25,7 @@
android:text="@string/activity_linked_devices_empty_state_message" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/linkDeviceButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

2
res/layout/activity_path.xml
View File

@ -43,7 +43,7 @@
</RelativeLayout>
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/learnMoreButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

2
res/layout/activity_pn_mode.xml
View File

@ -103,7 +103,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

4
res/layout/activity_register.xml
View File

@ -47,7 +47,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/registerButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"
@ -56,7 +56,7 @@
android:text="@string/continue_2" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

2
res/layout/activity_restore.xml
View File

@ -46,7 +46,7 @@
android:layout_weight="1"/>
<Button
style="@style/MediumProminentFilledButton"
style="@style/Widget.Session.Button.Common.ProminentFilled"
android:id="@+id/restoreButton"
android:layout_width="match_parent"
android:layout_height="@dimen/medium_button_height"

2
res/layout/activity_seed.xml
View File

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

4
res/layout/activity_settings.xml
View File

@ -87,7 +87,7 @@
android:orientation="horizontal">
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/copyButton"
android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"
@ -95,7 +95,7 @@
android:text="@string/copy" />
<Button
style="@style/MediumUnimportantOutlineButton"
style="@style/Widget.Session.Button.Common.UnimportantOutline"
android:id="@+id/shareButton"
android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"

4
res/layout/dialog_clear_all_data.xml
View File

@ -36,7 +36,7 @@
android:orientation="horizontal">
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/cancelButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
@ -44,7 +44,7 @@
android:text="@string/cancel" />
<Button
style="@style/DestructiveDialogButton"
style="@style/Widget.Session.Button.Dialog.Destructive"
android:id="@+id/clearAllDataButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"

4
res/layout/dialog_edit_device_name.xml
View File

@ -39,7 +39,7 @@
android:orientation="horizontal">
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/cancelButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
@ -47,7 +47,7 @@
android:text="@string/cancel" />
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/okButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"

4
res/layout/dialog_link_device_master_mode.xml
View File

@ -74,7 +74,7 @@
android:orientation="horizontal">
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/cancelButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
@ -82,7 +82,7 @@
android:text="@string/cancel" />
<Button
style="@style/ProminentDialogButton"
style="@style/Widget.Session.Button.Dialog.Prominent"
android:id="@+id/authorizeButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"

2
res/layout/dialog_link_device_slave_mode.xml
View File

@ -51,7 +51,7 @@
android:textAlignment="center" />
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/cancelButton"
android:layout_width="match_parent"
android:layout_height="@dimen/small_button_height"

4
res/layout/dialog_seed.xml
View File

@ -47,7 +47,7 @@
android:orientation="horizontal">
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/cancelButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
@ -55,7 +55,7 @@
android:text="@string/cancel" />
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/copyButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"

2
res/layout/fragment_enter_chat_url.xml
View File

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

6
res/layout/fragment_enter_public_key.xml
View File

@ -65,7 +65,7 @@
android:orientation="horizontal">
<Button
style="@style/MediumUnimportantFilledButton"
style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/copyButton"
android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"
@ -73,7 +73,7 @@
android:text="@string/copy" />
<Button
style="@style/MediumUnimportantFilledButton"
style="@style/Widget.Session.Button.Common.UnimportantFilled"
android:id="@+id/shareButton"
android:layout_width="0dp"
android:layout_height="@dimen/medium_button_height"
@ -89,7 +89,7 @@
android:layout_weight="1" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/createPrivateChatButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

2
res/layout/fragment_enter_session_id.xml
View File

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

2
res/layout/fragment_multi_device_removal_bottom_sheet.xml
View File

@ -31,7 +31,7 @@
android:textSize="@dimen/small_font_size" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/okButton"
android:layout_width="240dp"
android:layout_height="@dimen/medium_button_height"

4
res/layout/fragment_open_group_suggestion_bottom_sheet.xml
View File

@ -35,7 +35,7 @@
android:textAlignment="center" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/joinButton"
android:layout_width="240dp"
android:layout_height="@dimen/medium_button_height"
@ -43,7 +43,7 @@
android:text="Join Public Chat" />
<Button
style="@style/MediumUnimportantOutlineButton"
style="@style/Widget.Session.Button.Common.UnimportantOutline"
android:id="@+id/dismissButton"
android:layout_width="240dp"
android:layout_height="@dimen/medium_button_height"

2
res/layout/fragment_scan_qr_code_placeholder.xml
View File

@ -22,7 +22,7 @@
android:text="@string/fragment_scan_qr_code_camera_access_explanation" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/grantCameraAccessButton"
android:layout_width="wrap_content"
android:layout_height="@dimen/medium_button_height"

2
res/layout/fragment_view_my_qr_code.xml
View File

@ -56,7 +56,7 @@
android:text="This is your QR code. Other users can scan it to start a session with you." />
<Button
style="@style/MediumUnimportantOutlineButton"
style="@style/Widget.Session.Button.Common.UnimportantOutline"
android:id="@+id/shareButton"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

2
res/layout/prompt_passphrase_activity.xml
View File

@ -69,7 +69,7 @@
tools:visibility="visible"/>
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/lock_screen_auth_container"
android:layout_width="196dp"
android:layout_height="@dimen/medium_button_height"

13
res/layout/session_restore_banner.xml
View File

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/sessionRestoreBanner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/dialog_background"
android:background="?dialog_background_color"
android:orientation="vertical"
android:elevation="10dp">
@ -33,19 +34,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_spacing"
android:text="@string/session_reset_banner_message"
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
android:textAlignment="center" />
android:textAlignment="center"
tools:text="@string/session_reset_banner_message"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_spacing"
android:layout_marginTop="@dimen/medium_spacing"
android:orientation="horizontal">
<Button
style="@style/UnimportantDialogButton"
style="@style/Widget.Session.Button.Dialog.Unimportant"
android:id="@+id/dismissButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
@ -53,7 +54,7 @@
android:text="@string/session_reset_banner_dismiss_button_title" />
<Button
style="@style/ProminentDialogButton"
style="@style/Widget.Session.Button.Dialog.Prominent"
android:id="@+id/restoreButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"

20
res/layout/view_conversation.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/conversation_view_background"
android:orientation="horizontal"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:orientation="horizontal">
<View
android:id="@+id/accentView"
@ -21,11 +21,16 @@
android:layout_marginStart="@dimen/medium_spacing"
android:layout_marginBottom="@dimen/medium_spacing" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/medium_spacing"
android:layout_marginEnd="@dimen/medium_spacing"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<LinearLayout
@ -114,4 +119,13 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_gravity="bottom"
android:layout_marginStart="@dimen/medium_spacing"
android:background="?android:dividerHorizontal" />
</FrameLayout>
</LinearLayout>

2
res/layout/view_seed_reminder.xml
View File

@ -58,7 +58,7 @@
android:layout_marginLeft="4dp" />
<Button
style="@style/MediumProminentOutlineButton"
style="@style/Widget.Session.Button.Common.ProminentOutline"
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="28dp"

4
res/layout/view_user.xml
View File

@ -30,7 +30,6 @@
android:textSize="@dimen/medium_font_size"
android:textStyle="bold"
android:layout_weight="1"
android:textColor="?android:textColorPrimary"
tools:text="Spiderman" />
<ImageView
@ -38,8 +37,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="@dimen/medium_spacing"
android:src="@drawable/ic_circle"
android:tint="?android:textColorPrimary"/>
android:src="@drawable/ic_circle"/>
</LinearLayout>

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

@ -10,6 +10,7 @@
<color name="navigation_bar_background">#FCFCFC</color>
<color name="separator">#B0B0B0</color>
<color name="unimportant_button_background">@color/transparent</color>
<color name="unimportant_dialog_button_background">@color/dialog_background</color>
<color name="dialog_background">#FCFCFC</color>
<color name="dialog_border">#212121</color>
<color name="compose_view_background">#FCFCFC</color>
@ -26,7 +27,6 @@
<color name="action_bar_background">#fcfcfd</color>
<color name="unimportant_dialog_button_background">#1B1B1B</color>
<color name="app_icon_background">#333132</color>
<color name="progress_bar_background">#0AFFFFFF</color>
<color name="quote_not_found_background">#99FFFFFF</color>

1
res/values/dimens.xml
View File

@ -14,6 +14,7 @@
<!-- Element Sizes -->
<dimen name="small_button_height">34dp</dimen>
<dimen name="medium_button_height">38dp</dimen>
<dimen name="medium_button_corner_radius">22dp</dimen>
<dimen name="accent_line_thickness">4dp</dimen>
<dimen name="very_small_profile_picture_size">26dp</dimen>
<dimen name="small_profile_picture_size">36dp</dimen>

50
res/values/styles.xml
View File

@ -73,57 +73,49 @@
<item name="textAllCaps">false</item>
</style>
<style name="MediumProminentFilledButton">
<item name="android:background">@drawable/prominent_filled_button_medium_background</item>
<!-- TODO These button styles require proper background selectors for up/down visual state. -->
<style name="Widget.Session.Button.Common" parent="">
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/medium_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">@color/text</item>
</style>
<style name="MediumProminentOutlineButton">
<style name="Widget.Session.Button.Common.ProminentFilled">
<item name="android:background">@drawable/prominent_filled_button_medium_background</item>
<item name="android:textColor">?colorPrimary</item>
</style>
<style name="Widget.Session.Button.Common.ProminentOutline">
<item name="android:background">@drawable/prominent_outline_button_medium_background</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/medium_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">@color/accent</item>
</style>
<style name="MediumUnimportantFilledButton">
<style name="Widget.Session.Button.Common.UnimportantFilled">
<item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/medium_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">@color/text</item>
<item name="android:textColor">?colorPrimary</item>
</style>
<style name="MediumUnimportantOutlineButton">
<style name="Widget.Session.Button.Common.UnimportantOutline">
<item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/medium_font_size</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textColor">@color/text</item>
<item name="android:textColor">?colorPrimary</item>
</style>
<style name="UnimportantDialogButton">
<style name="Widget.Session.Button.Dialog" parent="">
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/small_font_size</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
<style name="Widget.Session.Button.Dialog.Unimportant">
<item name="android:background">@drawable/unimportant_dialog_button_background</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/small_font_size</item>
<item name="android:textColor">@color/text</item>
</style>
<style name="ProminentDialogButton">
<style name="Widget.Session.Button.Dialog.Prominent">
<item name="android:background">@drawable/prominent_dialog_button_background</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/small_font_size</item>
<item name="android:textColor">@color/text</item>
</style>
<style name="DestructiveDialogButton">
<style name="Widget.Session.Button.Dialog.Destructive">
<item name="android:background">@drawable/destructive_dialog_button_background</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">@dimen/small_font_size</item>
<item name="android:textColor">@color/text</item>
</style>
<style name="SessionIDTextView">

1
src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
View File

@ -13,6 +13,7 @@ class EditClosedGroupMembersAdapter(
private val glide: GlideRequests,
private val memberClickListener: ((String) -> Unit)? = null
) : RecyclerView.Adapter<EditClosedGroupMembersAdapter.ViewHolder>() {
private val members = ArrayList<String>()
private val lockedMembers = HashSet<String>()

2
src/org/thoughtcrime/securesms/loki/views/UserView.kt
View File

@ -39,7 +39,7 @@ class UserView : LinearLayout {
}
private fun setUpViewHierarchy() {
val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val contentView = inflater.inflate(R.layout.view_user, null)
addView(contentView)
}