#384 Make MultimediaHelper part of the ContentProvider library

elimu-ai · Mar 23, 2017 · 33421da · 33421da
1 parent d6e5338
commit 33421da
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...rg/literacyapp/util/MultimediaHelper.java → ...ontentprovider/util/MultimediaHelper.java b/...rg/literacyapp/util/MultimediaHelper.java → ...ontentprovider/util/MultimediaHelper.java
@@ -1,4 +1,4 @@
-package org.literacyapp.util;
+package org.literacyapp.contentprovider.util;
 
 import android.os.Environment;