k
/
legado
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
pull/1903/head
kunfei 3 years ago
parent 0962747d78 d4e3e159f0
commit f403f7a2bf
6 changed files with 13 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/assets/web/bookshelf/index.html
  2. 0
      app/src/main/assets/web/bookshelf/js/about.cee6f6d7.js
  3. 2
      app/src/main/assets/web/bookshelf/js/app.aa604b87.js
  4. 6
      app/src/main/assets/web/bookshelf/js/chunk-vendors.ca94fdd0.js
  5. 0
      app/src/main/assets/web/bookshelf/js/detail.bb04bd6b.js
  6. 22
      app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt

4
app/src/main/assets/web/bookshelf/index.html
Unescape View File

@ -1,3 +1,3 @@
<!DOCTYPE html><html lang="en" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="icon" href="../favicon.ico" type="image/x-icon"><link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"><title>Legado Bookshelf</title><link href="css/about.65a00131.css" rel="prefetch"><link href="css/detail.12a39aa7.css" rel="prefetch"><link href="js/about.2456ab2e.js" rel="prefetch"><link href="js/detail.8e2caf8f.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.bd1373b6.css" rel="preload" as="style"><link href="js/app.a68b7203.js" rel="preload" as="script"><link href="js/chunk-vendors.f36dda93.js" rel="preload" as="script"><link href="css/chunk-vendors.bd1373b6.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"></head><style>body::-webkit-scrollbar {
<!DOCTYPE html><html lang="zh-CN" style="padding: 0;height:100%"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="icon" href="../favicon.ico" type="image/x-icon"><link rel="shortcut icon" href="../favicon.ico" type="image/x-icon"><title>Legado Bookshelf</title><link href="css/about.65a00131.css" rel="prefetch"><link href="css/detail.12a39aa7.css" rel="prefetch"><link href="js/about.cee6f6d7.js" rel="prefetch"><link href="js/detail.bb04bd6b.js" rel="prefetch"><link href="css/app.e4c919b7.css" rel="preload" as="style"><link href="css/chunk-vendors.bd1373b6.css" rel="preload" as="style"><link href="js/app.aa604b87.js" rel="preload" as="script"><link href="js/chunk-vendors.ca94fdd0.js" rel="preload" as="script"><link href="css/chunk-vendors.bd1373b6.css" rel="stylesheet"><link href="css/app.e4c919b7.css" rel="stylesheet"></head><style>body::-webkit-scrollbar {
display: none;
}</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.f36dda93.js"></script><script src="js/app.a68b7203.js"></script></body></html>
}</style><body style="margin: 0;height:100%"><noscript><strong>We're sorry but yd-web-tool doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.ca94fdd0.js"></script><script src="js/app.aa604b87.js"></script></body></html>

0
app/src/main/assets/web/bookshelf/js/about.2456ab2e.js → app/src/main/assets/web/bookshelf/js/about.cee6f6d7.js
Unescape View File

2
app/src/main/assets/web/bookshelf/js/app.a68b7203.js → app/src/main/assets/web/bookshelf/js/app.aa604b87.js
View File

File diff suppressed because one or more lines are too long

6
app/src/main/assets/web/bookshelf/js/chunk-vendors.f36dda93.js → app/src/main/assets/web/bookshelf/js/chunk-vendors.ca94fdd0.js
View File

File diff suppressed because one or more lines are too long

0
app/src/main/assets/web/bookshelf/js/detail.8e2caf8f.js → app/src/main/assets/web/bookshelf/js/detail.bb04bd6b.js
Unescape View File

22
app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt
Unescape View File

@ -570,20 +570,14 @@ object ReadBookConfig {
bgDrawable = when (curBgType()) {
0 -> ColorDrawable(Color.parseColor(curBgStr()))
1 -> {
BitmapDrawable(
resources,
BitmapUtils.decodeAssetsBitmap(
appCtx,
"bg" + File.separator + curBgStr(),
width,
height
)
)
}
else -> BitmapDrawable(
resources,
BitmapUtils.decodeBitmap(curBgStr(), width, height)
)
val path = "bg" + File.separator + curBgStr()
val bitmap = BitmapUtils.decodeAssetsBitmap(appCtx, path, width, height)
BitmapDrawable(resources, bitmap)
}
else -> {
val bitmap = BitmapUtils.decodeBitmap(curBgStr(), width, height)
BitmapDrawable(resources, bitmap)
}
}
} catch (e: OutOfMemoryError) {
e.printOnDebug()

Write Preview
Loading…
Cancel
Save