diff --git a/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt b/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt
index 39611ec..fb708bd 100644
--- a/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt
+++ b/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt
@@ -5,12 +5,23 @@ import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.ViewModelProviders
+import kotlinx.android.synthetic.main.activity_hash_tag_it.*
+
class HashTagItActivity : AppCompatActivity() {
+ fun showToolbar(toggle: Boolean) {
+ if (toggle) {
+ supportActionBar?.hide()
+ } else {
+ supportActionBar?.show()
+ }
+ }
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_hash_tag_it)
+ setSupportActionBar(toolbar)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
diff --git a/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt b/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt
index 700a502..9a78157 100644
--- a/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt
+++ b/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.view.Window
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import kotlinx.coroutines.*
@@ -20,6 +19,9 @@ class SplashFragment: Fragment() {
override fun onStart() {
super.onStart()
+
+ (activity as? HashTagItActivity)?.showToolbar(true)
+
uiScope.launch {
withContext(Dispatchers.IO) {
delay(2000)
@@ -31,6 +33,8 @@ class SplashFragment: Fragment() {
override fun onPause() {
super.onPause()
+ (activity as? HashTagItActivity)?.showToolbar(false)
+
// make sure if user leaves screen to early before delay, we have killed the couroutine
job.cancel()
}
diff --git a/app/src/main/res/layout/activity_hash_tag_it.xml b/app/src/main/res/layout/activity_hash_tag_it.xml
index 74a5220..640d9ca 100644
--- a/app/src/main/res/layout/activity_hash_tag_it.xml
+++ b/app/src/main/res/layout/activity_hash_tag_it.xml
@@ -7,6 +7,15 @@
android:id="@+id/activityContainer"
android:orientation="vertical">
+
+
-