Merge pull request #25 from Connexions/add-2-books

Added Elem and Intermediate Algebra
Connexions · Jun 5, 2017 · 75ed822 · 75ed822
2 parents 328da66 + a3259e5
commit 75ed822
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.cnx.android"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 37
-        versionName "6.2"
+        versionCode 38
+        versionName "6.3"
     }
     dependencies{
         compile 'com.android.support:appcompat-v7:25.1.1'

diff --git a/app/src/main/assets/bookList.json b/app/src/main/assets/bookList.json
@@ -319,6 +319,22 @@
       "url":"http://cnx.org/contents/LnN76Opl:_45u6IpQ?minimal=true",
       "bookUrl":"http://cnx.org/contents/LnN76Opl:_45u6IpQ?minimal=true",
       "icon":"Astronomy"
+    },
+    {
+      "bookTitle":"Elementary Algebra",
+      "title":"Elementary Algebra",
+      "contentString":"",
+      "url":"http://cnx.org/contents/CImQfPDv:GfaWl1GG?minimal=true",
+      "bookUrl":"http://cnx.org/contents/CImQfPDv:GfaWl1GG?minimal=true",
+      "icon":"Elementary Algebra OS"
+    },
+    {
+      "bookTitle":"Intermediate Algebra",
+      "title":"Intermediate Algebra",
+      "contentString":"",
+      "url":"http://cnx.org/contents/AndhM9Sd:HCaG_W5c?minimal=true",
+      "bookUrl":"http://cnx.org/contents/AndhM9Sd:HCaG_W5c?minimal=true",
+      "icon":"Intermediate Algebra"
     }
   ]
 }
diff --git a/app/src/main/java/org/cnx/android/utils/CNXUtil.java b/app/src/main/java/org/cnx/android/utils/CNXUtil.java
@@ -297,6 +297,14 @@ else if(icon.equals(context.getString(R.string.astronomy_icon)) || contentString
         {
             coverId = R.drawable.astronomy;
         }
+        else if(icon.equals(context.getString(R.string.elem_algebra_icon)))
+        {
+            coverId = R.drawable.elementary_algebra;
+        }
+        else if(icon.equals(context.getString(R.string.intermediate_algebra_icon)))
+        {
+            coverId = R.drawable.intermediate_algebra;
+        }
         else
         {
             coverId = R.drawable.ic_book_black_48dp;

diff --git a/app/src/main/res/drawable-hdpi/elementary_algebra.png b/app/src/main/res/drawable-hdpi/elementary_algebra.png
diff --git a/app/src/main/res/drawable-hdpi/intermediate_algebra.png b/app/src/main/res/drawable-hdpi/intermediate_algebra.png
diff --git a/app/src/main/res/drawable-ldpi/elementary_algebra.png b/app/src/main/res/drawable-ldpi/elementary_algebra.png
diff --git a/app/src/main/res/drawable-ldpi/intermediate_algebra.png b/app/src/main/res/drawable-ldpi/intermediate_algebra.png
diff --git a/app/src/main/res/drawable-mdpi/elementary_algebra.png b/app/src/main/res/drawable-mdpi/elementary_algebra.png
diff --git a/app/src/main/res/drawable-mdpi/intermediate_algebra.png b/app/src/main/res/drawable-mdpi/intermediate_algebra.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -111,5 +111,7 @@
     <string name="bookmarks_shortcut_short_label">Bookmarks</string>
     <string name="bookmarks_shortcut_long_label">Open Bookmarks</string>
     <string name="bookmarks_shortcut_disabled_message">Shortcut is disabled</string>
+    <string name="elem_algebra_icon">Elementary Algebra OS</string>
+    <string name="intermediate_algebra_icon">Intermediate Algebra</string>
 </resources>