diff --git a/README.md b/README.md
index 1111748..4b918c9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
-
+
+
+
+
+
# DIFF Android
diff --git a/app/src/main/java/com/bniladridas/diff/ui/MarkdownPreview.kt b/app/src/main/java/com/bniladridas/diff/ui/MarkdownPreview.kt
index d04d507..4fe2203 100644
--- a/app/src/main/java/com/bniladridas/diff/ui/MarkdownPreview.kt
+++ b/app/src/main/java/com/bniladridas/diff/ui/MarkdownPreview.kt
@@ -27,9 +27,7 @@ internal fun markdownBodyPreview(
.replace(markdownLinkPattern) { match ->
match.groups[1]?.value?.trim().orEmpty()
}
- .replace(bareUrlPattern) { match ->
- match.value.displayUrl()
- }
+ .replaceBareUrls()
.lines()
.map { it.trim() }
.filter { it.isNotBlank() }
@@ -51,6 +49,11 @@ private fun String.cleanBadgeLabel(): String? {
return cleaned
}
+internal fun String.replaceBareUrls(): String =
+ replace(bareUrlPattern) { match ->
+ match.value.displayUrl()
+ }
+
private fun String.displayUrl(): String {
val withoutScheme = removePrefix("https://").removePrefix("http://")
return withoutScheme.substringBefore('/').ifBlank { "link" }
diff --git a/app/src/main/java/com/bniladridas/diff/ui/components/DiffComponents.kt b/app/src/main/java/com/bniladridas/diff/ui/components/DiffComponents.kt
index d373ce1..9a6b27a 100644
--- a/app/src/main/java/com/bniladridas/diff/ui/components/DiffComponents.kt
+++ b/app/src/main/java/com/bniladridas/diff/ui/components/DiffComponents.kt
@@ -1,6 +1,7 @@
package com.bniladridas.diff.ui.components
import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -52,6 +53,7 @@ import com.bniladridas.diff.model.TimelineEvent
import com.bniladridas.diff.model.WorkspaceTab
import com.bniladridas.diff.ui.formatDate
import com.bniladridas.diff.ui.markdownBodyPreview
+import com.bniladridas.diff.ui.replaceBareUrls
import com.bniladridas.diff.ui.shortSha
import com.bniladridas.diff.ui.theme.BrandOrange
import com.bniladridas.diff.ui.theme.BrandOrangeSoft
@@ -222,20 +224,19 @@ private fun markdownBlocks(
@Composable
fun BrandMark() {
+ val signRes = if (isSystemInDarkTheme()) {
+ R.drawable.app_icon_foreground
+ } else {
+ R.drawable.diff_sign
+ }
+
Row(verticalAlignment = Alignment.CenterVertically) {
- Box(
- modifier = Modifier
- .size(24.dp)
- .background(Color(0xFF111418), RoundedCornerShape(5.dp)),
- contentAlignment = Alignment.Center,
- ) {
- Icon(
- painter = painterResource(R.drawable.ic_diff_mark),
- contentDescription = null,
- tint = Color.Unspecified,
- modifier = Modifier.size(18.dp),
- )
- }
+ Icon(
+ painter = painterResource(signRes),
+ contentDescription = null,
+ tint = Color.Unspecified,
+ modifier = Modifier.size(24.dp),
+ )
Spacer(Modifier.width(7.dp))
Text(
"DIFF",
@@ -774,7 +775,7 @@ fun CheckCard(
}
log?.let { rawLog ->
Text(
- rawLog,
+ cleanCheckOutput(rawLog),
modifier = Modifier
.fillMaxWidth()
.background(codeSurface())
@@ -1231,6 +1232,7 @@ private fun cleanCheckOutput(value: String): String =
.replace("<", "<")
.replace(">", ">")
.replace("&", "&")
+ .replaceBareUrls()
.lineSequence()
.map { it.trim() }
.filter { it.isNotBlank() }
diff --git a/app/src/main/res/drawable-nodpi/app_icon_foreground.png b/app/src/main/res/drawable-nodpi/app_icon_foreground.png
index d8b6844..f72321d 100644
Binary files a/app/src/main/res/drawable-nodpi/app_icon_foreground.png and b/app/src/main/res/drawable-nodpi/app_icon_foreground.png differ
diff --git a/app/src/main/res/drawable-nodpi/diff_sign.png b/app/src/main/res/drawable-nodpi/diff_sign.png
new file mode 100644
index 0000000..879d02f
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/diff_sign.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index bb4d4f6..1ad7514 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 075179b..bd90a71 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 53e2503..6a05c7e 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 3eb4d7d..26cca98 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index b831f78..1b7eaf5 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/test/java/com/bniladridas/diff/ui/MarkdownPreviewTest.kt b/app/src/test/java/com/bniladridas/diff/ui/MarkdownPreviewTest.kt
index 32a2e5c..8409502 100644
--- a/app/src/test/java/com/bniladridas/diff/ui/MarkdownPreviewTest.kt
+++ b/app/src/test/java/com/bniladridas/diff/ui/MarkdownPreviewTest.kt
@@ -27,6 +27,16 @@ class MarkdownPreviewTest {
)
}
+ @Test
+ fun `shortens bare urls in log style output`() {
+ val body = "Downloaded from https://objects.githubusercontent.com/github-production-release-asset/example"
+
+ assertEquals(
+ "Downloaded from objects.githubusercontent.com",
+ body.replaceBareUrls(),
+ )
+ }
+
@Test
fun `hides html image badges behind alt labels`() {
val body = """
"""
diff --git a/docs/assets/diff-sign-light.png b/docs/assets/diff-sign-light.png
new file mode 100644
index 0000000..f72321d
Binary files /dev/null and b/docs/assets/diff-sign-light.png differ
diff --git a/docs/assets/diff-sign.png b/docs/assets/diff-sign.png
new file mode 100644
index 0000000..879d02f
Binary files /dev/null and b/docs/assets/diff-sign.png differ
diff --git a/docs/assets/icon-dark.png b/docs/assets/icon-dark.png
deleted file mode 100644
index abf6833..0000000
Binary files a/docs/assets/icon-dark.png and /dev/null differ
diff --git a/docs/assets/icon-transparent.png b/docs/assets/icon-transparent.png
deleted file mode 100644
index 3a1b048..0000000
Binary files a/docs/assets/icon-transparent.png and /dev/null differ