Bump version number and add dependencies

Bump version number and add dependencies to the about section
Splitter · Mar 15, 2014 · 1e47891 · 1e47891
1 parent a975fcb
commit 1e47891
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 6 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.andrew.apolloMod"
     android:versionCode="1"
-    android:versionName="1.4" >
+    android:versionName="1.5" >
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/assets/licenses.html b/assets/licenses.html
@@ -0,0 +1,67 @@
+<html><head><style> body { font-family: sans-serif;} pre { background-color: #eeeeee; padding: 1em; white-space: pre-wrap; } a:link,a:visited,a:hover{color:#0099cc;}</style></head><body>
+<h3>Notices for library:</h3>
+<ul>
+<li><a href="https://github.com/umano/AndroidSlidingUpPanel">AndroidSlidingUpPanel</a></li>
+</ul>
+<pre>
+/*
+ * Copyright (C) 2013 Umano
+ * 
+ * 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.
+ */
+</pre>
+
+
+<h3>Notices for library:</h3><ul>
+<li><a href="https://github.com/bauerca/drag-sort-listview">DragSortListView</a></li>
+</ul>
+<pre>
+/*
+ * Copyright (C) 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.
+ */
+</pre>
+</body></html>
+
+<h3>Notices for file:</h3><ul>
+<li>android-support-v4.jar</li>
+</ul>
+<pre>
+/*
+ * 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.
+ */
+</pre>
+</body></html>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -137,12 +137,15 @@ Original Apollo Source Code: \n
 https://github.com/CyanogenMod/android_packages_apps_Apollo/tree/cm-10.1
         
     ]]></string>
+    <string name="dependencies">Dependency Licenses</string>
+    <string name="dependencies_title">Dependency Licenses:</string>
 
     <!-- Settings keys -->
     <string name="key_themes" translatable="false">themepreview</string>
     <string name="key_themes_package" translatable="false">themePackageName</string>
     <string name="key_themes_preferences" translatable="false">themePrefences</string>
     <string name="key_build_version" translatable="false">build_version</string>
+    <string name="key_build_depends" translatable="false">build_depends</string>
     <string name="key_tabs_enabled" translatable="false">tabs_enabled</string>
     <string name="key_visualization_type" translatable="false">visualization_type</string>
     <string name="key_widget_style" translatable="false">widget_type</string>

diff --git a/res/xml/settings.xml b/res/xml/settings.xml
@@ -47,6 +47,9 @@
             android:key="@string/key_build_version"
             android:summary="@string/app_version_number"
             android:title="@string/version" />
+        <Preference
+            android:key="@string/key_build_depends"
+            android:title="@string/dependencies" />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/com/andrew/apolloMod/Constants.java b/src/com/andrew/apolloMod/Constants.java
@@ -15,7 +15,7 @@ public final class Constants {
     // SharedPreferences
     public final static String APOLLO = "Apollo", APOLLO_PREFERENCES = "apollopreferences",
             ARTIST_KEY = "artist", ALBUM_KEY = "album", ALBUM_ID_KEY = "albumid", NUMALBUMS = "num_albums",
-            GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",
+            GENRE_KEY = "genres", ARTIST_ID = "artistid", NUMWEEKS = "numweeks",BUILD_DEPENDS = "build_depends",
             PLAYLIST_NAME_FAVORITES = "Favorites", PLAYLIST_NAME = "playlist", WIDGET_STYLE="widget_type",
             VISUALIZATION_TYPE="visualization_type", DELETE_CACHE="delete_cache", BUILD_VERSION = "build_version",
             UP_STARTS_ALBUM_ACTIVITY = "upStartsAlbumActivity", TABS_ENABLED = "tabs_enabled";

diff --git a/src/com/andrew/apolloMod/preferences/SettingsHolder.java b/src/com/andrew/apolloMod/preferences/SettingsHolder.java
@@ -23,6 +23,7 @@
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
 import android.view.MenuItem;
+import android.webkit.WebView;
 import android.widget.TextView;
 
 import com.andrew.apolloMod.IApolloService;
@@ -35,10 +36,8 @@
 import static com.andrew.apolloMod.Constants.WIDGET_STYLE;
 import static com.andrew.apolloMod.Constants.DELETE_CACHE;
 import static com.andrew.apolloMod.Constants.BUILD_VERSION;
-/**
- * @author Andrew Neal FIXME - Work on the IllegalStateException thrown when
- *         using PreferenceFragment and theme chooser
- */
+import static com.andrew.apolloMod.Constants.BUILD_DEPENDS;
+
 @SuppressWarnings("deprecation")
 public class SettingsHolder extends PreferenceActivity  implements ServiceConnection  {
 	Context mContext;
@@ -63,6 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // Init about dialog
         initAboutDialog();
 
+        initDependencies();
+
     }
 
     @Override
@@ -128,6 +129,25 @@ public boolean onPreferenceClick(final Preference preference) {
         });
 
     }
+
+    private void initDependencies(){
+        final Preference buildDepend = findPreference(BUILD_DEPENDS);
+        buildDepend.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(final Preference preference) {
+
+            	final WebView webView = new WebView(mContext);
+                webView.loadUrl("file:///android_asset/licenses.html");
+                new AlertDialog.Builder(mContext)
+                        .setTitle(R.string.dependencies_title)
+                        .setView(webView)
+                        .setPositiveButton(android.R.string.ok, null)
+                        .create()
+                        .show();
+                return true;
+            }
+        });
+    }
     /**
      * Removes all of the cache entries.
      */