diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c4426b90d026cb7162b75db2b31c3be619c534c2..f9c07c3e37aae2692f4edb8337c6503a686513d1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,13 +9,17 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
- <activity android:name=".MainActivity">
+ <activity
+ android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity
+ android:name=".LoadingActivity"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/LoadingActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/LoadingActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..f2b006142bb1bb99cee277a6e81c77d199355652
--- /dev/null
+++ b/app/src/main/java/com/example/leo/fitnessdiy/LoadingActivity.java
@@ -0,0 +1,34 @@
+package com.example.leo.fitnessdiy;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+
+public class LoadingActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_loading);
+
+ Thread welcomeThread = new Thread() {
+ @Override
+ public void run() {
+ try {
+ super.run();
+ sleep(10000);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ findViewById(R.id.loading_progress).setVisibility(View.GONE);
+ Intent i = new Intent(LoadingActivity.this, MainActivity.class);
+ startActivity(i);
+ finish();
+ }
+ }
+ };
+
+ welcomeThread.start();
+ }
+}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java
index aae23959f99b4cf7cfd00427201ac064c989c809..1296724eaa52abb91a4e2e3e665fa65a2f734a9d 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/MainActivity.java
@@ -2,6 +2,9 @@ package com.example.leo.fitnessdiy;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.Menu;
+import android.view.Window;
+import android.view.WindowManager;
public class MainActivity extends AppCompatActivity {
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4864720c0209bba471b61cee13fb563b470144aa
Binary files /dev/null and b/app/src/main/res/drawable/logo.png differ
diff --git a/app/src/main/res/drawable/main_background.jpg b/app/src/main/res/drawable/main_background.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0dc70d40022ad13b7beb52476b158b1fd5207b68
Binary files /dev/null and b/app/src/main/res/drawable/main_background.jpg differ
diff --git a/app/src/main/res/layout/activity_loading.xml b/app/src/main/res/layout/activity_loading.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3492fa3e171f6b420cf57b3a30f28edddd83cdbf
--- /dev/null
+++ b/app/src/main/res/layout/activity_loading.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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="com.example.leo.fitnessdiy.LoadingActivity"
+ android:background="@drawable/main_background"
+ android:gravity="center"
+ android:padding="36dp"
+ android:orientation="vertical">
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:src="@drawable/logo"/>
+
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ android:id="@+id/loading_progress"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 53058319a021f58d3f31c444bf4c01bd5084daf5..82206779dc1b874f5f5d97ce8c4090973245bd0e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="com.example.leo.fitnessdiy.MainActivity">
+ tools:context="com.example.leo.fitnessdiy.MainActivity"
+ android:orientation="horizontal">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Hello World!"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 26c32629f35e927652a482d123b28cc82080e5f9..1b897916855303c62c64c30a9a270351df825f84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
<resources>
<string name="app_name">FitnessDIY</string>
+ <string name="logo_sub">Do It Yourself</string>
</resources>