Moved from Takehome to Planet learning (#118)

open-learning-exchange · Nov 16, 2017 · 0a0cd2a · 0a0cd2a
1 parent 0e17872
commit 0a0cd2a
Show file tree

Hide file tree

Showing 204 changed files with 708 additions and 18,240 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/assets/ABC.pdf b/app/assets/ABC.pdf
diff --git a/app/assets/bgin.mp4 b/app/assets/bgin.mp4
diff --git a/app/assets/logo_spinning.gif b/app/assets/logo_spinning.gif
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
-android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.0'
 
+android {
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
     defaultConfig {
-        applicationId "pbell.offline.ole.org.pbell"
-        minSdkVersion 15
+        applicationId "org.ole.learning.planet.planetlearning"
+        minSdkVersion 17
         targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0.5"
         multiDexEnabled true
     }
     buildTypes {
@@ -18,44 +18,50 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
     packagingOptions {
         exclude 'META-INF/ASL2.0'
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
     }
-   /* lintOptions {
+    lintOptions {
         abortOnError false
-    }*/
+    }
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
 
-    // useLibrary 'org.apache.http.legacy'
-}
+    dependencies {
+        compile fileTree(include: ['*.jar'], dir: 'libs')
+        androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+            exclude group: 'com.android.support', module: 'support-annotations'
+        })
+        compile 'com.android.support:multidex:1.0.1'
+        compile 'com.android.support:support-v4:26.+'
+        compile 'com.android.support:design:26.+'
+        compile 'com.android.support:appcompat-v7:26.+'
+        compile 'com.android.support.constraint:constraint-layout:1.0.2'
+        compile 'com.github.kittinunf.fuel:fuel-android:1.3.1'
+        compile 'com.couchbase.lite:couchbase-lite-android:1.+'
+        compile 'org.lightcouch:lightcouch:+'
+        compile 'com.github.tonyofrancis:Fetch:+'
+        compile 'us.feras.mdv:markdownview:1.1.0'
+        compile 'com.makeramen:roundedimageview:2.3.0'
 
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile files('libs/PdfViewer.jar')
-    ///compile 'org.apache.httpcomponents:httpmime:4.2.6'
-    compile files('libs/PBKDF2-1.0.4.jar')
-    compile('org.apache.httpcomponents:httpmime:4.3.6') {
-        exclude module: 'httpclient'
+        compile 'com.github.florent37:diagonallayout:1.0.4'
+        compile 'org.webjars.npm:jsonparse:1.2.0'
+        compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
+        compile 'com.roughike:bottom-bar:1.3.3'
+        compile 'com.mcxiaoke.volley:library-aar:1.0.0'
+        compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.+'
+        compile 'us.feras.mdv:markdownview:1.1.0'
+
+        compile 'com.android.support.constraint:constraint-layout:1.0.2'
+
+        compile files('libs/PBKDF2-1.0.4.jar')
+        testCompile 'junit:junit:4.12'
     }
-    compile 'com.android.support:support-v4:23.4.0'
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.google.android.support:wearable:2.0.0-alpha3'
-    compile 'com.google.android.gms:play-services-wearable:9.6.1'
-    ///compile 'com.github.tdscientist:ShelfView:v1.0'
-    compile 'com.github.florent37:diagonallayout:1.0.4'
-    compile 'com.github.kittinunf.fuel:fuel-android:1.3.1'
-    compile 'com.couchbase.lite:couchbase-lite-android:1.+'
-    compile 'org.lightcouch:lightcouch:0.1.8'
-    compile 'org.webjars.npm:jsonparse:1.2.0'
-    compile 'org.apache.httpcomponents:httpclient-android:4.3.5'
-    compile 'com.roughike:bottom-bar:1.3.3'
-    compile 'com.makeramen:roundedimageview:2.3.0'
-    compile 'com.mcxiaoke.volley:library-aar:1.0.0'
-    compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.+'
-    compile 'us.feras.mdv:markdownview:1.1.0'
-    testCompile 'junit:junit:4.12'
 }
