From 33421da70fb718650ac6909337604cd1786c49e0 Mon Sep 17 00:00:00 2001
From: Jo Grimstad <jo@literacyapp.org>
Date: Thu, 23 Mar 2017 17:45:33 +0300
Subject: [PATCH] #384 Make MultimediaHelper part of the ContentProvider
 library

---
 .../java/org/literacyapp/content/letter/LettersActivity.java | 3 +--
 .../literacyapp/content/multimedia/video/VideosActivity.java | 2 +-
 .../java/org/literacyapp/content/number/NumbersActivity.java | 2 +-
 .../org/literacyapp/content/task/LetterGraphemeActivity.java | 2 +-
 .../java/org/literacyapp/content/task/NumberActivity.java    | 2 +-
 .../org/literacyapp/content/task/NumberGraphemeActivity.java | 2 +-
 .../literacyapp/content/task/ScrollingLetterActivity.java    | 2 +-
 .../org/literacyapp/content/task/SelectLetterActivity.java   | 2 +-
 .../org/literacyapp/content/task/SelectNumberActivity.java   | 2 +-
 .../org/literacyapp/content/task/TypeLetterActivity.java     | 2 +-
 .../org/literacyapp/content/task/TypeNumberActivity.java     | 2 +-
 .../java/org/literacyapp/content/task/VideoActivity.java     | 2 +-
 .../java/org/literacyapp/content/task/VisemeActivity.java    | 2 +-
 .../service/synchronization/DownloadContentAsyncTask.java    | 2 +-
 contentprovider/build.gradle                                 | 5 ++---
 .../literacyapp/contentprovider}/util/MultimediaHelper.java  | 2 +-
 16 files changed, 17 insertions(+), 19 deletions(-)
 rename {app/src/main/java/org/literacyapp => contentprovider/src/main/java/org/literacyapp/contentprovider}/util/MultimediaHelper.java (98%)

diff --git a/app/src/main/java/org/literacyapp/content/letter/LettersActivity.java b/app/src/main/java/org/literacyapp/content/letter/LettersActivity.java
index ed09a01..bb8c91f 100644
--- a/app/src/main/java/org/literacyapp/content/letter/LettersActivity.java
+++ b/app/src/main/java/org/literacyapp/content/letter/LettersActivity.java
@@ -23,9 +23,8 @@
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.logic.CurriculumHelper;
 import org.literacyapp.model.enums.content.LiteracySkill;
-import org.literacyapp.model.enums.content.NumeracySkill;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/multimedia/video/VideosActivity.java b/app/src/main/java/org/literacyapp/content/multimedia/video/VideosActivity.java
index 4c8f130..8830b3f 100644
--- a/app/src/main/java/org/literacyapp/content/multimedia/video/VideosActivity.java
+++ b/app/src/main/java/org/literacyapp/content/multimedia/video/VideosActivity.java
@@ -20,7 +20,7 @@
 import org.literacyapp.contentprovider.model.content.Number;
 import org.literacyapp.contentprovider.model.content.multimedia.Video;
 import org.literacyapp.logic.CurriculumHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 
 import java.io.File;
 import java.util.Iterator;
diff --git a/app/src/main/java/org/literacyapp/content/number/NumbersActivity.java b/app/src/main/java/org/literacyapp/content/number/NumbersActivity.java
index 7eca129..c27e70e 100644
--- a/app/src/main/java/org/literacyapp/content/number/NumbersActivity.java
+++ b/app/src/main/java/org/literacyapp/content/number/NumbersActivity.java
@@ -25,7 +25,7 @@
 import org.literacyapp.logic.CurriculumHelper;
 import org.literacyapp.model.enums.content.NumeracySkill;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java b/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java
