diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f5e6591..cc62276 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,22 +5,18 @@
 # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
 
-name: Java CI with Gradle
+name: Build and test
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "dev" ]
   pull_request:
     branches: [ "main" ]
 
-permissions:
-  contents: read
-
 jobs:
+  # Build job
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 17
@@ -28,7 +24,30 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
+        cache: gradle
+    - name: Grant execute permissio for gradlew
+      run: chmod +x gradlew
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+      run: ./gradlew build
+
+  # Test job:
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+    - name: Grant execute permissio for gradlew
+      run: chmod +x gradlew
+    - name: Run linter and test
+      run: ./gradlew check
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
       with:
-        arguments: build
+        name: Test-Reports
+        path: app/build/Test-Reports
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..a88fc36
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,124 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="ENABLE_SECOND_REFORMAT" value="true" />
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 659bf43..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="16" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a9f4e52..ee0c965 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/local/Cellar/gradle/7.0/libexec" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..44ca2d9
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,41 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..2b8a50f
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e7f09d8..773fe0f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16_PREVIEW" project-jdk-name="Android Studio java home" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 0000000..f3d4a2e
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ScreenshotViewer">
+    <option name="frameScreenshot" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index afe2c8b..959b102 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Location_demo_app
 
-# Phone Location Deme Android App
+# Phone Location Demo Android App
 
 The Phone Location Demo Android App is a simple application that demonstrates how to retrieve the current location of an Android device using the device's GPS or network provider. It serves as a basic starting point for developers who want to integrate location-based features into their Android apps.
 
