Skip to content

Commit ede1ccd

Browse files
committed
Changed license to Apache License version 2.0.
1 parent 0b47dd6 commit ede1ccd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+523
-484
lines changed

LICENSE.txt

Lines changed: 176 additions & 164 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ The library provides the following features:
1616

1717
## License Agreement
1818

19-
This project is distributed under the GNU Lesser Public License version 3.0 (GLPLv3). For further information about this license agreement's content please refer to its full version, which is available at http://www.gnu.org/licenses/lgpl.txt.
19+
This project is distributed under the Apache License version 2.0. For further information about this license agreement's content please refer to its full version, which is available at http://www.apache.org/licenses/LICENSE-2.0.txt.
20+
21+
Prior to version 1.0.1 this library was distributed under the GNU Lesser General Public License version 3.0 (GLPLv3).
2022

2123
## Download
2224

doc/index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h4>About</h4>
2828

2929
<p>"AndroidBottomSheet" is an Android-library, which provides a bottom sheet as proposed by Android's Material design guidelines (see <a href="http://www.google.com/design/spec/components/bottom-sheets.html">here</a> for further details), which even works on pre-Lollipop devices. A bottom sheet is supposed to contain menu items, which can be clicked by the user. By default only a few items are shown, but by dragging the bottom sheet, it can be expanded to display all items. The following screenshot shows the appearance of a bottom sheet, which has been created by using the library:</p>
3030

31-
<p><center><a href="images/example.png" target="_blank".><img src="images/example.png" alt="Example"></center></a></p>
31+
<p><center><a href="images/example.png" target="_blank".><img src="images/example.png" alt="Example"></a></center></p>
3232

3333
<p>The aim of this documentation is to offer an overview of the project's source code and to explain, how the interface, which is provided by the library, can be used and how the underlying implementations are supposed to work.</p>
3434

@@ -46,7 +46,9 @@ <h4>About</h4>
4646

4747
<h4>License Agreement</h4>
4848

49-
<p>This project is distributed under the GNU Lesser Public License version 3.0 (GLPLv3). For further information about this license agreement's content please refer to its full version, which is available at <a href="http://www.gnu.org/licenses/lgpl.txt">http://www.gnu.org/licenses/lgpl.txt</a>.</p>
49+
<p>This project is distributed under the Apache License version 2.0. For further information about this license agreement's content please refer to its full version, which is available at <a href="http://www.apache.org/licenses/LICENSE-2.0.txt">http://www.apache.org/licenses/LICENSE-2.0.txt</a>.</p>
50+
51+
<p>Prior to version 1.0.1 this library was distributed under the GNU Lesser General Public License version 3.0 (GLPLv3).</p>
5052

5153
<h4>Download</h4>
5254

example/src/main/AndroidManifest.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<!--
4-
AndroidBottomSheet Copyright 2016 Michael Rapp
4+
Copyright 2016 Michael Rapp
55
6-
This program is free software: you can redistribute it and/or modify it under the terms of the GNU
7-
Lesser General Public License as published by the Free Software Foundation, either version 3 of the
8-
License, or (at your option) any later version.
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
7+
compliance with the License. You may obtain a copy of the License at
98
10-
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
11-
even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12-
General Public License for more details.
9+
http://www.apache.org/licenses/LICENSE-2.0
1310
14-
You should have received a copy of the GNU Lesser General Public License along with this program. If
15-
not, see <http://www.gnu.org/licenses/>.
11+
Unless required by applicable law or agreed to in writing, software distributed under the License is
12+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13+
implied. See the License for the specific language governing permissions and limitations under the
14+
License.
1615
-->
1716
<manifest
1817
package="de.mrapp.android.bottomsheet.example"

example/src/main/java/de/mrapp/android/bottomsheet/example/MainActivity.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
/*
2-
* AndroidBottomSheet Copyright 2016 Michael Rapp
2+
* Copyright 2014 - 2016 Michael Rapp
33
*
4-
* This program is free software: you can redistribute it and/or modify it under the terms of the
5-
* GNU Lesser General Public License as published by the Free Software Foundation, either version 3
6-
* of the License, or (at your option) any later version.
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
* in compliance with the License. You may obtain a copy of the License at
76
*
8-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
9-
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10-
* General Public License for more details.
7+
* http://www.apache.org/licenses/LICENSE-2.0
118
*
12-
* You should have received a copy of the GNU Lesser General Public License along with this program.
13-
* If not, see <http://www.gnu.org/licenses/>.
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License
10+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11+
* or implied. See the License for the specific language governing permissions and limitations under
12+
* the License.
1413
*/
1514
package de.mrapp.android.bottomsheet.example;
1615

example/src/main/java/de/mrapp/android/bottomsheet/example/PreferenceFragment.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
/*
2-
* AndroidBottomSheet Copyright 2016 Michael Rapp
2+
* Copyright 2014 - 2016 Michael Rapp
33
*
4-
* This program is free software: you can redistribute it and/or modify it under the terms of the
5-
* GNU Lesser General Public License as published by the Free Software Foundation, either version 3
6-
* of the License, or (at your option) any later version.
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
* in compliance with the License. You may obtain a copy of the License at
76
*
8-
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
9-
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10-
* General Public License for more details.
7+
* http://www.apache.org/licenses/LICENSE-2.0
118
*
12-
* You should have received a copy of the GNU Lesser General Public License along with this program.
13-
* If not, see <http://www.gnu.org/licenses/>.
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License
10+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11+
* or implied. See the License for the specific language governing permissions and limitations under
12+
* the License.
1413
*/
1514
package de.mrapp.android.bottomsheet.example;
1615

example/src/main/res/drawable/grid_item.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2016 Michael Rapp
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
7+
compliance with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software distributed under the License is
12+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13+
implied. See the License for the specific language governing permissions and limitations under the
14+
License.
15+
-->
216
<selector xmlns:android="http://schemas.android.com/apk/res/android">
317

418
<item android:drawable="@drawable/grid_item_icon_disabled" android:state_enabled="false"/>

example/src/main/res/drawable/grid_item_dark.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2016 Michael Rapp
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
7+
compliance with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software distributed under the License is
12+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13+
implied. See the License for the specific language governing permissions and limitations under the
14+
License.
15+
-->
216
<selector xmlns:android="http://schemas.android.com/apk/res/android">
317

418
<item android:drawable="@drawable/grid_item_dark_icon_disabled" android:state_enabled="false"/>

example/src/main/res/drawable/list_item.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2016 Michael Rapp
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
7+
compliance with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software distributed under the License is
12+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13+
implied. See the License for the specific language governing permissions and limitations under the
14+
License.
15+
-->
216
<selector xmlns:android="http://schemas.android.com/apk/res/android">
317

418
<item android:drawable="@drawable/list_item_icon_disabled" android:state_enabled="false"/>

example/src/main/res/drawable/list_item_dark.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
Copyright 2016 Michael Rapp
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
7+
compliance with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software distributed under the License is
12+
distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
13+
implied. See the License for the specific language governing permissions and limitations under the
14+
License.
15+
-->
216
<selector xmlns:android="http://schemas.android.com/apk/res/android">
317

418
<item android:drawable="@drawable/list_item_dark_icon_disabled" android:state_enabled="false"/>

0 commit comments

Comments
 (0)