gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

align single/dual-line list item layouts with avatar/icon according to material design

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-04-08 15:44:02 +02:00
parent 9da278538d
commit dc8774f5c9
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
9 changed files with 73 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/res/layout/conversation_privacy_toggle.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -19,11 +21,15 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout 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/call_header_layout" android:id="@+id/call_header_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/double_margin_between_elements" android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
@ -33,13 +39,13 @@
<ImageView <ImageView
android:id="@+id/public_call_link" android:id="@+id/public_call_link"
android:layout_width="@dimen/small_item_height" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="@dimen/standard_margin"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_public_black_24px" android:src="@drawable/ic_public_black_24px"
android:tint="@color/colorPrimary" /> app:tint="@color/colorPrimary" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -49,7 +55,7 @@
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:text="@string/nc_public_call" android:text="@string/nc_public_call"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="@style/ListItem"
tools:text="@string/nc_public_call" /> tools:text="@string/nc_public_call" />
</RelativeLayout> </RelativeLayout>
@ -60,7 +66,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:minHeight="@dimen/small_item_height" android:minHeight="@dimen/small_item_height"
android:visibility="gone"> android:visibility="gone"
tools:visibility="gone">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

20
app/src/main/res/layout/join_conversation_via_link.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -19,22 +21,25 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/joinConversationViaLinkRelativeLayout" android:id="@+id/joinConversationViaLinkRelativeLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/double_margin_between_elements" android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/joinConversationViaLinkImageView" android:id="@+id/joinConversationViaLinkImageView"
android:layout_width="@dimen/small_item_height" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="@dimen/standard_margin"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_public_black_24px" android:src="@drawable/ic_public_black_24px"
android:tint="@color/colorPrimary" /> app:tint="@color/colorPrimary" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -44,7 +49,6 @@
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:text="@string/nc_join_via_link" android:text="@string/nc_join_via_link"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="@style/ListItem" />
tools:text="@string/nc_join_via_link" />
</RelativeLayout> </RelativeLayout>

24
app/src/main/res/layout/rv_item_contact.xml
View File

@ -3,8 +3,8 @@
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger ~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger
~ Copyright (C) 2017 Mario Danic ~ Copyright (C) 2017 Mario Danic
~ Copyright (C) 2017 Andy Scherzinger
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by ~ it under the terms of the GNU General Public License as published by
@ -24,8 +24,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/rv_item_view_height" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_between_elements" android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
@ -34,9 +37,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/standard_margin"
android:contentDescription="@string/selected_list_item"
android:src="@drawable/ic_check_black_24dp" android:src="@drawable/ic_check_black_24dp"
android:tint="@color/colorPrimary" app:tint="@color/colorPrimary" />
android:visibility="gone" />
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/name_text" android:id="@+id/name_text"
@ -46,16 +50,16 @@
android:layout_toStartOf="@id/checkedImageView" android:layout_toStartOf="@id/checkedImageView"
android:layout_toEndOf="@id/simple_drawee_view" android:layout_toEndOf="@id/simple_drawee_view"
android:ellipsize="end" android:ellipsize="end"
android:lines="1"
android:textAppearance="@style/ListItem" android:textAppearance="@style/ListItem"
tools:text="Contact item text" /> tools:text="Jane Doe" />
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/simple_drawee_view" android:id="@+id/simple_drawee_view"
android:layout_width="@dimen/small_item_height" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/double_margin_between_elements" android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginEnd="@dimen/margin_between_elements"
app:roundAsCircle="true" /> app:roundAsCircle="true" />
</RelativeLayout> </RelativeLayout>

9
app/src/main/res/layout/rv_item_conversation.xml
View File

@ -4,7 +4,7 @@
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger ~ @author Andy Scherzinger
~ Copyright (C) 2017 Mario Danic ~ Copyright (C) 2017 Mario Danic
~ Copyright (C) 2017 Andy Scherzinger ~ Copyright (C) 2017-2021 Andy Scherzinger
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by ~ it under the terms of the GNU General Public License as published by
@ -23,9 +23,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="72dp"
android:layout_margin="8dp"> android:layout_margin="@dimen/standard_margin">
<FrameLayout <FrameLayout
android:id="@+id/frame_layout" android:id="@+id/frame_layout"
@ -59,7 +58,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/margin_between_elements" android:layout_marginStart="@dimen/standard_margin"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_more_horiz_black_24dp" /> android:src="@drawable/ic_more_horiz_black_24dp" />

25
app/src/main/res/layout/rv_item_notification_sound.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -20,21 +22,26 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="wrap_content"
android:layout_margin="@dimen/double_margin_between_elements" android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/checkedImageView" android:id="@+id/checkedImageView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/standard_margin"
android:contentDescription="@string/selected_list_item"
android:src="@drawable/ic_check_black_24dp" android:src="@drawable/ic_check_black_24dp"
android:tint="@color/colorPrimary" /> app:tint="@color/colorPrimary" />
<TextView <TextView
android:id="@+id/notificationNameTextView" android:id="@+id/notificationNameTextView"
@ -44,14 +51,16 @@
android:layout_toStartOf="@id/checkedImageView" android:layout_toStartOf="@id/checkedImageView"
android:layout_toEndOf="@id/simpleDraweeView" android:layout_toEndOf="@id/simpleDraweeView"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceListItem" /> android:lines="1"
android:textAppearance="@style/ListItem"
tools:text="Ringy Gone" />
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/simpleDraweeView" android:id="@+id/simpleDraweeView"
android:layout_width="@dimen/small_item_height" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="@dimen/standard_margin"
app:roundAsCircle="true" /> app:roundAsCircle="true" />
</RelativeLayout> </RelativeLayout>

12
app/src/main/res/layout/rv_item_title_header.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -22,17 +24,19 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/bg_default"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/title_text_view" android:id="@+id/title_text_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/standard_margin"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="16dp" android:layout_marginEnd="@dimen/standard_margin"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/standard_half_margin"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textStyle="bold"
tools:text="A" /> tools:text="A" />
<View <View

2
app/src/main/res/layout/user_info_details_table_item.xml
View File

@ -40,7 +40,7 @@
android:id="@+id/user_info_edit_text" android:id="@+id/user_info_edit_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_double_margin"
android:layout_marginEnd="@dimen/standard_margin" android:layout_marginEnd="@dimen/standard_margin"
android:autofillHints="none" android:autofillHints="none"
android:ellipsize="end" android:ellipsize="end"

1
app/src/main/res/values/strings.xml
View File

@ -389,4 +389,5 @@
<string name="tooManyUnreadMessages" translatable="false">999+</string> <string name="tooManyUnreadMessages" translatable="false">999+</string>
<string name="nc_action_open_main_menu">Open main menu</string> <string name="nc_action_open_main_menu">Open main menu</string>
<string name="failed_to_save">Failed to save %1$s</string> <string name="failed_to_save">Failed to save %1$s</string>
<string name="selected_list_item">selected</string>
</resources> </resources>

3
app/src/main/res/values/styles.xml
View File

@ -44,7 +44,8 @@
</style> </style>
<style name="ListItem" parent="BottomSheet.ListItem.TextAppearance"> <style name="ListItem" parent="BottomSheet.ListItem.TextAppearance">
<item name="android:textColor">@color/nc_incoming_text_default</item> <item name="android:textColor">@color/conversation_item_header</item>
<item name="android:textSize">16sp</item>
</style> </style>
<style name="ChipIncomingTextAppearance" parent="TextAppearance.MaterialComponents.Chip"> <style name="ChipIncomingTextAppearance" parent="TextAppearance.MaterialComponents.Chip">