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

优化导航栏

Browse Source
pull/487/head^2
gedoor 4 years ago
parent 9c47a79b4d
commit f3481cbd04
7 changed files with 31 additions and 21 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. 10
      app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt
  2. 6
      app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
  3. 3
      app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
  4. 4
      app/src/main/java/io/legado/app/ui/widget/BatteryView.kt
  5. 12
      app/src/main/res/layout/dialog_read_aloud.xml
  6. 5
      app/src/main/res/layout/view_book_page.xml
  7. 12
      app/src/main/res/layout/view_read_menu.xml

10
app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt
Unescape View File

@ -5,7 +5,6 @@ import android.app.Activity
import android.content.Intent
import android.content.pm.ActivityInfo
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.net.Uri
import android.os.Build
import android.os.Bundle
@ -166,9 +165,7 @@ abstract class ReadBookBaseActivity :
if (!isInMultiWindow) {
flag = flag or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
}
if (ReadBookConfig.hideNavigationBar) {
flag = flag or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
}
flag = flag or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
if (toolBarHide) {
if (ReadBookConfig.hideStatusBar) {
flag = flag or View.SYSTEM_UI_FLAG_FULLSCREEN
@ -185,11 +182,8 @@ abstract class ReadBookBaseActivity :
read_menu == null -> return
read_menu.isVisible -> ATH.setNavigationBarColorAuto(this)
bottomDialog > 0 -> ATH.setNavigationBarColorAuto(this, bottomBackground)
ReadBookConfig.bg is ColorDrawable -> {
ATH.setNavigationBarColorAuto(this, ReadBookConfig.bgMeanColor)
}
else -> {
ATH.setNavigationBarColorAuto(this, Color.BLACK)
ATH.setNavigationBarColorAuto(this, Color.TRANSPARENT)
}
}
}

6
app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt
Unescape View File

@ -14,7 +14,6 @@ import io.legado.app.R
import io.legado.app.constant.PreferKey
import io.legado.app.help.AppConfig
import io.legado.app.help.LocalConfig
import io.legado.app.help.ReadBookConfig
import io.legado.app.lib.theme.*
import io.legado.app.service.help.ReadBook
import io.legado.app.utils.*
@ -237,10 +236,9 @@ class ReadMenu @JvmOverloads constructor(
override fun onAnimationEnd(animation: Animation) {
vw_menu_bg.onClick { runMenuOut() }
val hasNavigationBar = ReadBookConfig.hideNavigationBar
&& SystemUtils.isNavigationBarExist(activity)
vwNavigationBar.layoutParams = vwNavigationBar.layoutParams.apply {
height = if (hasNavigationBar) context.navigationBarHeight else 0
height =
if (SystemUtils.isNavigationBarExist(activity)) context.navigationBarHeight else 0
}
if (LocalConfig.isFirstReadMenuShow) {
callBack.showReadMenuHelp()

3
app/src/main/java/io/legado/app/ui/book/read/page/ContentView.kt
Unescape View File

@ -84,6 +84,9 @@ class ContentView(context: Context) : FrameLayout(context) {
)
vw_top_divider.visible(showHeaderLine)
vw_bottom_divider.visible(showFooterLine)
page_nv_bar.layoutParams = page_nv_bar.layoutParams.apply {
height = if (hideStatusBar) 0 else context.navigationBarHeight
}
content_text_view.upVisibleRect()
}
upTime()

4
app/src/main/java/io/legado/app/ui/widget/BatteryView.kt
Unescape View File

@ -26,7 +26,9 @@ class BatteryView @JvmOverloads constructor(
batteryPaint.strokeWidth = 1.dp.toFloat()
batteryPaint.isAntiAlias = true
batteryPaint.color = paint.color
typeface = Typeface.createFromAsset(context.assets, "font${File.separator}number.ttf")
if (!isInEditMode) {
typeface = Typeface.createFromAsset(context.assets, "font${File.separator}number.ttf")
}
}
fun setColor(@ColorInt color: Int) {

12
app/src/main/res/layout/dialog_read_aloud.xml
Unescape View File

@ -225,7 +225,8 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:text="@string/chapter_list"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@ -263,7 +264,8 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:text="@string/main_menu"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@ -301,7 +303,8 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:text="@string/to_backstage"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>
@ -339,7 +342,8 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:text="@string/setting"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:textColor="@color/primaryText"
android:textSize="12sp" />
</LinearLayout>

5
app/src/main/res/layout/view_book_page.xml
Unescape View File

@ -148,4 +148,9 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/page_nv_bar"
android:layout_width="match_parent"
android:layout_height="0dp" />
</LinearLayout>

12
app/src/main/res/layout/view_read_menu.xml
Unescape View File

@ -281,7 +281,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:text="@string/chapter_list"
android:textColor="@color/primaryText"
android:textSize="12sp" />
@ -321,7 +322,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:text="@string/read_aloud"
android:textColor="@color/primaryText"
android:textSize="12sp" />
@ -361,7 +363,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:text="@string/interface_setting"
android:textColor="@color/primaryText"
android:textSize="12sp" />
@ -401,7 +404,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:maxLines="1"
android:singleLine="true"
android:ellipsize="middle"
android:text="@string/setting"
android:textColor="@color/primaryText"
android:textSize="12sp" />

Write Preview
Loading…
Cancel
Save