diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 955f0b4..3c87f2e 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -5,10 +5,18 @@ plugins { id("dev.flutter.flutter-gradle-plugin") } +import java.util.Properties +import java.io.FileInputStream + +val dotenv = Properties().apply { + load(FileInputStream(rootProject.file("../.env"))) +} + android { namespace = "com.example.wheres_my_sign" compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion + ndkVersion = "27.0.12077973" + //ndkVersion = flutter.ndkVersion compileOptions { sourceCompatibility = JavaVersion.VERSION_11 @@ -20,6 +28,7 @@ android { } defaultConfig { + manifestPlaceholders["GMS_API_KEY"] = dotenv.getProperty("GMS_API_KEY") // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId = "com.example.wheres_my_sign" // You can update the following values to match your application needs. diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 74a3330..60d3f55 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,13 @@ + + + main() async { + await dotenv.load(fileName: ".env"); + runApp(SignLocatorApp()); } -class MyApp extends StatelessWidget { - const MyApp({super.key}); +class SignLocatorApp extends StatelessWidget { + const SignLocatorApp({super.key}); - // This widget is the root of your application. @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // TRY THIS: Try running your application with "flutter run". You'll see - // the application has a purple toolbar. Then, without quitting the app, - // try changing the seedColor in the colorScheme below to Colors.green - // and then invoke "hot reload" (save your changes or press the "hot - // reload" button in a Flutter-supported IDE, or press "r" if you used - // the command line to start the app). - // - // Notice that the counter didn't reset back to zero; the application - // state is not lost during the reload. To reset the state, use hot - // restart instead. - // - // This works for code too, not just values: Most code changes can be - // tested with just a hot reload. - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - ), - home: const MyHomePage(title: 'Flutter Demo Home Page'), + title: 'Sign Locator', + theme: ThemeData(primarySwatch: Colors.blue), + home: SignMapScreen(), ); } } -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; +class SignMapScreen extends StatefulWidget { + const SignMapScreen({super.key}); @override - State createState() => _MyHomePageState(); + SignMapScreenState createState() => SignMapScreenState(); } -class _MyHomePageState extends State { - int _counter = 0; +class SignMapScreenState extends State { + GoogleMapController? mapController; + Set markers = {}; + LatLng _initialPosition = const LatLng(37.7749, -122.4194); // Default: SF + BitmapDescriptor customIcon = BitmapDescriptor.defaultMarker; - void _incrementCounter() { + void customMarker() { + BitmapDescriptor.asset( + ImageConfiguration(), + 'assets/icons/sign_marker.png', + ).then((icon) { + setState(() { + customIcon = icon; + }); + }); + } + + @override + void initState() { + super.initState(); + _requestPermissions(); + customMarker(); + } + + Future _requestPermissions() async { + await Permission.locationWhenInUse.request(); + _goToUserLocation(); + } + + Future _goToUserLocation() async { + bool serviceEnabled = await Geolocator.isLocationServiceEnabled(); + if (!serviceEnabled) return; + + LocationPermission permission = await Geolocator.checkPermission(); + if (permission == LocationPermission.denied || + permission == LocationPermission.deniedForever) { + permission = await Geolocator.requestPermission(); + } + + Position position = await Geolocator.getCurrentPosition(); + _initialPosition = LatLng(position.latitude, position.longitude); + + mapController?.animateCamera(CameraUpdate.newLatLng(_initialPosition)); + } + + void _addMarker() async { + Position position = await Geolocator.getCurrentPosition(); + final markerId = MarkerId(DateTime.now().toString()); + final newMarker = Marker( + markerId: markerId, + position: LatLng(position.latitude, position.longitude), + infoWindow: InfoWindow(title: 'Sign Location'), + icon: customIcon, + ); setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; + markers.add(newMarker); + }); + } + + void _clearMarkers() { + setState(() { + markers.clear(); }); } @override Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. return Scaffold( appBar: AppBar( - // TRY THIS: Try changing the color here to a specific color (to - // Colors.amber, perhaps?) and trigger a hot reload to see the AppBar - // change color while the other colors stay the same. - backgroundColor: Theme.of(context).colorScheme.inversePrimary, - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - // - // TRY THIS: Invoke "debug painting" (choose the "Toggle Debug Paint" - // action in the IDE, or press "p" in the console), to see the - // wireframe for each widget. - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text('You have pushed the button this many times:'), - Text( - '$_counter', - style: Theme.of(context).textTheme.headlineMedium, - ), - ], + title: SizedBox( + width: MediaQuery.of(context).size.width, + child: Image.asset( + 'assets/app_title.png', // Replace with your image path + fit: BoxFit.contain, // Adjust the height as needed + ), ), ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. + body: GoogleMap( + zoomGesturesEnabled: true, + scrollGesturesEnabled: true, + tiltGesturesEnabled: true, + rotateGesturesEnabled: true, + mapType: MapType.normal, + onMapCreated: (controller) { + mapController = controller; + }, + initialCameraPosition: CameraPosition( + target: _initialPosition, + zoom: 14, + ), + myLocationEnabled: true, + markers: markers, + ), + floatingActionButton: Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + FloatingActionButton( + onPressed: _addMarker, + tooltip: 'Drop Pin', + child: Icon(Icons.add_location), + ), + SizedBox(height: 12), + FloatingActionButton( + onPressed: _clearMarkers, + backgroundColor: Colors.red, + tooltip: 'Clear Pins', + child: Icon(Icons.clear), + ), + ], + ), ); } } diff --git a/pubspec.lock b/pubspec.lock index 6be6db9..3cfa83f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -86,6 +86,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_dotenv: + dependency: "direct main" + description: + name: flutter_dotenv + sha256: b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b + url: "https://pub.dev" + source: hosted + version: "5.2.1" flutter_lints: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 27b0861..70b79cf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,6 +37,7 @@ dependencies: google_maps_flutter: ^2.12.1 geolocator: ^14.0.0 permission_handler: ^12.0.0+1 + flutter_dotenv: ^5.2.1 dev_dependencies: flutter_test: @@ -90,3 +91,7 @@ flutter: # # For details regarding fonts from package dependencies, # see https://flutter.dev/to/font-from-package + assets: + - .env + - assets/app_title.png + - assets/icons/sign_marker.png \ No newline at end of file diff --git a/test/widget_test.dart b/test/widget_test.dart index b33908f..6f8cb19 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -13,7 +13,7 @@ import 'package:wheres_my_sign/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); + await tester.pumpWidget(const SignLocatorApp()); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget);