Skip to content
This repository was archived by the owner on Apr 14, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
29b2caf
Changes to database and sync with classroom dialog
nickthegroot Apr 4, 2017
091f828
Added function to delete all assignments when associated class is del…
nickthegroot Apr 5, 2017
b8a491b
Changed classroom sync so no existing assignments or classes will be …
nickthegroot Apr 12, 2017
0bd44bb
Changed "application name" back to Unity Planner for Google Classroom…
nickthegroot Apr 12, 2017
b8f3799
Updated version number and signing config
nickthegroot Apr 12, 2017
3d08810
Added semi-working notifications
nickthegroot Apr 14, 2017
5d0d5f1
Working notificaitons
nickthegroot Apr 15, 2017
b5d3399
Grouped notifications together
nickthegroot Apr 15, 2017
921f046
Started work on settings and changed classroom sync to only include a…
nickthegroot Apr 17, 2017
9fbf9fe
Fixed bug where changing class name would not show in assignments and…
nickthegroot Apr 17, 2017
3371822
bugged push
nickthegroot Apr 19, 2017
3cf5572
Bug fixes and made some notification settings change app behavor.
nickthegroot Apr 19, 2017
8208336
Fixed bug where classes would be readded after g classroom sync
nickthegroot Apr 19, 2017
9734c6f
Fixed bug where synced assignments wouldn't have the name of updated …
nickthegroot Apr 19, 2017
db8f978
Updated changed class names with Database.updateDatabase()
nickthegroot Apr 19, 2017
ab8184d
Changed way updated names are stored in database, hid edit screens un…
nickthegroot Apr 20, 2017
a14a5df
Updated settings and fixed bug where app would crash on pressing save…
nickthegroot Apr 20, 2017
5599b4f
Added sharing, fixed settings, added app info in settings.
nickthegroot Apr 21, 2017
2767950
Changes to make app release ready
nickthegroot Apr 21, 2017
a253b90
Fixed bugs and changed notifications to only notify if assignment is …
nickthegroot Apr 26, 2017
703d0c9
License and readme
nickthegroot Apr 26, 2017
ab47627
Added setting to change how many days in advance to notify for an ass…
nickthegroot Apr 26, 2017
d2a23b6
Changes for 0.6.1
nickthegroot Apr 26, 2017
eaf9572
Made more settings actually change things
nickthegroot Apr 26, 2017
855fe8d
Added Firebase Crash reporting
nickthegroot Apr 26, 2017
0d15f7a
Updated add and edit assignment to see large class names
nickthegroot Apr 26, 2017
31a662f
Updated README
nickthegroot Apr 26, 2017
10785c4
Merge branch 'master' into unstable
nickthegroot Apr 26, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .idea/libraries/rules_0_5.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions .idea/libraries/runner_0_5.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
21 changes: 14 additions & 7 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand All @@ -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>
21 changes: 10 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.android.application'

//noinspection GroovyMissingReturnStatement
Expand All @@ -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'
})
Expand All @@ -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'

This file was deleted.

30 changes: 26 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" />
Expand All @@ -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"
Expand Down Expand Up @@ -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>
Binary file added app/src/main/ic_info_pic-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/src/main/java/com/nbdeg/unityplanner/IntroActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading