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

修复bug

Browse Source
pull/5/head
fengyuecanzhu 4 years ago
parent 3c520e296d
commit b0983b755d
18 changed files with 666 additions and 412 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
      .idea/assetWizardSettings.xml
  2. 19
      README.md
  3. 39
      app/src/main/assets/PrivacyPolicy.html
  4. 6
      app/src/main/assets/updatelog.fy
  5. 1
      app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
  6. 62
      app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java
  7. 2
      app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java
  8. 21
      app/src/main/java/xyz/fycz/myreader/ui/activity/SplashActivity.java
  9. 2
      app/src/main/java/xyz/fycz/myreader/ui/dialog/BookGroupDialog.java
  10. 18
      app/src/main/java/xyz/fycz/myreader/ui/dialog/DialogCreator.java
  11. 125
      app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
  12. 14
      app/src/main/java/xyz/fycz/myreader/ui/fragment/FindFragment.java
  13. 30
      app/src/main/java/xyz/fycz/myreader/util/utils/MeUtils.java
  14. 9
      app/src/main/res/drawable/ic_right_arrow.xml
  15. 59
      app/src/main/res/layout/dialog_full_webview.xml
  16. 51
      app/src/main/res/layout/fragment_find.xml
  17. 610
      app/src/main/res/layout/layout_about_content.xml
  18. 6
      app/src/main/res/values/strings.xml

4
.idea/assetWizardSettings.xml
Unescape View File

@ -14,8 +14,8 @@
<option name="values"> <option name="values">
<map> <map>
<entry key="assetSourceType" value="FILE" /> <entry key="assetSourceType" value="FILE" />
<entry key="outputName" value="ic_top" /> <entry key="outputName" value="ic_right_arrow" />
<entry key="sourceFile" value="F:\SVG图标\置顶.svg" /> <entry key="sourceFile" value="F:\SVG图标\右箭头.svg" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>

19
README.md
Unescape View File

