v1.0.2

Merge pull request #3 from alhazmy13/develop
alhazmy13 · Sep 5, 2016 · 4cd8240 · 4cd8240
2 parents d654d0b + 30bd2d8
commit 4cd8240
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 2 deletions.
diff --git a/ActivityClean Architecture/globals.xml.ftl → ActivityCleanArchitecture/globals.xml.ftl b/ActivityClean Architecture/globals.xml.ftl → ActivityCleanArchitecture/globals.xml.ftl
diff --git a/ActivityClean Architecture/recipe.xml.ftl → ActivityCleanArchitecture/recipe.xml.ftl b/ActivityClean Architecture/recipe.xml.ftl → ActivityCleanArchitecture/recipe.xml.ftl
diff --git a/...Architecture/root/recipe_manifest.xml.ftl → ...Architecture/root/recipe_manifest.xml.ftl b/...Architecture/root/recipe_manifest.xml.ftl → ...Architecture/root/recipe_manifest.xml.ftl
@@ -1,8 +1,8 @@
-<recipe folder="root://activities/common">
+<recipe folder="root://activities/ActivityCleanArchitecture">
 
     <merge from="root/src/AndroidManifest.xml.ftl"
              to="${escapeXmlAttribute(manifestOut)}/AndroidManifest.xml" />
-    <merge from="../../common/root/res/values/manifest_strings.xml.ftl"
+    <merge from="root/res/values/manifest_strings.xml.ftl"
              to="${escapeXmlAttribute(resOut)}/values/strings.xml" />
 
 </recipe>
diff --git a/ActivityCleanArchitecture/root/res/values/manifest_strings.xml.ftl b/ActivityCleanArchitecture/root/res/values/manifest_strings.xml.ftl
@@ -0,0 +1,5 @@
+<resources>
+<#if !isNewProject && generateActivityTitle!true>
+    <string name="title_${activityToLayout(activityClass)}">${escapeXmlString(activityTitle)}</string>
+</#if>
+</resources>
diff --git a/...itecture/root/src/AndroidManifest.xml.ftl → ...itecture/root/src/AndroidManifest.xml.ftl b/...itecture/root/src/AndroidManifest.xml.ftl → ...itecture/root/src/AndroidManifest.xml.ftl
diff --git a/...t/src/app_package/SimpleActivity.java.ftl → ...t/src/app_package/SimpleActivity.java.ftl b/...t/src/app_package/SimpleActivity.java.ftl → ...t/src/app_package/SimpleActivity.java.ftl
diff --git a/...root/src/app_package/SimpleModel.java.ftl → ...root/src/app_package/SimpleModel.java.ftl b/...root/src/app_package/SimpleModel.java.ftl → ...root/src/app_package/SimpleModel.java.ftl
diff --git a/.../src/app_package/SimplePresenter.java.ftl → .../src/app_package/SimplePresenter.java.ftl b/.../src/app_package/SimplePresenter.java.ftl → .../src/app_package/SimplePresenter.java.ftl
diff --git a/...src/app_package/SimpleRepository.java.ftl → ...src/app_package/SimpleRepository.java.ftl b/...src/app_package/SimpleRepository.java.ftl → ...src/app_package/SimpleRepository.java.ftl
diff --git a/...app_package/SimpleRepositoryImpl.java.ftl → ...app_package/SimpleRepositoryImpl.java.ftl b/...app_package/SimpleRepositoryImpl.java.ftl → ...app_package/SimpleRepositoryImpl.java.ftl
diff --git a/...pp_package/SimpleRetroiftService.java.ftl → ...pp_package/SimpleRetroiftService.java.ftl b/...pp_package/SimpleRetroiftService.java.ftl → ...pp_package/SimpleRetroiftService.java.ftl
diff --git a/...ot/src/app_package/SimpleService.java.ftl → ...ot/src/app_package/SimpleService.java.ftl b/...ot/src/app_package/SimpleService.java.ftl → ...ot/src/app_package/SimpleService.java.ftl
diff --git a/.../root/src/app_package/SimpleView.java.ftl → .../root/src/app_package/SimpleView.java.ftl b/.../root/src/app_package/SimpleView.java.ftl → .../root/src/app_package/SimpleView.java.ftl
diff --git a/ActivityClean Architecture/template.xml → ActivityCleanArchitecture/template.xml b/ActivityClean Architecture/template.xml → ActivityCleanArchitecture/template.xml
diff --git a/... Architecture/template_blank_activity.png → ...nArchitecture/template_blank_activity.png b/... Architecture/template_blank_activity.png → ...nArchitecture/template_blank_activity.png