More spotlight improvements.

tomdoeslinux · Jul 24, 2022 · c869fd9 · c869fd9
1 parent 3ed03d6
commit c869fd9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/app/src/main/java/com/therealbluepandabear/pixapencil/fragments/appinfo/AppInfoFragment.kt b/app/src/main/java/com/therealbluepandabear/pixapencil/fragments/appinfo/AppInfoFragment.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.Lifecycle
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.therealbluepandabear.pixapencil.BuildConfig
 import com.therealbluepandabear.pixapencil.R
+import com.therealbluepandabear.pixapencil.activities.main.MainActivity
 import com.therealbluepandabear.pixapencil.databinding.FragmentAppInfoBinding
 
 class AppInfoFragment : Fragment() {
@@ -27,6 +28,8 @@ class AppInfoFragment : Fragment() {
         binding.fragmentAppInfoCommunityText.movementMethod = LinkMovementMethod.getInstance()
         binding.fragmentAppInfoCreatedByText.movementMethod = LinkMovementMethod.getInstance()
         binding.fragmentAppInfoAboutText.movementMethod = LinkMovementMethod.getInstance()
+
+        (activity as MainActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     companion object {

diff --git a/...therealbluepandabear/pixapencil/fragments/newproject/NewProjectFragment+startSpotLight.kt b/...therealbluepandabear/pixapencil/fragments/newproject/NewProjectFragment+startSpotLight.kt
@@ -90,14 +90,19 @@ fun NewProjectFragment.startSpotLight() {
     var current = 1
 
     lyt.findViewById<Button>(R.id.layoutTarget_nextButton).setOnClickListener {
-        if (current == 1 && binding.fragmentNewCanvasProjectTitleTextInputEditText.text.toString().isNotBlank()) {
+        if (current == 1 && binding.fragmentNewCanvasProjectTitleTextInputEditText.text.toString().isNotBlank()) {7
+            lyt.findViewById<TextView>(R.id.layoutTarget_errorText).text = ""
             current++
             spotlight.next()
         } else if (current == 2 && binding.fragmentNewCanvasWidthTextInputEditText.text.toString().isNotBlank()) {
+            lyt.findViewById<TextView>(R.id.layoutTarget_errorText).text = ""
             current++
             spotlight.next()
         } else if (current == 3 && binding.fragmentNewCanvasHeightTextInputEditText.text.toString().isNotBlank()) {
+            lyt.findViewById<TextView>(R.id.layoutTarget_errorText).text = ""
             spotlight.next()
+        } else {
+            lyt.findViewById<TextView>(R.id.layoutTarget_errorText).text = "Please input a value"
         }
     }
 

diff --git a/app/src/main/res/layout/fragment_app_info.xml b/app/src/main/res/layout/fragment_app_info.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".fragments.appinfo.AppInfoFragment"
     style="@style/defaultFragmentStyle">
-
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="150dp"

diff --git a/app/src/main/res/layout/layout_target.xml b/app/src/main/res/layout/layout_target.xml
@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
 
     <Button
@@ -31,12 +32,28 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="32dp"
+        android:layout_marginBottom="8dp"
         android:fontFamily="@font/manrope_medium"
         android:text="TextView"
         android:textAlignment="textStart"
         android:textColor="@color/white"
         android:textSize="24sp"
+        app:layout_constraintBottom_toTopOf="@+id/layoutTarget_errorText"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/layoutTarget_nextButton"
+        tools:textColor="@color/black" />
+
+    <TextView
+        android:id="@+id/layoutTarget_errorText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        android:fontFamily="@font/manrope_medium"
+        android:text=""
+        android:textAlignment="textStart"
+        android:textColor="@android:color/holo_red_dark"
+        android:textSize="16sp"
         app:layout_constraintBottom_toTopOf="@+id/layoutTarget_nextButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/layoutTarget_nextButton" />