Merge commit '648da629d53fb2725039103458abddcd3e651fe3' into version-2

jakubkinst · Mar 8, 2017 · fcde71b · fcde71b
2 parents 25c92ee + 648da62
commit fcde71b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/.../AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/recipe.xml.ftl b/.../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" />

diff --git a/...es/viewmodelbinding/ViewModelBindingActivity/root/src/app_package/AndroidManifest.xml.ftl b/...es/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}.<#if scrPackage != "">${scrPackage}.</#if>${screenClass}"
                 <#if isNewProject>
                     android:label="@string/app_name"
                 <#else>

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

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

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

diff --git a/...as/AndroidStudioTemplate/templates/viewmodelbinding/ViewModelBindingActivity/template.xml b/...as/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 -->