@ -2,7 +2,15 @@
## 一、概要 ## 一、概要
风月读书，一款开源、免费的小说阅读软件。 风月读书，是一款提供网络文学搜索和阅读的工具，为广大网络文学爱好者提供一种方便、快捷舒适的阅读体验。
1.【免费阅读】百万小说，免费阅读。都市爽文、言情穿越、玄幻修仙、科幻悬疑...你想看的这里都有。
2.【自定义书源】，自己动手，丰衣足食。支持多种书源类型，兼容第三方书源，再也不用担心书源不够了。
3.【朗读听书】这里每一本书都能听，解放双眼，随时随地听小说。
4.【私密书架】独立分组，特定入口，双重认证，全力保护您的阅读隐私。
* 官网：[https://reader.fycz.tk](https://reader.fycz.tk) * 官网：[https://reader.fycz.tk](https://reader.fycz.tk)
* 反馈交流群: * 反馈交流群:
@ -11,6 +19,15 @@
* [更新日志](./app/src/main/assets/updatelog.fy) * [更新日志](./app/src/main/assets/updatelog.fy)
* [免责声明](./app/src/main/assets/disclaimer.fy) * [免责声明](./app/src/main/assets/disclaimer.fy)
<table>
<tr>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p1.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p2.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p3.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p4.png" ></center></td>
</tr>
</table>
## 二、关于书源 ## 二、关于书源
* 软件内置了~~36~~(33)个书源如下: * 软件内置了~~36~~(33)个书源如下:

39
app/src/main/assets/PrivacyPolicy.html
Unescape View File

@ -0,0 +1,39 @@
<head><title>风月读书APP隐私政策</title></head>
<body>
<h2 class="title">风月读书APP隐私政策</h2>
<div class="content">
<p>本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。</p>
<h4>1. 适用范围</h4>
<p>(a) 在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；</p>
<p>(b) 在您使用本应用网络服务，或访问本应用平台网页时，本应用自动接收并记录的您的浏览器和计算机上的信息，包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；</p>
<p>(c) 本应用通过合法途径从商业伙伴处取得的用户个人数据。</p>
<p>您了解并同意，以下信息不适用本隐私权政策：</p>
<p>(a) 您在使用本应用平台提供的搜索服务时输入的关键字信息；</p>
<p>(b) 本应用收集到的您在本应用发布的有关信息数据，包括但不限于参与活动、成交信息及评价详情；</p>
<p>(c) 违反法律规定或违反本应用规则行为及本应用已对您采取的措施。</p>
<h4>2. 信息使用</h4>
<p>(a)本应用不会向任何无关第三方提供、出售、出租、分享或交易您的个人信息，除非事先得到您的许可，或该第三方和本应用单独或共同为您提供服务，且在该服务结束后，其将被禁止访问包括其以前能够访问的所有这些资料。</p>
<p>(b) 本应用亦不允许任何第三方以任何手段收集、编辑、出售或者无偿传播您的个人信息。任何本应用平台用户如从事上述活动，一经发现，本应用有权立即终止与该用户的服务协议。</p>
<p>(c) 为服务用户的目的，本应用可能通过使用您的个人信息，向您提供您感兴趣的信息，包括但不限于向您发出产品和服务信息，或者与本应用合作伙伴共享信息以便他们向您发送有关其产品和服务的信息（后者需要您的事先同意）。</p>
<h4>3. 信息披露</h4>
<p>在如下情况下，本应用将依据您的个人意愿或法律的规定全部或部分的披露您的个人信息：</p>
<p>(a) 经您事先同意，向第三方披露；</p>
<p>(b)为提供您所要求的产品和服务，而必须和第三方分享您的个人信息；</p>
<p>(c) 根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露；</p>
<p>(d) 如您出现违反中国有关法律、法规或者本应用服务协议或相关规则的情况，需要向第三方披露；</p>
<p>(e) 如您是适格的知识产权投诉人并已提起投诉，应被投诉人要求，向被投诉人披露，以便双方处理可能的权利纠纷；</p>
<p>(f) 在本应用平台上创建的某一交易中，如交易任何一方履行或部分履行了交易义务并提出信息披露请求的，本应用有权决定向该用户提供其交易对方的联络方式等必要信息，以促成交易的完成或纠纷的解决。</p>
<p>(g) 其它本应用根据法律、法规或者网站政策认为合适的披露。</p>
<h4>4. Cookie的使用</h4>
<p>(a) 在您未拒绝接受cookies的情况下，本应用会在您的计算机上设定或取用cookies ，以便您能登录或使用依赖于cookies的本应用平台服务或功能。本应用使用cookies可为您提供更加周到的个性化服务，包括推广服务。</p>
<p>(b) 您有权选择接受或拒绝接受cookies。您可以通过修改浏览器设置的方式拒绝接受cookies。但如果您选择拒绝接受cookies，则您可能无法登录或使用依赖于cookies的本应用网络服务或功能。</p>
<p>(c) 通过本应用所设cookies所取得的有关信息，将适用本政策。</p>
<h4>5. 信息安全</h4>
<p>(a) 本应用帐号均有安全保护功能，请妥善保管您的用户名及密码信息。本应用将通过对用户密码进行加密等安全措施确保您的信息不丢失，不被滥用和变造。尽管有前述安全措施，但同时也请您注意在信息网络上不存在“完善的安全措施”。</p>
<p>(b) 在使用本应用网络服务进行网上交易时，您不可避免的要向交易对方或潜在的交易对</p>
<h4>6.本隐私政策的更改</h4>
<p>(a)如果决定更改隐私政策，我们会在本政策中以及我们认为适当的位置发布这些更改，以便您了解我们如何收集、使用您的个人信息，哪些人可以访问这些信息，以及在什么情况下我们会透露这些信息。</p>
<p>(b)风月读书保留随时修改本政策的权利，因此请经常查看。如对本政策作出重大更改，风月读书会通过网站通知的形式告知。</p>
<p>为防止向第三方披露自己的个人信息，如联络方式或者邮政地址。请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，尤其是本应用用户名及密码发生泄露，请您立即联络本应用客服，以便本应用采取相应措施。</p>
</div>
</body>

6
app/src/main/assets/updatelog.fy
Unescape View File

@ -1,3 +1,9 @@
2021.06.05
风月读书v2.0.9
更新内容：
1、新增隐私政策
2、修复在[所有书籍]分组阅读时没有阅读记录的bug
2021.06.04 2021.06.04
风月读书v2.0.8 风月读书v2.0.8
更新内容： 更新内容：

1
app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
Unescape View File

@ -2,6 +2,7 @@ package xyz.fycz.myreader.common;
public class URLCONST { public class URLCONST {
public static final String OFFICIAL_WEB = "https://reader.fycz.tk/";
public static String APP_DIR_UR = "https://www.lanzous.com/b00ngso7e"; public static String APP_DIR_UR = "https://www.lanzous.com/b00ngso7e";

62
app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java
Unescape View File

@ -24,11 +24,13 @@ import xyz.fycz.myreader.common.URLCONST;
import xyz.fycz.myreader.databinding.ActivityAboutBinding; import xyz.fycz.myreader.databinding.ActivityAboutBinding;
import xyz.fycz.myreader.ui.dialog.DialogCreator; import xyz.fycz.myreader.ui.dialog.DialogCreator;
import xyz.fycz.myreader.ui.dialog.LoadingDialog; import xyz.fycz.myreader.ui.dialog.LoadingDialog;
import xyz.fycz.myreader.ui.dialog.MyAlertDialog;
import xyz.fycz.myreader.util.ShareUtils; import xyz.fycz.myreader.util.ShareUtils;
import xyz.fycz.myreader.util.SharedPreUtils; import xyz.fycz.myreader.util.SharedPreUtils;
import xyz.fycz.myreader.util.ToastUtils; import xyz.fycz.myreader.util.ToastUtils;
import xyz.fycz.myreader.util.ZipUtils; import xyz.fycz.myreader.util.ZipUtils;
import xyz.fycz.myreader.util.utils.FileUtils; import xyz.fycz.myreader.util.utils.FileUtils;
import xyz.fycz.myreader.util.utils.ImageLoader;
import xyz.fycz.myreader.util.utils.OkHttpUtils; import xyz.fycz.myreader.util.utils.OkHttpUtils;
import xyz.fycz.myreader.util.utils.RxUtils; import xyz.fycz.myreader.util.utils.RxUtils;
@ -56,40 +58,62 @@ public class AboutActivity extends BaseActivity {
@Override @Override
protected void initWidget() { protected void initWidget() {
super.initWidget(); super.initWidget();
binding.il.tvVersionName.setText("风月读书v" + App.getStrVersionName()); binding.il.tvVersionName.setText(String.format("风月读书v%s", App.getStrVersionName()));
if (!App.isDestroy(this)) {
ImageLoader.INSTANCE.load(this, "http://yunjuw.cn/template/mytheme/statics/img/logo.png")
.into(binding.il.ivDyys);
}
} }
@Override @Override
protected void initClick() { protected void initClick() {
super.initClick(); super.initClick();
ClipboardManager mClipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager mClipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
binding.il.vmAuthor.setOnClickListener(v -> { binding.il.rlUpdate.setOnClickListener(v -> App.checkVersionByServer(this, true));
//数据 binding.il.rlUpdateLog.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "更新日志", "updatelog.fy"));
ClipData mClipData = ClipData.newPlainText("Label", "fy@fycz.xyz");
//把数据设置到剪切板上 binding.il.rlShare.setOnClickListener(v -> ShareUtils.share(this, getString(R.string.share_text) +
assert mClipboardManager != null;
mClipboardManager.setPrimaryClip(mClipData);
ToastUtils.showSuccess("邮箱复制成功！");
});
binding.il.vwShare.setOnClickListener(v -> ShareUtils.share(this, getString(R.string.share_text) +
SharedPreUtils.getInstance().getString(getString(R.string.downloadLink), URLCONST.LAN_ZOUS_URL))); SharedPreUtils.getInstance().getString(getString(R.string.downloadLink), URLCONST.LAN_ZOUS_URL)));
binding.il.vwUpdate.setOnClickListener(v -> App.checkVersionByServer(this, true)); binding.il.rlQq.setOnClickListener(v -> {
binding.il.vwUpdateLog.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "更新日志", "updatelog.fy"));
binding.il.vwShareLog.setOnClickListener(v -> DialogCreator.createCommonDialog(this, "分享崩溃日志",
"你是希望将日志上传到服务器，还是直接分享给他人？", true,
"上传服务器", "直接分享", (dialog, which) -> uploadCrashLog(), (dialog, which) -> shareCrashLog()));
binding.il.vwQq.setOnClickListener(v -> {
if (!App.joinQQGroup(this, "8PIOnHFuH6A38hgxvD_Rp2Bu-Ke1ToBn")) { if (!App.joinQQGroup(this, "8PIOnHFuH6A38hgxvD_Rp2Bu-Ke1ToBn")) {
//数据 //数据
ClipData mClipData = ClipData.newPlainText("Label", "1085028304"); ClipData mClipData = ClipData.newPlainText("Label", "1085028304");
//把数据设置到剪切板上 //把数据设置到剪切板上
assert mClipboardManager != null;
mClipboardManager.setPrimaryClip(mClipData); mClipboardManager.setPrimaryClip(mClipData);
ToastUtils.showError("未安装手Q或安装的版本不支持！\n已复制QQ群号，您可自行前往QQ添加！"); ToastUtils.showError("未安装手Q或安装的版本不支持！\n已复制QQ群号，您可自行前往QQ添加！");
} }
}); });
binding.il.vwGit.setOnClickListener(v -> openIntent(Intent.ACTION_VIEW, getString(R.string.this_github_url)));
binding.il.vwDisclaimer.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "免责声明", "disclaimer.fy")); binding.il.rlOfficialWeb.setOnClickListener(v -> {
MyAlertDialog.showFullWebViewDia(this, URLCONST.OFFICIAL_WEB,
true, null);
});
binding.il.rlGit.setOnClickListener(v -> {
MyAlertDialog.showFullWebViewDia(this, getString(R.string.this_github_url),
true, null);
});
binding.il.rlContactAuthor.setOnClickListener(v -> {
//数据
ClipData mClipData = ClipData.newPlainText("Label", "fengyuecanzhu@gmail.com");
//把数据设置到剪切板上
mClipboardManager.setPrimaryClip(mClipData);
ToastUtils.showSuccess("邮箱\"fengyuecanzhu@gmail.com\"已复制到剪切板");
});
binding.il.rlShareLog.setOnClickListener(v -> DialogCreator.createCommonDialog(this, "分享崩溃日志",
"你是希望将日志上传到服务器，还是直接分享给他人？", true,
"上传服务器", "直接分享", (dialog, which) -> uploadCrashLog(), (dialog, which) -> shareCrashLog()));
binding.il.rlPrivacyPolicy.setOnClickListener(v -> MyAlertDialog
.showFullWebViewDia(this, "file:///android_asset/PrivacyPolicy.html",
false, null));
binding.il.rlDisclaimer.setOnClickListener(v -> DialogCreator.createAssetTipDialog(this, "免责声明", "disclaimer.fy"));
binding.il.rlDyys.setOnClickListener(v -> {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("http://yunjuw.cn/"));
startActivity(intent);
});
} }
void openIntent(String intentName, String address) { void openIntent(String intentName, String address) {

2
app/src/main/java/xyz/fycz/myreader/ui/activity/ReadActivity.java
Unescape View File

@ -358,7 +358,7 @@ public class ReadActivity extends BaseActivity implements ColorPickerDialogListe
mSourceDialog.setABooks(aBooks); mSourceDialog.setABooks(aBooks);
} }
String privateGroupId = SharedPreUtils.getInstance().getString("privateGroupId"); String privateGroupId = SharedPreUtils.getInstance().getString("privateGroupId");
isPrivate = privateGroupId.equals(mBook.getGroupId()); isPrivate = !TextUtils.isEmpty(mBook.getGroupId()) && privateGroupId.equals(mBook.getGroupId());
} }
@Override @Override

