Add splash screen to the example app.

pandulapeter · Oct 15, 2019 · 7e3c2cb · 7e3c2cb
1 parent cfdcec2
commit 7e3c2cb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/beagle/build.gradle b/beagle/build.gradle
@@ -18,8 +18,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0"
     implementation "com.google.android.material:material:1.0.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"

diff --git a/example/src/main/AndroidManifest.xml b/example/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme"
+        android:theme="@style/SplashTheme"
         tools:ignore="GoogleAppIndexingWarning">
 
         <activity android:name="com.pandulapeter.beagleExample.screens.MainActivity">

diff --git a/example/src/main/java/com/pandulapeter/beagleExample/screens/LoginActivity.kt b/example/src/main/java/com/pandulapeter/beagleExample/screens/LoginActivity.kt
@@ -13,6 +13,7 @@ import com.pandulapeter.beagleExample.utils.mockTestAccounts
 class LoginActivity : AppCompatActivity(R.layout.activity_login) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
         findViewById<View>(R.id.open_debug_menu_button).setOnClickListener { Beagle.fetch(this) }
         findViewById<View>(R.id.back_button).setOnClickListener { supportFinishAfterTransition() }

diff --git a/example/src/main/java/com/pandulapeter/beagleExample/screens/MainActivity.kt b/example/src/main/java/com/pandulapeter/beagleExample/screens/MainActivity.kt
@@ -14,6 +14,7 @@ import com.pandulapeter.beagleExample.utils.logMessages
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
         findViewById<View>(R.id.open_debug_menu_button).setOnClickListener { Beagle.fetch(this) }
         findViewById<View>(R.id.perform_network_request_button).setOnClickListener { performNetworkRequest() }

diff --git a/example/src/main/res/drawable/bg_splash.xml b/example/src/main/res/drawable/bg_splash.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/beagle_background" />
+    <item
+        android:drawable="@drawable/img_logo"
+        android:gravity="center" />
+</layer-list>
diff --git a/example/src/main/res/values/themes.xml b/example/src/main/res/values/themes.xml
@@ -1,19 +1,33 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="SplashTheme" parent="Theme.MaterialComponents.NoActionBar">
         <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowBackground">@drawable/bg_splash</item>
+    </style>
+
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowBackground">@color/beagle_foreground</item>
+        <item name="colorPrimary">@color/beagle_background</item>
+        <item name="materialButtonStyle">@style/Button</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="Button" parent="Widget.MaterialComponents.Button">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/beagle_foreground</item>
     </style>
 
     <style name="BeagleTheme" parent="Theme.MaterialComponents.Light">
         <item name="colorPrimary">@color/accent</item>
         <item name="colorButtonNormal">@color/accent</item>
         <item name="colorAccent">@color/accent</item>
         <item name="colorSwitchThumbNormal">@color/accent</item>
-        <item name="materialButtonStyle">@style/Button</item>
+        <item name="materialButtonStyle">@style/BeagleButton</item>
         <item name="android:windowBackground">@color/background</item>
     </style>
 
-    <style name="Button" parent="Widget.MaterialComponents.Button">
+    <style name="BeagleButton" parent="Widget.MaterialComponents.Button">
         <item name="android:textAllCaps">false</item>
     </style>