Skip to content

Commit ce53b69

Browse files
blazsolarblazsolar
committed
Merge branch 'release/0.2'
2 parents 978dc5e + c89fdf8 commit ce53b69

File tree

21 files changed

+384
-60
lines changed

21 files changed

+384
-60
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ local.properties
2424
*.ipr
2525
*.iws
2626
.idea/
27+
28+
# MAC
29+
.DS_Store

‎README.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,38 @@
11
FlowLayout
22
==========
33

4-
Android layout that arranges its children in multiple columns or rows depending on their width or height.
4+
FlowLayout is an opensource Android library that alows developers to easily integrate flow layout into their app. FlowLayout is an layout that display its children in multiple rows depending on their size.
55

6+
Setup
7+
-----
8+
* Import the library in Eclipse as Android library project.
9+
* Add FlowLayout as dependency to your existing project.
610

7-
License
8-
=======
11+
Usage
12+
-----
13+
```xml
14+
<si.solarb.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
15+
xmlns:flowlayout="http://schemas.android.com/apk/res/si.solarb.flowlayout"
16+
android:layout_width="match_parent"
17+
android:layout_height="match_parent"
18+
android:gravity="start|top">
19+
20+
<View
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_margin="0dp"
24+
android:layout_gravity="start|top" />
25+
26+
</si.solarb.flowlayout.FlowLayout>
27+
```
928

29+
Example
30+
-------
31+
![Framed example screenshot](https://raw.github.com/blazsolar/FlowLayout/master/example/framed_example_screenshot.png)
32+
Source code with examples is included in repository.
33+
34+
License
35+
-------
1036
Copyright 2013 Blaž Šolar
1137

1238
Licensed under the Apache License, Version 2.0 (the "License");

‎example/AndroidManifest.xml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,30 @@
66

77
<uses-sdk
88
android:targetSdkVersion="17"
9-
android:minSdkVersion="11" />
9+
android:minSdkVersion="8" />
1010

1111
<application
1212
android:label="@string/app_name"
1313
android:icon="@drawable/ic_launcher"
14-
android:theme="@android:style/Theme.Holo.Light.DarkActionBar">
15-
<activity android:name="FlowLayoutActivity"
16-
android:label="@string/app_name">
14+
android:theme="@android:style/Theme.Holo">
15+
16+
<activity android:name="FlowLayoutActivity"
17+
android:label="@string/app_name">
18+
1719
<intent-filter>
18-
<action android:name="android.intent.action.MAIN" />
19-
<category android:name="android.intent.category.LAUNCHER" />
20+
<action android:name="android.intent.action.MAIN" />
21+
<category android:name="android.intent.category.LAUNCHER" />
2022
</intent-filter>
21-
</activity>
23+
24+
</activity>
25+
2226
<activity android:name=".BasicActivity"
23-
android:label="@string/activity_basic" />
27+
android:label="@string/activity_basic" />
28+
29+
<activity
30+
android:name=".AllInOneActivity"
31+
android:label="@string/activity_all_in_one" />
32+
2433
</application>
34+
2535
</manifest>

‎example/framed_example_screenshot.png

314 KB
Loading

‎example/ic_launcher.png

4.61 KB
Loading

‎example/res/drawable-hdpi/ic_launcher.png

100644100755
-7.34 KB
Loading

‎example/res/drawable-ldpi/ic_launcher.png

-2.67 KB
Binary file not shown.

‎example/res/drawable-mdpi/ic_launcher.png

100644100755
-3.28 KB
Loading

‎example/res/drawable-xhdpi/ic_launcher.png

100644100755
-9.88 KB
Loading

‎example/res/layout/activity_all_in_one.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
~ Copyright 2013 Blaž Šolar
5+
~
6+
~ Licensed under the Apache License, Version 2.0 (the "License");
7+
~ you may not use this file except in compliance with the License.
8+
~ You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<si.solarb.flowlayout.FlowLayout xmlns:android="http://schemas.android.com/apk/res/android"
20+
xmlns:flowlayout="http://schemas.android.com/apk/res/si.solarb.flowlayout"
21+
android:layout_width="match_parent"
22+
android:layout_height="match_parent"
23+
android:gravity="start|top">
24+
25+
<Button
26+
android:layout_width="wrap_content"
27+
android:layout_height="wrap_content"
28+
android:text="Lorem ipsum"
29+
android:layout_gravity="center_vertical" />
30+
31+
<Button
32+
android:layout_width="wrap_content"
33+
android:layout_height="100dp"
34+
android:text="dolor" />
35+
36+
<Button
37+
android:layout_width="100dp"
38+
android:layout_height="wrap_content"
39+
android:text="sit amet, consectetur"
40+
android:layout_gravity="bottom"/>
41+
42+
<Button
43+
android:layout_width="wrap_content"
44+
android:layout_height="match_parent"
45+
android:layout_margin="10dp"
46+
android:text="adipisicing" />
47+
48+
<Button
49+
android:layout_width="match_parent"
50+
android:layout_height="wrap_content"
51+
android:layout_margin="10dp"
52+
android:text="elit, sed do eiusmod" />
53+
54+
<Button
55+
android:layout_width="200dp"
56+
android:layout_height="wrap_content"
57+
android:layout_margin="10dp"
58+
android:text="tempor incididunt" />
59+
60+
</si.solarb.flowlayout.FlowLayout>

0 commit comments

Comments
 (0)