diff --git a/app/app.iml b/app/app.iml
index fdb981a..6ca53c1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
-
+
@@ -46,6 +46,9 @@
+
@@ -97,13 +100,6 @@
-
-
-
-
-
-
-
@@ -111,6 +107,13 @@
+
+
+
+
+
+
+
@@ -133,13 +136,17 @@
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index c9e67bb..cd2ad73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
applicationId 'com.eleith.hashtagit'
minSdkVersion 22
targetSdkVersion 28
- versionCode 1
- versionName "1.0"
+ versionCode 2
+ versionName "2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/icon-web.png b/app/src/main/icon-web.png
index 8eb4d7e..b29bf15 100644
Binary files a/app/src/main/icon-web.png and b/app/src/main/icon-web.png differ
diff --git a/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt b/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt
index fb708bd..5aa0153 100644
--- a/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt
+++ b/app/src/main/java/com/eleith/hashtagit/HashTagItActivity.kt
@@ -12,9 +12,9 @@ class HashTagItActivity : AppCompatActivity() {
fun showToolbar(toggle: Boolean) {
if (toggle) {
- supportActionBar?.hide()
- } else {
supportActionBar?.show()
+ } else {
+ supportActionBar?.hide()
}
}
@@ -23,28 +23,4 @@ class HashTagItActivity : AppCompatActivity() {
setContentView(R.layout.activity_hash_tag_it)
setSupportActionBar(toolbar)
}
-
- override fun onCreateOptionsMenu(menu: Menu?): Boolean {
- super.onCreateOptionsMenu(menu)
- menuInflater.inflate(R.menu.menu_main, menu)
- return true
- }
-
- override fun onOptionsItemSelected(item: MenuItem?): Boolean {
- return when (item?.itemId) {
- R.id.icon_inverse -> {
-
- // actually, probably dont need view model
- // and can just change theme here on the clicks
- val vm = ViewModelProviders.of(this)[BackgroundViewModel::class.java]
- vm.backgroundColor.value?.apply {
- !this
- }
- true
- }
- else -> {
- super.onOptionsItemSelected(item)
- }
- }
- }
}
diff --git a/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt b/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt
index 9a78157..f58ff8b 100644
--- a/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt
+++ b/app/src/main/java/com/eleith/hashtagit/SplashFragment.kt
@@ -19,8 +19,7 @@ class SplashFragment: Fragment() {
override fun onStart() {
super.onStart()
-
- (activity as? HashTagItActivity)?.showToolbar(true)
+ (activity as? HashTagItActivity)?.showToolbar(false)
uiScope.launch {
withContext(Dispatchers.IO) {
@@ -30,11 +29,14 @@ class SplashFragment: Fragment() {
}
}
+ override fun onStop() {
+ super.onStop()
+ (activity as? HashTagItActivity)?.showToolbar(true)
+ }
+
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/java/com/eleith/hashtagit/SubmissionFragment.kt b/app/src/main/java/com/eleith/hashtagit/SubmissionFragment.kt
index 5e17d62..2e84b56 100644
--- a/app/src/main/java/com/eleith/hashtagit/SubmissionFragment.kt
+++ b/app/src/main/java/com/eleith/hashtagit/SubmissionFragment.kt
@@ -6,7 +6,6 @@ import android.app.Activity
import android.content.pm.ActivityInfo
import android.os.Bundle
import android.util.DisplayMetrics
-import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -24,13 +23,25 @@ class SubmissionFragment : Fragment() {
return inflater.inflate(R.layout.fragment_submission, container, false)
}
+ override fun onStart() {
+ super.onStart()
+ (activity as? HashTagItActivity)?.showToolbar(false)
+ }
+
+ override fun onStop() {
+ super.onStop()
+ (activity as? HashTagItActivity)?.showToolbar(true)
+ }
+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
if (activity?.requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE) {
arguments?.apply {
- textView.text = SubmissionFragmentArgs.fromBundle(this).writtenText
+ val hash = "#"
+ val submission = SubmissionFragmentArgs.fromBundle(this).writtenText
+ textView.text = String.format("%s%s", hash, submission)
textView.measure(0, 0)
putIntoLeanBackMode()
diff --git a/app/src/main/res/drawable/hashitnow.png b/app/src/main/res/drawable/hashitnow.png
index 9490369..43009d4 100644
Binary files a/app/src/main/res/drawable/hashitnow.png and b/app/src/main/res/drawable/hashitnow.png differ
diff --git a/app/src/main/res/drawable/icon_text.xml b/app/src/main/res/drawable/icon_text.xml
deleted file mode 100644
index 8cd9436..0000000
--- a/app/src/main/res/drawable/icon_text.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
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 640d9ca..61fb881 100644
--- a/app/src/main/res/layout/activity_hash_tag_it.xml
+++ b/app/src/main/res/layout/activity_hash_tag_it.xml
@@ -2,6 +2,7 @@
diff --git a/app/src/main/res/layout/fragment_input.xml b/app/src/main/res/layout/fragment_input.xml
index 39f431d..1c1171a 100644
--- a/app/src/main/res/layout/fragment_input.xml
+++ b/app/src/main/res/layout/fragment_input.xml
@@ -35,7 +35,7 @@
-
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/icon.png b/app/src/main/res/mipmap-hdpi/icon.png
index fd930da..8af13d9 100644
Binary files a/app/src/main/res/mipmap-hdpi/icon.png and b/app/src/main/res/mipmap-hdpi/icon.png differ
diff --git a/app/src/main/res/mipmap-hdpi/icon_foreground.png b/app/src/main/res/mipmap-hdpi/icon_foreground.png
index 4345f01..637e1bd 100644
Binary files a/app/src/main/res/mipmap-hdpi/icon_foreground.png and b/app/src/main/res/mipmap-hdpi/icon_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/icon_round.png b/app/src/main/res/mipmap-hdpi/icon_round.png
index fb69bb5..8260ad8 100644
Binary files a/app/src/main/res/mipmap-hdpi/icon_round.png and b/app/src/main/res/mipmap-hdpi/icon_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/icon.png b/app/src/main/res/mipmap-mdpi/icon.png
index 0716a77..4453d60 100644
Binary files a/app/src/main/res/mipmap-mdpi/icon.png and b/app/src/main/res/mipmap-mdpi/icon.png differ
diff --git a/app/src/main/res/mipmap-mdpi/icon_foreground.png b/app/src/main/res/mipmap-mdpi/icon_foreground.png
index 9e97ddc..9391dc4 100644
Binary files a/app/src/main/res/mipmap-mdpi/icon_foreground.png and b/app/src/main/res/mipmap-mdpi/icon_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/icon_round.png b/app/src/main/res/mipmap-mdpi/icon_round.png
index e8d7c97..f95728e 100644
Binary files a/app/src/main/res/mipmap-mdpi/icon_round.png and b/app/src/main/res/mipmap-mdpi/icon_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/icon.png b/app/src/main/res/mipmap-xhdpi/icon.png
index 669d285..2ccf040 100644
Binary files a/app/src/main/res/mipmap-xhdpi/icon.png and b/app/src/main/res/mipmap-xhdpi/icon.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/icon_foreground.png b/app/src/main/res/mipmap-xhdpi/icon_foreground.png
index c8bebae..7257858 100644
Binary files a/app/src/main/res/mipmap-xhdpi/icon_foreground.png and b/app/src/main/res/mipmap-xhdpi/icon_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/icon_round.png b/app/src/main/res/mipmap-xhdpi/icon_round.png
index 88d5b38..a9d2794 100644
Binary files a/app/src/main/res/mipmap-xhdpi/icon_round.png and b/app/src/main/res/mipmap-xhdpi/icon_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/icon.png b/app/src/main/res/mipmap-xxhdpi/icon.png
index 6cb9b59..b732167 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/icon.png and b/app/src/main/res/mipmap-xxhdpi/icon.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/icon_foreground.png b/app/src/main/res/mipmap-xxhdpi/icon_foreground.png
index c495371..a126769 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/icon_foreground.png and b/app/src/main/res/mipmap-xxhdpi/icon_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/icon_round.png b/app/src/main/res/mipmap-xxhdpi/icon_round.png
index 17c4a90..f62262b 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/icon_round.png and b/app/src/main/res/mipmap-xxhdpi/icon_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/icon.png b/app/src/main/res/mipmap-xxxhdpi/icon.png
index 3da1fdd..00bb47f 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/icon.png and b/app/src/main/res/mipmap-xxxhdpi/icon.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png b/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png
index a7328cf..951434f 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_round.png b/app/src/main/res/mipmap-xxxhdpi/icon_round.png
index 93f6852..b3a68f6 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/icon_round.png and b/app/src/main/res/mipmap-xxxhdpi/icon_round.png differ
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bdfe33e..606cf45 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,4 +8,8 @@
- @color/colorAccent
+
+