1
0

Revert "Merge branch 'new-splashscreen' into 'master'"

This reverts merge request !4
This commit is contained in:
RicomenPL
2017-04-09 13:05:59 +00:00
parent 8793f93679
commit 9ad8bcef0a
8 changed files with 115 additions and 37 deletions

View File

@ -3,5 +3,4 @@
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="gray">#444440</color>
</resources>

View File

@ -8,8 +8,9 @@
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="SplashTheme" parent="@android:style/Theme.DeviceDefault">
<item name="android:windowBackground">@drawable/background_splash</item>
<style name = "NoActionBar" parent = "@android:style/Theme.DeviceDefault">
<item name = "android:windowActionBar">false</item>
<item name = "android:windowNoTitle">true</item>
</style>
</resources>