index 416d8bd..85560e5 100644
--- a/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java
@@ -20,7 +20,7 @@
 import org.literacyapp.contentprovider.model.content.Letter;
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/NumberActivity.java b/app/src/main/java/org/literacyapp/content/task/NumberActivity.java
index 160f16c..7e6c77b 100644
--- a/app/src/main/java/org/literacyapp/content/task/NumberActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/NumberActivity.java
@@ -19,7 +19,7 @@
 import org.literacyapp.contentprovider.model.content.Number;
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java b/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java
index 2f8f198..619b662 100644
--- a/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java
@@ -20,7 +20,7 @@
 import org.literacyapp.contentprovider.model.content.Number;
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/ScrollingLetterActivity.java b/app/src/main/java/org/literacyapp/content/task/ScrollingLetterActivity.java
index d8df138..2f9198e 100644
--- a/app/src/main/java/org/literacyapp/content/task/ScrollingLetterActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/ScrollingLetterActivity.java
@@ -22,7 +22,7 @@
 import org.literacyapp.contentprovider.model.content.Letter;
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java b/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java
index 6d96d6a..3e87875 100644
--- a/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java
@@ -25,7 +25,7 @@
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.logic.CurriculumHelper;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java b/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java
index aabacf6..68694d1 100644
--- a/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java
@@ -25,7 +25,7 @@
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.logic.CurriculumHelper;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/TypeLetterActivity.java b/app/src/main/java/org/literacyapp/content/task/TypeLetterActivity.java
index 220af59..fe315aa 100644
--- a/app/src/main/java/org/literacyapp/content/task/TypeLetterActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/TypeLetterActivity.java
@@ -29,7 +29,7 @@
 import org.literacyapp.contentprovider.model.content.multimedia.JoinVideosWithLetters;
 import org.literacyapp.contentprovider.model.content.multimedia.Video;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/TypeNumberActivity.java b/app/src/main/java/org/literacyapp/content/task/TypeNumberActivity.java
index 72b9711..18bc82e 100644
--- a/app/src/main/java/org/literacyapp/content/task/TypeNumberActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/TypeNumberActivity.java
@@ -29,7 +29,7 @@
 import org.literacyapp.contentprovider.model.content.multimedia.JoinVideosWithNumbers;
 import org.literacyapp.contentprovider.model.content.multimedia.Video;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/content/task/VideoActivity.java b/app/src/main/java/org/literacyapp/content/task/VideoActivity.java
index 8c9cc89..e2bb384 100644
--- a/app/src/main/java/org/literacyapp/content/task/VideoActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/VideoActivity.java
@@ -12,7 +12,7 @@
 import org.literacyapp.R;
 import org.literacyapp.contentprovider.dao.VideoDao;
 import org.literacyapp.contentprovider.model.content.multimedia.Video;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 
 import java.io.File;
 
diff --git a/app/src/main/java/org/literacyapp/content/task/VisemeActivity.java b/app/src/main/java/org/literacyapp/content/task/VisemeActivity.java
index b409c1c..2dd1e6a 100644
--- a/app/src/main/java/org/literacyapp/content/task/VisemeActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/VisemeActivity.java
@@ -21,7 +21,7 @@
 import org.literacyapp.contentprovider.model.content.Letter;
 import org.literacyapp.contentprovider.model.content.multimedia.Audio;
 import org.literacyapp.util.MediaPlayerHelper;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
diff --git a/app/src/main/java/org/literacyapp/service/synchronization/DownloadContentAsyncTask.java b/app/src/main/java/org/literacyapp/service/synchronization/DownloadContentAsyncTask.java
index 53b88b4..eada9d2 100644
--- a/app/src/main/java/org/literacyapp/service/synchronization/DownloadContentAsyncTask.java
+++ b/app/src/main/java/org/literacyapp/service/synchronization/DownloadContentAsyncTask.java
@@ -55,7 +55,7 @@
 import org.literacyapp.util.DeviceInfoHelper;
 import org.literacyapp.util.EnvironmentSettings;
 import org.literacyapp.util.JsonLoader;
-import org.literacyapp.util.MultimediaHelper;
+import org.literacyapp.contentprovider.util.MultimediaHelper;
 import org.literacyapp.util.MultimediaDownloader;
 
 import java.io.File;
diff --git a/contentprovider/build.gradle b/contentprovider/build.gradle
index 921587b..4b8d34e 100644
--- a/contentprovider/build.gradle
+++ b/contentprovider/build.gradle
@@ -8,11 +8,10 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 1000002
-        versionName "1.0.2"
+        versionCode 1000003
+        versionName "1.0.3-SNAPSHOT"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
 
     buildTypes {
diff --git a/app/src/main/java/org/literacyapp/util/MultimediaHelper.java b/contentprovider/src/main/java/org/literacyapp/contentprovider/util/MultimediaHelper.java
similarity index 98%
rename from app/src/main/java/org/literacyapp/util/MultimediaHelper.java
rename to contentprovider/src/main/java/org/literacyapp/contentprovider/util/MultimediaHelper.java
index 57a3372..5200d31 100644
--- a/app/src/main/java/org/literacyapp/util/MultimediaHelper.java
+++ b/contentprovider/src/main/java/org/literacyapp/contentprovider/util/MultimediaHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.util;
+package org.literacyapp.contentprovider.util;
 
 import android.os.Environment;