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 9946181d4813e4c8485f858207874ffca739d62d..928c8f02641d020715c337960445d86fb056dec8 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 1270a6d77986a435546914430be3a4f3d67dad75..7006f8f56e6968aeb9f06f92a2a5a4aeffbb5f2f 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 2a0b20956750854e26052487adc122b60d798884..462ec5cc8d930438ac90dd3d88c144bcf0e77d7b 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 3d576e1e9e95c8aa63e6844cb2c7b8377b46e704..87de55c2f0bf7080febacd656f2a06997a9d27cd 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 bc904f147095501c36ce2a104e8ceb8c1e337751..f17215680930826b6b2bd97dfb4476ea7cacfe2e 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 6d42e0c170e63b21e35949aba79af5c67b21b1d4..3a63850b6c5c3184506234cef6f8f16f7fcecf55 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