From 05f1388b79e7113a9fc2e2be065089f133839cea Mon Sep 17 00:00:00 2001 From: Matthew Willis Date: Tue, 13 Aug 2013 15:43:43 -0500 Subject: [PATCH] Rename TypedResources2 to TypedLayouts --- src/main/scala/AndroidBase.scala | 4 ++-- src/main/scala/AndroidJavaLayout.scala | 2 +- src/main/scala/AndroidPlugin.scala | 6 ++--- src/main/scala/AndroidProjects.scala | 6 ++--- ...pedResources2.scala => TypedLayouts.scala} | 24 +++++++++---------- 5 files changed, 21 insertions(+), 21 deletions(-) rename src/main/scala/{TypedResources2.scala => TypedLayouts.scala} (93%) diff --git a/src/main/scala/AndroidBase.scala b/src/main/scala/AndroidBase.scala index 8302fcd..6fb967f 100644 --- a/src/main/scala/AndroidBase.scala +++ b/src/main/scala/AndroidBase.scala @@ -386,8 +386,8 @@ object AndroidBase { // Use typed resources by default useTypedResources := true, - // Use typed resources 2 by default - useTypedResources2 := true, + // Use typed layouts by default + useTypedLayouts := true, // Gradle uses libs/ as the unmanaged JAR directory! unmanagedBase <<= (baseDirectory) (_ / "libs"), diff --git a/src/main/scala/AndroidJavaLayout.scala b/src/main/scala/AndroidJavaLayout.scala index 4463fcd..d630082 100644 --- a/src/main/scala/AndroidJavaLayout.scala +++ b/src/main/scala/AndroidJavaLayout.scala @@ -10,7 +10,7 @@ object AndroidJavaLayout { autoScalaLibrary in GlobalScope := false, useProguard in Compile := false, useTypedResources in Compile := false, - useTypedResources2 in Compile := false, + useTypedLayouts in Compile := false, manifestPath in Compile <<= (baseDirectory, manifestName) map((s,m) => Seq(s / m)) map (x=>x), mainResPath in Compile <<= (baseDirectory, resDirectoryName) (_ / _) map (x=>x), mainAssetsPath in Compile <<= (baseDirectory, assetsDirectoryName) (_ / _), diff --git a/src/main/scala/AndroidPlugin.scala b/src/main/scala/AndroidPlugin.scala index 56b3caf..54e2511 100644 --- a/src/main/scala/AndroidPlugin.scala +++ b/src/main/scala/AndroidPlugin.scala @@ -76,7 +76,7 @@ object AndroidPlugin extends Plugin { val usePreloaded = SettingKey[Boolean]("use-preloaded", "Use preloaded libraries for development") val useDebug = SettingKey[Boolean]("use-debug", "Use debug settings when building an APK") val useTypedResources = SettingKey[Boolean]("use-typed-resources", "Use typed resources") - val useTypedResources2 = SettingKey[Boolean]("use-typed-resources2", "Use typed resources 2") + val useTypedLayouts = SettingKey[Boolean]("use-typed-layouts", "Use typed layouts") /** ApkLib dependencies */ case class LibraryProject(pkgName: String, manifest: File, sources: Set[File], resDir: Option[File], assetsDir: Option[File]) @@ -195,7 +195,7 @@ object AndroidPlugin extends Plugin { val typedResource = TaskKey[File]("typed-resource", """Typed resource file to be generated, also includes interfaces to access these resources.""") - val typedResource2 = TaskKey[File]("typed-resource2", + val typedLayouts = TaskKey[File]("typed-layouts", """Typed resource file to be generated, also includes interfaces to access these resources.""") val layoutResources = TaskKey[Seq[File]]("layout-resources", @@ -220,7 +220,7 @@ object AndroidPlugin extends Plugin { val generateTypedResources = TaskKey[Seq[File]]("generate-typed-resources", """Produce a file TR.scala that contains typed references to layout resources.""") - val generateTypedResources2 = TaskKey[Seq[File]]("generate-typed-resources2", + val generateTypedLayouts = TaskKey[Seq[File]]("generate-typed-layouts", """Produce a file typed_resource.scala that contains typed references to layout resources.""") val generateManifest = TaskKey[Seq[File]]("generate-manifest", diff --git a/src/main/scala/AndroidProjects.scala b/src/main/scala/AndroidProjects.scala index 193f269..a68f59d 100644 --- a/src/main/scala/AndroidProjects.scala +++ b/src/main/scala/AndroidProjects.scala @@ -24,7 +24,7 @@ object AndroidProjects { AndroidTest.settings ++ AndroidNdk.settings ++ TypedResources.settings ++ - TypedResources2.settings ++ + TypedLayouts.settings ++ Seq( // Test projects are Debug projects by default useDebug := true, @@ -39,7 +39,7 @@ object AndroidProjects { // projects, but you can enable it afterwards anyway, if you really // need it. useTypedResources := false, - useTypedResources2 := false + useTypedLayouts := false ) ) @@ -94,7 +94,7 @@ object AndroidProjects { AndroidLaunch.settings ++ AndroidNdk.settings ++ TypedResources.settings ++ - TypedResources2.settings + TypedLayouts.settings } // Development settings diff --git a/src/main/scala/TypedResources2.scala b/src/main/scala/TypedLayouts.scala similarity index 93% rename from src/main/scala/TypedResources2.scala rename to src/main/scala/TypedLayouts.scala index f22de53..4b98cb2 100644 --- a/src/main/scala/TypedResources2.scala +++ b/src/main/scala/TypedLayouts.scala @@ -8,7 +8,7 @@ import Keys._ import AndroidPlugin._ // FIXME more appropriate name -object TypedResources2 { +object TypedLayouts { /** Views with android:id. */ private case class NamedView(id: String, className: String, @@ -224,10 +224,10 @@ object TypedResources2 { "def %1$s = `this`.views.%1$s".format(quoteReserved(view.id)) } - private def generateTypedResources2Task = - (useTypedResources2, typedResource2, layoutResources, libraryJarPath, manifestPackage, streams) map { - (useTypedResources2, typedResource2, layoutResources, libraryJarPath, manifestPackage, s) => - if (useTypedResources2) { + private def generateTypedLayoutsTask = + (useTypedLayouts, typedLayouts, layoutResources, libraryJarPath, manifestPackage, streams) map { + (useTypedLayouts, typedLayouts, layoutResources, libraryJarPath, manifestPackage, s) => + if (useTypedLayouts) { // e.g. main_activity.xml -> main_activity def baseName(path: File) = { val name = path.getName @@ -241,7 +241,7 @@ object TypedResources2 { ) ) - IO.write(typedResource2, + IO.write(typedLayouts, """|package %s | |package typed_resource { @@ -263,22 +263,22 @@ object TypedResources2 { .mkString("\n ") ) ) - s.log.info("Wrote %s".format(typedResource2)) - Seq(typedResource2) + s.log.info("Wrote %s".format(typedLayouts)) + Seq(typedLayouts) } else { Seq.empty } } lazy val settings: Seq[Setting[_]] = (Seq ( - typedResource2 <<= (manifestPackage, managedScalaPath) map { - _.split('.').foldLeft(_) ((p, s) => p / s) / "typed_resource.scala" + typedLayouts <<= (manifestPackage, managedScalaPath) map { + _.split('.').foldLeft(_) ((p, s) => p / s) / "typed_layouts.scala" }, layoutResources <<= (mainResPath) map { x => (x * "layout*" * "*.xml" get) }, - generateTypedResources2 <<= generateTypedResources2Task, + generateTypedLayouts <<= generateTypedLayoutsTask, - sourceGenerators <+= generateTypedResources2, + sourceGenerators <+= generateTypedLayouts, watchSources <++= (layoutResources) map (ls => ls) ))