From e8ad19e8f81c5fd142d71344de9322c9638768ef Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 26 Mar 2018 14:30:25 +0200
Subject: [PATCH] Attempt to fix missing italics for monospace text
- Also adds new placeholders
---
.../ui/chat/messages/QuasselMessageRenderer.kt | 9 ++++++++-
app/src/main/res/layout/widget_chatmessage_action.xml | 4 ++--
app/src/main/res/layout/widget_chatmessage_error.xml | 4 ++--
app/src/main/res/layout/widget_chatmessage_info.xml | 4 ++--
app/src/main/res/layout/widget_chatmessage_notice.xml | 4 ++--
app/src/main/res/layout/widget_chatmessage_server.xml | 4 ++--
6 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
index 9946181d4..928c8f026 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/QuasselMessageRenderer.kt
@@ -37,6 +37,8 @@ class QuasselMessageRenderer @Inject constructor(
timePattern(appearanceSettings.showSeconds, appearanceSettings.use24hClock)
)
+ val monospaceItalic = Typeface.create(Typeface.MONOSPACE, Typeface.ITALIC)
+
private fun timePattern(showSeconds: Boolean,
use24hClock: Boolean) = when (use24hClock to showSeconds) {
false to true -> "hh:mm:ss a"
@@ -74,7 +76,12 @@ class QuasselMessageRenderer @Inject constructor(
}
}
if (appearanceSettings.useMonospace) {
- viewHolder.content.typeface = Typeface.MONOSPACE
+ val old = viewHolder.content.typeface
+ if (old.isItalic) {
+ viewHolder.content.typeface = monospaceItalic
+ } else {
+ viewHolder.content.typeface = Typeface.MONOSPACE
+ }
}
val textSize = appearanceSettings.textSize.toFloat()
viewHolder.time.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize)
diff --git a/app/src/main/res/layout/widget_chatmessage_action.xml b/app/src/main/res/layout/widget_chatmessage_action.xml
index 1270a6d77..7006f8f56 100644
--- a/app/src/main/res/layout/widget_chatmessage_action.xml
+++ b/app/src/main/res/layout/widget_chatmessage_action.xml
@@ -25,7 +25,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:typeface="monospace"
- tools:text="[15:55]" />
+ tools:text="@sample/messages.json/data/time" />
<TextView
android:id="@+id/content"
@@ -35,7 +35,7 @@
android:textColor="?attr/colorForegroundAction"
android:textIsSelectable="true"
android:textStyle="italic"
- tools:text="-*- justJanne loves the new version" />
+ tools:text="@sample/messages.json/data/message" />
</LinearLayout>
<View
diff --git a/app/src/main/res/layout/widget_chatmessage_error.xml b/app/src/main/res/layout/widget_chatmessage_error.xml
index 2a0b20956..462ec5cc8 100644
--- a/app/src/main/res/layout/widget_chatmessage_error.xml
+++ b/app/src/main/res/layout/widget_chatmessage_error.xml
@@ -25,7 +25,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:typeface="monospace"
- tools:text="[15:55]" />
+ tools:text="@sample/messages.json/data/time" />
<TextView
android:id="@+id/content"
@@ -34,7 +34,7 @@
android:layout_weight="1"
android:textColor="?attr/colorForegroundError"
android:textIsSelectable="true"
- tools:text="everyone: deserves a chance to fly. No such channel" />
+ tools:text="@sample/messages.json/data/message" />
</LinearLayout>
<View
diff --git a/app/src/main/res/layout/widget_chatmessage_info.xml b/app/src/main/res/layout/widget_chatmessage_info.xml
index 3d576e1e9..87de55c2f 100644
--- a/app/src/main/res/layout/widget_chatmessage_info.xml
+++ b/app/src/main/res/layout/widget_chatmessage_info.xml
@@ -25,7 +25,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:fontFamily="monospace"
android:textColor="?attr/colorForegroundSecondary"
- tools:text="[15:55]" />
+ tools:text="@sample/messages.json/data/time" />
<TextView
android:id="@+id/content"
@@ -35,7 +35,7 @@
android:textColor="?attr/colorForegroundSecondary"
android:textIsSelectable="true"
android:textStyle="italic"
- tools:text="Connecting to irc.freenode.net:6667..." />
+ tools:text="@sample/messages.json/data/message" />
</LinearLayout>
<View
diff --git a/app/src/main/res/layout/widget_chatmessage_notice.xml b/app/src/main/res/layout/widget_chatmessage_notice.xml
index bc904f147..f17215680 100644
--- a/app/src/main/res/layout/widget_chatmessage_notice.xml
+++ b/app/src/main/res/layout/widget_chatmessage_notice.xml
@@ -25,7 +25,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:fontFamily="monospace"
android:textColor="?attr/colorForegroundNotice"
- tools:text="[15:55]" />
+ tools:text="@sample/messages.json/data/time" />
<TextView
android:id="@+id/content"
@@ -34,7 +34,7 @@
android:layout_weight="1"
android:textColor="?attr/colorForegroundNotice"
android:textIsSelectable="true"
- tools:text="Connecting to irc.freenode.net:6667..." />
+ tools:text="@sample/messages.json/data/message" />
</LinearLayout>
<View
diff --git a/app/src/main/res/layout/widget_chatmessage_server.xml b/app/src/main/res/layout/widget_chatmessage_server.xml
index 6d42e0c17..3a63850b6 100644
--- a/app/src/main/res/layout/widget_chatmessage_server.xml
+++ b/app/src/main/res/layout/widget_chatmessage_server.xml
@@ -25,7 +25,7 @@
android:layout_marginRight="@dimen/message_horizontal"
android:textColor="?attr/colorForegroundSecondary"
android:typeface="monospace"
- tools:text="[15:55]" />
+ tools:text="@sample/messages.json/data/time" />
<TextView
android:id="@+id/content"
@@ -34,7 +34,7 @@
android:layout_weight="1"
android:textColor="?attr/colorForegroundSecondary"
android:textIsSelectable="true"
- tools:text="Connecting to irc.freenode.net:6667..." />
+ tools:text="@sample/messages.json/data/message" />
</LinearLayout>
<View
--
GitLab