From 1ced939f28cca5d5c9ee6c8ad67eceadbad218a8 Mon Sep 17 00:00:00 2001 From: zlj <390057892@qq.com> Date: Thu, 17 Oct 2019 17:53:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BF=BB=E9=A1=B5=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- app/build.gradle | 1 - .../novel/read/event/DeleteResponseEvent.kt | 1 + .../read/widget/dialog/ReadSettingDialog.kt | 22 +++ app/src/main/res/layout/layout_setting.xml | 129 ++++++++++++++---- app/src/main/res/values-night/strings.xml | 6 + .../main/res/values-zh-rTW-night/strings.xml | 6 + app/src/main/res/values-zh-rTW/strings.xml | 6 + app/src/main/res/values/strings.xml | 6 + build.gradle | 2 + common_lib/build.gradle | 5 + 11 files changed, 156 insertions(+), 30 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 6d5dd44..89482aa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,7 +10,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 5ecf23e..0fccfd2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation rootProject.ext.dependencies["junit"] androidTestImplementation rootProject.ext.dependencies["runner"] androidTestImplementation rootProject.ext.dependencies["espresso_core"] diff --git a/app/src/main/java/com/novel/read/event/DeleteResponseEvent.kt b/app/src/main/java/com/novel/read/event/DeleteResponseEvent.kt index 87a7287..1691041 100644 --- a/app/src/main/java/com/novel/read/event/DeleteResponseEvent.kt +++ b/app/src/main/java/com/novel/read/event/DeleteResponseEvent.kt @@ -4,3 +4,4 @@ import com.mango.mangolib.event.BaseEvent import com.novel.read.model.db.CollBookBean class DeleteResponseEvent(var isDelete: Boolean, var collBook: CollBookBean) : BaseEvent() + diff --git a/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt b/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt index 4b95d59..22aaabc 100644 --- a/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt +++ b/app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.kt @@ -39,6 +39,7 @@ class ReadSettingDialog(mActivity: Activity, private var mPageLoader: PageLoader initData() initWidget() initClick() + initPageMode() } //设置Dialog显示的位置 @@ -133,6 +134,27 @@ class ReadSettingDialog(mActivity: Activity, private var mPageLoader: PageLoader mPageLoader.setTextSize(mSettingManager!!.textSize) }) + //Page Mode 切换 + read_setting_rg_page_mode.setOnCheckedChangeListener { group, checkedId -> + val pageMode: PageMode = when (checkedId) { + R.id.read_setting_rb_simulation -> PageMode.SIMULATION + R.id.read_setting_rb_cover -> PageMode.COVER + R.id.read_setting_rb_scroll -> PageMode.SCROLL + R.id.read_setting_rb_none -> PageMode.NONE + else -> PageMode.SIMULATION + } + mPageLoader.setPageMode(pageMode) + } + + } + + private fun initPageMode() { + when (mPageMode) { + PageMode.SIMULATION -> read_setting_rb_simulation.isChecked = true + PageMode.COVER -> read_setting_rb_cover.isChecked = true + PageMode.NONE -> read_setting_rb_none.isChecked = true + PageMode. SCROLL -> read_setting_rb_scroll.isChecked = true + } } companion object { diff --git a/app/src/main/res/layout/layout_setting.xml b/app/src/main/res/layout/layout_setting.xml index 7ea63f9..ce681d3 100644 --- a/app/src/main/res/layout/layout_setting.xml +++ b/app/src/main/res/layout/layout_setting.xml @@ -1,111 +1,184 @@ - + android:layout_marginEnd="10dp" + android:orientation="horizontal"> + android:textSize="16sp" /> + android:text="@string/simple_font" + android:textColor="@drawable/text_color" /> + android:text="@string/traditional_font" + android:textColor="@drawable/text_color" /> + android:layout_marginEnd="10dp" + android:orientation="horizontal"> + android:textSize="16sp" /> + android:layout_weight="1" + android:src="@drawable/ic_font_min" /> + android:src="@drawable/ic_font_add" /> + + + + + + + + + + + + + + + + + + + + + android:layout_marginEnd="10dp" + android:orientation="horizontal"> + android:textSize="16sp" /> diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml index 8f91c90..9dbc50f 100644 --- a/app/src/main/res/values-night/strings.xml +++ b/app/src/main/res/values-night/strings.xml @@ -142,6 +142,12 @@ 如果您觉得我们做的还不错请给我们一个五星好评鼓励一下 + + 仿真 + 覆盖 + 滚动 + 无 + 成功添加到下载列表 该任务已存在 diff --git a/app/src/main/res/values-zh-rTW-night/strings.xml b/app/src/main/res/values-zh-rTW-night/strings.xml index 504b4e1..02e21da 100644 --- a/app/src/main/res/values-zh-rTW-night/strings.xml +++ b/app/src/main/res/values-zh-rTW-night/strings.xml @@ -139,6 +139,12 @@ 如果您覺得我們做的還不錯請給我們壹個五星好評鼓勵壹下 + + 仿真 + 覆盖 + 滚动 + 无 + 成功添加到下載列表 該任務已存在 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index ccb6381..12907e5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -141,6 +141,12 @@ 如果您覺得我們做的還不錯請給我們壹個五星好評鼓勵壹下 + + 仿真 + 覆盖 + 滚动 + 无 + 成功添加到下載列表 該任務已存在 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db988ac..7564ac8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -144,6 +144,12 @@ 如果您觉得我们做的还不错请给我们一个五星好评鼓励一下 + + 仿真 + 覆盖 + 滚动 + 无 + 成功添加到下载列表 该任务已存在 diff --git a/build.gradle b/build.gradle index b79d78d..69703bd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } google() jcenter() + maven { url "https://jitpack.io" } } dependencies { classpath 'com.android.tools.build:gradle:3.5.0' @@ -20,6 +21,7 @@ allprojects { maven { url "http://maven.aliyun.com/nexus/content/groups/public/" } google() jcenter() + maven { url "https://jitpack.io" } } } diff --git a/common_lib/build.gradle b/common_lib/build.gradle index ba5997e..e5b296f 100644 --- a/common_lib/build.gradle +++ b/common_lib/build.gradle @@ -40,8 +40,13 @@ dependencies { api rootProject.ext.dependencies["glide"] api rootProject.ext.dependencies["litepal"] + //adapter + api 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.47' + + //繁简转换库 api files('libs/ZHConverter.jar') + //伸缩布局 api 'com.google.android:flexbox:0.3.1' // RxJava