From 90bcfd7797a78fdcb646c5e452bb6fc3bdc3f89a Mon Sep 17 00:00:00 2001 From: Negue Date: Sat, 27 Jun 2015 20:14:26 +0200 Subject: [PATCH] Remove old Changelog Dialog --- Habitica/res/xml/app_prefs_cat2.xml | 4 - Habitica/res/xml/app_prefs_cat3.xml | 5 - Habitica/res/xml/changelog.xml | 6 - Habitica/res/xml/pref_headers.xml | 6 - .../android/habitica/ChangeLogDialog.java | 255 ------------------ 5 files changed, 276 deletions(-) delete mode 100644 Habitica/res/xml/app_prefs_cat3.xml delete mode 100644 Habitica/res/xml/changelog.xml delete mode 100644 Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java diff --git a/Habitica/res/xml/app_prefs_cat2.xml b/Habitica/res/xml/app_prefs_cat2.xml index 9c7eddb70..5259b88f9 100644 --- a/Habitica/res/xml/app_prefs_cat2.xml +++ b/Habitica/res/xml/app_prefs_cat2.xml @@ -15,8 +15,4 @@ - \ No newline at end of file diff --git a/Habitica/res/xml/app_prefs_cat3.xml b/Habitica/res/xml/app_prefs_cat3.xml deleted file mode 100644 index 2d9b9e6e2..000000000 --- a/Habitica/res/xml/app_prefs_cat3.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Habitica/res/xml/changelog.xml b/Habitica/res/xml/changelog.xml deleted file mode 100644 index fe71c138c..000000000 --- a/Habitica/res/xml/changelog.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - Soon to be filled with many features - - \ No newline at end of file diff --git a/Habitica/res/xml/pref_headers.xml b/Habitica/res/xml/pref_headers.xml index 4be771ce7..08ce5fa4b 100644 --- a/Habitica/res/xml/pref_headers.xml +++ b/Habitica/res/xml/pref_headers.xml @@ -22,10 +22,4 @@ -
-
- \ No newline at end of file diff --git a/Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java b/Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java deleted file mode 100644 index 3e4d8739e..000000000 --- a/Habitica/src/com/habitrpg/android/habitica/ChangeLogDialog.java +++ /dev/null @@ -1,255 +0,0 @@ -/* - * (c) 2012 Martin van Zuilekom (http://martin.cubeactive.com) - * - * 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. - * - */ -package com.habitrpg.android.habitica; - -import android.annotation.SuppressLint; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.Resources; -import android.content.res.XmlResourceParser; -import android.text.format.DateFormat; -import android.util.Log; -import android.webkit.WebView; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import java.io.IOException; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * Class to show a change log dialog - */ -public class ChangeLogDialog { - private static final String TAG = "ChangeLogDialog"; - - private final Context mContext; - private String mStyle = "h1 { margin-left: 0px; font-size: 12pt; }" - + "li { margin-left: 0px; font-size: 9pt; }" - + "ul { padding-left: 30px; }" - + ".summary { font-size: 9pt; color: #606060; display: block; clear: left; }" - + ".date { font-size: 9pt; color: #606060; display: block; }"; - - protected DialogInterface.OnDismissListener mOnDismissListener; - - public ChangeLogDialog(final Context context) { - mContext = context; - } - - protected Context getContext() { - return mContext; - } - - //Get the current app version - private String getAppVersion() { - String versionName = ""; - try { - final PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0); - versionName = packageInfo.versionName; - } catch (NameNotFoundException e) { - Log.e(TAG, e.getMessage(), e); - } - return versionName; - } - - //Parse a date string from the xml and format it using the local date format - @SuppressLint("SimpleDateFormat") - private String parseDate(final String dateString) { - final SimpleDateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); - try { - final Date parsedDate = dateFormat.parse(dateString); - return DateFormat.getDateFormat(getContext()).format(parsedDate); - } catch (ParseException ignored) { - //If there is a problem parsing the date just return the original string - return dateString; - } - } - - //Parse a the release tag and appends it to the changelog builder - private void parseReleaseTag(final StringBuilder changelogBuilder, final XmlPullParser resourceParser) throws XmlPullParserException, IOException { - changelogBuilder.append("

Release: ").append(resourceParser.getAttributeValue(null, "version")).append("

"); - - //Add date if available - if (resourceParser.getAttributeValue(null, "date") != null) { - changelogBuilder.append("").append(parseDate(resourceParser.getAttributeValue(null, "date"))).append(""); - } - - //Add summary if available - if (resourceParser.getAttributeValue(null, "summary") != null) { - changelogBuilder.append("").append(resourceParser.getAttributeValue(null, "summary")).append(""); - } - - changelogBuilder.append("
    "); - - //Parse child nodes - int eventType = resourceParser.getEventType(); - while ((eventType != XmlPullParser.END_TAG) || (resourceParser.getName().equals("change") || resourceParser.getName().equals("feature") || resourceParser.getName().equals("bugfix"))) { - if ((eventType == XmlPullParser.START_TAG)) { - if (resourceParser.getName().equals("change")) - { - eventType = resourceParser.next(); - changelogBuilder.append("
  • " + resourceParser.getText() + "
    • "); - } else if (resourceParser.getName().equals("bugfix")) { - eventType = resourceParser.next(); - changelogBuilder.append("
  • Bugfix: " + resourceParser.getText() + "
    • "); - } else if (resourceParser.getName().equals("feature")) { - eventType = resourceParser.next(); - changelogBuilder.append("
  • New Feature: " + resourceParser.getText() + "
    • "); - } - } - eventType = resourceParser.next(); - } - changelogBuilder.append("
"); - } - - //CSS style for the html - private String getStyle() { - return String.format("", mStyle); - } - - public void setStyle(final String style) { - mStyle = style; - } - - public ChangeLogDialog setOnDismissListener(final DialogInterface.OnDismissListener onDismissListener) { - mOnDismissListener = onDismissListener; - return this; - } - - //Get the changelog in html code, this will be shown in the dialog's webview - private String getHTMLChangelog(final int resourceId, final Resources resources, final int version) { - boolean releaseFound = false; - final StringBuilder changelogBuilder = new StringBuilder(); - changelogBuilder.append("").append(getStyle()).append(""); - final XmlResourceParser xml = resources.getXml(resourceId); - try { - int eventType = xml.getEventType(); - while (eventType != XmlPullParser.END_DOCUMENT) { - if ((eventType == XmlPullParser.START_TAG) && (xml.getName().equals("release"))) { - //Check if the version matches the release tag. - //When version is 0 every release tag is parsed. - final int versioncode = Integer.parseInt(xml.getAttributeValue(null, "versioncode")); - if ((version == 0) || (versioncode == version)) { - parseReleaseTag(changelogBuilder, xml); - releaseFound = true; //At lease one release tag has been parsed. - } - } - eventType = xml.next(); - } - } catch (XmlPullParserException e) { - Log.e(TAG, e.getMessage(), e); - return ""; - } catch (IOException e) { - Log.e(TAG, e.getMessage(), e); - return ""; - } finally { - xml.close(); - } - changelogBuilder.append(""); - - //Check if there was a release tag parsed, if not return an empty string. - if (releaseFound) { - return changelogBuilder.toString(); - } else { - return ""; - } - } - - //Returns change log in HTML format - public String getHTML() { - //TODO: Remove duplicate code with the method show() - //Get resources - final String packageName = mContext.getPackageName(); - final Resources resources; - try { - resources = mContext.getPackageManager().getResourcesForApplication(packageName); - } catch (NameNotFoundException ignored) { - return ""; - } - - //Create HTML change log - return getHTMLChangelog(R.xml.changelog, resources, 0); - } - - //Call to show the change log dialog - public void show() { - show(0); - } - - protected void show(final int version) { - //Get resources - final String packageName = mContext.getPackageName(); - final Resources resources; - try { - resources = mContext.getPackageManager().getResourcesForApplication(packageName); - } catch (NameNotFoundException ignored) { - return; - } - - //Get dialog title - String title = resources.getString(R.string.title_changelog); - title = String.format("%s v%s", title, getAppVersion()); - - //Create html change log - final String htmlChangelog = getHTMLChangelog(R.xml.changelog, resources, version); - - //Get button strings - final String closeString = resources.getString(R.string.changelog_close); - - //Check for empty change log - if (htmlChangelog.length() == 0) { - //It seems like there is nothing to show, just bail out. - return; - } - - //Create web view and load html - final WebView webView = new WebView(mContext); - webView.loadDataWithBaseURL(null, htmlChangelog, "text/html", "utf-8", null); - final AlertDialog.Builder builder = new AlertDialog.Builder(mContext) - .setTitle(title) - .setView(webView) - .setPositiveButton(closeString, new Dialog.OnClickListener() { - public void onClick(final DialogInterface dialogInterface, final int i) { - dialogInterface.dismiss(); - } - }) - .setOnCancelListener( new OnCancelListener() { - - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - }); - AlertDialog dialog = builder.create(); - dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(final DialogInterface dialog) { - if (mOnDismissListener != null) { - mOnDismissListener.onDismiss(dialog); - } - } - }); - dialog.show(); - } - -}