21
app/src/main/java/xyz/fycz/myreader/ui/activity/SplashActivity.java
Unescape View File

@ -113,11 +113,24 @@ public class SplashActivity extends BaseActivity {
.init(); .init();
SystemBarUtils.hideStableStatusBar(this); SystemBarUtils.hideStableStatusBar(this);
//loadImage(); //loadImage();
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) { boolean agreePrivacyPolicy = SharedPreUtils.getInstance().getBoolean("agreePrivacyPolicy");
mPermissionsChecker = new PermissionsChecker(this); if (agreePrivacyPolicy) {
requestPermission(); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
mPermissionsChecker = new PermissionsChecker(this);
requestPermission();
} else {
start();
}
} else { } else {
start(); MyAlertDialog.showPrivacyDialog(this, (dialog, which) -> {
SharedPreUtils.getInstance().putBoolean("agreePrivacyPolicy", true);
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
mPermissionsChecker = new PermissionsChecker(this);
requestPermission();
} else {
start();
}
}, (dialog, which) -> finish());
} }
} }

2
app/src/main/java/xyz/fycz/myreader/ui/dialog/BookGroupDialog.java
Unescape View File

@ -119,7 +119,7 @@ public class BookGroupDialog {
BookGroup bookGroup = !isRename ? new BookGroup() : mBookGroups.get(groupNum); BookGroup bookGroup = !isRename ? new BookGroup() : mBookGroups.get(groupNum);
String oldName = bookGroup.getName(); String oldName = bookGroup.getName();
int maxLen = 20; int maxLen = 20;
MyAlertDialog.showFullScreenInputDia(mContext, !isRename ? "新建分组" : "重命名分组", "请输入分组名", MyAlertDialog.showFullInputDia(mContext, !isRename ? "新建分组" : "重命名分组", "请输入分组名",
isRename ? oldName : "", null, true, maxLen, newGroupName -> { isRename ? oldName : "", null, true, maxLen, newGroupName -> {
for (CharSequence oldGroupName : mGroupNames) { for (CharSequence oldGroupName : mGroupNames) {
if (oldGroupName.equals(newGroupName)) { if (oldGroupName.equals(newGroupName)) {

18
app/src/main/java/xyz/fycz/myreader/ui/dialog/DialogCreator.java
Unescape View File

@ -18,6 +18,7 @@ import java.io.InputStreamReader;
import xyz.fycz.myreader.application.App; import xyz.fycz.myreader.application.App;
import xyz.fycz.myreader.util.IOUtils; import xyz.fycz.myreader.util.IOUtils;
import xyz.fycz.myreader.util.help.StringHelper; import xyz.fycz.myreader.util.help.StringHelper;
import xyz.fycz.myreader.util.utils.MeUtils;
public class DialogCreator { public class DialogCreator {
@ -221,23 +222,10 @@ public class DialogCreator {
* @param assetName 需要后缀名 * @param assetName 需要后缀名
*/ */
public static void createAssetTipDialog(Context mContext, String title, String assetName) { public static void createAssetTipDialog(Context mContext, String title, String assetName) {
BufferedReader br = null; DialogCreator.createTipDialog(mContext, title, MeUtils.getAssetStr(mContext.getAssets(), assetName));
try {
br = new BufferedReader(new InputStreamReader(mContext.getAssets().open(assetName)));
StringBuilder assetText = new StringBuilder();
String line = null;
while ((line = br.readLine()) != null) {
assetText.append(line);
assetText.append("\r\n");
}
DialogCreator.createTipDialog(mContext, title, assetText.toString());
} catch (IOException e) {
e.printStackTrace();
} finally {
IOUtils.close(br);
}
} }
public interface OnClickPositiveListener { public interface OnClickPositiveListener {
void onClick(Dialog dialog, View view); void onClick(Dialog dialog, View view);
} }

125
app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
Unescape View File

@ -1,25 +1,43 @@
package xyz.fycz.myreader.ui.dialog; package xyz.fycz.myreader.ui.dialog;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.text.Editable; import android.text.Editable;
import android.text.InputType; import android.text.InputType;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextPaint;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.webkit.JsResult;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import com.google.android.material.textfield.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import com.kongzue.dialogx.dialogs.BottomDialog; import com.kongzue.dialogx.dialogs.BottomDialog;
import com.kongzue.dialogx.dialogs.FullScreenDialog; import com.kongzue.dialogx.dialogs.FullScreenDialog;
import com.kongzue.dialogx.interfaces.OnBackPressedListener;
import com.kongzue.dialogx.interfaces.OnBindView; import com.kongzue.dialogx.interfaces.OnBindView;
import xyz.fycz.myreader.R; import xyz.fycz.myreader.R;
@ -136,9 +154,9 @@ public class MyAlertDialog {
} }
public static void showFullScreenInputDia(Context context, String title, String hint, String initText, public static void showFullInputDia(Context context, String title, String hint, String initText,
Integer inputType, boolean cancelable, int maxLen, Integer inputType, boolean cancelable, int maxLen,
OnInputFinishListener posListener) { OnInputFinishListener posListener) {
FullScreenDialog.show(new OnBindView<FullScreenDialog>(R.layout.dialog_input) { FullScreenDialog.show(new OnBindView<FullScreenDialog>(R.layout.dialog_input) {
@Override @Override
@ -294,6 +312,105 @@ public class MyAlertDialog {
}).setCancelButton("知道了"); }).setCancelButton("知道了");
} }
public static void showPrivacyDialog(Context context, DialogInterface.OnClickListener pos, DialogInterface.OnClickListener neg) {
TextView view = (TextView) LayoutInflater.from(context).inflate(R.layout.dialog_textview, null);
String msg = context.getString(R.string.privacy_tip);
int start = msg.indexOf("《隐私政策》");
SpannableString span = new SpannableString(msg);
AlertDialog dialog = build(context).setTitle("风月读书APP隐私政策")
.setView(view)
.setCancelable(false)
.setPositiveButton("同意并继续", pos)
.setNegativeButton("不同意", neg)
.create();
span.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
showFullWebViewDia(context, "file:///android_asset/PrivacyPolicy.html", false, () -> showPrivacyDialog(context, pos, neg));
dialog.dismiss();
}
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
}
}, start, start + 6, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
view.setText(span);
view.setMovementMethod(LinkMovementMethod.getInstance());
dialog.show();
}
public static void showFullWebViewDia(Context context, String url, boolean outBrowser, OnCancel onCancel) {
FullScreenDialog.show(new OnBindView<FullScreenDialog>(R.layout.dialog_full_webview) {
@Override
public void onBind(final FullScreenDialog dialog, View v) {
TextView btnBrowser = v.findViewById(R.id.btn_browser);
TextView btnClose = v.findViewById(R.id.btn_close);
TextView tvTitle = v.findViewById(R.id.tv_title);
WebView webView = v.findViewById(R.id.webView);
ProgressBar pbLoad = v.findViewById(R.id.pb_load);
btnClose.setVisibility(outBrowser ? View.VISIBLE : View.GONE);
btnClose.setOnClickListener(v1 -> {
if (onCancel != null) onCancel.cancel();
dialog.dismiss();
});
btnBrowser.setText(outBrowser ? R.string.browser : R.string.close);
btnBrowser.setOnClickListener(v1 -> {
if (outBrowser) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(webView.getUrl()));
context.startActivity(intent);
} else {
if (onCancel != null) onCancel.cancel();
dialog.dismiss();
}
});
WebSettings webSettings = webView.getSettings();
webSettings.setJavaScriptEnabled(true);
webSettings.setLoadWithOverviewMode(true);
webSettings.setSupportZoom(true);
webSettings.setAllowFileAccess(true);
webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
webSettings.setLoadsImagesAutomatically(true);
webSettings.setDefaultTextEncodingName("utf-8");
webView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
view.loadUrl(url);
return true;
}
});
webView.setWebChromeClient(new WebChromeClient() {
@Override
public void onProgressChanged(WebView view, int newProgress) {
if (newProgress < 100) {
pbLoad.setVisibility(View.VISIBLE);
pbLoad.setProgress(newProgress);
} else {
pbLoad.setVisibility(View.GONE);
}
}
@Override
public void onReceivedTitle(WebView view, String title) {
tvTitle.setText(title);
}
});
webView.loadUrl(url);
}
}).setOnBackPressedListener(() -> {
if (onCancel != null) onCancel.cancel();
return false;
});
}
public interface OnVerify { public interface OnVerify {
void success(boolean needGoTo); void success(boolean needGoTo);
@ -307,7 +424,7 @@ public class MyAlertDialog {
void onChange(String text); void onChange(String text);
} }
public interface OnInputFinishListener{ public interface OnInputFinishListener {
void finish(String text); void finish(String text);
} }
} }

14
app/src/main/java/xyz/fycz/myreader/ui/fragment/FindFragment.java
Unescape View File

@ -33,20 +33,6 @@ public class FindFragment extends BaseFragment {
return binding.getRoot(); return binding.getRoot();
} }
@Override
protected void initWidget(Bundle savedInstanceState) {
super.initWidget(savedInstanceState);
if (!App.isDestroy(getActivity())) {
ImageLoader.INSTANCE.load(getContext(), "http://yunjuw.cn/template/mytheme/statics/img/logo.png")
.into(binding.ivDyys);
}
binding.mineRlDyys.setOnClickListener(v -> {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("http://yunjuw.cn/"));
startActivity(intent);
});
}
@Override @Override
protected void initClick() { protected void initClick() {
super.initClick(); super.initClick();

30
app/src/main/java/xyz/fycz/myreader/util/utils/MeUtils.java
Unescape View File

@ -1,13 +1,18 @@
package xyz.fycz.myreader.util.utils; package xyz.fycz.myreader.util.utils;
import android.content.Context;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Scanner; import java.util.Scanner;
import xyz.fycz.myreader.util.IOUtils;
/** /**
* by yangyxd * by yangyxd
* data: 2019.08.29 * data: 2019.08.29
@ -90,4 +95,29 @@ public class MeUtils {
} }
return inSampleSize; return inSampleSize;
} }
/**
* 从assets文件夹之中读取文件
*
* @param am
* @param assetName 需要后缀名
*/
public static String getAssetStr(AssetManager am, String assetName) {
BufferedReader br = null;
try {
br = new BufferedReader(new InputStreamReader(am.open(assetName)));
StringBuilder assetText = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
assetText.append(line);
assetText.append("\r\n");
}
return assetText.toString();
} catch (IOException e) {
e.printStackTrace();
} finally {
IOUtils.close(br);
}
return "";
}
} }

