Browse Source

Clean up splash screen code

arkon 5 years ago
parent
commit
07caea8b4e

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
         <activity
             android:name=".ui.main.MainActivity"
             android:launchMode="singleTask"
-            android:theme="@style/SplashScreenBackground">
+            android:theme="@style/Theme.Splash">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

+ 0 - 10
app/src/main/res/drawable/branded_logo.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-            android:opacity="opaque">
-    <item android:drawable="@color/material_grey_50"/>
-    <item>
-        <bitmap
-            android:src="@drawable/branded_logo_icon"
-            android:gravity="center"/>
-    </item>
-</layer-list>

BIN
app/src/main/res/drawable/branded_logo_icon.png


+ 3 - 4
app/src/main/res/drawable/splash_background.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorSplash"/>
+    <item android:drawable="@color/colorSplash" />
     <item
-        android:gravity="center"
-        android:drawable="@mipmap/ic_launcher_round">
-    </item>
+        android:drawable="@drawable/tachiyomi_circle"
+        android:gravity="center"></item>
 </layer-list>

+ 1 - 1
app/src/main/res/layout/recent_chapters_item.xml

@@ -18,7 +18,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/branded_logo_icon" />
+        tools:src="@drawable/tachiyomi_circle" />
 
     <TextView
         android:id="@+id/manga_title"

+ 1 - 1
app/src/main/res/layout/track_search_item.xml

@@ -29,7 +29,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0"
-            tools:src="@drawable/branded_logo_icon"/>
+            tools:src="@drawable/tachiyomi_circle"/>
         <TextView
             android:id="@+id/track_search_title"
             android:layout_width="0dp"

+ 2 - 2
app/src/main/res/values/colors.xml

@@ -8,6 +8,8 @@
     <color name="colorDarkPrimaryDark">#1C1C1D</color>
     <color name="colorAmoledPrimary">@color/md_black_1000</color>
 
+    <color name="colorSplash">#455A64</color>
+
     <!-- Light Theme -->
     <color name="colorAccentLight">@color/md_blue_A400</color>
     <color name="textColorPrimaryLight">@color/md_black_1000_87</color>
@@ -84,6 +86,4 @@
 
     <color name="md_teal_500">#009688</color>
 
-    <color name="colorSplash">#455A64</color>
-
 </resources>

+ 0 - 10
app/src/main/res/values/styles.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-
-    <!--=============-->
-    <!--Splash Screen-->
-    <!--=============-->
-
-    <style name="SplashScreenBackground" parent="Theme.Tachiyomi">
-        <item name="android:windowBackground">@drawable/splash_background</item>
-    </style>
-
-
     <!--========-->
     <!--Toolbars-->
     <!--========-->

+ 2 - 2
app/src/main/res/values/themes.xml

@@ -156,8 +156,8 @@
     <!--===============-->
     <!-- Launch Screen -->
     <!--===============-->
-    <style name="Theme.BrandedLaunch">
-        <item name="android:windowBackground">@drawable/branded_logo</item>
+    <style name="Theme.Splash" parent="Theme.Tachiyomi">
+        <item name="android:windowBackground">@drawable/splash_background</item>
     </style>