Revert "Merge branch 'new-splashscreen' into 'master'"
This reverts merge request !4
This commit is contained in:
@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:drawable="@color/gray"/>
|
||||
|
||||
<item>
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@mipmap/ic_launcher"/>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
53
app/src/main/res/layout/activity_started.xml
Normal file
53
app/src/main/res/layout/activity_started.xml
Normal file
@ -0,0 +1,53 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<android.support.constraint.ConstraintLayout
|
||||
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="leszcz_team.wulkanowy.activity.started.StartedActivity"
|
||||
tools:layout_editor_absoluteY="0dp"
|
||||
tools:layout_editor_absoluteX="0dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/nameApp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/app_name"
|
||||
android:textSize="40sp"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
tools:layout_constraintRight_creator="1"
|
||||
tools:layout_constraintBottom_creator="1"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
tools:layout_constraintLeft_creator="1"
|
||||
android:layout_marginBottom="185dp" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/logoImage"
|
||||
android:layout_width="201dp"
|
||||
android:layout_height="176dp"
|
||||
android:src="@drawable/logo_image"
|
||||
tools:layout_constraintRight_creator="1"
|
||||
tools:layout_constraintBottom_creator="1"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nameApp"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
tools:layout_constraintLeft_creator="1"
|
||||
android:layout_marginBottom="29dp"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.502" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/rawText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/under_logo"
|
||||
tools:layout_constraintTop_creator="1"
|
||||
tools:layout_constraintRight_creator="1"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:layout_marginTop="57dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/nameApp"
|
||||
tools:layout_constraintLeft_creator="1"
|
||||
app:layout_constraintLeft_toLeftOf="parent" />
|
||||
</android.support.constraint.ConstraintLayout>
|
@ -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>
|
||||
|
@ -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>
|
||||
|
Reference in New Issue
Block a user