Skip to content

Commit

Permalink
Merge pull request #12 from Parabox-App/develop
Browse files Browse the repository at this point in the history
1.1.1
  • Loading branch information
ojhdt authored Feb 22, 2023
2 parents a692cf1 + 791f539 commit a0d9ecd
Show file tree
Hide file tree
Showing 49 changed files with 2,524 additions and 544 deletions.
24 changes: 14 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
applicationId "com.ojhdtapp.parabox"
minSdk 26
targetSdk 33
versionCode 14
versionName "1.1.0"
versionCode 15
versionName "1.1.1"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down Expand Up @@ -112,6 +112,9 @@ dependencies {
implementation "androidx.compose.material:material-icons-extended:$compose_version"
implementation "com.google.android.material:material:1.9.0-alpha01"

// Onedrive
implementation 'com.microsoft.identity.client:msal:4.2.0'

// Qiniu
implementation 'com.qiniu:qiniu-java-sdk:7.12.1'

Expand All @@ -126,7 +129,7 @@ dependencies {
implementation 'com.google.firebase:firebase-appcheck-playintegrity'

// WorkManager
implementation "androidx.work:work-runtime-ktx:2.7.1"
implementation "androidx.work:work-runtime-ktx:2.8.0"
implementation 'androidx.hilt:hilt-work:1.0.0'
kapt 'androidx.hilt:hilt-compiler:1.0.0'

Expand Down Expand Up @@ -172,9 +175,9 @@ dependencies {
implementation 'com.ojhdt:parabox-development-kit:1.0.6'

// Paging
def paging_version = "3.2.0-alpha03"
def paging_version = "3.2.0-alpha04"
implementation "androidx.paging:paging-runtime:$paging_version"
implementation "androidx.paging:paging-compose:1.0.0-alpha17"
implementation "androidx.paging:paging-compose:1.0.0-alpha18"

// Coil
implementation 'io.coil-kt:coil:2.2.2'
Expand Down Expand Up @@ -206,18 +209,18 @@ dependencies {
implementation "com.google.accompanist:accompanist-placeholder-material:$acc_version"

// Navigation Compose
def nav_version = "2.6.0-alpha04"
def nav_version = "2.6.0-alpha05"
implementation "androidx.navigation:navigation-compose:$nav_version"

// m3
implementation "androidx.compose.material3:material3:1.1.0-alpha05"
implementation "androidx.compose.material3:material3-window-size-class:1.1.0-alpha05"
implementation "androidx.compose.material3:material3:1.1.0-alpha06"
implementation "androidx.compose.material3:material3-window-size-class:1.1.0-alpha06"

// Chrome Custom Tab
implementation "androidx.browser:browser:1.4.0"
implementation "androidx.browser:browser:1.5.0"

// ViewModel
def lifecycle_version = "2.6.0-alpha05"
def lifecycle_version = "2.6.0-beta01"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
// ViewModel utilities for Compose
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
Expand All @@ -241,6 +244,7 @@ dependencies {
// Retrofit
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'

// Room
def room_version = "2.5.0"
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
android:required="false" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.VIBRATE" />
Expand Down Expand Up @@ -82,6 +83,21 @@
</intent-filter>
</activity>

<!--Intent filter to capture authorization code response from the default browser on the device calling back to our app after interactive sign in -->
<activity
android:name="com.microsoft.identity.client.BrowserTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="msauth"
android:host="com.ojhdtapp.parabox"
android:path="/tRs+aB2aiUENDbRJA51OjlWMREM=" />
</intent-filter>
</activity>

<service
android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
android:enabled="false"
Expand Down
Loading

0 comments on commit a0d9ecd

Please sign in to comment.