Skip to content

Commit

Permalink
Merge pull request #17 from ZoeMeow1027/draft - 2.0-draft11 (886)
Browse files Browse the repository at this point in the history
Various changes, please view in CHANGELOG.md or commits.
  • Loading branch information
ZoeMeow1027 authored Dec 14, 2023
2 parents c417912 + f173f09 commit da85ff8
Show file tree
Hide file tree
Showing 104 changed files with 4,368 additions and 1,775 deletions.
10 changes: 10 additions & 0 deletions .idea/deploymentTargetDropDown.xml

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

3 changes: 2 additions & 1 deletion .idea/gradle.xml

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

10 changes: 10 additions & 0 deletions .idea/migrations.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

5 changes: 3 additions & 2 deletions .idea/runConfigurations/app.xml

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

1 change: 0 additions & 1 deletion .idea/vcs.xml

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

57 changes: 57 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,63 @@
- This will save changelog for application. Feel free to report issues, fork or contribute this project :))
- You can also view file changed at [https://github.com/ZoeMeow1027/DutSchedule/commits](https://github.com/ZoeMeow1027/DutSchedule/commits).

## 2.0-draft11 (886)
- Account Activity:
- Redesign items in Subject Information (previous named Subject Schedule) and Subject Fee.
- Add a visibility icon for showing password for Password OutlinedTextField.
- [New] Search bar for search a SubjectResult.
- [New] School year filter in SubjectResult.

- [New] Help Activity:
- This will explain and provide external link related for DUT school.

- News Activity & News Detail Activity:
- News Search will split variables to NewsSearchViewModel.
- In news details - subject, content description will show entire content whenever new can parse to news subject.

- Main Activity:
- Redesign components for optimize view.
- Lessons today
- Date and time (add current school year and week)
- School news

- MainViewModel:
- Various changes for easier for manage them.

- [New] NewsUpdateService:
- This service ensure notify you new announcements in sv.dut.udn.vn.

- App Settings & Settings Activity
- [New] News Subject with new parse
- This will apply a new parse for news subject if supported.
- Access them in App Settings.
- [View only] Background opacity and Component opacity
- This will change background color and component opacity.
- Will shown only when BackgroundImageOption isn't equal BackgroundImageOption.None.
- Redesign in News Filter Settings.
- Reorder some options to correct group.
- Added and modified some properties. You might need to delete app or clear app data before updating. We will update a migrations in future.

- Miscellaneous:
- Updated dependencies to latest.
- Add new permission: SCHEDULE_EXACT_ALARM, FOREGROUND_SERVICE.
- Modified app icon: Got from old project - DUTApp_API (this may be changed in future).
- Rework BaseActivity.kt: No more built-in Scaffold, transparent status bar.
- App will have black background in SplashScreen if system dark mode have enabled.
- Fix a issue cause news subject page automatically refresh.
- Make transparent for component if BackgroundImageOption isn't equal BackgroundImageOption.None.
- Improve performance and optimize codes.
- Merge extension function into one.

## 2.0-draft10 (701)
- [New] Account training details (all subjects result), but not done yet.
- [Changed] Implement dependencies to latest version.
- [Changed] Optimized code usages.
- [Fixed] Request permissions now update its status.

## 2.0-draft9 (692)
- [New] News search (however, this's new feature, so maybe improve later).

## 2.0-draft8 (683)
- [New] Account training status.
- [Changed] Implement dependencies to latest version.
Expand Down
4 changes: 3 additions & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/build
/build
/debug
/release
47 changes: 25 additions & 22 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId "io.zoemeow.dutschedule"
minSdk 21
targetSdkVersion 34
versionCode 683
versionName "2.0-draft8"
versionCode 886
versionName "2.0-draft11"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down Expand Up @@ -54,20 +54,20 @@ dependencies {
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.1'
implementation platform('androidx.compose:compose-bom:2023.03.00')
implementation "androidx.compose.ui:ui:1.6.0-beta01"
implementation "androidx.compose.ui:ui-tooling-preview:1.6.0-beta01"
implementation platform('androidx.compose:compose-bom:2023.10.01')
implementation "androidx.compose.ui:ui:1.6.0-beta02"
implementation "androidx.compose.ui:ui-tooling-preview:1.6.0-beta02"
implementation 'androidx.compose.material3:material3'
implementation platform('androidx.compose:compose-bom:2023.03.00')
implementation platform('androidx.compose:compose-bom:2023.10.01')
implementation 'androidx.compose.ui:ui-graphics'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation platform('androidx.compose:compose-bom:2023.03.00')
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.0-beta01"
androidTestImplementation platform('androidx.compose:compose-bom:2023.03.00')
debugImplementation "androidx.compose.ui:ui-tooling:1.6.0-beta01"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.6.0-beta01"
androidTestImplementation platform('androidx.compose:compose-bom:2023.10.01')
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.0-beta02"
androidTestImplementation platform('androidx.compose:compose-bom:2023.10.01')
debugImplementation "androidx.compose.ui:ui-tooling:1.6.0-beta02"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.6.0-beta02"

// implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

Expand All @@ -80,27 +80,28 @@ dependencies {
runtimeOnly 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0-rc01'

// https://mvnrepository.com/artifact/androidx.fragment/fragment-ktx
runtimeOnly 'androidx.fragment:fragment-ktx:1.7.0-alpha06'
runtimeOnly 'androidx.fragment:fragment-ktx:1.7.0-alpha07'

// https://mvnrepository.com/artifact/androidx.compose.material3/material3
runtimeOnly 'androidx.compose.material3:material3:1.2.0-alpha11'
runtimeOnly 'androidx.compose.material3:material3:1.2.0-alpha12'

// AlarmManager for restart service after closed
// Required to avoid crash on Android 12 - API 31
implementation 'androidx.work:work-runtime-ktx:2.8.1'
implementation 'androidx.work:work-runtime:2.9.0'
implementation 'androidx.work:work-runtime-ktx:2.9.0'

// https://mvnrepository.com/artifact/androidx.compose.material/material-icons-extended
runtimeOnly 'androidx.compose.material:material-icons-extended:1.6.0-beta01'
runtimeOnly 'androidx.compose.material:material-icons-extended:1.6.0-beta02'

// Google Dagger/Hilt
implementation "com.google.dagger:hilt-android:2.44"
kapt "com.google.dagger:hilt-compiler:2.44"
implementation 'com.google.dagger:hilt-android:2.49'
kapt 'com.google.dagger:hilt-compiler:2.49'

// Accompanist - Pull-to-refresh - https://mvnrepository.com/artifact/com.google.accompanist/accompanist-swiperefresh
implementation 'com.google.accompanist:accompanist-swiperefresh:0.33.2-alpha'

// Accompanist - Pager - https://mvnrepository.com/artifact/com.google.accompanist/accompanist-pager
runtimeOnly 'com.google.accompanist:accompanist-pager:0.33.2-alpha'
// runtimeOnly 'com.google.accompanist:accompanist-pager:0.33.2-alpha'

// Accompanist - FlowLayout (deprecated) implementation 'com.google.accompanist:accompanist-flowlayout:0.33.2-alpha'

Expand All @@ -111,20 +112,22 @@ dependencies {
// implementation 'com.google.accompanist:accompanist-drawablepainter:0.23.1'

// Jsoup HTML parser library - https://mvnrepository.com/artifact/org.jsoup/jsoup
implementation 'org.jsoup:jsoup:1.16.1'
implementation 'org.jsoup:jsoup:1.17.1'

// Google Gson - https://mvnrepository.com/artifact/com.google.code.gson/gson
implementation 'com.google.code.gson:gson:2.10.1'

// Android Browser (use WebView in app) - https://mvnrepository.com/artifact/androidx.browser/browser
implementation 'androidx.browser:browser:1.8.0-alpha01'
implementation 'androidx.browser:browser:1.8.0-beta01'

// https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.11'

implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.4.1"
implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.5.0'

implementation 'com.github.dutwrapper:dutwrapper-java:62743dce5f'
implementation 'com.github.dutwrapper:dutwrapper-java:62b8a00'

implementation 'com.google.android.material:material:1.10.0'
}

// Allow references to generated code
Expand Down
12 changes: 11 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application
android:name=".MainApplication"
Expand All @@ -22,7 +24,7 @@
android:usesCleartextTraffic="true"
tools:targetApi="tiramisu">

<!-- Trigger Google Play services to install the backported photo picker module. -->
<!-- Trigger Google Play services to install the backport photo picker module. -->
<!--suppress AndroidDomInspection -->
<service android:name="com.google.android.gms.metadata.ModuleDependencies"
android:enabled="false"
Expand Down Expand Up @@ -80,10 +82,18 @@
android:label="DutSchedule - Settings"
android:screenOrientation="portrait"
android:theme="@style/Theme.DutSchedule" />
<activity
android:name=".activity.HelpActivity"
android:exported="false"
android:label="DutSchedule - Help"
android:screenOrientation="portrait"
android:theme="@style/Theme.DutSchedule"
android:windowSoftInputMode="adjustResize" />
<service
android:name=".service.NewsUpdateService"
android:enabled="true"
android:exported="true"
android:foregroundServiceType="shortService"
android:label="DutSchedule - News Update Service" />
</application>

Expand Down
Binary file added app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit da85ff8

Please sign in to comment.