diff options
Diffstat (limited to 'app')
18 files changed, 620 insertions, 306 deletions
diff --git a/app/build.gradle b/app/build.gradle index f0c0327..3eaec0f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,24 +3,13 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 buildToolsVersion "23.0.2" - packagingOptions { - exclude 'META-INF/DEPENDENCIES.txt' - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE.txt' - exclude 'META-INF/NOTICE' - exclude 'META-INF/LICENSE' - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/notice.txt' - exclude 'META-INF/license.txt' - exclude 'META-INF/dependencies.txt' - exclude 'META-INF/LGPL2.1' - } + defaultConfig { applicationId "org.bienvenidoainternet.baiparser" minSdkVersion 15 targetSdkVersion 23 - versionCode 1 - versionName "1.1" + versionCode 5 + versionName "1.5" } buildTypes { release { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 31f37e2..59d5328 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,14 +22,16 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name=".ResponseActivity" /> + <activity android:name=".ResponseActivity" + android:theme="@style/AppTheme" /> <activity android:name=".SettingsActivity" - android:label="@string/title_activity_settings" /> + android:label="@string/title_activity_settings" + android:theme="@style/AppTheme" /> <activity android:name=".ViewerActivity" - android:theme="@style/TransparentCompat"></activity> - <activity android:name=".UpdaterActivity"></activity> + android:theme="@style/TransparentCompat" /> + <activity android:name=".LicensesActivity"></activity> </application> </manifest> diff --git a/app/src/main/assets/html/licenses.html b/app/src/main/assets/html/licenses.html new file mode 100644 index 0000000..2dc0b8e --- /dev/null +++ b/app/src/main/assets/html/licenses.html @@ -0,0 +1,540 @@ +<!DOCTYPE html> +<html> +<head> + <title>Open Source Licences</title> + <meta charset="UTF-8"> + <style type="text/css"> + body { + margin: 0; + padding: 10px; + font-family: sans-serif; + } + + pre { + background-color: #F0F0F0; + padding: 12px; + white-space: pre-wrap; + } + </style> +</head> +<body> + <h3>This software includes several Android classes from the Android Open Source Project.</h3> + <pre> + <code> +Copyright (C) 2012 The Android Open Source Project + +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>Subsampling Scale Image View</h3> + <a href="https://github.com/davemorrissey/subsampling-scale-image-view">https://github.com/davemorrissey/subsampling-scale-image-view</a> + <pre> + <code> +Copyright 2014 David Morrissey + +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 Asynchronous Networking and Image Loading</h3> + <a href="https://github.com/koush/ion">https://github.com/koush/ion</a> + <pre> + <code> + Copyright 2013 Koushik Dutta (2013) + + 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> + <code> +MIT License +Copyright (c) + +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. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +// Copyright (c) 2011 Google Inc. 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 Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond + </code> + </pre> + <br> + + <h3>Material Design icons by Google</h3> + <a href="https://github.com/google/material-design-icons">https://github.com/google/material-design-icons</a> + <pre> + <code> + Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public licenses. +Notwithstanding, Creative Commons may elect to apply one of its public +licenses to material it publishes and in those instances will be +considered the "Licensor." Except for the limited purpose of indicating +that material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the public +licenses. + +Creative Commons may be contacted at creativecommons.org. + </code> + </pre> +</body> +</html> diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java new file mode 100644 index 0000000..b91ce2b --- /dev/null +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/LicensesActivity.java @@ -0,0 +1,16 @@ +package org.bienvenidoainternet.baiparser; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.webkit.WebView; + +public class LicensesActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_licenses); + WebView webView = (WebView) findViewById(R.id.webView); + webView.loadUrl("file:///android_asset/html/licenses.html"); + } +} diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java index bfe9db7..65b51e2 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/MainActivity.java @@ -217,10 +217,8 @@ public class MainActivity extends AppCompatActivity refreshNavigator(); } - // TODO: Aplicar tema al navigator -// navigationView.setBackgroundColor(themeManager.getPrimaryDarkColor()); - // TODO: Arreglar el servidor -// checkForUpdates(); + //TODO: Aplicar tema al navigator + //navigationView.setBackgroundColor(themeManager.getPrimaryDarkColor()); } @Override @@ -293,10 +291,9 @@ public class MainActivity extends AppCompatActivity childFragment.scrollToTop(); } break; - case R.id.action_update: - Toast.makeText(getApplicationContext(), "nope", Toast.LENGTH_SHORT).show(); -// Intent updater = new Intent(getApplicationContext(), UpdaterActivity.class); -// startActivity(updater); + case R.id.action_about: + startActivity(new Intent(getApplicationContext(), LicensesActivity.class)); + break; } return super.onOptionsItemSelected(item); } @@ -420,10 +417,10 @@ public class MainActivity extends AppCompatActivity } } } + /* Crea una secuencia de caracteres de 8 digitos aleatorios (incluye mayusculas, minisculas y numeros). */ - public String makePassword(){ Random r = new Random(); String rnd = ""; @@ -441,40 +438,4 @@ public class MainActivity extends AppCompatActivity } return rnd; } - - public void checkForUpdates(){ - Ion.with(getApplicationContext()) - .load("http://ahri.xyz/bai/version.php") - .asString() - .setCallback(new FutureCallback<String>() { - @Override - public void onCompleted(Exception e, String result) { - if (e != null){ - e.printStackTrace(); - }else{ - try { - JSONObject version = new JSONObject(result); - float lastVersion = (float) version.getDouble("version"); - if (CURRENT_VERSION == lastVersion){ - Log.v("Updater", "Up to date"); - }else{ - Log.v("Updater", "New version available : " + lastVersion); - Snackbar.make(getCurrentFocus(), "Nueva versión disponible", Snackbar.LENGTH_LONG) - .setAction("Actualizar", new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent updater = new Intent(getApplicationContext(), UpdaterActivity.class); - startActivity(updater); - } - }) - .setActionTextColor(Color.rgb(255,127,0)) - .show(); - } - } catch (JSONException e1) { - e1.printStackTrace(); - } - } - } - }); - } } diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java index b319426..e96868a 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ResponseActivity.java @@ -2,11 +2,15 @@ package org.bienvenidoainternet.baiparser; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -27,12 +31,6 @@ import java.io.File; import utils.ContentProviderUtils; -//import org.apache.http.HttpEntity; -//import org.apache.http.entity.ContentType; -//import org.apache.http.entity.mime.HttpMultipartMode; -//import org.apache.http.entity.mime.MultipartEntityBuilder; -//import org.apache.http.entity.mime.content.FileBody; -//import org.apache.http.entity.mime.content.StringBody; public class ResponseActivity extends AppCompatActivity { @@ -67,17 +65,6 @@ public class ResponseActivity extends AppCompatActivity { LinearLayout layoutProcess = (LinearLayout)findViewById(R.id.layoutPostProcess); layoutProcess.setVisibility(View.GONE); filePath = (EditText) findViewById(R.id.txtFilePath); - Button send = (Button)findViewById(R.id.btnSend); - send.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - TextView txtName = (TextView) findViewById(R.id.txtPosterName); - TextView txtEmail = (TextView) findViewById(R.id.txtEmail); - TextView txtMessage = (TextView) findViewById(R.id.txtResponse); - makePost(txtName.getText().toString(), txtEmail.getText().toString(), txtMessage.getText().toString()); - - } - }); Button bBold = (Button) findViewById(R.id.buttonBold); bBold.setOnClickListener(new View.OnClickListener() { @@ -127,6 +114,23 @@ public class ResponseActivity extends AppCompatActivity { } @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.menu_replyform, menu); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.action_form_reply){ + TextView txtName = (TextView) findViewById(R.id.txtPosterName); + TextView txtEmail = (TextView) findViewById(R.id.txtEmail); + TextView txtMessage = (TextView) findViewById(R.id.txtResponse); + makePost(txtName.getText().toString(), txtEmail.getText().toString(), txtMessage.getText().toString()); + } + return super.onOptionsItemSelected(item); + } + + @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); if (requestCode == PICK_IMAGE && resultCode == RESULT_OK && null != data) { diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/UpdaterActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/UpdaterActivity.java deleted file mode 100644 index e98f303..0000000 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/UpdaterActivity.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.bienvenidoainternet.baiparser; - -import android.content.Context; -import android.content.ContextWrapper; -import android.content.Intent; -import android.net.Uri; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.text.Html; -import android.util.Log; -import android.view.View; -import android.widget.Button; -import android.widget.ProgressBar; -import android.widget.TextView; -import android.widget.Toast; - -import com.koushikdutta.async.future.FutureCallback; -import com.koushikdutta.ion.Ion; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; - -public class UpdaterActivity extends AppCompatActivity { - private float lastVersion = 1.0F; - Button btnUpdate; - ProgressBar barUpdate; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_updater); - setTheme(R.style.AppTheme_Black_Activity); - btnUpdate = (Button) findViewById(R.id.btnDownloadLastVersion); - barUpdate = (ProgressBar) findViewById(R.id.barUpdateProgress); - TextView txtCurrentVersion = (TextView) findViewById(R.id.txtCurrentVersion); - btnUpdate.setEnabled(false); - txtCurrentVersion.setText("Versión actual: " + MainActivity.CURRENT_VERSION); - getVersionData(); - btnUpdate.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - downloadApk(); - } - }); - } - - private void getVersionData(){ - Ion.with(getApplicationContext()) - .load("http://ahri.xyz/bai/version.php") - .asString() - .setCallback(new FutureCallback<String>() { - @Override - public void onCompleted(Exception e, String result) { - if (e != null) { - e.printStackTrace(); - } else { - JSONObject version = null; - try { - version = new JSONObject(result); - lastVersion = (float) version.getDouble("version"); - TextView txtLastVersion = (TextView) findViewById(R.id.txtLastVersion); - txtLastVersion.setText("Última versión: " + lastVersion); - - if (lastVersion > MainActivity.CURRENT_VERSION) { - getChangelog(); - btnUpdate.setEnabled(true); - } - } catch (JSONException e1) { - e1.printStackTrace(); - } - } - } - }); - } - - private void getChangelog(){ - Ion.with(getApplicationContext()) - .load("http://ahri.xyz/bai/lastChangelog.txt") - .asString() - .setCallback(new FutureCallback<String>() { - @Override - public void onCompleted(Exception e, String result) { - if (e != null){ - e.printStackTrace(); - }else{ - TextView txtChangelog = (TextView) findViewById(R.id.txtChangelog); - txtChangelog.setText(Html.fromHtml(result)); - } - } - }); - } - - private void downloadApk(){ - ContextWrapper cw = new ContextWrapper(getApplicationContext()); - File directory = cw.getDir("src", Context.MODE_PRIVATE); - if (!directory.exists()) { - directory.mkdir(); - } - final File filePath = new File(directory, "last.apk"); - if (filePath.exists()) { - filePath.delete(); - } - Ion.with(getApplicationContext()) - .load("http://ahri.xyz/bai/" + lastVersion + "/last.apk") - .setLogging("Updater", Log.VERBOSE) - .progressBar(barUpdate) - .write(filePath) - .setCallback(new FutureCallback<File>() { - @Override - public void onCompleted(Exception e, File result) { - if (e != null) { - Toast.makeText(getApplicationContext(), "Error: " + e.getMessage(), Toast.LENGTH_LONG).show(); - } else { - Intent promptInstall = new Intent(Intent.ACTION_VIEW) - .setDataAndType(Uri.fromFile(filePath), - "application/vnd.android.package-archive"); - startActivity(promptInstall); - } - } - }); - } -} - - diff --git a/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java b/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java index b113c2a..4501c0f 100644 --- a/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java +++ b/app/src/main/java/org/bienvenidoainternet/baiparser/ViewerActivity.java @@ -40,26 +40,6 @@ public class ViewerActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - -// SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); -// int themeId = Integer.valueOf(settings.getString("setting_theme", "1")), currentThemeId = R.style.AppTheme; -// switch (themeId) { -// case 1: -// currentThemeId = R.style.AppTheme_NoActionBar; -// break; -// case 2: -// currentThemeId = R.style.AppTheme_Dark; -// break; -// case 3: -// currentThemeId = R.style.AppTheme_HeadLine; -// break; -// case 4: -// currentThemeId = R.style.AppTheme_Black; -// break; -// } -// setTheme(currentThemeId); - - if (savedInstanceState != null){ bi = savedInstanceState.getParcelable("boardItem"); } @@ -70,8 +50,6 @@ public class ViewerActivity extends AppCompatActivity { imageView = (SubsamplingScaleImageView)findViewById(R.id.imageView); gifView = (GifImageView) findViewById(R.id.gifView); setTitle(bi.getFile()); -// imageView.setOnClickListener(new View.OnClickListener() { -// new TaskDownloadFile().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); downloadFile(); this.getSupportActionBar().setDisplayHomeAsUpEnabled(true); } diff --git a/app/src/main/res/drawable-hdpi/ic_action_send.png b/app/src/main/res/drawable-hdpi/ic_action_send.png Binary files differnew file mode 100644 index 0000000..100cd85 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_action_send.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_send.png b/app/src/main/res/drawable-mdpi/ic_action_send.png Binary files differnew file mode 100644 index 0000000..eea6617 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_action_send.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_send.png b/app/src/main/res/drawable-xhdpi/ic_action_send.png Binary files differnew file mode 100644 index 0000000..b098e07 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_action_send.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_send.png b/app/src/main/res/drawable-xxhdpi/ic_action_send.png Binary files differnew file mode 100644 index 0000000..f1f07a9 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_send.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_send.png b/app/src/main/res/drawable-xxxhdpi/ic_action_send.png Binary files differnew file mode 100644 index 0000000..2dcc7a2 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_action_send.png diff --git a/app/src/main/res/layout/activity_licenses.xml b/app/src/main/res/layout/activity_licenses.xml new file mode 100644 index 0000000..c9cf760 --- /dev/null +++ b/app/src/main/res/layout/activity_licenses.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context="org.bienvenidoainternet.baiparser.LicensesActivity"> + + <WebView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/webView" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> +</RelativeLayout> diff --git a/app/src/main/res/layout/activity_response.xml b/app/src/main/res/layout/activity_response.xml index 19194d4..bfd143e 100644 --- a/app/src/main/res/layout/activity_response.xml +++ b/app/src/main/res/layout/activity_response.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingBottom="@dimen/activity_vertical_margin" @@ -9,6 +10,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="org.bienvenidoainternet.baiparser.ResponseActivity" android:textAlignment="textEnd"> + <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -36,7 +38,7 @@ android:hint="@string/txt_email" /> <EditText - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textMultiLine" android:ems="10" @@ -49,16 +51,6 @@ android:capitalize="sentences" /> <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/btn_send" - android:id="@+id/btnSend" - android:layout_alignWithParentIfMissing="false" - android:layout_below="@+id/txtResponse" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> - - <Button style="?android:attr/buttonStyleSmall" android:layout_width="32dp" android:layout_height="32dp" diff --git a/app/src/main/res/layout/activity_updater.xml b/app/src/main/res/layout/activity_updater.xml deleted file mode 100644 index b287293..0000000 --- a/app/src/main/res/layout/activity_updater.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - tools:context="org.bienvenidoainternet.baiparser.UpdaterActivity"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Versión actual:" - android:id="@+id/txtCurrentVersion" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Última versión:" - android:id="@+id/txtLastVersion" - android:layout_below="@+id/txtCurrentVersion" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <Button - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Descargar última versión" - android:id="@+id/btnDownloadLastVersion" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" /> - - <ProgressBar - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/barUpdateProgress" - android:layout_above="@+id/btnDownloadLastVersion" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="" - android:id="@+id/txtChangelog" - android:layout_below="@+id/txtLastVersion" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:layout_marginTop="5dp" - android:typeface="monospace" - android:layout_above="@+id/barUpdateProgress" - android:layout_marginBottom="5dp" /> -</RelativeLayout> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 280b121..7735ffb 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -23,8 +23,8 @@ android:title="@string/action_settings" app:showAsAction="never" /> <item - android:title="Buscar actualizaciones" - android:id="@+id/action_update" + android:title="Acerca de ..." + android:id="@+id/action_about" android:orderInCategory="500" app:showAsAction="never"/> <item diff --git a/app/src/main/res/menu/menu_replyform.xml b/app/src/main/res/menu/menu_replyform.xml new file mode 100644 index 0000000..395bca3 --- /dev/null +++ b/app/src/main/res/menu/menu_replyform.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item android:id="@+id/action_form_reply" + android:icon="@drawable/ic_action_send" + android:title="Responder" + app:showAsAction="always"/> +</menu>
\ No newline at end of file |
