Skip to content
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
15 changes: 15 additions & 0 deletions android-marker-app-custom-style/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
1 change: 1 addition & 0 deletions android-marker-app-custom-style/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
61 changes: 61 additions & 0 deletions android-marker-app-custom-style/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
}

android {
namespace = "com.example.android_custom_style"
compileSdk = 36

defaultConfig {
applicationId = "com.example.android_custom_style"
minSdk = 24
targetSdk = 36
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
compose = true
}
}

dependencies {

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation("com.mapbox.maps:android-ndk27:11.16.6")
implementation("com.mapbox.extension:maps-compose-ndk27:11.16.6")
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
}
21 changes: 21 additions & 0 deletions android-marker-app-custom-style/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.example.android_custom_style

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.example.android_custom_style", appContext.packageName)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Androidcustomstyle">
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.Androidcustomstyle">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
package com.example.android_custom_style

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.Phone
import androidx.compose.material.icons.filled.Place
import androidx.compose.material.icons.filled.Star
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Text
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.mapbox.geojson.Point
import com.mapbox.maps.extension.compose.MapboxMap
import com.mapbox.maps.extension.compose.animation.viewport.rememberMapViewportState
import com.mapbox.maps.extension.compose.style.MapStyle
import com.mapbox.maps.extension.compose.style.rememberStyleState
import org.json.JSONObject
import kotlin.math.roundToInt

public class MainActivity : ComponentActivity() {

val locationName = mutableStateOf("none")
val locationAddress = mutableStateOf("none")
val locationPhoneNumber = mutableStateOf("none")
val locationRating = mutableStateOf("none")

@OptIn(ExperimentalMaterial3Api::class)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
val sheetState = rememberModalBottomSheetState()
var showBottomSheet by remember { mutableStateOf(false) }

fun grabPOIData(properties: JSONObject)
{
locationName.value = properties.get("storeName").toString()
locationAddress.value = properties.get("address").toString() + ", " + properties.get("city").toString() + " " + properties.get("postalCode").toString()
locationPhoneNumber.value = properties.get("phoneFormatted").toString()
locationRating.value = properties.get("rating").toString()

showBottomSheet = true
}

MapboxMap(
Modifier.fillMaxSize(),
scaleBar = {},
style = {
MapStyle(
style = "mapbox://styles/examples/cm37hh1nx017n01qk2hngebzt",
styleState = rememberStyleState {
styleInteractionsState
.onLayerClicked(id = "dog-groomers-3o4sdb") { feature, context ->
grabPOIData(feature.properties)
true
}
.onLayerClicked(id = "dog-groomers-boston-marker") { feature, context ->
grabPOIData(feature.properties)
true
}
}
)
},
mapViewportState = rememberMapViewportState {
setCameraOptions {
zoom(7.0)
center(Point.fromLngLat(-71.09290,42.34622))
pitch(0.0)
bearing(0.0)
}
},
)

// Adds UI element with call to action and app title text
Column(
modifier = Modifier
.fillMaxWidth(0.5f)
.fillMaxHeight(0.15f)
.padding(16.dp),
verticalArrangement = Arrangement.SpaceEvenly)
{
Box(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight(0.3f)
.clip(shape = RoundedCornerShape(5.dp))
.padding(1.dp)
.background(Color.White)
)
{
Row(modifier = Modifier.padding(1.dp))
{
Icon(Icons.Filled.Favorite, "", tint = Color.Red, modifier = Modifier.padding(2.dp))
Text("Pet Spa Finder", style = MaterialTheme.typography.titleMedium, modifier = Modifier.padding(8.dp,1.dp,1.dp,1.dp))
}
}
Box(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight(0.7f)
.padding(1.dp)
.clip(shape = RoundedCornerShape(5.dp))
.background(Color.White)
)
{
Row(modifier = Modifier.padding(1.dp))
{
Text("Click a marker for more information.", style = MaterialTheme.typography.bodyMedium, modifier = Modifier.padding(5.dp,2.dp))
}
}
}

// Checks if a marker has been tapped, if so will open the ModalBottomSheet
if (showBottomSheet) {
ModalBottomSheet(
onDismissRequest = {
showBottomSheet = false
},
sheetState = sheetState
) {
// Aligns the contents of the ModalBottomSheet for better readability
Column(
modifier = Modifier.fillMaxWidth().padding(25.dp,0.dp,0.dp,0.dp),
horizontalAlignment = Alignment.Start
) {
// These values update when the marker is selected by querying the GeoJSON
// for the related data, and then updating the global variables so the text prints correctly here.
Text(
text = locationName.value,
style = MaterialTheme.typography.displaySmall,
)

Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxHeight(0.04f))
{
Text("Rating: ", style = MaterialTheme.typography.bodyMedium)
val roundedRating = locationRating.value.toFloat().roundToInt()
for (i in 0..roundedRating-1){//locationRating.value.toInt()) {
Icon(Icons.Filled.Star,"",tint = Color.Red)
}
}

Spacer(modifier = Modifier.padding(vertical = 10.dp))

Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxHeight(0.04f))
{
Icon(Icons.Filled.Place, "", tint = Color.Red, modifier = Modifier.padding(2.dp))
Text(locationAddress.value, style = MaterialTheme.typography.bodyLarge, modifier = Modifier.padding(1.dp))
}
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxHeight(0.04f))
{
Icon(Icons.Filled.Phone, "", tint = Color.Red, modifier = Modifier.padding(3.dp))
Text(
locationPhoneNumber.value,
style = MaterialTheme.typography.bodyLarge
)
}

// Adds padding at the bottom of the ModalBottomSheet
Spacer(modifier = Modifier.padding(vertical = 50.dp))

}

}
}

}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.android_custom_style.ui.theme

import androidx.compose.ui.graphics.Color

val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)

val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
Loading