+
+
+
diff --git a/app/libs/PdfViewer.jar b/app/libs/PdfViewer.jar
diff --git a/app/libs/aspectjrt-1.7.3.jar b/app/libs/aspectjrt-1.7.3.jar
diff --git a/app/libs/isoparser-1.0-RC-27.jar b/app/libs/isoparser-1.0-RC-27.jar
diff --git a/app/libs/sun.misc.BASE64Decoder.jar b/app/libs/sun.misc.BASE64Decoder.jar
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /Users/leonardmensah/Library/android-sdk-macosx/tools/proguard/proguard-android.txt
+# in /Users/leonardmensah/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/app/src/androidTest/java/org/ole/learning/planet/planetlearning/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/ole/learning/planet/planetlearning/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package org.ole.learning.planet.planetlearning;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.ole.learning.planet.planetlearning", appContext.getPackageName());
+    }
+}
diff --git a/app/src/androidTest/java/pbell/offline/ole/org/pbell/ApplicationTest.java b/app/src/androidTest/java/pbell/offline/ole/org/pbell/ApplicationTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="pbell.offline.ole.org.pbell">
+    package="org.ole.learning.planet.planetlearning">
 
     <!-- To auto-complete the email text field in the login form with the user's emails -->
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -18,8 +18,6 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-    <permission android:name="android.permission.SET_TIME" />
-
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -28,94 +26,43 @@
         android:xlargeScreens="true" />
 
     <application
-        android:name=".AppController"
+        android:name="android.support.multidex.MultiDexApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ole_logo_trans"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".Dashboard"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:uiOptions="splitActionBarWhenNarrow" />
-        <activity
-            android:name=".LoginActivity"
-            android:label="@string/title_activity_login" />
-        <activity
-            android:name=".SyncDevice"
-            android:label="@string/title_activity_sync_device"
-            android:parentActivityName=".Dashboard"
-            android:theme="@style/AppTheme.NoActionBar">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="pbell.offline.ole.org.pbell.Dashboard" />
-        </activity>
-        <activity
-            android:name=".NewSync"
-            android:label="@string/title_activity_new_sync"
-            android:parentActivityName=".LoginActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".MemberListDownloadRes"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".MyPdfViewerActivity"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".Course"
-            android:label="@string/title_activity_course"
-            android:parentActivityName=".Dashboard"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:screenOrientation="landscape" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="pbell.offline.ole.org.pbell.Dashboard" />
-        </activity>
-        <activity
-            android:name=".FullscreenActivity"
-            android:configChanges="locale|orientation|keyboardHidden|screenSize"
-            android:label="@string/app_name"
             android:screenOrientation="landscape"
-            android:theme="@style/FullscreenTheme"/>
-        <activity
-            android:name=".FullscreenLogin"
-            android:configChanges="locale|orientation|keyboardHidden|screenSize"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape"
-            android:theme="@style/FullscreenTheme">
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
-
         <service
             android:name=".ServerSearchService"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
-
         <activity
-            android:name=".Home"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/title_activity_home"
-            android:theme="@style/FullscreenTheme" />
+            android:name=".FullscreenLogin"
+            android:configChanges="locale|orientation|keyboardHidden|screenSize"
+            android:label="@string/title_activity_fullscreen_login"
+            android:screenOrientation="reverseLandscape"
+            android:theme="@style/AppTheme"></activity>
         <activity
             android:name=".User_Dashboard"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_user__dashboard"
-            android:theme="@style/FullscreenTheme"
-            android:screenOrientation="landscape"  />
-        <activity android:name=".Loading_Screen"
-            android:screenOrientation="landscape"
-            android:theme="@style/SplashTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:screenOrientation="reverseLandscape"
+            android:theme="@style/FullscreenTheme"></activity>
+        <activity
+            android:name=".DownloadingItems"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/title_activity_downloading_items"
+            android:theme="@style/FullscreenTheme"></activity>
     </application>
 
 </manifest>
diff --git a/...fline/ole/org/pbell/AndroidDecrypter.java → ...anet/planetlearning/AndroidDecrypter.java b/...fline/ole/org/pbell/AndroidDecrypter.java → ...anet/planetlearning/AndroidDecrypter.java
@@ -1,4 +1,4 @@
-package pbell.offline.ole.org.pbell;
+package org.ole.learning.planet.planetlearning;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/...ell/offline/ole/org/pbell/CouchViews.java → ...ing/planet/planetlearning/CouchViews.java b/...ell/offline/ole/org/pbell/CouchViews.java → ...ing/planet/planetlearning/CouchViews.java
@@ -1,4 +1,4 @@
-package pbell.offline.ole.org.pbell;
+package org.ole.learning.planet.planetlearning;
 
 import com.couchbase.lite.Database;
 import com.couchbase.lite.Emitter;