9
app/src/main/res/drawable/ic_right_arrow.xml
Unescape View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:pathData="M384.32,797.51a30.09,30.09 0,0 1,-21.29 -51.39L597.14,512 363.03,277.82a30.09,30.09 0,0 1,0 -42.57,30.09 30.09,0 0,1 42.57,0l255.39,255.46a30.09,30.09 0,0 1,0 42.57L405.6,788.7a30.04,30.04 0,0 1,-21.28 8.82z"
android:fillColor="#ffffff"/>
</vector>

59
app/src/main/res/layout/dialog_full_webview.xml
Unescape View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:orientation="horizontal">
<TextView
android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="@string/close"
android:textColor="@color/md_blue_400"
android:textSize="@dimen/text_medium_size" />
<TextView
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/app_name"
android:textColor="@color/textPrimary"
android:maxLines="1"
android:ellipsize="end"
android:textSize="@dimen/text_medium_size"
android:layout_weight="1" />
<TextView
android:id="@+id/btn_browser"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="@string/browser"
android:textColor="@color/md_blue_400"
android:textSize="@dimen/text_medium_size" />
</LinearLayout>
<ProgressBar
android:id="@+id/pb_load"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="2dp"
android:max="100" />
<WebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

51
app/src/main/res/layout/fragment_find.xml
Unescape View File

