Skip to content

Commit

Permalink
Build: Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
zhanghai committed May 3, 2024
1 parent 0901066 commit 4cd7710
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 18 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ dependencies {

implementation 'androidx.activity:activity-ktx:1.9.0'
// Appcompat 1.7.0-alpha01 is required for properly changing locale below API 24 (b/243119645).
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'androidx.core:core-ktx:1.13.0'
implementation 'androidx.appcompat:appcompat:1.7.0-beta01'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.drawerlayout:drawerlayout:1.2.0'
implementation 'androidx.exifinterface:exifinterface:1.3.7'
implementation 'androidx.fragment:fragment-ktx:1.6.2'
implementation 'androidx.fragment:fragment-ktx:1.7.0'
def androidx_lifecycle_version = '2.7.0'
implementation "androidx.lifecycle:lifecycle-common-java8:$androidx_lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidx_lifecycle_version"
Expand All @@ -141,7 +141,7 @@ dependencies {
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'com.google.android.material:material:1.11.0'
implementation 'com.google.android.material:material:1.12.0'

implementation 'com.caverock:androidsvg-aar:1.4'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<resources>

<style name="Platform.V21.Theme.MaterialFiles" parent="Theme.MaterialComponents.DayNight">
<style name="Platform.V21.Theme.MaterialFiles" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimaryDark">@color/system_window_scrim_compat</item>
</style>
<style name="Platform.Theme.MaterialFiles" parent="Platform.V21.Theme.MaterialFiles" />
Expand All @@ -17,11 +17,9 @@
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialFiles.ActionBarPopup</item>
<item name="android:colorBackground">?colorSurface</item>
<item name="dropDownListViewStyle">@style/Widget.MaterialFiles.ListView.DropDown</item>
<item name="windowActionBar">false</item>
<!-- https://developer.android.com/training/tv/start/start#transition-color -->
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="windowNoTitle">true</item>

<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryVariant">?colorPrimary</item>
Expand Down Expand Up @@ -57,7 +55,7 @@
</style>
<style name="Theme.MaterialFiles.Translucent" parent="Base.Theme.MaterialFiles.Translucent" />

<style name="Platform.V21.Theme.MaterialFiles.Immersive" parent="Theme.MaterialComponents">
<style name="Platform.V21.Theme.MaterialFiles.Immersive" parent="Theme.MaterialComponents.NoActionBar">
<item name="android:navigationBarColor">?colorPrimaryDark</item>

<item name="colorPrimaryDark">@color/dark_50_percent</item>
Expand All @@ -69,12 +67,10 @@
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialFiles.ActionBarPopup</item>
<item name="android:colorBackground">?colorSurface</item>
<item name="dropDownListViewStyle">@style/Widget.MaterialFiles.ListView.DropDown</item>
<item name="windowActionBar">false</item>
<!-- https://developer.android.com/training/tv/start/start#transition-color -->
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="windowNoTitle">true</item>

<item name="colorPrimary">@color/color_primary_dark</item>
<item name="colorPrimaryVariant">?colorPrimary</item>
Expand Down
8 changes: 2 additions & 6 deletions app/src/main/res/values/themes_material3.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<resources>

<style name="Platform.V21.Theme.MaterialFiles.Material3" parent="Theme.Material3.DynamicColors.DayNight">
<style name="Platform.V21.Theme.MaterialFiles.Material3" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
<item name="colorPrimaryDark">@color/system_window_scrim_compat</item>
</style>
<style name="Platform.Theme.MaterialFiles.Material3" parent="Platform.V21.Theme.MaterialFiles.Material3" />
Expand All @@ -17,11 +17,9 @@
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialFiles.ActionBarPopup</item>
<item name="android:colorBackground">?colorSurface</item>
<item name="dropDownListViewStyle">@style/Widget.MaterialFiles.ListView.DropDown</item>
<item name="windowActionBar">false</item>
<!-- https://developer.android.com/training/tv/start/start#transition-color -->
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="windowNoTitle">true</item>

<item name="colorAccent">?colorPrimary</item>
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.MaterialFiles.Material3.SmallComponent</item>
Expand Down Expand Up @@ -61,7 +59,7 @@
</style>
<style name="Theme.MaterialFiles.Material3.Translucent" parent="Base.Theme.MaterialFiles.Material3.Translucent" />

<style name="Platform.V21.Theme.MaterialFiles.Material3.Immersive" parent="Theme.Material3.DynamicColors.Dark">
<style name="Platform.V21.Theme.MaterialFiles.Material3.Immersive" parent="Theme.Material3.DynamicColors.Dark.NoActionBar">
<item name="android:navigationBarColor">?colorPrimaryDark</item>

<item name="colorPrimaryDark">@color/dark_50_percent</item>
Expand All @@ -73,12 +71,10 @@
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialFiles.ActionBarPopup</item>
<item name="android:colorBackground">?colorSurface</item>
<item name="dropDownListViewStyle">@style/Widget.MaterialFiles.ListView.DropDown</item>
<item name="windowActionBar">false</item>
<!-- https://developer.android.com/training/tv/start/start#transition-color -->
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowBackground">@android:color/black</item>
<item name="windowNoTitle">true</item>

<item name="colorAccent">?colorPrimary</item>
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.MaterialFiles.Material3.SmallComponent</item>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.2'
classpath 'com.android.tools.build:gradle:8.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Sep 23 01:27:10 PDT 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.4-all.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.6-all.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 4cd7710

Please sign in to comment.