Merge pull request #21 from nbd9/unstable

0.6.1
nickthegroot · Apr 26, 2017 · 78b8a6f · 78b8a6f
2 parents c5943fa + 10785c4
commit 78b8a6f
Show file tree

Hide file tree

Showing 56 changed files with 1,616 additions and 663 deletions.
diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml
diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 # Unity Planner
-![Build Status](https://www.bitrise.io/app/4e05fb2db43f3697.svg?token=jWwhAr3v39j1IUQHD9rgfw)
 <img align="right" src="http://www.nbdeg.com/images/unityplanner.png" height="320" width="320">
 
 The student planner app created to unify and simplify your school life.

diff --git a/app/app.iml b/app/app.iml
@@ -63,20 +63,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -90,6 +90,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -118,6 +120,9 @@
     <orderEntry type="library" exported="" name="google-api-services-classroom-v1-rev24-1.22.0" level="project" />
     <orderEntry type="library" exported="" name="twitter-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="bolts-android-1.4.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-crash-10.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-appinvite-10.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="fabric-1.3.14" level="project" />
     <orderEntry type="library" exported="" name="tweet-ui-2.3.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
@@ -169,6 +174,7 @@
     <orderEntry type="library" exported="" name="firebase-analytics-impl-10.2.0" level="project" />
     <orderEntry type="library" exported="" name="google-http-client-jackson2-1.22.0" level="project" />
     <orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" />
+    <orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
     <orderEntry type="library" exported="" name="tweet-composer-2.3.0" level="project" />
@@ -177,6 +183,7 @@
     <orderEntry type="library" exported="" name="twitter-core-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
     <orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
+    <orderEntry type="library" exported="" name="firebase-invites-10.0.1" level="project" />
     <orderEntry type="library" exported="" name="android-android-25" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,3 +1,4 @@
+apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.android.application'
 
 //noinspection GroovyMissingReturnStatement
@@ -6,27 +7,22 @@ android {
     buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.nbdeg.unityplanner"
-        minSdkVersion 21
+        minSdkVersion 19
         targetSdkVersion 25
-        versionCode 1
-        versionName "v0.5.1"
+        versionCode 8
+        versionName "0.6.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
         configurations.all {
             resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
         }
-    }
-
-    buildTypes {
-        release {
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
+        vectorDrawables.useSupportLibrary = true
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    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'
     })
@@ -52,8 +48,11 @@ dependencies {
     compile 'com.google.android.gms:play-services-auth:10.2.0'
     compile 'pub.devrel:easypermissions:0.2.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3'
+    compile 'com.android.support:support-vector-drawable:25.3.1'
+    compile 'com.google.firebase:firebase-invites:10.0.1'
+    compile 'com.google.firebase:firebase-crash:10.0.1'
     testCompile 'junit:junit:4.12'
 }
 
 
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/androidTest/java/com/nbdeg/unityplanner/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/nbdeg/unityplanner/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:allowBackup="true"
@@ -15,6 +17,9 @@
         android:label="@string/app_name"
         android:supportsRtl="false"
         android:theme="@style/AppTheme">
+
+        <!-- Start Notifications -->
+
         <service android:name=".utils.MyFirebaseMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
@@ -26,7 +31,14 @@
             </intent-filter>
         </service>
 
-        <receiver android:name=".utils.NotificationPublisher" />
+        <receiver android:name=".utils.DeviceBootReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".utils.AlarmReceiver" />
+
+        <!-- End Notifications -->
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
@@ -66,14 +78,24 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".editAssignment" />
-        <activity android:name=".editClass" />
+        <activity android:name=".editAssignment"
+            android:label="Edit an assignment"/>
+        <activity android:name=".editClass"
+            android:label="Edit a class"/>
         <activity
             android:name=".IntroActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".classroomLogin"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:parentActivityName=".MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.nbdeg.unityplanner.MainActivity" />
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/ic_info_pic-web.png b/app/src/main/ic_info_pic-web.png
diff --git a/app/src/main/java/com/nbdeg/unityplanner/IntroActivity.java b/app/src/main/java/com/nbdeg/unityplanner/IntroActivity.java
@@ -11,18 +11,24 @@
 import com.github.paolorotolo.appintro.AppIntroFragment;
 import com.nbdeg.unityplanner.IntroSlides.classroomSignIn;
 
+import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;
+
 public class IntroActivity extends AppIntro {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Hides status bar
+        getWindow().getDecorView().setSystemUiVisibility(SYSTEM_UI_FLAG_FULLSCREEN);
+
         // Adding slides to tutorial slideshow
         // addSlide(AppIntroFragment.newInstance(title, description, image, backgroundColor));
         addSlide(AppIntroFragment.newInstance("Welcome to Unity Planner", "The planner to unify your school life", R.mipmap.ic_logo_white, ContextCompat.getColor(this, R.color.colorPrimary)));
         addSlide(AppIntroFragment.newInstance("Unify your school life", "Unity Planner helps students stay organized by bringing common tools together in one place", R.drawable.ic_assignment_white, Color.RED));
         addSlide(new classroomSignIn());
 
         setColorTransitionsEnabled(true);
+
     }
 
     @Override