@ -250,57 +250,6 @@
android:text="@string/read_xs7"/> android:text="@string/read_xs7"/>
</RelativeLayout>--> </RelativeLayout>-->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:clickable="false">
<ImageView
android:id="@+id/iv_links"
android:layout_alignParentStart="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/ic_link"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="15dp"
android:layout_toEndOf="@id/iv_links"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_small_size"
android:text="友情链接"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/mine_rl_dyys"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/selector_common_bg"
android:paddingLeft="20dp"
android:paddingRight="20dp">
<ImageView
android:id="@+id/iv_dyys"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true" />
<TextView
android:id="@+id/tv_dyys"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="15dp"
android:layout_toEndOf="@id/iv_dyys"
android:text="@string/dyys"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_normal_size" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

610
app/src/main/res/layout/layout_about_content.xml
Unescape View File

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorBackground"
android:scrollbars="vertical"> android:scrollbars="vertical">
<LinearLayout <LinearLayout
@ -15,8 +14,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="6dp" android:background="@color/colorForeground"
android:orientation="vertical"> android:orientation="vertical"
>
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -32,324 +32,334 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:textColor="@color/textSecondary" android:textColor="@color/textPrimary"
android:textSize="16sp" android:textSize="16sp"
tools:text="风月读书" /> tools:text="风月读书" />
</LinearLayout> </LinearLayout>
<androidx.cardview.widget.CardView
android:id="@+id/vm_author" <RelativeLayout
android:id="@+id/rl_update"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_centerVertical="true"
android:padding="5dp"> android:text="@string/update"
android:textColor="@color/textPrimary"
<TextView android:textSize="@dimen/text_normal_size" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" <androidx.appcompat.widget.AppCompatImageView
android:layout_marginTop="5dp" android:layout_width="wrap_content"
android:layout_marginBottom="5dp" android:layout_height="wrap_content"
android:text="开发者" android:layout_alignParentEnd="true"
android:textColor="@color/textSecondary" android:layout_centerVertical="true"
android:textSize="16sp" /> app:srcCompat="@drawable/ic_right_arrow"
app:tint="@color/textSecondary" />
<RelativeLayout </RelativeLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content" <RelativeLayout
android:paddingBottom="6dp"> android:id="@+id/rl_update_log"
<xyz.fycz.myreader.widget.custom.CircleImageView
android:id="@+id/ig_avatar_fycz"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginRight="16dp"
android:src="@mipmap/ic_avatar_fycz" />
<TextView
android:id="@+id/fycz"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/ig_avatar_fycz"
android:layout_toEndOf="@id/ig_avatar_fycz"
android:text="ヅ风月の残烛"
android:textColor="@color/textSecondary"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/fycz"
android:layout_toEndOf="@id/ig_avatar_fycz"
android:text="@string/email"
android:textColor="@color/textSecondary" />
</RelativeLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_share"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_centerVertical="true"
android:text="@string/update_log"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
<ImageView app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="24dp" app:tint="@color/textSecondary" />
android:layout_height="24dp" </RelativeLayout>
android:layout_gravity="center_vertical"
android:padding="2dp"
android:src="@drawable/ic_share" <RelativeLayout
app:tint="@color/textSecondary" /> android:id="@+id/rl_official_web"
<TextView
android:id="@+id/tv_share"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:gravity="center_vertical"
android:text="@string/share_app"
android:textColor="@color/textSecondary" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_update"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_centerVertical="true"
android:text="@string/official_web"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
<ImageView app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="24dp" app:tint="@color/textSecondary" />
android:layout_height="24dp" </RelativeLayout>
android:layout_gravity="center_vertical"
android:src="@drawable/ic_update" <RelativeLayout
app:tint="@color/textSecondary" /> android:id="@+id/rl_git"
<TextView
android:id="@+id/tv_update"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:gravity="center_vertical"
android:text="@string/update"
android:textColor="@color/textSecondary" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_update_log"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_centerVertical="true"
android:text="@string/git_hub"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
<ImageView app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="24dp" app:tint="@color/textSecondary" />
android:layout_height="24dp" </RelativeLayout>
android:layout_gravity="center_vertical"
android:src="@drawable/ic_list" <View
app:tint="@color/textSecondary" />
<TextView
android:id="@+id/tv_update_log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:gravity="center_vertical"
android:text="@string/update_log"
android:textColor="@color/textSecondary" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_qq"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="10dp" />
android:layout_gravity="center_vertical"
android:layout_margin="6dp" <RelativeLayout
android:clickable="true" android:id="@+id/rl_share"
android:focusable="true" android:layout_width="match_parent"
android:foreground="?attr/selectableItemBackground" android:layout_height="50dp"
app:cardBackgroundColor="@color/background_card"> android:background="@drawable/selector_common_bg"
android:gravity="center"
<LinearLayout android:paddingStart="20dp"
android:layout_width="match_parent" android:paddingEnd="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_centerVertical="true"
android:text="@string/share_app"
<ImageView android:textColor="@color/textPrimary"
android:layout_width="24dp" android:textSize="@dimen/text_normal_size" />
android:layout_height="24dp"
android:layout_gravity="center_vertical" <androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_qq_group" android:layout_width="wrap_content"
app:tint="@color/textSecondary" /> android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
<TextView android:layout_centerVertical="true"
android:id="@+id/tv_qq" app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="match_parent" app:tint="@color/textSecondary" />
android:layout_height="wrap_content" </RelativeLayout>
android:layout_gravity="center"
android:layout_margin="5dp" <RelativeLayout
android:gravity="center_vertical" android:id="@+id/rl_qq"
android:text="@string/join_qq_group"
android:textColor="@color/textSecondary" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_git"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_centerVertical="true"
android:text="@string/join_qq_group"
<ImageView android:textColor="@color/textPrimary"
android:layout_width="24dp" android:textSize="@dimen/text_normal_size" />
android:layout_height="24dp"
android:layout_gravity="center_vertical" <androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/ic_social_github" android:layout_width="wrap_content"
app:tint="@color/textSecondary" /> android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
<TextView android:layout_centerVertical="true"
android:id="@+id/tv_git" app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="match_parent" app:tint="@color/textSecondary" />
android:layout_height="wrap_content" </RelativeLayout>
android:layout_gravity="center"
android:layout_margin="5dp"
android:gravity="center_vertical" <RelativeLayout
android:text="@string/git_hub" android:id="@+id/rl_contact_author"
android:textColor="@color/textSecondary" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_share_log"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_centerVertical="true"
android:text="@string/contact_author"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
<ImageView app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="24dp" app:tint="@color/textSecondary" />
android:layout_height="24dp" </RelativeLayout>
android:layout_gravity="center_vertical"
android:src="@drawable/ic_upload" <RelativeLayout
app:tint="@color/textSecondary" /> android:id="@+id/rl_share_log"
<TextView
android:id="@+id/tv_share_log"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:gravity="center_vertical"
android:text="@string/share_log"
android:textColor="@color/textSecondary" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/vw_disclaimer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:background="@drawable/selector_common_bg"
android:layout_margin="6dp" android:gravity="center"
android:clickable="true" android:paddingStart="20dp"
android:focusable="true" android:paddingEnd="10dp">
android:foreground="?attr/selectableItemBackground"
app:cardBackgroundColor="@color/background_card"> <TextView
android:layout_width="wrap_content"
<LinearLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_centerVertical="true"
android:text="@string/share_log"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:srcCompat="@drawable/ic_right_arrow"
app:tint="@color/textSecondary" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="10dp" />
<RelativeLayout
android:id="@+id/rl_privacy_policy"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/selector_common_bg"
android:gravity="center"
android:paddingStart="20dp"
android:paddingEnd="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/privacy_policy"
android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp"> android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
<ImageView app:srcCompat="@drawable/ic_right_arrow"
android:layout_width="24dp" app:tint="@color/textSecondary" />
android:layout_height="24dp" </RelativeLayout>
android:layout_gravity="center_vertical"
android:src="@drawable/ic_disclaimer" <RelativeLayout
app:tint="@color/textSecondary" /> android:id="@+id/rl_disclaimer"
android:layout_width="match_parent"
<TextView android:layout_height="50dp"
android:id="@+id/tv_disclaimer" android:background="@drawable/selector_common_bg"
android:layout_width="match_parent" android:gravity="center"
android:layout_height="wrap_content" android:paddingStart="20dp"
android:layout_gravity="center" android:paddingEnd="10dp">
android:layout_margin="5dp"
android:gravity="center_vertical" <TextView
android:text="@string/disclaimer" android:layout_width="wrap_content"
android:textColor="@color/textSecondary" /> android:layout_height="wrap_content"
</LinearLayout> android:layout_centerVertical="true"
android:text="@string/disclaimer"
</androidx.cardview.widget.CardView> android:textColor="@color/textPrimary"
android:textSize="@dimen/text_normal_size" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:srcCompat="@drawable/ic_right_arrow"
app:tint="@color/textSecondary" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:clickable="false">
<ImageView
android:id="@+id/iv_links"
android:layout_alignParentStart="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:src="@drawable/ic_link"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="15dp"
android:layout_toEndOf="@id/iv_links"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_small_size"
android:text="友情链接"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_dyys"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/selector_common_bg"
android:paddingLeft="20dp"
android:paddingRight="20dp">
<ImageView
android:id="@+id/iv_dyys"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true" />
<TextView
android:id="@+id/tv_dyys"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="15dp"
android:layout_toEndOf="@id/iv_dyys"
android:text="@string/dyys"
android:textColor="@color/textSecondary"
android:textSize="@dimen/text_normal_size" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

6
app/src/main/res/values/strings.xml
Unescape View File

@ -492,6 +492,12 @@
<string name="dyys">段友影视，超清无水印广告视频站</string> <string name="dyys">段友影视，超清无水印广告视频站</string>
<string name="all_read_time">总阅读时间：%s</string> <string name="all_read_time">总阅读时间：%s</string>
<string name="read_record">阅读记录</string> <string name="read_record">阅读记录</string>
<string name="privacy_tip">\n感谢您使用风月读书APP！\n我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益，在您使用我们的产品前，请务必审慎阅读《隐私政策》内的所有条款，当您点击“同意并继续”即表示您己阅读完毕并同意以上协议的全部内容，开始使用我们的产品和服务。</string>
<string name="close">关闭</string>
<string name="official_web">官网</string>
<string name="privacy_policy">隐私政策</string>
<string name="contact_author">联系作者</string>
<string name="browser">浏览器</string>
<string-array name="reset_screen_time"> <string-array name="reset_screen_time">

Write Preview
Loading…
Cancel
Save