Add a link to the GPLv3

Update used libraries licenses
filtering
Floens 10 years ago
parent 2e2335c5b2
commit 20ca6af6d1
  1. 45
      Clover/app/src/main/assets/html/licenses.html
  2. 12
      Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java
  3. 13
      Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
  4. 5
      Clover/app/src/main/res/values/strings.xml

@ -94,51 +94,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
</pre>
<br>
<h3>This software includes several Android classes from DashClock</h3>
<a href="https://code.google.com/p/dashclock/">https://code.google.com/p/dashclock/</a>
<pre>
<code>
Copyright 2013 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
</code>
</pre>
<br>
<h3>DragSortListView</h3>
<a href="https://github.com/bauerca/drag-sort-listview">https://github.com/bauerca/drag-sort-listview</a>
<pre>
<code>
A subclass of the Android ListView component that enables drag
and drop re-ordering of list items.
Copyright 2012 Carl Bauer
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
</code>
</pre>
<br>
<h3>android-gif-drawable</h3>
<a href="https://github.com/koral--/android-gif-drawable">https://github.com/koral--/android-gif-drawable</a>
<pre>

@ -20,22 +20,26 @@ package org.floens.chan.ui.controller;
import android.content.Context;
import android.webkit.WebView;
import org.floens.chan.R;
import org.floens.chan.controller.Controller;
public class LicensesController extends Controller {
public LicensesController(Context context) {
private String title;
private String url;
public LicensesController(Context context, String title, String url) {
super(context);
this.title = title;
this.url = url;
}
@Override
public void onCreate() {
super.onCreate();
navigationItem.title = string(R.string.setting_screen_licenses);
navigationItem.title = title;
WebView webView = new WebView(context);
webView.loadUrl("file:///android_asset/html/licenses.html");
webView.loadUrl(url);
webView.setBackgroundColor(0xffffffff);
view = webView;
}

@ -172,10 +172,19 @@ public class MainSettingsController extends SettingsController implements Toolba
// About group
SettingsGroup about = new SettingsGroup(s(R.string.settings_group_about));
about.add(new LinkSettingView(this, s(R.string.settings_about_licenses), s(R.string.settings_about_licences_description), new View.OnClickListener() {
about.add(new LinkSettingView(this, s(R.string.settings_about_license), s(R.string.settings_about_license_description), new View.OnClickListener() {
@Override
public void onClick(View v) {
navigationController.pushController(new LicensesController(context));
navigationController.pushController(new LicensesController(context,
s(R.string.settings_about_license), "file:///android_asset/html/license.html"));
}
}));
about.add(new LinkSettingView(this, s(R.string.settings_about_licenses), s(R.string.settings_about_licenses_description), new View.OnClickListener() {
@Override
public void onClick(View v) {
navigationController.pushController(new LicensesController(context,
s(R.string.settings_about_licenses), "file:///android_asset/html/licenses.html"));
}
}));

@ -185,8 +185,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<string name="setting_post_pin">Pin thread on post</string>
<string name="settings_group_about">About</string>
<string name="settings_about_license">Released under the GNU GPLv3 license</string>
<string name="settings_about_license_description">Tap to see license</string>
<string name="settings_about_licenses">Open Source Licenses</string>
<string name="settings_about_licences_description">Legal information about licenses</string>
<string name="settings_about_licenses_description">Legal information about licenses</string>
<string name="settings_developer">Developer settings</string>
<string name="settings_screen_advanced">Advanced settings</string>
@ -253,7 +255,6 @@ Don't have a 4chan Pass?&lt;br>
</string>
<string name="setting_pass_summary_enabled">Using 4chan pass</string>
<string name="setting_pass_summary_disabled">Off</string>
<string name="setting_screen_licenses">Open Source Licenses</string>
</resources>

Loading…
Cancel
Save