Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
CSE340 Sensing and Location
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cse340
exercises
CSE340 Sensing and Location
Commits
aa68abf9
Commit
aa68abf9
authored
2 years ago
by
Lauren Bricker
Browse files
Options
Downloads
Patches
Plain Diff
fix inflation error with bad color
parent
099b7477
No related branches found
Branches containing commit
No related tags found
1 merge request
!2
Mapbox sync
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/build.gradle
+2
-2
2 additions, 2 deletions
app/build.gradle
app/src/main/res/layout/location_layout.xml
+3
-3
3 additions, 3 deletions
app/src/main/res/layout/location_layout.xml
build.gradle
+0
-4
0 additions, 4 deletions
build.gradle
settings.gradle
+21
-0
21 additions, 0 deletions
settings.gradle
with
26 additions
and
9 deletions
app/build.gradle
+
2
−
2
View file @
aa68abf9
...
...
@@ -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'
}
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/location_layout.xml
+
3
−
3
View file @
aa68abf9
...
...
@@ -52,7 +52,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/vMargin"
android:backgroundTint=
"@color/
material_dynamic_tertiary9
0"
android:backgroundTint=
"@color/
purple_20
0"
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_tertiary9
0"
android:backgroundTint=
"@color/
purple_20
0"
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_tertiary9
0"
android:backgroundTint=
"@color/
purple_20
0"
android:clickable=
"true"
android:contentDescription=
"@string/zoom_out"
android:tint=
"@android:color/white"
...
...
This diff is collapsed.
Click to expand it.
build.gradle
+
0
−
4
View file @
aa68abf9
...
...
@@ -12,10 +12,6 @@ buildscript {
}
allprojects
{
repositories
{
google
()
mavenCentral
()
}
}
...
...
This diff is collapsed.
Click to expand it.
settings.gradle
+
21
−
0
View file @
aa68abf9
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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment