gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-29 15:45:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1223 from nextcloud/lockIcon

Browse Source 
Remove lock icon in conversation list
This commit is contained in:
Andy Scherzinger 2021-05-06 19:50:46 +02:00 committed by GitHub
commit 8ee33bb251
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
View File

@ -162,13 +162,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
holder.dialogUnreadBubble.setVisibility(View.GONE); holder.dialogUnreadBubble.setVisibility(View.GONE);
} }
if (conversation.isHasPassword()) {
holder.passwordProtectedRoomImageView.setVisibility(View.VISIBLE);
} else {
holder.passwordProtectedRoomImageView.setVisibility(View.GONE);
}
if (conversation.isFavorite()) { if (conversation.isFavorite()) {
holder.pinnedConversationImageView.setVisibility(View.VISIBLE); holder.pinnedConversationImageView.setVisibility(View.VISIBLE);
} else { } else {
@ -286,8 +279,6 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
EmojiTextView dialogLastMessage; EmojiTextView dialogLastMessage;
@BindView(R.id.dialogUnreadBubble) @BindView(R.id.dialogUnreadBubble)
Chip dialogUnreadBubble; Chip dialogUnreadBubble;
@BindView(R.id.passwordProtectedRoomImageView)
ImageView passwordProtectedRoomImageView;
@BindView(R.id.favoriteConversationImageView) @BindView(R.id.favoriteConversationImageView)
ImageView pinnedConversationImageView; ImageView pinnedConversationImageView;

2
app/src/main/res/drawable/shape_lock_bubble.xml
View File

@ -23,7 +23,7 @@
<item> <item>
<shape <shape
android:shape="oval"> android:shape="oval">
<solid android:color="@color/white"/> <solid android:color="@color/bg_default"/>
</shape> </shape>
</item> </item>
<item android:drawable="@drawable/ic_lock_grey600_24px"/> <item android:drawable="@drawable/ic_lock_grey600_24px"/>

8
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View File

@ -46,14 +46,6 @@
app:roundAsCircle="true" app:roundAsCircle="true"
tools:src="@drawable/ic_call_black_24dp" /> tools:src="@drawable/ic_call_black_24dp" />
<ImageView
android:id="@+id/passwordProtectedRoomImageView"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="bottom|end"
android:background="@drawable/shape_lock_bubble"
android:contentDescription="@string/password_protected" />
<ImageView <ImageView
android:id="@+id/favoriteConversationImageView" android:id="@+id/favoriteConversationImageView"
android:layout_width="16dp" android:layout_width="16dp"

2
scripts/analysis/findbugs-results.txt
View File

@ -1 +1 @@
485 484

2
scripts/analysis/lint-results.txt
View File

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 3 errors and 348 warnings</span> <span class="mdl-layout-title">Lint Report: 3 errors and 347 warnings</span>