diff --git a/assets/data/licences.html b/assets/data/licences.html new file mode 100644 index 000000000..d12b179ff --- /dev/null +++ b/assets/data/licences.html @@ -0,0 +1,24 @@ +

Third-party libraries

+

File chooser

+

Copyright (C) 2012 Hai Bison.

+

Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions:

+

The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software.

+

NanoHttpd

+

Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias. All rights reserved.

+

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

+

* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

+

* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

+

* Neither the name of the NanoHttpd organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

+

AmbilWarna

+

AmbilWarna used for color picker controls.

+

DragSortListiew

+

DragSortListiew used in network catalog management activity.

+

Dictionary APIs

+

FBReader uses OpenDictionary API.

+

FBReader uses the ABBYY Lingvo API. See ABBYY Lingvo on Google Play.

diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index b3dc3fa61..65e032ea6 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -762,6 +762,10 @@ + + + + diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml index ba5ce7e26..8d3c13877 100644 --- a/assets/resources/application/bg.xml +++ b/assets/resources/application/bg.xml @@ -761,6 +761,10 @@ + + + + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index 25d9787cd..7dbcbf47d 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -762,6 +762,10 @@ + + + + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 56f604032..ee6c06d69 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -765,6 +765,10 @@ + + + + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index 653b67661..ac663fe35 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index 720186a0f..bfb653456 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -758,6 +758,10 @@ + + + + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index 27f566a9b..a96d9f72d 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -754,6 +754,10 @@ + + + + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index ba164cf42..65cfdfab3 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index 0b6b8eb09..b6266cffe 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -761,6 +761,10 @@ + + + + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index 48c4f0ed8..83d4cd7a0 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index a1eed40e0..5e6facb0c 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index dad5bd87a..4ac6cf414 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -749,6 +749,10 @@ + + + + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index 6fa8d519b..724e58e52 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 37a5c740b..da0779657 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml index 4a95a9ca5..bc9c4e728 100644 --- a/assets/resources/application/hy.xml +++ b/assets/resources/application/hy.xml @@ -761,6 +761,10 @@ + + + + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index fe15ce2d3..0603233cc 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -747,6 +747,10 @@ + + + + diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml index d47431bab..466a8a134 100644 --- a/assets/resources/application/ka.xml +++ b/assets/resources/application/ka.xml @@ -761,6 +761,10 @@ + + + + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index c768d2fcd..86c61452f 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index 89f14e831..a8c588fbd 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index 8ec0cf0d7..b7e836708 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/pt.xml b/assets/resources/application/pt.xml index 6731d249a..7d2991e82 100644 --- a/assets/resources/application/pt.xml +++ b/assets/resources/application/pt.xml @@ -758,6 +758,10 @@ + + + + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index 74e75fc13..5e04c0279 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index cf360c67b..ea04bf028 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -761,6 +761,10 @@ + + + + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index 2d105918d..2b0811402 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index d3e51c40c..cf21871a4 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index a5ab8fea3..1c89926be 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -756,6 +756,10 @@ + + + + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index 96b93e07e..0b4e3cd1f 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index 4844a6373..756caa699 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 2d5a10921..4ef28b486 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -746,6 +746,10 @@ + + + + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index 6bd53a7e8..a842edc8a 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -746,6 +746,10 @@ + + + + diff --git a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java index 893b3aff2..0f68256cd 100644 --- a/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java +++ b/src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java @@ -614,5 +614,7 @@ public class PreferenceActivity extends ZLPreferenceActivity { aboutScreen.addPreference(new UrlPreference(this, aboutScreen.Resource, "site")); aboutScreen.addPreference(new UrlPreference(this, aboutScreen.Resource, "email")); aboutScreen.addPreference(new UrlPreference(this, aboutScreen.Resource, "twitter")); + aboutScreen.addPreference(new UrlPreference(this, aboutScreen.Resource, "facebook")); + aboutScreen.addPreference(new ThirdPartyLibrariesPreference(this, aboutScreen.Resource, "thirdParty")); } } diff --git a/src/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java b/src/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java new file mode 100644 index 000000000..6c7dffea5 --- /dev/null +++ b/src/org/geometerplus/android/fbreader/preferences/ThirdPartyLibrariesPreference.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2009-2014 Geometer Plus + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. + */ + +package org.geometerplus.android.fbreader.preferences; + +import java.io.*; + +import android.content.Context; +import android.preference.DialogPreference; +import android.text.Html; + +import org.geometerplus.zlibrary.core.filesystem.ZLFile; +import org.geometerplus.zlibrary.core.resources.ZLResource; + +class ThirdPartyLibrariesPreference extends DialogPreference { + ThirdPartyLibrariesPreference(Context context, ZLResource resource, String key) { + super(context, null); + + setTitle(resource.getResource(key).getValue()); + setNegativeButtonText(null); + setPositiveButtonText(ZLResource.resource("dialog").getResource("button").getResource("ok").getValue()); + final StringBuilder html = new StringBuilder(); + try { + final BufferedReader reader = new BufferedReader(new InputStreamReader( + ZLFile.createFileByPath("data/licences.html").getInputStream() + )); + String line; + while ((line = reader.readLine()) != null) { + html.append(line); + } + reader.close(); + } catch (IOException e) { + } + setDialogMessage(Html.fromHtml(html.toString())); + } +}