Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
noahweasley committed Mar 26, 2022
2 parents 37d9f20 + d37b62c commit 45e8893
Show file tree
Hide file tree
Showing 139 changed files with 4,108 additions and 405 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@
/captures
.externalNativeBuild
/app/android.keystore
/app/src/main/res/xml/assignments.xml
/app/src/main/res/xml/courses.xml
/app/src/main/res/xml/exams.xml
/app/src/main/res/xml/scheduled_timetable.xml
/app/src/main/res/xml/timetable.xml
/app/src/main/res/xml/metadata.xml
24 changes: 0 additions & 24 deletions .idea/codeStyles/Project.xml

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

5 changes: 4 additions & 1 deletion .idea/dbnavigator.xml

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

17 changes: 0 additions & 17 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

38 changes: 31 additions & 7 deletions .idea/misc.xml

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

7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@

![Presentation 5](/presentation/5.jpg?raw=true)

### About

TimeLY is the kind of android application you might want to have as a University student, although, the app isn't
complete, when it is, it would pack a lot of features that would make students life much more easier.

### Application package usages

**N.B** : _All packages listed here are located [here](https://github.com/noahweasley/TimeLY/tree/master/app/src/main/java/com/noah/timely)_
Expand All @@ -31,7 +36,7 @@
| custom | Package containing all custom views used in TimeLY |
| error | Package housing everything related to TimeLY's error display |
| exam | Package housing everything related to TimeLY's exam management system |
| exports | Package housing everything related to TimeLY's data export mechanisms |
| exports | Package housing everything related to TimeLY's data export / import feature |
| gallery | Package housing everything related to TimeLY's image management system |
| main | The main parts of the app. This package contains mostly the app start-up code |
| report | Package that houses TimeLY's bug report management systems |
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
minSdkVersion 16
targetSdkVersion 31
multiDexEnabled true
versionCode 3
versionName "1.1.1"
versionCode 4
versionName "1.2.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
vectorDrawables.useSupportLibrary = true

Expand Down Expand Up @@ -52,14 +52,14 @@ android {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'org.jetbrains:annotations:15.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.appcompat:appcompat-resources:1.3.1'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.appcompat:appcompat-resources:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'androidx.fragment:fragment:1.3.6'
implementation 'androidx.fragment:fragment:1.4.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.kevalpatel2106:ringtonepicker:1.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.preference:preference:1.1.1'
implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
implementation 'org.greenrobot:eventbus:3.2.0'
Expand Down
Loading

0 comments on commit 45e8893

Please sign in to comment.