diff --git a/app/build.gradle b/app/build.gradle
index 12b78d7..8e875e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,16 +1,17 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
 }
 
 android {
     namespace 'com.example.location_demo_app'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.location_demo_app"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -27,17 +28,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.2.0'
+        kotlinCompilerExtensionVersion '1.4.0'
     }
     packagingOptions {
         resources {
@@ -48,16 +49,41 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-alpha11'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation "androidx.compose.ui:ui:1.4.3"
+    implementation 'androidx.compose:compose-bom:2023.06.01'
+    implementation "androidx.compose.foundation:foundation:1.4.3"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.4.3"
+
+    // maps
+    implementation 'com.google.maps.android:maps-compose:2.11.2'
+
+    // Make sure to also include the latest version of the Maps SDK for Android
+    implementation 'com.google.android.gms:play-services-maps:18.1.0'
+
+    // Optionally, you can include the Compose utils library for Clustering, etc.
+    implementation 'com.google.maps.android:maps-compose-utils:2.11.2'
+
+    // Optionally, you can include the widgets library for ScaleBar, etc.
+    implementation 'com.google.maps.android:maps-compose-widgets:2.11.2'
+
+    implementation 'androidx.compose.material3:material3:1.2.0-alpha03'
+    implementation 'androidx.compose.material:material-icons-extended:1.4.3'
+    implementation 'androidx.compose.material:material-icons-core:1.4.3'
+    implementation 'androidx.compose.material3:material3-window-size-class-android:1.2.0-alpha03'
+    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
+    implementation 'androidx.navigation:navigation-compose:2.6.0'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.4.3"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.4.3"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.4.3"
+// Room
+    implementation "androidx.room:room-runtime:2.5.2"
+    kapt "androidx.room:room-compiler:2.5.2"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b6d04f..e8ab847 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"
@@ -12,7 +14,7 @@
         android:theme="@style/Theme.Location_demo_app"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui_layer.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.Location_demo_app">
@@ -22,6 +24,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyACg7BWXRr1964PpBIVC0te5hRNWyTDePU"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..6c607e8
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/example/location_demo_app/MainActivity.kt b/app/src/main/java/com/example/location_demo_app/MainActivity.kt
deleted file mode 100644
index c909bf6..0000000
--- a/app/src/main/java/com/example/location_demo_app/MainActivity.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.example.location_demo_app
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.example.location_demo_app.ui.theme.Location_demo_appTheme
-
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            Location_demo_appTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    Greeting("Android")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun Greeting(name: String) {
-    Text(text = "Hello $name!")
-}
-
-@Preview(showBackground = true)
-@Composable
-fun DefaultPreview() {
-    Location_demo_appTheme {
-        Greeting("Android")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/data/DialogData.kt b/app/src/main/java/com/example/location_demo_app/data/DialogData.kt
new file mode 100644
index 0000000..9146260
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/data/DialogData.kt
@@ -0,0 +1,22 @@
+package com.example.location_demo_app.data
+
+/**
+ * Data class for holding the data required to show the dialog.
+ *
+ * @property shouldBeShown Tells if dialog should be shown or not.
+ * @property title Title text for the dialog.
+ * @property text Details text for the dialog.
+ * @property confirmButtonText Text for the primary/confirmation button in dialog.
+ * @property dismissButtonText Text for the secondary/dismiss button in dialog.
+ * @property confirmButtonAction Invoked when confirmation button is clicked.
+ * @property dismissButtonAction Invoked when dismiss button is clicked.
+ */
+data class DialogData(
+    val shouldBeShown: Boolean = false,
+    val title: String = "",
+    val text: String = "",
+    val confirmButtonText: String = "",
+    val dismissButtonText: String = "",
+    val confirmButtonAction: () -> Unit = {},
+    val dismissButtonAction: () -> Unit = {},
+)
diff --git a/app/src/main/java/com/example/location_demo_app/data/MapPosition.kt b/app/src/main/java/com/example/location_demo_app/data/MapPosition.kt
new file mode 100644
index 0000000..9a4f795
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/data/MapPosition.kt
@@ -0,0 +1,11 @@
+package com.example.location_demo_app.data
+
+/**
+ * Data class for holding the map coordinated positions.
+ *
+ * @property latitude Holds latitude coordinates.
+ * @property longitude Holds longitude coordinates.
+ */
+data class MapPosition(
+    var latitude: Double = 0.0, var longitude: Double = 0.0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/data/PermissionResult.kt b/app/src/main/java/com/example/location_demo_app/data/PermissionResult.kt
new file mode 100644
index 0000000..b10d335
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/data/PermissionResult.kt
@@ -0,0 +1,32 @@
+package com.example.location_demo_app.data
+
+import android.content.Intent
+
+/**
+ * Sealed interface for the permission check results.
+ */
+sealed interface PermissionResult {
+
+    /**
+     * Data class holding the gps and network check cumulative result.
+     *
+     * @property haveBothPermission Tells if app have both permissions.
+     */
+    data class AllPermission(val haveBothPermission: Boolean) : PermissionResult
+
+    /**
+     * Data class holding the gps off related results.
+     *
+     * @property gpsError Error string that need to be shown in dialog.
+     * @property settingIntent Intent to launch the setting for GPS access permission.
+     */
+    data class GpsOff(val gpsError: String, val settingIntent: Intent) : PermissionResult
+
+    /**
+     * Data class holding the network off related results.
+     *
+     * @property networkError Error string that need to be shown in dialog.
+     * @property settingIntent Intent to launch the setting for network access permission.
+     */
+    data class NetworkOff(val networkError: String, val settingIntent: Intent) : PermissionResult
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui/theme/Color.kt b/app/src/main/java/com/example/location_demo_app/ui/theme/Color.kt
deleted file mode 100644
index c89d05d..0000000
--- a/app/src/main/java/com/example/location_demo_app/ui/theme/Color.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.location_demo_app.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/app/src/main/java/com/example/location_demo_app/ui_layer/MainActivity.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/MainActivity.kt
new file mode 100644
index 0000000..b64af32
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/MainActivity.kt
@@ -0,0 +1,107 @@
+package com.example.location_demo_app.ui_layer
+
+import android.content.Intent
+import android.os.Bundle
+import android.provider.Settings
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.runtime.Composable
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import com.example.location_demo_app.data.DialogData
+import com.example.location_demo_app.data.PermissionResult
+import com.example.location_demo_app.ui_layer.Utils.ScreenConstants
+import com.example.location_demo_app.ui_layer.Utils.checkLocationServiceEnabled
+import com.example.location_demo_app.ui_layer.screens.DialogBox
+import com.example.location_demo_app.ui_layer.screens.MainScreen
+import com.example.location_demo_app.ui_layer.screens.PermissionDialog
+import com.example.location_demo_app.ui_layer.screens.SplashScreen
+import com.example.location_demo_app.ui_layer.theme.Location_demo_appTheme
+
+/**
+ * Main screen of the app hosting many other screens like Splash screen, main map screen, settings screen.
+ */
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        // Setting compose content on activity.
+        setContent {
+            Location_demo_appTheme {
+                InitNavigator() // Start showing the screens.
+
+                var doHavePermission: Boolean = false
+                var errorText: String = ""
+                var settingIntent: Intent = Intent()
+
+                // Checks for the required permissions.
+                val permissionCheckResult = checkLocationServiceEnabled()
+
+                with(permissionCheckResult) {
+                    if (this is PermissionResult.AllPermission && this.haveBothPermission) {
+                        doHavePermission = true
+                    } else {
+                        when (this) {
+                            is PermissionResult.NetworkOff -> {
+                                errorText = this.networkError
+                                settingIntent = this.settingIntent
+                            }
+
+                            is PermissionResult.GpsOff -> {
+                                errorText = this.gpsError
+                                settingIntent = this.settingIntent
+                            }
+
+                            else -> {
+                                errorText = "Both permission are not present."
+                                settingIntent = Intent(Settings.ACTION_NETWORK_OPERATOR_SETTINGS)
+                            }
+                        }
+                    }
+                }
+
+                // To show the dialog for asking required permissions from the user for accessing internet and location if not already granted.
+                if (!doHavePermission) {
+                    DialogBox(
+                        dialogData = DialogData(shouldBeShown = true,
+                            title = "Error",
+                            text = errorText,
+                            confirmButtonText = "Fix error",
+                            dismissButtonText = "Cancel",
+                            confirmButtonAction = {
+                                startActivity(settingIntent)
+                            })
+                    )
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Compose ui for showing different types of screen on the activity using navigation.
+ */
+@Composable
+private fun InitNavigator() {
+    val navController = rememberNavController()
+    val checkPermissionAndLaunchMainScreen: () -> Unit = {
+        if (true) {
+            navController.navigate(ScreenConstants.MAIN_SCREEN)
+        } else {
+            TODO("Need to reiterate this and update accordingly.")
+            navController.navigate(ScreenConstants.ASK_PERMISSION)
+        }
+    }
+
+    NavHost(
+        navController = navController, startDestination = ScreenConstants.SPLASH_SCREEN
+    ) {
+        composable(ScreenConstants.SPLASH_SCREEN) {
+            SplashScreen(
+                checkPermissionAndLaunchMainScreen
+            )
+        }
+        composable(ScreenConstants.MAIN_SCREEN) { MainScreen() }
+        composable(ScreenConstants.ASK_PERMISSION) { PermissionDialog(navController) {} }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/Utils/Permission.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/Utils/Permission.kt
new file mode 100644
index 0000000..9e95251
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/Utils/Permission.kt
@@ -0,0 +1,74 @@
+package com.example.location_demo_app.ui_layer.Utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.location.LocationManager
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.example.location_demo_app.data.PermissionResult
+
+/**
+ * An extension function to check the location services of the device and returns result accordingly.
+ */
+fun Context.checkLocationServiceEnabled(): PermissionResult {
+    val locationManager = this.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    var gpsEnabled = false
+    var networkEnabled = false
+
+    try {
+        gpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
+    } catch (ex: Exception) {
+
+    }
+
+    try {
+        networkEnabled = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+    } catch (ex: Exception) {
+    }
+
+    when {
+        !gpsEnabled && !networkEnabled -> {
+            return PermissionResult.AllPermission(false)
+        }
+
+        !gpsEnabled -> {
+            return PermissionResult.GpsOff(
+                gpsError = "Your device cant get GPS location.",
+                settingIntent = Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+            )
+        }
+
+        !networkEnabled -> {
+            return PermissionResult.NetworkOff(
+                networkError = "Your device don't have network connection.",
+                settingIntent = Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+            )
+        }
+
+        else -> {
+            return PermissionResult.AllPermission(haveBothPermission = true)
+        }
+    }
+}
+
+/**
+ * A extension method to check the permission(Might cleanup later).
+ */
+fun Context.checkPermissions(): Boolean {
+    return (ContextCompat.checkSelfPermission(
+        this, android.Manifest.permission.ACCESS_COARSE_LOCATION
+    ) == PackageManager.PERMISSION_GRANTED) && (ContextCompat.checkSelfPermission(
+        this, android.Manifest.permission.ACCESS_FINE_LOCATION
+    ) == PackageManager.PERMISSION_GRANTED)
+}
+
+/**
+ * A extension method to check the permission rationale(Might cleanup later).
+ */
+fun Activity.checkPermissionRationale() = ActivityCompat.shouldShowRequestPermissionRationale(
+    this, android.Manifest.permission.ACCESS_FINE_LOCATION
+) && ActivityCompat.shouldShowRequestPermissionRationale(
+    this, android.Manifest.permission.ACCESS_COARSE_LOCATION
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/Utils/ScreenConstants.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/Utils/ScreenConstants.kt
new file mode 100644
index 0000000..70ace01
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/Utils/ScreenConstants.kt
@@ -0,0 +1,11 @@
+package com.example.location_demo_app.ui_layer.Utils
+
+/**
+ * An object class holding the screens constants for uses at many other places.
+ */
+object ScreenConstants {
+    const val MAIN_SCREEN = "mainScreen"
+    const val SPLASH_SCREEN = "mainScreen"
+    const val SETTING_SCREEN = "settingScreen"
+    const val ASK_PERMISSION = "askPermission"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/DialogBox.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/DialogBox.kt
new file mode 100644
index 0000000..ea1380f
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/DialogBox.kt
@@ -0,0 +1,45 @@
+package com.example.location_demo_app.ui_layer.screens
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import com.example.location_demo_app.data.DialogData
+
+/**
+ * A generic composable for emitting a dialog ui.
+ *
+ * @param dialogData Takes [DialogData] to show the dialog.
+ */
+@Composable
+fun DialogBox(dialogData: DialogData) {
+    var openDialog by remember { mutableStateOf(dialogData.shouldBeShown) }
+    if (openDialog) {
+        AlertDialog(onDismissRequest = {
+            openDialog = false
+        },
+            title = { Text(text = dialogData.title) },
+            text = { Text(text = dialogData.text) },
+            confirmButton = {
+                TextButton(onClick = {
+                    openDialog = false
+                    dialogData.confirmButtonAction()
+                }) {
+                    Text(dialogData.confirmButtonText)
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    openDialog = false
+                    dialogData.dismissButtonAction()
+
+                }) {
+                    Text(text = dialogData.dismissButtonText)
+                }
+            })
+    }
+}
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/MainScreen.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/MainScreen.kt
new file mode 100644
index 0000000..159d450
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/MainScreen.kt
@@ -0,0 +1,108 @@
+package com.example.location_demo_app.ui_layer.screens
+
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.LocationOn
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarColors
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.example.location_demo_app.ui_layer.screens.main_screen_components.MainScreenContent
+import com.example.location_demo_app.ui_layer.screens.main_screen_components.RefreshFab
+import com.example.location_demo_app.ui_layer.theme.bottomBarColor
+import com.example.location_demo_app.ui_layer.theme.fabBackground
+import com.example.location_demo_app.ui_layer.theme.fabColor
+import com.example.location_demo_app.ui_layer.theme.themeColor
+
+/**
+ * Main screen compose layout showing the map, navigation top app bar, navigation bottom bar, FAB
+ * button etc.
+ */
+@Preview
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainScreen() {
+    var selectedItem by remember { mutableIntStateOf(0) }
+
+    Scaffold(topBar = {
+        // Top app bar.
+        TopAppBar(title = { Text("Location demo app") }, navigationIcon = {
+            IconButton(onClick = {}) {
+                Icon(Icons.Filled.Close, contentDescription = "Back button")
+            }
+        }, colors = TopAppBarColors(
+            themeColor, fabBackground, fabColor, fabColor, fabColor
+        ), actions = {
+            // Top app bar menu item.
+            IconButton(onClick = { /* doSomething() */ }) {
+                Icon(
+                    Icons.Filled.LocationOn, contentDescription = "Location on"
+                )
+            }
+        })
+    }, floatingActionButton = {
+        // Floating action button.
+        RefreshFab(onRefreshClick = { })
+    }, bottomBar = {
+        // bottom Navigation bar having two icons i.e, Main, Settings.
+        NavigationBar(
+            containerColor = bottomBarColor, tonalElevation = 5.dp
+        ) {
+            NavigationBarItem(
+                icon = {
+                    Icon(
+                        imageVector = Icons.Filled.Home, contentDescription = "Home"
+                    )
+                },
+                label = { Text(text = "Home") },
+                selected = selectedItem == 0,
+                onClick = { selectedItem = 0 },
+                alwaysShowLabel = false
+            )
+            NavigationBarItem(
+                icon = {
+                    Icon(
+                        imageVector = Icons.Filled.Settings, contentDescription = "Settings"
+                    )
+                },
+                label = { Text(text = "Settings") },
+                selected = selectedItem == 1,
+                onClick = { selectedItem = 1 },
+                alwaysShowLabel = false
+            )
+        }
+    }, content = {
+        // Screen content hosting map and bottomSheet.
+        if (selectedItem == 0) {
+            // Main screen
+            Surface(modifier = Modifier.padding(it)) {
+                MainScreenContent()
+            }
+        } else {
+            // Setting screen.
+            Surface(modifier = Modifier.padding(it)) {
+
+            }
+        }
+    })
+}
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/PermissionDialog.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/PermissionDialog.kt
new file mode 100644
index 0000000..2045c5d
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/PermissionDialog.kt
@@ -0,0 +1,31 @@
+package com.example.location_demo_app.ui_layer.screens
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavController
+import com.example.location_demo_app.data.DialogData
+import com.example.location_demo_app.ui_layer.Utils.ScreenConstants
+
+/**
+ * Dialog box for asking the required permission if the device do not have necessary permissions.
+ *
+ * @param navController Used to launch main screen when user dismiss the dialog.
+ * @param permissionRequest This is used to invoke the permission setting so that user can grant permission.
+ */
+@Composable
+fun PermissionDialog(navController: NavController, permissionRequest: () -> Unit) {
+    DialogBox(
+        dialogData = DialogData(
+            shouldBeShown = true,
+            title = "Need permission",
+            text = "Please provide the location access.",
+            confirmButtonText = "Provide access",
+            dismissButtonText = "Dismiss",
+            confirmButtonAction = {
+                permissionRequest()// Fire permission request.
+            },
+            dismissButtonAction = {
+                navController.navigate(ScreenConstants.MAIN_SCREEN)
+            },
+        )
+    )
+}
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/SettingScreen.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/SettingScreen.kt
new file mode 100644
index 0000000..c085adc
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/SettingScreen.kt
@@ -0,0 +1,7 @@
+package com.example.location_demo_app.ui_layer.screens
+
+/**
+ * Compose function for setting screen content.
+ */
+class SettingScreen {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/SplashScreen.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/SplashScreen.kt
new file mode 100644
index 0000000..a0935d0
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/SplashScreen.kt
@@ -0,0 +1,43 @@
+package com.example.location_demo_app.ui_layer.screens
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.example.location_demo_app.R
+import kotlinx.coroutines.delay
+
+/**
+ * Splash compose screen for the main activity that will be shown at the starting of the launch.
+ *
+ * @param navigateToMainScreen Lambda function that will be invoked to launch the main screen.
+ */
+@Composable
+fun SplashScreen(navigateToMainScreen: () -> Unit) {
+    LaunchedEffect(Unit) {
+        // Simulate a loading delay
+        delay(2000)
+        navigateToMainScreen()
+    }
+
+    // Splash screen compose
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Image(
+            painter = painterResource(id = R.drawable.baseline_share_location_24),
+            contentDescription = "Splash Screen",
+            modifier = Modifier
+                .size(200.dp)
+                .offset(y = (-50).dp) // Adjust the offset as per your design
+        )
+    }
+}
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/MainScreenContent.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/MainScreenContent.kt
new file mode 100644
index 0000000..7d685ab
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/MainScreenContent.kt
@@ -0,0 +1,72 @@
+package com.example.location_demo_app.ui_layer.screens.main_screen_components
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.BottomSheetScaffold
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.rememberBottomSheetScaffoldState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.example.location_demo_app.data.MapPosition
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.model.CameraPosition
+import com.google.android.gms.maps.model.LatLng
+import com.google.maps.android.compose.GoogleMap
+import com.google.maps.android.compose.MapProperties
+import com.google.maps.android.compose.MapUiSettings
+import com.google.maps.android.compose.rememberCameraPositionState
+import kotlinx.coroutines.launch
+
+/**
+ * Main content screen compose having the map and bottom sheet.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainScreenContent() {
+    // State required for the Google map compose component.
+    val cameraPositionState = rememberCameraPositionState {
+        position = CameraPosition.fromLatLngZoom(LatLng(0.0, 0.0), 1f)
+    }
+
+    // Stated for the bottom sheet.
+    val coroutineScope = rememberCoroutineScope()
+    val scaffoldState = rememberBottomSheetScaffoldState()
+
+    // lambda to handle the position updates on map click, button click, or when user enter the coordinates.
+    val mapPositionClicked: (MapPosition) -> Unit = {
+        coroutineScope.launch { scaffoldState.bottomSheetState.partialExpand() }
+        cameraPositionState.move(
+            CameraUpdateFactory.newLatLng(
+                LatLng(
+                    it.latitude, it.longitude
+                )
+            )
+        )
+    }
+
+    // Bottom sheet
+    BottomSheetScaffold(scaffoldState = scaffoldState,
+        sheetPeekHeight = 32.dp,
+        sheetContent = { SheetContent(cameraPositionState, mapPositionClicked) }) {
+        GoogleMap(modifier = Modifier.fillMaxSize(),
+            cameraPositionState = cameraPositionState,
+            properties = MapProperties(isMyLocationEnabled = true),
+            uiSettings = MapUiSettings(
+                zoomGesturesEnabled = true,
+                zoomControlsEnabled = false,
+                myLocationButtonEnabled = true,
+            ),
+            onMyLocationClick = {
+                mapPositionClicked(MapPosition(it.latitude, it.longitude))
+            },
+            onMapClick = {
+                mapPositionClicked(MapPosition(it.latitude, it.longitude))
+            })
+        BackHandler() {
+            coroutineScope.launch { scaffoldState.bottomSheetState.partialExpand() }
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/RefreshFabButton.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/RefreshFabButton.kt
new file mode 100644
index 0000000..bea7c15
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/RefreshFabButton.kt
@@ -0,0 +1,37 @@
+package com.example.location_demo_app.ui_layer.screens.main_screen_components
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.FloatingActionButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.example.location_demo_app.ui_layer.theme.fabBackground
+import com.example.location_demo_app.ui_layer.theme.fabColor
+
+/**
+ * Compose function for the RefreshButton compose component.
+ *
+ * @param onRefreshClick When button is clicked.
+ */
+@Composable
+fun RefreshFab(onRefreshClick: () -> Unit) {
+    FloatingActionButton(
+        onClick = onRefreshClick,
+        modifier = Modifier.size(70.dp, 70.dp),
+        containerColor = fabBackground,
+        elevation = FloatingActionButtonDefaults.elevation(
+            defaultElevation = 8.dp, pressedElevation = 5.dp
+        )
+    ) {
+        Icon(
+            modifier = Modifier.size(36.dp, 36.dp),
+            imageVector = Icons.Filled.Refresh,
+            contentDescription = "Refresh",
+            tint = fabColor
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/SheetContent.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/SheetContent.kt
new file mode 100644
index 0000000..cba45a9
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/screens/main_screen_components/SheetContent.kt
@@ -0,0 +1,76 @@
+package com.example.location_demo_app.ui_layer.screens.main_screen_components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.example.location_demo_app.data.MapPosition
+import com.google.maps.android.compose.CameraPositionState
+
+/**
+ * Composable for sheet content having textfield to enter the latitude, latitude and two buttons
+ * to check
+ *
+ * @param cameraPositionState Takes camera position state to get the live pointed location by the map.
+ * @param putLocationOnMap Lambda function if user wants to see coordinates in map.
+ *
+ */
+@Composable
+fun SheetContent(
+    cameraPositionState: CameraPositionState,
+    putLocationOnMap: (MapPosition) -> Unit
+) {
+    var latitude by rememberSaveable { mutableStateOf("0.0") }
+    var longitude by rememberSaveable { mutableStateOf("0.0") }
+    Column(modifier = Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) {
+        Text(text = "Latitude")
+        TextField(value = latitude, singleLine = true, onValueChange = {
+            latitude = it
+        })
+
+        Spacer(modifier = Modifier.height(10.dp))
+
+        Text(text = "Longitude")
+        TextField(value = longitude, singleLine = true, onValueChange = {
+            longitude = it
+        })
+
+        Spacer(modifier = Modifier.height(20.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+
+            Button(onClick = {
+                latitude = cameraPositionState.position.target.latitude.toString()
+                longitude = cameraPositionState.position.target.longitude.toString()
+            }) { Text(text = "Get current position") }
+
+            Button(onClick = {
+                putLocationOnMap(
+                    MapPosition(
+                        latitude.toDouble(),
+                        longitude.toDouble()
+                    )
+                )
+            }) {
+                Text(text = "Check positions on map")
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Color.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Color.kt
new file mode 100644
index 0000000..848e91c
--- /dev/null
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Color.kt
@@ -0,0 +1,16 @@
+package com.example.location_demo_app.ui_layer.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFF59D564)
+val PurpleGrey80 = Color(0xFF97C79C)
+val Pink80 = Color(0xFF9EFFA8)
+
+val Purple40 = Color(0xFF398841)
+val PurpleGrey40 = Color(0xFF58725B)
+val Pink40 = Color(0xFF6B9970)
+
+val themeColor = Color(0xFF47AB51)
+val fabColor = Color(0xFF1E4B23)
+val fabBackground = Color(0xE2B6DABA)
+val bottomBarColor = Color(0xFFCFF3D3)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/location_demo_app/ui/theme/Theme.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Theme.kt
similarity index 97%
rename from app/src/main/java/com/example/location_demo_app/ui/theme/Theme.kt
rename to app/src/main/java/com/example/location_demo_app/ui_layer/theme/Theme.kt
index 014d5da..94db378 100644
--- a/app/src/main/java/com/example/location_demo_app/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.example.location_demo_app.ui.theme
+package com.example.location_demo_app.ui_layer.theme
 
 import android.app.Activity
 import android.os.Build
diff --git a/app/src/main/java/com/example/location_demo_app/ui/theme/Type.kt b/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Type.kt
similarity index 94%
rename from app/src/main/java/com/example/location_demo_app/ui/theme/Type.kt
rename to app/src/main/java/com/example/location_demo_app/ui_layer/theme/Type.kt
index 9dad092..0c833b7 100644
--- a/app/src/main/java/com/example/location_demo_app/ui/theme/Type.kt
+++ b/app/src/main/java/com/example/location_demo_app/ui_layer/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.example.location_demo_app.ui.theme
+package com.example.location_demo_app.ui_layer.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/baseline_share_location_24.xml b/app/src/main/res/drawable/baseline_share_location_24.xml
new file mode 100644
index 0000000..0a3e00d
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_share_location_24.xml
@@ -0,0 +1,10 @@
+<vector android:height="24dp" android:tint="#47AB51"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M13.02,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.42,-1.43C15.81,19.17 14.48,19.75 13.02,19.93z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M4.03,12c0,-4.05 3.03,-7.41 6.95,-7.93V2.05C5.95,2.58 2.03,6.84 2.03,12c0,5.16 3.92,9.42 8.95,9.95v-2.02C7.06,19.41 4.03,16.05 4.03,12z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M19.95,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32l-1.43,1.43C19.19,8.21 19.77,9.54 19.95,11z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M18.34,4.26c-1.48,-1.21 -3.32,-2.01 -5.32,-2.21v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.34,4.26z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M18.33,16.9l1.43,1.42c1.21,-1.48 2.01,-3.31 2.21,-5.32h-2.02C19.77,14.46 19.19,15.79 18.33,16.9z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16,11.1C16,8.61 14.1,7 12,7s-4,1.61 -4,4.1c0,1.66 1.33,3.63 4,5.9C14.67,14.73 16,12.76 16,11.1zM12,12c-0.59,0 -1.07,-0.48 -1.07,-1.07c0,-0.59 0.48,-1.07 1.07,-1.07s1.07,0.48 1.07,1.07C13.07,11.52 12.59,12 12,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..fe38e32
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#40B546">
+  <group android:scaleX="0.464"
+      android:scaleY="0.464"
+      android:translateX="6.432"
+      android:translateY="6.432">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13.02,19.93v2.02c2.01,-0.2 3.84,-1 5.32,-2.21l-1.42,-1.43C15.81,19.17 14.48,19.75 13.02,19.93z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M4.03,12c0,-4.05 3.03,-7.41 6.95,-7.93V2.05C5.95,2.58 2.03,6.84 2.03,12c0,5.16 3.92,9.42 8.95,9.95v-2.02C7.06,19.41 4.03,16.05 4.03,12z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.95,11h2.02c-0.2,-2.01 -1,-3.84 -2.21,-5.32l-1.43,1.43C19.19,8.21 19.77,9.54 19.95,11z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.34,4.26c-1.48,-1.21 -3.32,-2.01 -5.32,-2.21v2.02c1.46,0.18 2.79,0.76 3.9,1.62L18.34,4.26z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.33,16.9l1.43,1.42c1.21,-1.48 2.01,-3.31 2.21,-5.32h-2.02C19.77,14.46 19.19,15.79 18.33,16.9z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,11.1C16,8.61 14.1,7 12,7s-4,1.61 -4,4.1c0,1.66 1.33,3.63 4,5.9C14.67,14.73 16,12.76 16,11.1zM12,12c-0.59,0 -1.07,-0.48 -1.07,-1.07c0,-0.59 0.48,-1.07 1.07,-1.07s1.07,0.48 1.07,1.07C13.07,11.52 12.59,12 12,12z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..7353dbd 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
deleted file mode 100644
index 6f3b755..0000000
--- a/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..057886a
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..81fde02
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..d8ebfcf
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..4dd1f7c
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..77f6b79
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..0a419d2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..ecb40ba
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..fde3e1a
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..a352f76
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..c9207c3
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index eec3f82..2b04e2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,5 +6,5 @@ buildscript {
 plugins {
     id 'com.android.application' version '7.4.2' apply false
     id 'com.android.library' version '7.4.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
\ No newline at end of file