Skip to content
This repository has been archived by the owner on Sep 3, 2023. It is now read-only.

dependency and theme updates #2090

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 11 additions & 9 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ext.versions = [
min_sdk: 16,
compile_sdk: 29,
build_tools: "29.0.0",
publish_version: "3.3.0",
publish_version_code: 262
compile_sdk: 33,
build_tools: "30.0.3",
publish_version: "3.5.0",
publish_version_code: 264
]

ext.deps = [
gradle_plugins: [
android: "com.android.tools.build:gradle:4.1.2",
kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61",
spotless: "com.diffplug.spotless:spotless-plugin-gradle:3.27.1",
android: "com.android.tools.build:gradle:7.3.1",
kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0",
spotless: "com.diffplug.spotless:spotless-plugin-gradle:4.5.1",
versions: "com.github.ben-manes:gradle-versions-plugin:0.27.0"
],

Expand All @@ -25,7 +25,7 @@ ext.deps = [
recycler_view: "androidx.recyclerview:recyclerview:1.1.0"
],

google_material: "com.google.android.material:material:1.1.0",
google_material: "com.google.android.material:material:1.8.0",

kotlin: [
stdlib8: "org.jetbrains.kotlin:kotlin-stdlib-jdk8",
Expand All @@ -40,5 +40,7 @@ ext.deps = [
date_picker: "com.afollestad:date-picker:0.6.1"
],

leak_canary: "com.squareup.leakcanary:leakcanary-android:2.2"
leak_canary: "com.squareup.leakcanary:leakcanary-android:2.2",

multiDex: "androidx.multidex:multidex:2.0.1"
]
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
android.disableAutomaticComponentCreation=true
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Fri Jan 27 16:19:26 PKT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
3 changes: 3 additions & 0 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ ext.module_name = "materialdialogssample"
apply from: rootProject.file("gradle/android_application_config.gradle")

android.defaultConfig.vectorDrawables.useSupportLibrary = true
android.defaultConfig.multiDexEnabled = true

dependencies {
implementation project(':core')
Expand All @@ -24,4 +25,6 @@ dependencies {
implementation deps.afollestad.assent

debugImplementation deps.leak_canary

debugImplementation deps.multiDex
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package com.afollestad.materialdialogssample

import android.app.Application
import androidx.multidex.MultiDex
import leakcanary.LeakCanary

/** @author Aidan Follestad (afollestad) */
Expand All @@ -24,5 +25,7 @@ class SampleApp : Application() {
override fun onCreate() {
super.onCreate()
LeakCanary.config = LeakCanary.config.copy(retainedVisibleThreshold = 3)

MultiDex.install(this)
}
}
3 changes: 2 additions & 1 deletion sample/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

<activity
android:name=".MainActivity"
android:label="@string/app_name">
android:label="@string/app_name"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/res/values-v21/styles_parent.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="ThemeParent" parent="Theme.MaterialComponents.Light.DarkActionBar">
<style name="ThemeParent" parent="Theme.Material3.Light">
<item name="android:navigationBarColor">?colorPrimaryDark</item>
<item name="sample_button_color">#80000000</item>
<item name="sample_button_text_color">#e6e6e6</item>
</style>

<style name="ThemeParent.Dark" parent="Theme.MaterialComponents">
<style name="ThemeParent.Dark" parent="Theme.Material3.Dark">
<item name="android:navigationBarColor">?colorPrimaryDark</item>
<item name="sample_button_color">#80000000</item>
<item name="sample_button_text_color">#e6e6e6</item>
Expand Down
2 changes: 1 addition & 1 deletion sample/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<item name="android:layout_marginBottom">@dimen/headerMarginVertical</item>
</style>

<style name="SampleButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
<style name="SampleButton" parent="Widget.Material3.Button.UnelevatedButton">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/sample_button_height</item>
<item name="android:layout_marginTop">@dimen/sample_button_spacing</item>
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/res/values/styles_parent.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="ThemeParent" parent="Theme.MaterialComponents.Light.DarkActionBar">
<style name="ThemeParent" parent="Theme.Material3.Light">
<item name="sample_button_color">#80000000</item>
<item name="sample_button_text_color">#e6e6e6</item>
</style>

<style name="ThemeParent.Dark" parent="Theme.MaterialComponents">
<style name="ThemeParent.Dark" parent="Theme.Material3.Dark">
<item name="sample_button_color">#80000000</item>
<item name="sample_button_text_color">#e6e6e6</item>
</style>
Expand Down