diff --git a/android-marker-app-custom-style/.gitignore b/android-marker-app-custom-style/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/android-marker-app-custom-style/.gitignore @@ -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 diff --git a/android-marker-app-custom-style/app/.gitignore b/android-marker-app-custom-style/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/android-marker-app-custom-style/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/android-marker-app-custom-style/app/build.gradle.kts b/android-marker-app-custom-style/app/build.gradle.kts new file mode 100644 index 0000000..13ca19a --- /dev/null +++ b/android-marker-app-custom-style/app/build.gradle.kts @@ -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) +} \ No newline at end of file diff --git a/android-marker-app-custom-style/app/proguard-rules.pro b/android-marker-app-custom-style/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/android-marker-app-custom-style/app/proguard-rules.pro @@ -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 \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/androidTest/java/com/example/android_custom_style/ExampleInstrumentedTest.kt b/android-marker-app-custom-style/app/src/androidTest/java/com/example/android_custom_style/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..9fe41e9 --- /dev/null +++ b/android-marker-app-custom-style/app/src/androidTest/java/com/example/android_custom_style/ExampleInstrumentedTest.kt @@ -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) + } +} \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/AndroidManifest.xml b/android-marker-app-custom-style/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9ccaa87 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/MainActivity.kt b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/MainActivity.kt new file mode 100644 index 0000000..f859f39 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/MainActivity.kt @@ -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)) + + } + + } + } + + } + } + +} \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Color.kt b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Color.kt new file mode 100644 index 0000000..5c793f7 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Color.kt @@ -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) \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Theme.kt b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Theme.kt new file mode 100644 index 0000000..ac027d0 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.example.android_custom_style.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun AndroidcustomstyleTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Type.kt b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Type.kt new file mode 100644 index 0000000..fd7d832 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/java/com/example/android_custom_style/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.android_custom_style.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/res/drawable/ic_launcher_background.xml b/android-marker-app-custom-style/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android-marker-app-custom-style/app/src/main/res/drawable/ic_launcher_foreground.xml b/android-marker-app-custom-style/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android-marker-app-custom-style/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android-marker-app-custom-style/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android-marker-app-custom-style/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/android-marker-app-custom-style/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/android-marker-app-custom-style/app/src/main/res/values/colors.xml b/android-marker-app-custom-style/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/res/values/strings.xml b/android-marker-app-custom-style/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..20d22a4 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + android-custom-style + \ No newline at end of file diff --git a/android-marker-app-custom-style/app/src/main/res/values/themes.xml b/android-marker-app-custom-style/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..3c688f4 --- /dev/null +++ b/android-marker-app-custom-style/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +