diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2017-10-15 18:13:57 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-10-15 18:13:57 +0900 |
commit | 477b25648c5fd5eefe52534997ed61772560674b (patch) | |
tree | bf7f8d2917e5287da1afbf38f9441b8b4209b12c /app/src/main | |
parent | beee7bd29cb21ab2c18c1a9a7e88cac95381d77c (diff) | |
download | SmileEssence-477b25648c5fd5eefe52534997ed61772560674b.tar.gz |
license activity made simple
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt | 34 | ||||
-rw-r--r-- | app/src/main/res/layout/layout_license.xml | 50 | ||||
-rw-r--r-- | app/src/main/res/values/license.xml | 180 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 6 |
4 files changed, 5 insertions, 265 deletions
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt index b166d1af..cf37e5c4 100644 --- a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt +++ b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.kt @@ -2,46 +2,14 @@ package net.lacolaco.smileessence.activity import android.os.Bundle import android.support.v7.app.AppCompatActivity -import android.view.MenuItem -import android.widget.TextView import kotlinx.android.synthetic.main.layout_license.* import net.lacolaco.smileessence.R -import java.util.* class LicenseActivity : AppCompatActivity() { - private val fileNames: List<String> - get() { - val apacheFiles = ArrayList<String>() - apacheFiles.add(getString(R.string.library_name_twitter4j)) - apacheFiles.add(getString(R.string.library_name_volley)) - apacheFiles.add(getString(R.string.library_name_twitter_text)) - return apacheFiles - } - public override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.layout_license) setSupportActionBar(toolbar) - - setFiles() - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - android.R.id.home -> { - finish() - return true - } - } - return true - } - - private fun setFiles() { - val apacheFiles = fileNames - for (apacheFile in apacheFiles) { - val name = TextView(this) - name.text = String.format("- %s", apacheFile) - linear_license_files.addView(name) - } + web_view.loadUrl("file:///android_asset/licenses.html") } } diff --git a/app/src/main/res/layout/layout_license.xml b/app/src/main/res/layout/layout_license.xml index 52c0fefb..0ad86e59 100644 --- a/app/src/main/res/layout/layout_license.xml +++ b/app/src/main/res/layout/layout_license.xml @@ -10,52 +10,8 @@ android:background="?attr/colorPrimary" android:elevation="4dp" /> - <ScrollView + <WebView + android:id="@+id/web_view" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="10dp"> - - <TextView - android:id="@+id/textView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left|center_vertical" - android:text="@string/notices_of_files" - android:textSize="20sp" - android:textStyle="bold" /> - - <LinearLayout - android:id="@+id/linear_license_files" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="left|center_vertical" - android:orientation="vertical" - android:paddingBottom="10dp" - android:paddingLeft="10dp" - android:paddingTop="10dp" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#cacaca" - android:padding="10dp"> - - <TextView - android:id="@+id/textView4" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|left" - android:text="@string/apache" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small" - android:textColor="@color/gray_dark_dark" - android:typeface="monospace" /> - </FrameLayout> - </LinearLayout> - </ScrollView> + android:layout_height="match_parent" /> </LinearLayout> diff --git a/app/src/main/res/values/license.xml b/app/src/main/res/values/license.xml deleted file mode 100644 index c3d9f3cd..00000000 --- a/app/src/main/res/values/license.xml +++ /dev/null @@ -1,180 +0,0 @@ -<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> - <string name="apache" tools:ignore="TypographyOther"> - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - </string> -</resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1c33e49..d15d7e8d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,13 +5,10 @@ <string name="app_author">Developed by laco0416</string> <string name="app_thanks_to">Thanks to</string> <string name="thanks_to">miz_hi, yaplus, firstspring1845, ahiru3net, unyuho123, karno, ret156, vividtomato_, hoyo203, brsywe, NTTrf, mikamikafever</string> - <string name="library_name_twitter4j">twitter4j</string> - <string name="library_name_volley">Volley</string> - <string name="library_name_twitter_text">twitter-text</string> <string name="activity_setting">App Setting</string> <string name="activity_edit_extraction">Extraction Setting</string> <string name="activity_authenticate">Authenticate</string> - <string name="activity_licenses">Licenses</string> + <string name="activity_licenses">Open Source Licenses</string> <string name="intent_post">Tweet</string> <string name="message_oauth_text">Please get PIN code at a URL below, and input it.</string> <string name="message_oauth_hint">PIN code</string> @@ -122,7 +119,6 @@ <string name="command_status_add_to_reply">Add to reply</string> <string name="notice_error_get_user_timeline">Failed to get user timeline</string> <string name="notice_error_get_list">Failed to get list timeline</string> - <string name="notices_of_files">Notices of files:</string> <string name="notice_cant_remove_last_account">You can\'t remove last account</string> <string name="notice_error_storage_permission">Write access to external storage is required.</string> </resources> |