gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-05 22:05:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix-up remaining things

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-08-09 17:54:48 +02:00 committed by Mario Đanić
parent 925ac6724e
commit 0e6779616b
9 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
View File

@ -122,20 +122,21 @@ public class MagicIncomingTextMessageViewHolder
messageUserAvatarView.getHierarchy().setPlaceholderImage(drawable);
}
} else {
Resources resources = context.getResources();
int bg_bubble_color = DisplayUtils.isDarkModeActive(context) ?
resources.getColor(R.color.bg_message_list_incoming_bubble_dark2) :
resources.getColor(R.color.bg_message_list_incoming_bubble);
messageUserAvatarView.setVisibility(View.INVISIBLE);
Drawable bubbleDrawable = DisplayUtils.getMessageSelector(bg_bubble_color,
resources.getColor(R.color.transparent),
bg_bubble_color, R.drawable.shape_grouped_incoming_message);
ViewCompat.setBackground(bubble, bubbleDrawable);
messageAuthor.setVisibility(View.GONE);
}
Resources resources = context.getResources();
int bg_bubble_color = DisplayUtils.isDarkModeActive(context) ?
resources.getColor(R.color.bg_message_list_incoming_bubble_dark2) :
resources.getColor(R.color.bg_message_list_incoming_bubble);
Drawable bubbleDrawable = DisplayUtils.getMessageSelector(bg_bubble_color,
resources.getColor(R.color.transparent),
bg_bubble_color, R.drawable.shape_grouped_incoming_message);
ViewCompat.setBackground(bubble, bubbleDrawable);
HashMap<String, HashMap<String, String>> messageParameters = message.getMessageParameters();
Context context = NextcloudTalkApplication.getSharedApplication().getApplicationContext();

3
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java
View File

@ -28,7 +28,6 @@ import android.content.res.Configuration;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Typeface;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.BitmapDrawable;
@ -250,7 +249,7 @@ public class DisplayUtils {
if (!isCall) {
if (chipResource == R.xml.chip_outgoing_others || chipResource == R.xml.chip_accent_background) {
drawable = R.drawable.white_circle;
drawable = R.drawable.mention_chip;
} else {
drawable = R.drawable.accent_circle;
}

2
app/src/main/res/drawable/white_circle.xml → app/src/main/res/drawable/mention_chip.xml
View File

@ -22,5 +22,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@color/bg_default"/>
android:color="@color/bg_dark_mention_chips"/>
</shape>

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

@ -28,6 +28,6 @@
android:bottomLeftRadius="@dimen/message_bubble_corners_radius"
android:topRightRadius="@dimen/message_bubble_corners_radius" />
<solid android:color="@color/white" />
<solid android:color="@color/bg_default" />
</shape>

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

@ -28,6 +28,6 @@
android:topLeftRadius="@dimen/message_bubble_corners_radius"
android:bottomRightRadius="@dimen/message_bubble_corners_radius" />
<solid android:color="@color/white" />
<solid android:color="@color/bg_default" />
</shape>

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

@ -28,6 +28,6 @@
android:topLeftRadius="@dimen/message_bubble_corners_radius"
android:bottomRightRadius="@dimen/message_bubble_corners_radius" />
<solid android:color="@color/white" />
<solid android:color="@color/bg_default" />
</shape>

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

@ -64,6 +64,7 @@
<color name="bg_default">#FFFFFF</color>
<color name="bg_alt">@color/white60</color>
<color name="bg_system_bubble_dark">#444444</color>
<color name="bg_dark_mention_chips">#333333</color>
<color name="bg_message_list_incoming_bubble">#EFEFEF</color>
<color name="bg_message_list_incoming_bubble_dark2">#444444</color>
<color name="bg_bottom_sheet">#46ffffff</color>

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

@ -44,7 +44,7 @@
</style>
<style name="ChipOutgoingTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
<item name="android:textColor">@color/nc_outcoming_text_default</item>
<item name="android:textColor">@color/nc_incoming_text_default</item>
</style>
<style name="ChipMentionTextAppearance" parent="TextAppearance.MaterialComponents.Chip">

2
app/src/main/res/xml/chip_outgoing_others.xml
View File

@ -22,7 +22,7 @@
<chip xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:textAppearance="@style/ChipOutgoingTextAppearance"
app:chipStrokeColor="@color/white"
app:chipStrokeColor="@color/bg_default"
app:chipBackgroundColor="@color/transparent"
app:chipStrokeWidth="1dp"
app:closeIconEnabled="false" />