forked from roboguice/roboguice
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Turn astroboy second activity into fragment.
- Loading branch information
1 parent
23f329d
commit f20c13c
Showing
17 changed files
with
362 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>roboguice-aggregator</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.m2e.core.maven2Builder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.m2e.core.maven2Nature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| encoding/<project>=UTF-8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| activeProfiles= | ||
| eclipse.preferences.version=1 | ||
| resolveWorkspaceProjects=true | ||
| version=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> | ||
| <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> | ||
| <classpathentry kind="src" path="gen"/> | ||
| <classpathentry kind="src" output="bin/classes" path="src/main/java"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="bin/classes"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>astroboy</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>com.android.ide.eclipse.adt.ApkBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.m2e.core.maven2Builder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>com.android.ide.eclipse.adt.AndroidNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.m2e.core.maven2Nature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| eclipse.preferences.version=1 | ||
| encoding//src/main/java=UTF-8 | ||
| encoding//src/test/java=UTF-8 | ||
| encoding/<project>=UTF-8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 | ||
| org.eclipse.jdt.core.compiler.compliance=1.5 | ||
| org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning | ||
| org.eclipse.jdt.core.compiler.source=1.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| activeProfiles= | ||
| eclipse.preferences.version=1 | ||
| resolveWorkspaceProjects=true | ||
| version=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,121 +1,125 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.roboguice</groupId> | ||
| <artifactId>astroboy</artifactId> | ||
| <version>2.1-SNAPSHOT</version> | ||
| <packaging>apk</packaging> | ||
| <name>astroboy</name> | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.roboguice</groupId> | ||
| <artifactId>astroboy</artifactId> | ||
| <version>2.1-SNAPSHOT</version> | ||
| <packaging>apk</packaging> | ||
| <name>astroboy</name> | ||
|
|
||
| <dependencies> | ||
| <dependencies> | ||
|
|
||
| <!-- REGULAR DEPENDENCIES --> | ||
|
|
||
| <dependency> | ||
| <groupId>org.roboguice</groupId> | ||
| <artifactId>roboguice</artifactId> | ||
| <version>2.1-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.inject</groupId> | ||
| <artifactId>guice</artifactId> | ||
| <version>3.0</version> | ||
| <classifier>no_aop</classifier> | ||
| </dependency> | ||
| <!-- REGULAR DEPENDENCIES --> | ||
|
|
||
| <dependency> | ||
| <groupId>org.roboguice</groupId> | ||
| <artifactId>roboguice</artifactId> | ||
| <version>2.1-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.inject</groupId> | ||
| <artifactId>guice</artifactId> | ||
| <version>3.0</version> | ||
| <classifier>no_aop</classifier> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.android</groupId> | ||
| <artifactId>support-v4</artifactId> | ||
| <version>r7</version> | ||
| </dependency> | ||
|
|
||
|
|
||
| <!-- TEST DEPENDENCIES --> | ||
| <!-- TEST DEPENDENCIES --> | ||
|
|
||
| <dependency> | ||
| <groupId>com.pivotallabs</groupId> | ||
| <artifactId>robolectric</artifactId> | ||
| <version>1.0-RC1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-core</artifactId> | ||
| <version>1.9.0</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.pivotallabs</groupId> | ||
| <artifactId>robolectric</artifactId> | ||
| <version>1.0-RC1</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.mockito</groupId> | ||
| <artifactId>mockito-core</artifactId> | ||
| <version>1.9.0</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
|
|
||
| <!-- PROVIDED DEPENDENCIES --> | ||
|
|
||
| <!-- PROVIDED DEPENDENCIES --> | ||
| <dependency> | ||
| <groupId>com.google.android</groupId> | ||
| <artifactId>android</artifactId> | ||
| <version>2.1.2</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.8.2</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> <!-- needed to prevent warnings in robolectric tests --> | ||
| <groupId>com.google.android.maps</groupId> | ||
| <artifactId>maps</artifactId> | ||
| <version>7_r1</version> | ||
| <scope>provided</scope> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <dependency> | ||
| <groupId>com.google.android</groupId> | ||
| <artifactId>android</artifactId> | ||
| <version>2.1.2</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.8.2</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> <!-- needed to prevent warnings in robolectric tests --> | ||
| <groupId>com.google.android.maps</groupId> | ||
| <artifactId>maps</artifactId> | ||
| <version>7_r1</version> | ||
| <scope>provided</scope> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>com.jayway.maven.plugins.android.generation2</groupId> | ||
| <artifactId>android-maven-plugin</artifactId> | ||
| <version>3.2.0</version> | ||
| <configuration> | ||
| <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile> | ||
| <assetsDirectory>${project.basedir}/assets</assetsDirectory> | ||
| <resourceDirectory>${project.basedir}/res</resourceDirectory> | ||
| <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory> | ||
| <sdk> | ||
| <platform>9</platform> | ||
| </sdk> | ||
| <undeployBeforeDeploy>true</undeployBeforeDeploy> | ||
| </configuration> | ||
| <extensions>true</extensions> | ||
| </plugin> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>com.jayway.maven.plugins.android.generation2</groupId> | ||
| <artifactId>android-maven-plugin</artifactId> | ||
| <version>3.2.0</version> | ||
| <configuration> | ||
| <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile> | ||
| <assetsDirectory>${project.basedir}/assets</assetsDirectory> | ||
| <resourceDirectory>${project.basedir}/res</resourceDirectory> | ||
| <nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory> | ||
| <sdk> | ||
| <platform>9</platform> | ||
| </sdk> | ||
| <undeployBeforeDeploy>true</undeployBeforeDeploy> | ||
| </configuration> | ||
| <extensions>true</extensions> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>2.5.1</version> | ||
| <configuration> | ||
| <source>1.5</source> | ||
| <target>1.5</target> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>2.5.1</version> | ||
| <configuration> | ||
| <source>1.5</source> | ||
| <target>1.5</target> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-gpg-plugin</artifactId> | ||
| <version>1.4</version> | ||
| <configuration> | ||
| <useAgent>true</useAgent> | ||
| <executable>gpg2</executable> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-gpg-plugin</artifactId> | ||
| <version>1.4</version> | ||
| <configuration> | ||
| <useAgent>true</useAgent> | ||
| <executable>gpg2</executable> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| <parent> | ||
| <groupId>org.sonatype.oss</groupId> | ||
| <artifactId>oss-parent</artifactId> | ||
| <version>6</version> | ||
| </parent> | ||
|
|
||
| <parent> | ||
| <groupId>org.sonatype.oss</groupId> | ||
| <artifactId>oss-parent</artifactId> | ||
| <version>6</version> | ||
| </parent> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>third.party.closed.source.repo</id> | ||
| <url>file://${basedir}/../maven_repo_3rd_party</url> | ||
| </repository> | ||
| </repositories> | ||
| <repositories> | ||
| <repository> | ||
| <id>third.party.closed.source.repo</id> | ||
| <url>file://${basedir}/../maven_repo_3rd_party</url> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:orientation="vertical" > | ||
|
|
||
| <fragment | ||
| android:id="@+id/fragment_fight_evil" | ||
| android:name="org.roboguice.astroboy.fragment.FightForcesOfEvilFragment" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" /> | ||
|
|
||
| </LinearLayout> |
File renamed without changes.
Oops, something went wrong.