diff --git a/Clover/app/src/main/assets/html/licenses.html b/Clover/app/src/main/assets/html/licenses.html index 7240eb1f..6724e8c6 100644 --- a/Clover/app/src/main/assets/html/licenses.html +++ b/Clover/app/src/main/assets/html/licenses.html @@ -94,51 +94,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-

This software includes several Android classes from DashClock

- https://code.google.com/p/dashclock/ - 
-        
-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.
-        
-
-
- -

DragSortListView

- https://github.com/bauerca/drag-sort-listview - 
-        
-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.
-        
-
-
-

android-gif-drawable

https://github.com/koral--/android-gif-drawable 
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java
index baaa1e58..61315500 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/LicensesController.java
@@ -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;
     }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
index b6939d2f..a59b73c0 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java
@@ -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"));
             }
         }));
 
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 76254626..e0aa1d53 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -185,8 +185,10 @@ along with this program.  If not, see .
     Pin thread on post
 
     About
+    Released under the GNU GPLv3 license
+    Tap to see license
     Open Source Licenses
-    Legal information about licenses
+    Legal information about licenses
     Developer settings
 
     Advanced settings
@@ -253,7 +255,6 @@ Don't have a 4chan Pass?<br>
     
     Using 4chan pass
     Off
-    Open Source Licenses