Renamed WelcomeScreen to MainScreen

arburk · Jul 2, 2023 · a0c1411 · a0c1411
1 parent ed1fdf1
commit a0c1411
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -113,8 +113,8 @@ dependencies {
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
   implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
   implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
-  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
-  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+  testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
   androidTestImplementation 'androidx.test.ext:junit:1.1.5'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/...arburk/vscp/app/activity/WelcomeScreen.kt → ...ub/arburk/vscp/app/activity/MainScreen.kt b/...arburk/vscp/app/activity/WelcomeScreen.kt → ...ub/arburk/vscp/app/activity/MainScreen.kt
@@ -7,14 +7,14 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.github.arburk.vscp.app.R
-import com.github.arburk.vscp.app.databinding.WelcomeScreenBinding
+import com.github.arburk.vscp.app.databinding.MainScreenBinding
 
 /**
  * A simple [Fragment] subclass as the default destination in the navigation.
  */
-class WelcomeScreen : Fragment() {
+class MainScreen : Fragment() {
 
-  private var _binding: WelcomeScreenBinding? = null
+  private var _binding: MainScreenBinding? = null
 
   // This property is only valid between onCreateView and
   // onDestroyView.
@@ -25,7 +25,7 @@ class WelcomeScreen : Fragment() {
     savedInstanceState: Bundle?
   ): View {
 
-    _binding = WelcomeScreenBinding.inflate(inflater, container, false)
+    _binding = MainScreenBinding.inflate(inflater, container, false)
     return binding.root
 
   }
@@ -34,7 +34,7 @@ class WelcomeScreen : Fragment() {
     super.onViewCreated(view, savedInstanceState)
 
     binding.pokerTimer.setOnClickListener {
-      findNavController().navigate(R.id.action_WelcomeScreen_to_Timer)
+      findNavController().navigate(R.id.action_MainScreen_to_Timer)
     }
   }
 

diff --git a/app/src/main/res/layout/fragment_round_settings.xml b/app/src/main/res/layout/fragment_round_settings.xml
@@ -18,8 +18,7 @@
       android:orientation="horizontal"
       android:id="@+id/add_remove_layout"
       android:layout_width="match_parent"
-      android:layout_height="50dp"
-      tools:context=".activity.RoundSettings">
+      android:layout_height="50dp">
 
     <ImageButton
         android:id="@+id/remove_last_blind_button"

diff --git a/app/src/main/res/layout/welcome_screen.xml → app/src/main/res/layout/main_screen.xml b/app/src/main/res/layout/welcome_screen.xml → app/src/main/res/layout/main_screen.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.github.arburk.vscp.app.activity.WelcomeScreen">
+    tools:context="com.github.arburk.vscp.app.activity.MainScreen">
 
   <ImageView
       android:id="@+id/titleImage"

diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -3,16 +3,16 @@
             xmlns:app="http://schemas.android.com/apk/res-auto"
             xmlns:tools="http://schemas.android.com/tools"
             android:id="@+id/nav_graph"
-            app:startDestination="@id/WelcomeScreen">
+            app:startDestination="@id/MainScreen">
 
   <fragment
-      android:id="@+id/WelcomeScreen"
-      android:name="com.github.arburk.vscp.app.activity.WelcomeScreen"
+      android:id="@+id/MainScreen"
+      android:name="com.github.arburk.vscp.app.activity.MainScreen"
       android:label="@string/title"
-      tools:layout="@layout/welcome_screen">
+      tools:layout="@layout/main_screen">
 
     <action
-        android:id="@+id/action_WelcomeScreen_to_Timer"
+        android:id="@+id/action_MainScreen_to_Timer"
         app:destination="@id/Timer"/>
   </fragment>
 
@@ -23,8 +23,8 @@
       tools:layout="@layout/timer">
 
     <action
-        android:id="@+id/action_Timer_to_WelcomeScreen"
-        app:destination="@id/WelcomeScreen"/>
+        android:id="@+id/action_Timer_to_MainScreen"
+        app:destination="@id/MainScreen"/>
 
     <action
         android:id="@+id/action_Timer_to_TimerSettings"

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!-- Base application theme. -->
   <style name="Theme.VSCPApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
     <!-- Primary brand color. -->

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!-- Base application theme. -->
   <style name="Theme.VSCPApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
     <!-- Primary brand color. -->

diff --git a/app/src/test/java/com/github/arburk/vscp/app/model/ConfigModelTest.kt b/app/src/test/java/com/github/arburk/vscp/app/model/ConfigModelTest.kt
@@ -1,6 +1,8 @@
 package com.github.arburk.vscp.app.model
 
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
 class ConfigModelTest {