Skip to content

Added dark_theme.html #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added dark_theme.html #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/com/mukesh/markdownview/example/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -39,7 +40,8 @@ class MainActivity : ComponentActivity() {
// Display markdown via URL
MarkDown(
url = URL("https://raw.githubusercontent.com/mukeshsolanki/MarkdownView-Android/main/README.md"),
modifier = Modifier.fillMaxSize()
modifier = Modifier.fillMaxSize(),
isDarkTheme = isSystemInDarkTheme(),
)
}
}
Expand Down
23 changes: 23 additions & 0 deletions markdownview/src/main/assets/html/dark_preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!doctype html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="js/jquery-3.5.1.min.js"></script>
<script src="js/marked.js"></script>
<script src="js/highlight.pack.js"></script>
<script src="js/preview.js"></script>

<link rel="stylesheet" href="css/github.css"/>
<link rel="stylesheet" href="css/bootstrap.css"/>
<style>
img { max-width: 100%; }
body {
background-color: black; /* Set background color to black */
color: white;
}
</style>
</head>
<body>
<div class="container" id="preview"></div>
</body>
</html>
20 changes: 14 additions & 6 deletions markdownview/src/main/java/com/mukesh/Markdown.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ private const val TAG = "MarkDown"
fun MarkDown(
modifier: Modifier = Modifier,
text: String,
shouldOpenUrlInBrowser: Boolean = true
shouldOpenUrlInBrowser: Boolean = true,
isDarkTheme: Boolean = false,
) {
val bs64MdText: String = imgToBase64(text)
val escMdText: String = escapeForText(bs64MdText)
Expand All @@ -58,7 +59,10 @@ fun MarkDown(
return false
}
}
loadUrl("file:///android_asset/html/preview.html")
if(isDarkTheme)
loadUrl("file:///android_asset/html/dark_preview.html")
else
loadUrl("file:///android_asset/html/preview.html")
@SuppressLint("SetJavaScriptEnabled")
settings.javaScriptEnabled = true
settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
Expand All @@ -76,7 +80,8 @@ fun MarkDown(
fun MarkDown(
modifier: Modifier = Modifier,
file: File,
shouldOpenUrlInBrowser: Boolean = true
shouldOpenUrlInBrowser: Boolean = true,
isDarkTheme: Boolean = false,
) {
var mdText = ""
try {
Expand All @@ -99,7 +104,8 @@ fun MarkDown(
MarkDown(
text = mdText,
modifier = modifier,
shouldOpenUrlInBrowser = shouldOpenUrlInBrowser
shouldOpenUrlInBrowser = shouldOpenUrlInBrowser,
isDarkTheme = isDarkTheme,
)
}

Expand All @@ -113,7 +119,8 @@ fun MarkDown(
fun MarkDown(
modifier: Modifier = Modifier,
url: URL,
shouldOpenUrlInBrowser: Boolean = true
shouldOpenUrlInBrowser: Boolean = true,
isDarkTheme: Boolean = false,
) {
val urlContent = remember { mutableStateOf("") }
thread {
Expand All @@ -130,7 +137,8 @@ fun MarkDown(
MarkDown(
text = urlContent.value,
modifier = modifier,
shouldOpenUrlInBrowser = shouldOpenUrlInBrowser
shouldOpenUrlInBrowser = shouldOpenUrlInBrowser,
isDarkTheme = isDarkTheme,
)
}
}
Expand Down