Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ApmeM/android-flowlayout
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mobilogie/android-flowlayout
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 4 commits
  • 9 files changed
  • 1 contributor

Commits on Sep 9, 2014

  1. Ignore gen/build folders; renamed AndroidManifest.xml under app/ to e… 

    …asily know which project to import, when we only need the library; renamed library folder for easy import in Eclipse
    Guillaume Boudreau committed Sep 9, 2014
    Copy the full SHA
    c531628 View commit details

  2. Missed source folder

    Guillaume Boudreau committed Sep 9, 2014
    Copy the full SHA
    d747e9d View commit details

Commits on Feb 2, 2015

  1. Merge branch 'master' of github.com:ApmeM/android-flowlayout 

    Conflicts:
	.gitignore
    Guillaume Boudreau committed Feb 2, 2015
    Copy the full SHA
    239416e View commit details

  2. Updated target SDK to 21 (5.0.1)

    Guillaume Boudreau committed Feb 2, 2015
    Copy the full SHA
    e31ba73 View commit details
10 changes: 6 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,9 @@ target/
*.iws
*.log
*.class
.idea/
.gradle
build/
*.orig
.idea/
.gradle
build/
*.orig
libraries/layouts/src/android-flowlayout/gen
libraries/layouts/src/android-flowlayout/bin
0 app/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml.bak
View file
File renamed without changes.
10 changes: 10 additions & 0 deletions libraries/layouts/src/android-flowlayout/.classpath
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="src" path="java"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
33 changes: 33 additions & 0 deletions libraries/layouts/src/android-flowlayout/.project
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>android-flowlayout</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>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
2 changes: 1 addition & 1 deletion ...ries/layouts/src/main/AndroidManifest.xml → ...rc/android-flowlayout/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.apmem.tools.layouts" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16"/>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="21"/>
</manifest>
0 ...a/org/apmem/tools/layouts/FlowLayout.java → ...a/org/apmem/tools/layouts/FlowLayout.java
View file
File renamed without changes.
15 changes: 15 additions & 0 deletions libraries/layouts/src/android-flowlayout/project.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system edit
# "ant.properties", and override values to adapt the script to your
# project structure.
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-21
android.library=true
0 ...ies/layouts/src/main/res/values/attrs.xml → ...c/android-flowlayout/res/values/attrs.xml
View file
File renamed without changes.
1 change: 1 addition & 0 deletions libraries/layouts/src/android-flowlayout/src
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../main/java