From 2c387a463292e5a55f476a3ed2d459ed5a21dab9 Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Wed, 1 Feb 2017 17:53:10 +0100
Subject: [PATCH 01/10] Update template.xml

---
 .../ViewModelBindingActivity/template.xml            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/template.xml b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/template.xml
index 36cab09..e44ae4b 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/template.xml
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/template.xml
@@ -69,6 +69,18 @@
         constraints="package"
         default="com.mycompany.myapp" />
 
+    <parameter
+        id="vmPackage"
+        name="View Model Package name"
+        type="string"
+        default="viewmodel" />
+
+    <parameter
+        id="scrPackage"
+        name="Screen Package name"
+        type="string"
+        default="activity" />
+
     <!-- 128x128 thumbnails relative to template.xml -->
     <thumbs>
         <!-- default thumbnail is required -->

From 70bb94cd282db05114a0f1814ab71cfe39936e1e Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Wed, 1 Feb 2017 17:53:58 +0100
Subject: [PATCH 02/10] Update recipe.xml.ftl

---
 .../viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl
index 61e0650..fbe82db 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl
@@ -19,10 +19,10 @@
                  to="${escapeXmlAttribute(resOut)}/layout/${layoutName}.xml" />
 
     <instantiate from="root/src/app_package/Screen.java.ftl"
-                   to="${escapeXmlAttribute(srcOut)}/${screenClass}.java" />
+                   to="${escapeXmlAttribute(srcOut)}/${scrPackage}/${screenClass}.java" />
 
     <instantiate from="root/src/app_package/ViewModel.java.ftl"
-                   to="${escapeXmlAttribute(srcOut)}/${viewModelClass}.java" />
+                   to="${escapeXmlAttribute(srcOut)}/${vmPackage}/${viewModelClass}.java" />
 
     <open file="${escapeXmlAttribute(srcOut)}/${screenClass}.java" />
     <open file="${escapeXmlAttribute(resOut)}/layout/${layoutName}.xml" />

From aab2f9f4ab5b12b0306d98fce6bb742a92d087a4 Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Wed, 1 Feb 2017 17:54:19 +0100
Subject: [PATCH 03/10] Update AndroidManifest.xml.ftl

---
 .../root/src/app_package/AndroidManifest.xml.ftl                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
index 56fc6a8..bf1d505 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <application>
-            <activity android:name="${relativePackage}.${screenClass}"
+            <activity android:name="${relativePackage}.${scrPackage}.${screenClass}"
                 <#if isNewProject>
                     android:label="@string/app_name"
                 <#else>

From aebf2d3f6cfdb15e6dd6766fc467f938d26f259a Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Wed, 1 Feb 2017 17:54:37 +0100
Subject: [PATCH 04/10] Update Screen.java.ftl

---
 .../root/src/app_package/Screen.java.ftl                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
index cb2f541..e33f3b4 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${packageName}.${scrPackage};
 
 <#if screenType == "Fragment">
 import android.os.Bundle;

From cccda4f152243360afb07c1fe33affdfbe021941 Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Wed, 1 Feb 2017 17:54:54 +0100
Subject: [PATCH 05/10] Update ViewModel.java.ftl

---
 .../root/src/app_package/ViewModel.java.ftl                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
index 9911860..a80cfce 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${packageName}.${vmPackage};
 
 import android.databinding.ObservableField;
 import android.view.View;

From f6cde1d3c75eb5198ca2823936c77cd60844788f Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Wed, 1 Feb 2017 17:55:11 +0100
Subject: [PATCH 06/10] Update layout.xml.ftl

---
 .../root/src/app_package/layout.xml.ftl                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
index d5a311d..9ff95c1 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
@@ -7,7 +7,7 @@
 
 		<variable
 			name="viewModel"
-			type="${packageName}.${viewModelClass}"/>
+			type="${packageName}.${vmPackage}.${viewModelClass}"/>
 	</data>
 	<#if useStatefulLayout>
 	<cz.kinst.jakub.view.StatefulLayout

From 14eefb4c10fdadef5d26fd1ef45dba2559c0b5e0 Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Fri, 3 Feb 2017 01:30:59 +0100
Subject: [PATCH 07/10] Update Screen.java.ftl

---
 .../root/src/app_package/Screen.java.ftl                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
index e33f3b4..2e2760f 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/Screen.java.ftl
@@ -1,4 +1,4 @@
-package ${packageName}.${scrPackage};
+package ${packageName}<#if scrPackage != "">.${scrPackage}</#if>;
 
 <#if screenType == "Fragment">
 import android.os.Bundle;

From 9f96143d0359800f333b420f775454429315cba6 Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Fri, 3 Feb 2017 01:31:02 +0100
Subject: [PATCH 08/10] Update ViewModel.java.ftl

---
 .../root/src/app_package/ViewModel.java.ftl                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
index a80cfce..2854664 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/ViewModel.java.ftl
@@ -1,4 +1,4 @@
-package ${packageName}.${vmPackage};
+package ${packageName}<#if vmPackage != "">.${vmPackage}</#if>;
 
 import android.databinding.ObservableField;
 import android.view.View;

From 1e8e5c45063707e463479468657d92b6286ae085 Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Fri, 3 Feb 2017 01:31:05 +0100
Subject: [PATCH 09/10] Update layout.xml.ftl

---
 .../root/src/app_package/layout.xml.ftl                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
index 9ff95c1..d518ef2 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/layout.xml.ftl
@@ -7,7 +7,7 @@
 
 		<variable
 			name="viewModel"
-			type="${packageName}.${vmPackage}.${viewModelClass}"/>
+			type="${packageName}.<#if vmPackage != "">${vmPackage}.</#if>${viewModelClass}"/>
 	</data>
 	<#if useStatefulLayout>
 	<cz.kinst.jakub.view.StatefulLayout

From 978b9b837db7e209db4f86446fb7064d4072dfee Mon Sep 17 00:00:00 2001
From: Jiri Helmich <helmanss1@gmail.com>
Date: Fri, 3 Feb 2017 01:31:09 +0100
Subject: [PATCH 10/10] Update AndroidManifest.xml.ftl

---
 .../root/src/app_package/AndroidManifest.xml.ftl                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
index bf1d505..3c298d0 100644
--- a/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
+++ b/extras/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <application>
-            <activity android:name="${relativePackage}.${scrPackage}.${screenClass}"
+            <activity android:name="${relativePackage}.<#if scrPackage != "">${scrPackage}.</#if>${screenClass}"
                 <#if isNewProject>
                     android:label="@string/app_name"
                 <#else>