Merge remote-tracking branch 'origin/master'

pull/32/head
Invinciblelee 6 years ago
commit 926a2563f2
  1. 2
      app/src/main/java/io/legado/app/ui/widget/anima/RotateLoading.kt
  2. 2
      app/src/main/res/layout/item_bookshelf_list.xml
  3. 8
      app/src/main/res/layout/view_titlebar.xml

@ -1,4 +1,4 @@
package io.legado.app.ui.widget
package io.legado.app.ui.widget.anima
import android.animation.Animator
import android.animation.AnimatorSet

@ -40,7 +40,7 @@
android:includeFontPadding="false"
tools:ignore="RtlHardcoded" />
<io.legado.app.ui.widget.RotateLoading
<io.legado.app.ui.widget.anima.RotateLoading
android:id="@+id/rl_loading"
android:layout_width="26dp"
android:layout_height="26dp"

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
Loading…
Cancel
Save