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

Merge branch 'master' of https://github.com/390057892/reader

Browse Source
old
zlj 5 years ago
parent 11faf85fd1 fbc2cb83c3
commit ecbb2e5edd
5 changed files with 19 additions and 62 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. 2
      .idea/misc.xml
  2. 2
      app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.java
  3. 1
      app/src/main/res/layout/activity_main.xml
  4. 32
      app/src/main/res/layout/layout_setting.xml
  5. 44
      app/src/main/res/values-zh-rTW/colors.xml

2
.idea/misc.xml
Unescape View File

@ -5,7 +5,7 @@
<configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
</configurations> </configurations>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
app/src/main/java/com/novel/read/widget/dialog/ReadSettingDialog.java
Unescape View File

@ -26,6 +26,7 @@ import com.novel.read.widget.page.ReadSettingManager;
import java.util.Arrays; import java.util.Arrays;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife;
public class ReadSettingDialog extends Dialog { public class ReadSettingDialog extends Dialog {
@ -72,6 +73,7 @@ public class ReadSettingDialog extends Dialog {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.layout_setting); setContentView(R.layout.layout_setting);
ButterKnife.bind(this);
setUpWindow(); setUpWindow();
initData(); initData();
initWidget(); initWidget();

1
app/src/main/res/layout/activity_main.xml
Unescape View File

@ -6,7 +6,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.NovelMainActivity"> tools:context=".activity.NovelMainActivity">
<FrameLayout <FrameLayout
android:id="@+id/fl_content" android:id="@+id/fl_content"
android:layout_width="0dp" android:layout_width="0dp"

32
app/src/main/res/layout/layout_setting.xml
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/read_menu_color" android:background="@color/read_menu_color"
@ -9,7 +9,7 @@
android:id="@+id/ll_setting" android:id="@+id/ll_setting"
android:padding="5dp"> android:padding="5dp">
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:orientation="horizontal" android:orientation="horizontal"
@ -17,7 +17,7 @@
android:layout_marginEnd="10dp"> android:layout_marginEnd="10dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -25,7 +25,7 @@
android:textSize="16sp" android:textSize="16sp"
android:text="@string/font"/> android:text="@string/font"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_simple" android:id="@+id/tv_simple"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -35,7 +35,7 @@
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:text="@string/simple_font"/> android:text="@string/simple_font"/>
<TextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_trans" android:id="@+id/tv_trans"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -45,9 +45,9 @@
android:textColor="@drawable/text_color" android:textColor="@drawable/text_color"
android:text="@string/traditional_font"/> android:text="@string/traditional_font"/>
</LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:orientation="horizontal" android:orientation="horizontal"
@ -55,7 +55,7 @@
android:layout_marginEnd="10dp"> android:layout_marginEnd="10dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
@ -63,7 +63,7 @@
android:textSize="16sp" android:textSize="16sp"
android:text="@string/font_size"/> android:text="@string/font_size"/>
<ImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/read_setting_tv_font_minus" android:id="@+id/read_setting_tv_font_minus"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -71,7 +71,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_font_min"/> android:src="@drawable/ic_font_min"/>
<ImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/read_setting_tv_font_plus" android:id="@+id/read_setting_tv_font_plus"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -80,17 +80,17 @@
android:gravity="center" android:gravity="center"
android:src="@drawable/ic_font_add"/> android:src="@drawable/ic_font_add"/>
</LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"> android:layout_marginEnd="10dp">
<TextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
@ -99,7 +99,7 @@
android:textSize="16sp" android:textSize="16sp"
android:text="@string/font_bg"/> android:text="@string/font_bg"/>
<android.support.v7.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/read_setting_rv_bg" android:id="@+id/read_setting_rv_bg"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="4" android:layout_weight="4"
@ -108,7 +108,7 @@
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:scrollbars="none" /> android:scrollbars="none" />
</LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout> </androidx.appcompat.widget.LinearLayoutCompat>

44
app/src/main/res/values-zh-rTW/colors.xml
Unescape View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="white">#ffffff</color>
<color name="colorBlue">#5086DF</color>
<!--night-->
<color name="colorPrimary">#282A2E</color>
<color name="colorSelect">#498EFF</color>
<color name="colorNoSelect">#8B8484</color>
<color name="colorTitle">#FFFFFF</color>
<color name="colorSubTitle">#878C9B</color>
<color name="smallColor">#D2D2D2</color>
<color name="colorLine">#222326</color>
<color name="colorSearchBg">#515356</color>
<color name="colorSearchText">#969696</color>
<!--通用背景色-->
<color name="common_bg">@color/colorPrimary</color>
<!--通用触摸背景色-->
<color name="common_touch_bg">#3C3C3C</color>
<color name="transparent">#00000000</color>
<!--read-->
<color name="nb.read.bg_1">#EFEFF7</color>
<color name="nb.read.bg_2">#CCEBCC</color>
<color name="nb.read.bg_4">#CEC29C</color>
<color name="nb.read.bg_5">#001C27</color>
<color name="nb.read.bg_6">#DDCEC29C</color>
<color name="nb.read.font_1">#383429</color>
<color name="nb.read.font_2">#2F332D</color>
<color name="nb.read.font_3">#92918C</color>
<color name="nb.read.font_4">#2C2C2C</color>
<color name="nb.read.font_5">#627176</color>
<color name="nb.read.bg.night">#000000</color>
<color name="nb.read.font_night">#99ffffff</color>
<color name="nb.read.menu.bg">#191919</color>
<color name="nb.read.menu.text">#CBCBCB</color>
<color name="nb.read.bar.translucent">#88000000</color>
</resources>
Write Preview
Loading…
Cancel
Save