Skip to content
Snippets Groups Projects
Commit aa68abf9 authored by Lauren Bricker's avatar Lauren Bricker
Browse files

fix inflation error with bad color

parent 099b7477
No related branches found
No related tags found
1 merge request!2Mapbox sync
......@@ -30,8 +30,8 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation 'com.google.android.material:material:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'com.google.android.material:material:1.5.0'
implementation 'com.google.android.material:material:1.6.0'
implementation 'com.google.android.gms:play-services-location:19.0.1'
}
......@@ -52,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/vMargin"
android:backgroundTint="@color/material_dynamic_tertiary90"
android:backgroundTint="@color/purple_200"
android:clickable="true"
android:contentDescription="@string/find_my_location"
android:tint="@android:color/white"
......@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/vMargin"
android:backgroundTint="@color/material_dynamic_tertiary90"
android:backgroundTint="@color/purple_200"
android:clickable="true"
android:contentDescription="@string/zoom_in"
android:tint="@android:color/white"
......@@ -80,7 +80,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/vMargin"
android:backgroundTint="@color/material_dynamic_tertiary90"
android:backgroundTint="@color/purple_200"
android:clickable="true"
android:contentDescription="@string/zoom_out"
android:tint="@android:color/white"
......
......@@ -12,10 +12,6 @@ buildscript {
}
allprojects {
repositories {
google()
mavenCentral()
}
}
......
rootProject.name = "sensing"
include ':app'
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven {
url 'https://api.mapbox.com/downloads/v2/releases/maven'
authentication {
basic(BasicAuthentication)
}
credentials {
// Do not change the username below.
// This should always be `mapbox` (not your username).
username = "mapbox"
// Use the secret token you stored in gradle.properties as the password
password = MAPBOX_SECRET_TOKEN
}
}
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment