Tutorial Updates corresponding

square · Oct 20, 2023 · eb56826 · eb56826
1 parent 0218aca
commit eb56826
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle
@@ -58,7 +58,7 @@ subprojects {
   plugins.withId("org.jetbrains.kotlin.android")  {
     java {
       toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
       }
     }
   }

diff --git a/samples/tutorial/gradle/wrapper/gradle-wrapper.properties b/samples/tutorial/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/tutorial/tutorial-2-complete/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt b/samples/tutorial/tutorial-2-complete/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt
@@ -29,14 +29,15 @@ class TodoListLayoutRunner(
     todoListBinding.root.backPressedHandler = rendering.onBack
 
     with(todoListBinding.todoListWelcome) {
-      text = resources.getString(R.string.todo_list_welcome, rendering.username)
+      text =
+        resources.getString(workflow.tutorial.views.R.string.todo_list_welcome, rendering.username)
     }
 
     adapter.todoList = rendering.todoTitles
     adapter.notifyDataSetChanged()
   }
 
   companion object : ViewFactory<TodoListScreen> by bind(
-      TodoListViewBinding::inflate, ::TodoListLayoutRunner
+    TodoListViewBinding::inflate, ::TodoListLayoutRunner
   )
 }
diff --git a/samples/tutorial/tutorial-3-complete/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt b/samples/tutorial/tutorial-3-complete/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt
@@ -29,7 +29,8 @@ class TodoListLayoutRunner(
     todoListBinding.root.backPressedHandler = rendering.onBack
 
     with(todoListBinding.todoListWelcome) {
-      text = resources.getString(R.string.todo_list_welcome, rendering.username)
+      text =
+        resources.getString(workflow.tutorial.views.R.string.todo_list_welcome, rendering.username)
     }
 
     adapter.todoList = rendering.todoTitles

diff --git a/samples/tutorial/tutorial-4-complete/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt b/samples/tutorial/tutorial-4-complete/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt
@@ -29,7 +29,8 @@ class TodoListLayoutRunner(
     todoListBinding.root.backPressedHandler = rendering.onBack
 
     with(todoListBinding.todoListWelcome) {
-      text = resources.getString(R.string.todo_list_welcome, rendering.username)
+      text =
+        resources.getString(workflow.tutorial.views.R.string.todo_list_welcome, rendering.username)
     }
 
     adapter.todoList = rendering.todoTitles

diff --git a/samples/tutorial/tutorial-base/src/main/java/workflow/tutorial/TutorialActivity.kt b/samples/tutorial/tutorial-base/src/main/java/workflow/tutorial/TutorialActivity.kt
@@ -7,6 +7,7 @@ class TutorialActivity : AppCompatActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-    setContentView(R.layout.welcome_view)
+    setContentView(workflow.tutorial.views.R.layout.welcome_viewgs
+    )
   }
 }
diff --git a/samples/tutorial/tutorial-final/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt b/samples/tutorial/tutorial-final/src/main/java/workflow/tutorial/TodoListLayoutRunner.kt
@@ -29,7 +29,8 @@ class TodoListLayoutRunner(
     todoListBinding.root.backPressedHandler = rendering.onBack
 
     with(todoListBinding.todoListWelcome) {
-      text = resources.getString(R.string.todo_list_welcome, rendering.username)
+      text =
+        resources.getString(workflow.tutorial.views.R.string.todo_list_welcome, rendering.username)
     }
 
     adapter.todoList = rendering.todoTitles