优化

gedoor · Jul 12, 2018 · 4e21b24 · 4e21b24
1 parent 333d350
commit 4e21b24
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/MoreSettingPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/MoreSettingPop.java
@@ -75,7 +75,7 @@ public MoreSettingPop(ReadBookActivity readBookActivity, @NonNull OnChangeProLis
         this.activity = readBookActivity;
         this.changeProListener = changeProListener;
 
-        View view = LayoutInflater.from(activity).inflate(R.layout.view_pop_more_setting, null);
+        View view = LayoutInflater.from(activity).inflate(R.layout.pop_more_setting, null);
         ImmersionBar.navigationBarPadding(activity, view);
         this.setContentView(view);
         ButterKnife.bind(this, view);

diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadAdjustPop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadAdjustPop.java
@@ -1,7 +1,6 @@
 //Copyright (c) 2017. 章钦豪. All rights reserved.
 package com.monke.monkeybook.view.popupwindow;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -15,7 +14,6 @@
 
 import com.monke.monkeybook.R;
 import com.monke.monkeybook.help.ReadBookControl;
-import com.monke.monkeybook.service.ReadAloudService;
 import com.monke.monkeybook.utils.barUtil.ImmersionBar;
 import com.monke.monkeybook.view.activity.ReadBookActivity;
 import com.monke.monkeybook.widget.checkbox.SmoothCheckBox;
@@ -60,7 +58,7 @@ public ReadAdjustPop(ReadBookActivity readBookActivity, OnAdjustListener adjustL
         this.activity = readBookActivity;
         this.adjustListener = adjustListener;
 
-        View view = LayoutInflater.from(activity).inflate(R.layout.view_pop_read_adjust, null);
+        View view = LayoutInflater.from(activity).inflate(R.layout.pop_read_adjust, null);
         ImmersionBar.navigationBarPadding(activity, view);
         this.setContentView(view);
         ButterKnife.bind(this, view);

diff --git a/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadInterfacePop.java b/app/src/main/java/com/monke/monkeybook/view/popupwindow/ReadInterfacePop.java
@@ -102,7 +102,7 @@ public ReadInterfacePop(ReadBookActivity readBookActivity, @NonNull OnChangeProL
         this.activity = readBookActivity;
         this.changeProListener = changeProListener;
 
-        View view = LayoutInflater.from(readBookActivity).inflate(R.layout.view_pop_read_interface, null);
+        View view = LayoutInflater.from(readBookActivity).inflate(R.layout.pop_read_interface, null);
         ImmersionBar.navigationBarPadding(activity, view);
         this.setContentView(view);
         ButterKnife.bind(this, view);

diff --git a/...main/res/layout/view_pop_more_setting.xml → app/src/main/res/layout/pop_more_setting.xml b/...main/res/layout/view_pop_more_setting.xml → app/src/main/res/layout/pop_more_setting.xml
diff --git a/.../main/res/layout/view_pop_read_adjust.xml → app/src/main/res/layout/pop_read_adjust.xml b/.../main/res/layout/view_pop_read_adjust.xml → app/src/main/res/layout/pop_read_adjust.xml
diff --git a/...in/res/layout/view_pop_read_interface.xml → ...rc/main/res/layout/pop_read_interface.xml b/...in/res/layout/view_pop_read_interface.xml → ...rc/main/res/layout/pop_read_interface.xml
@@ -156,18 +156,28 @@
                 android:textSize="14sp"
                 tools:ignore="HardcodedText" />
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5" />
+
             <TextView
                 android:id="@+id/tv_convert_o"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
-                android:layout_weight="4"
+                android:layout_weight="3"
                 android:background="@drawable/selector_pop_font_bg"
                 android:gravity="center"
                 android:text="关闭"
                 android:textSize="14sp"
                 tools:ignore="HardcodedText" />
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5" />
+
             <TextView
                 android:id="@+id/tv_convert_f"
                 android:layout_width="0dp"