Update Score and Word Count Display #10

app/build.gradle

@@ -47,4 +47,5 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
     implementation 'androidx.fragment:fragment-ktx:1.6.1'
     implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.activity:activity:1.8.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
@@ -9,10 +8,23 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Unscramble">
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".SplashScreen"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/com/example/android/unscramble/SplashScreen.kt

@@ -0,0 +1,34 @@
+package com.example.android.unscramble
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
+
+@Suppress("DEPRECATION")
+class SplashScreen : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_splash_screen)
+
+        // This is used to hide the status bar and make
+        // the splash screen as a full screen activity.
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_FULLSCREEN,
+            WindowManager.LayoutParams.FLAG_FULLSCREEN
+        )
+
+        // we used the postDelayed(Runnable, time) method
+        // to send a message with a delayed time.
+        //Normal Handler is deprecated , so we have to change the code little bit
+
+        // Handler().postDelayed({
+        Handler(Looper.getMainLooper()).postDelayed({
+            val intent = Intent(this, MainActivity::class.java)
+            startActivity(intent)
+            finish()
+        }, 3000) // 3000 is the delayed time in milliseconds.
+    }
+}

app/src/main/java/com/example/android/unscramble/ui/game/GameViewModel.kt

@@ -9,7 +9,7 @@ class GameViewModel : ViewModel() {
 
     private var wordsList: MutableList<String> = mutableListOf()
     private lateinit var currentWord: String
-
+    var i = 0
     private var _score = MutableLiveData(0)
     val score: LiveData<Int>
         get() = _score
@@ -21,15 +21,24 @@ class GameViewModel : ViewModel() {
     private val _currentScrambledWord = MutableLiveData<String>()
     val currentScrambledWord: LiveData<String>
         get() = _currentScrambledWord
-
+    public fun shuffle(str: String): String {
+        val charArray = str.toCharArray()
+        for (i in charArray.indices) {
+            val randomIndex = charArray.indices.random()
+            val temp = charArray[i]
+            charArray[i] = charArray[randomIndex]
+            charArray[randomIndex] = temp
+        }
+        return String(charArray)
+    }
 
     private fun getNextWord() {
         currentWord = allWordsList.random()
 
         if (wordsList.contains(currentWord)) {
             getNextWord()
         } else {
-            _currentScrambledWord.value = currentWord
+            _currentScrambledWord.value = shuffle(currentWord)
             _currentWordCount.value = (_currentWordCount.value)?.inc()
             wordsList.add(currentWord)
         }
@@ -49,18 +58,20 @@ class GameViewModel : ViewModel() {
     }
 
     private fun increaseScore() {
-        _score.value = 0
+        _score.value = 20 * i
     }
 
     fun isUserWordCorrect(playerWord: String): Boolean {
         if (playerWord.equals(currentWord, true)) {
+            i = i + 1
             increaseScore()
             return true
         }
         return false
     }
 
     fun reinitializeData() {
+        i = 0
         _score.value = 0
         _currentWordCount.value = 0
         wordsList.clear()

app/src/main/res/layout/activity_splash_screen.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.motion.widget.MotionLayout 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"
+    android:background="#fff"
+    app:layoutDescription="@xml/activity_splash_screen_scene"
+    tools:context=".SplashScreen">
+
+    <ImageView
+        android:id="@+id/SplashScreenImage"
+        android:layout_width="300dp"
+        android:layout_height="200dp"
+        android:src="@drawable/ic_launcher_foreground"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.motion.widget.MotionLayout>

app/src/main/res/xml/activity_splash_screen_scene.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto">
+
+    <Transition
+        motion:constraintSetEnd="@+id/end"
+        motion:constraintSetStart="@id/start"
+        motion:autoTransition="animateToEnd"
+        motion:duration="1000">
+       <KeyFrameSet>
+           <KeyAttribute
+               motion:motionTarget="@+id/SplashScreenImage"
+               motion:framePosition="0"
+               android:scaleX="1.2" />
+           <KeyAttribute
+               motion:motionTarget="@+id/SplashScreenImage"
+               motion:framePosition="0"
+               android:scaleY="1.2" />
+           <KeyAttribute
+               motion:motionTarget="@+id/SplashScreenImage"
+               motion:framePosition="100"
+               android:scaleX="100" />
+           <KeyAttribute
+               motion:motionTarget="@+id/SplashScreenImage"
+               motion:framePosition="100"
+               android:scaleY="100" />
+           <KeyAttribute
+               motion:motionTarget="@+id/SplashScreenImage"
+               motion:framePosition="76"
+               android:scaleX="0.7" />
+           <KeyAttribute
+               motion:motionTarget="@+id/SplashScreenImage"
+               motion:framePosition="76"
+               android:scaleY="0.7" />
+       </KeyFrameSet>
+    </Transition>
+
+    <ConstraintSet android:id="@+id/start">
+    </ConstraintSet>
+
+    <ConstraintSet android:id="@+id/end">
+    </ConstraintSet>
+</MotionScene>