diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 0000000..d06671e
--- /dev/null
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidTestResultsUserPreferences">
+    <option name="androidTestResultsTableState">
+      <map>
+        <entry key="-911241014">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_6a_API_31" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="-206570098">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_6a_API_31" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="28629151">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_6a_API_31" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="156573147">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_6a_API_31" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="1376964628">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_6a_API_31" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+        <entry key="1752327724">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_6a_API_31" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..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="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <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..2f6efe7
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,androidx.test.core.app.ActivityScenario,launch" />
+    </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 bdd9278..f85f849 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="io.cucumber.junit.CucumberOptions" />
+    </list>
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index a296beb..71df546 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,18 +12,24 @@ apply from: file("$rootDir/ktlint.gradle")
 
 android {
     namespace 'com.codestracture'
-    compileSdk 33
+    testNamespace "com.codestracture.test"
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.codestracture"
         minSdk 23
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
         buildConfigField 'String', 'BASE_URL', "\"https://portal.courtesycarsredhill.co.uk/CCRAPI/api/\""
+
+        testApplicationId "com.codestracture.test"
+        testInstrumentationRunner 'com.codestracture.test.Instrumentation'
+        testInstrumentationRunnerArguments = [
+         cucumberUseAndroidJUnitRunner: 'com.codestracture.test.Instrumentation',
+         clearPackageData: 'true'
+        ]
     }
 
     signingConfigs {
@@ -45,12 +51,12 @@ 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 {
@@ -58,28 +64,27 @@ android {
         dataBinding = true
     }
 
-    lintOptions {
-        // set to true to turn off analysis progress reporting by lint
-        quiet true
-        // set to true to have all release builds run lint on issues with severity=fatal
-        // and abort the build (controlled by abortOnError above) if fatal issues are found
-        checkReleaseBuilds true
-        // if true, stop the gradle build if errors are found
+
+    sourceSets {
+        androidTest {
+            assets.srcDirs = ['src/androidTest/assets']
+        }
+    }
+
+    testOptions {
+        execution = 'ANDROIDX_TEST_ORCHESTRATOR'
+    }
+    lint {
         abortOnError false
-        // if true, only report errors
-        ignoreWarnings false
-        // if true, check all issues, including those that are off by default
-        checkAllWarnings true
-        // if true, treat all warnings as errors
-        warningsAsErrors true
-        // turn on the given issue id's
-        enable 'RtlHardcoded','RtlCompat', 'RtlEnabled'
-        // check *only* the given issue id's
+        absolutePaths true
         checkOnly 'NewApi', 'InlinedApi'
-        // if true, don't include source code lines in the error output
+        checkAllWarnings true
+        checkReleaseBuilds true
+        enable 'RtlHardcoded', 'RtlCompat', 'RtlEnabled'
+        ignoreWarnings false
         noLines true
-        // if true, emit full/absolute paths to files with errors (true by default)
-        absolutePaths true
+        quiet true
+        warningsAsErrors true
     }
 }
 
@@ -133,6 +138,29 @@ dependencies {
     implementation 'at.aau.itec.android.mediaplayer:mediaplayer:1.3.3'
     implementation 'at.aau.itec.android.mediaplayer:mediaplayer-dash:1.3.3'
     implementation 'at.aau.itec.android.mediaplayer:mediaplayer-gles:1.3.3'
+
+    def withoutMTP = {
+        exclude group: 'org.mobicents.protocols.ss7.mtp', module: 'mtp-api'
+        exclude group: 'org.mobicents.protocols.ss7.mtp', module: 'mtp'
+        exclude group: 'org.mobicents.protocols.ss7.sccp', module: 'sccp-api'
+        exclude group: 'org.mobicents.protocols.ss7.sccp', module: 'sccp'
+    }
+    implementation 'org.mobicents.protocols.ss7.map:map-impl:8.0.112', withoutMTP
+
+    androidTestImplementation "com.google.dagger:hilt-android-testing:2.48"
+    kapt 'com.google.dagger:hilt-android-compiler:2.48'
+
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.5.1')
+    androidTestImplementation('androidx.test:rules:1.4.0')
+    androidTestImplementation('androidx.test:core:1.4.0')
+    androidTestImplementation('androidx.test:runner:1.4.0')
+    androidTestImplementation('androidx.test.ext:junit-ktx:1.1.5')
+
+    androidTestImplementation "io.cucumber:cucumber-picocontainer:4.8.1"
+    androidTestImplementation "io.cucumber:cucumber-android:4.9.0"
+    androidTestImplementation "io.cucumber:cucumber-android-hilt:4.10.0"
+
+    androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }
 
 kapt {
diff --git a/app/src/androidTest/assets/features/login.feature b/app/src/androidTest/assets/features/login.feature
new file mode 100644
index 0000000..5ebeab0
--- /dev/null
+++ b/app/src/androidTest/assets/features/login.feature
@@ -0,0 +1,38 @@
+Feature: Login
+    Perform login on email and password are inputted
+
+    @login-feature
+    Scenario Outline: Input email and password in wrong format
+        Given I am on splash screen
+        Given I am on login screen
+        When I input email <email>
+        And I input password "<password>"
+        And I press submit button
+        Then I should see error on the <view>
+
+    Examples:
+        | email | password  | view  |
+        | test  | lemoncake | email |
+        | test@test.com || password |
+
+    @login-feature
+    Scenario Outline: Input email and password in correct format
+        Given I am on splash screen
+        Given I am on login screen
+        When I input email <email>
+        And I input password "<password>"
+        And I press submit button
+        Then I should <see> auth error
+
+    Examples:
+        | email              | password   | see   |
+        | espresso@spoon.com | bananacake | true  |
+        | espresso@spoon.com | lemoncake  | false |
+        | latte@spoon.com    | lemoncake  | true  |
+
+    @login-feature
+    Scenario: Tap login button and show login screen
+        Given I am on splash screen
+        Given I am on login screen
+        When I tap sign up button
+        Then I should see sign up screen
\ No newline at end of file
diff --git a/app/src/androidTest/assets/features/signup.feature b/app/src/androidTest/assets/features/signup.feature
new file mode 100644
index 0000000..a9b90be
--- /dev/null
+++ b/app/src/androidTest/assets/features/signup.feature
@@ -0,0 +1,8 @@
+Feature: Signup
+    Perform sign up
+
+    @signup-feature
+    Scenario: Tap login button and show login screen
+        Given I am on sign up screen
+        When I tap login button
+        Then I should see login screen
diff --git a/app/src/androidTest/java/com/codestracture/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/codestracture/ExampleInstrumentedTest.kt
deleted file mode 100644
index cfd0671..0000000
--- a/app/src/androidTest/java/com/codestracture/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.codestracture
-
-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.codestracture", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/codestracture/test/Instrumentation.java b/app/src/androidTest/java/com/codestracture/test/Instrumentation.java
new file mode 100644
index 0000000..98d26c3
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/Instrumentation.java
@@ -0,0 +1,66 @@
+package com.codestracture.test;
+
+import android.app.Application;
+import android.content.Context;
+import android.os.Bundle;
+
+import java.io.File;
+
+import dagger.hilt.android.testing.HiltTestApplication;
+import io.cucumber.android.runner.CucumberAndroidJUnitRunner;
+import io.cucumber.junit.CucumberOptions;
+
+@CucumberOptions(features = "features", glue = "com.codestracture.test.steps", strict = true)
+public class Instrumentation extends CucumberAndroidJUnitRunner {
+
+    @Override
+    public void onCreate(final Bundle bundle) {
+        bundle.putString("plugin", getPluginConfigurationString()); // we programmatically create the plugin configuration
+        //it crashes on Android R without it
+        new File(getAbsoluteFilesPath()).mkdirs();
+
+        String tags = "@login-feature"; //"@login-feature";
+        if (!tags.isEmpty()) {
+            bundle.putString("tags", tags.replaceAll(",", "--").replaceAll("\\s",""));
+        }
+
+        super.onCreate(bundle);
+    }
+
+    /**
+     * Since we want to checkout the external storage directory programmatically, we create the plugin configuration
+     * here, instead of the {@link CucumberOptions} annotation.
+     *
+     * @return the plugin string for the configuration, which contains XML, HTML and JSON paths
+     */
+    private String getPluginConfigurationString() {
+        String cucumber = "cucumber";
+        String separator = "--";
+        return "junit:" + getCucumberXml(cucumber) + separator +
+                "html:" + getCucumberHtml(cucumber);
+    }
+
+    private String getCucumberHtml(String cucumber) {
+        return getAbsoluteFilesPath() + "/" + cucumber + ".html";
+    }
+
+    private String getCucumberXml(String cucumber) {
+        return getAbsoluteFilesPath() + "/" + cucumber + ".xml";
+    }
+
+    /**
+     * The path which is used for the report files.
+     *
+     * @return the absolute path for the report files
+     */
+    private String getAbsoluteFilesPath() {
+        //sdcard/Android/data/cucumber.cukeulator
+        File directory = getTargetContext().getExternalFilesDir(null);
+        return new File(directory, "reports").getAbsolutePath();
+    }
+
+    @Override
+    public Application newApplication(ClassLoader cl, String className, Context context) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        return super.newApplication(cl, HiltTestApplication.class.getName(), context);
+    }
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/screen/BaseScreen.java b/app/src/androidTest/java/com/codestracture/test/screen/BaseScreen.java
new file mode 100644
index 0000000..b233f59
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/screen/BaseScreen.java
@@ -0,0 +1,21 @@
+package com.codestracture.test.screen;
+
+import android.content.Context;
+
+import org.junit.Before;
+import org.junit.Rule;
+
+import dagger.hilt.android.testing.HiltAndroidRule;
+
+public class BaseScreen {
+
+    @Rule(order = 0)
+    public HiltAndroidRule hiltRule = new HiltAndroidRule(this);
+
+    public Context context;
+
+    @Before
+    public void setup() {
+        hiltRule.inject();
+    }
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/screen/LoginScreen.java b/app/src/androidTest/java/com/codestracture/test/screen/LoginScreen.java
new file mode 100644
index 0000000..a7bfdca
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/screen/LoginScreen.java
@@ -0,0 +1,78 @@
+package com.codestracture.test.screen;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static org.hamcrest.Matchers.not;
+
+import android.content.Context;
+import android.os.SystemClock;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.codestracture.R;
+import com.codestracture.test.utils.CommonUtils;
+import com.codestracture.ui.test.LoginActivity;
+import com.codestracture.ui.test.SplashActivity;
+
+public class LoginScreen extends BaseScreen {
+
+    private ActivityScenario<SplashActivity> activityActivityScenario;
+
+    public void launchSplashScreen() {
+        activityActivityScenario = ActivityScenario.launch(SplashActivity.class);
+        activityActivityScenario.onActivity(activity -> context = activity.getBaseContext());
+        SystemClock.sleep(1000);
+    }
+    public void finishSplashScreen() {
+        activityActivityScenario.close();
+    }
+
+    public void iAmOnLoginScreen() {
+        assertEquals(activityActivityScenario.getState(), Lifecycle.State.CREATED);
+    }
+
+    public void iInputEmail(final String email) {
+        onView(withId(R.id.email)).perform(typeText(email));
+    }
+
+    public void iInputPassword(final String password) {
+        onView(withId(R.id.password)).perform(typeText(password), closeSoftKeyboard());
+    }
+
+    public void iPressSubmitButton() {
+        onView(withId(R.id.submit)).perform(click());
+    }
+
+    public void iTapSignUpButton() {
+        onView(withId(R.id.signup)).perform(click());
+    }
+
+    public void iShouldSeeErrorOnTheEditTextView(final String viewName) {
+        int viewId = (viewName.equals("email")) ? R.id.email : R.id.password;
+        int messageId = (viewName.equals("email")) ? R.string.msg_email_error : R.string.msg_password_error;
+
+        onView(withId(viewId)).check(matches(CommonUtils.hasErrorText(context.getString(messageId))));
+    }
+
+    public void iShouldSeeAuthError(boolean shouldSeeError) {
+        if (shouldSeeError) {
+            onView(withId(R.id.error)).check(matches(isDisplayed()));
+        } else {
+            onView(withId(R.id.error)).check(matches(not(isDisplayed())));
+        }
+    }
+
+    public void iShouldSeeSignUpScreen() {
+        onView(withId(R.id.page_title)).check(matches(withText(R.string.signup)));
+    }
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/screen/SignupScreen.java b/app/src/androidTest/java/com/codestracture/test/screen/SignupScreen.java
new file mode 100644
index 0000000..b899816
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/screen/SignupScreen.java
@@ -0,0 +1,59 @@
+package com.codestracture.test.screen;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static org.junit.Assert.assertNotNull;
+
+import android.os.SystemClock;
+
+import androidx.test.core.app.ActivityScenario;
+
+import com.codestracture.R;
+import com.codestracture.ui.test.SignupActivity;
+import com.codestracture.ui.test.SplashActivity;
+
+import org.junit.Before;
+import org.junit.Rule;
+
+import dagger.hilt.android.testing.HiltAndroidRule;
+
+public class SignupScreen extends BaseScreen {
+
+    private ActivityScenario<SplashActivity> splashActivityActivityScenario;
+    private SplashActivity splashActivity;
+
+    public ActivityScenario<SignupActivity> activityTestRule;
+
+    private SignupActivity signupActivity;
+
+    public void launchSplashScreen() {
+        splashActivityActivityScenario = ActivityScenario.launch(SplashActivity.class);
+        splashActivityActivityScenario.onActivity(activity -> splashActivity = activity);
+    }
+    public void finishSplashScreen() {
+        splashActivityActivityScenario.close();
+    }
+
+    public void launchSignupScreen() {
+        activityTestRule = ActivityScenario.launch(SignupActivity.class);
+        activityTestRule.onActivity(activity -> signupActivity = activity);
+    }
+
+    public void iAmOnSignupScreen() {
+        assertNotNull(signupActivity);
+    }
+
+    public void iTapLoginButton() {
+        // Close the keyboard else the login button is not available for click on the screen
+        onView(withId(R.id.login)).perform(closeSoftKeyboard(), click());
+    }
+
+    public void iShouldSeeLoginScreen() {
+        SystemClock.sleep(2000);
+        onView(withId(R.id.page_title)).check(matches(withText(R.string.login)));
+    }
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/steps/LoginSteps.java b/app/src/androidTest/java/com/codestracture/test/steps/LoginSteps.java
new file mode 100644
index 0000000..6818ffe
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/steps/LoginSteps.java
@@ -0,0 +1,60 @@
+package com.codestracture.test.steps;
+
+import androidx.test.filters.MediumTest;
+
+import com.codestracture.test.screen.LoginScreen;
+
+import dagger.hilt.android.testing.HiltAndroidTest;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+@MediumTest
+@HiltAndroidTest
+public class LoginSteps extends LoginScreen {
+
+    @Given("^I am on splash screen$")
+    public void I_am_on_splash_screen() {
+        launchSplashScreen();
+    }
+
+    @Given("^I am on login screen")
+    public void I_am_on_login_screen() {
+        iAmOnLoginScreen();
+    }
+
+    @When("^I input email (\\S+)$")
+    public void I_input_email(final String email) {
+        iInputEmail(email);
+    }
+
+    @When("^I input password \"(.*?)\"$")
+    public void I_input_password(final String password) {
+        iInputPassword(password);
+    }
+
+    @When("^I press submit button$")
+    public void I_press_submit_button() {
+        iPressSubmitButton();
+    }
+
+    @When("^I tap sign up button$")
+    public void I_tap_sign_up_button() {
+        iTapSignUpButton();
+    }
+
+    @Then("^I should see error on the (\\S+)$")
+    public void I_should_see_error_on_the_editTextView(final String viewName) {
+        iShouldSeeErrorOnTheEditTextView(viewName);
+    }
+
+    @Then("^I should (true|false) auth error$")
+    public void I_should_see_auth_error(boolean shouldSeeError) {
+        iShouldSeeAuthError(shouldSeeError);
+    }
+
+    @Then("^I should see sign up screen$")
+    public void I_should_see_sign_up_screen() {
+        iShouldSeeSignUpScreen();
+    }
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/steps/SignupSteps.java b/app/src/androidTest/java/com/codestracture/test/steps/SignupSteps.java
new file mode 100644
index 0000000..56bef2c
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/steps/SignupSteps.java
@@ -0,0 +1,31 @@
+package com.codestracture.test.steps;
+
+import androidx.test.filters.MediumTest;
+
+import com.codestracture.test.screen.SignupScreen;
+
+import dagger.hilt.android.testing.HiltAndroidTest;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
+
+@MediumTest
+@HiltAndroidTest
+public class SignupSteps extends SignupScreen {
+
+    @Given("^I am on sign up screen$")
+    public void I_am_on_sign_up_screen() {
+        iAmOnSignupScreen();
+    }
+
+    @When("^I tap login button$")
+    public void I_tap_login_button() {
+        iTapLoginButton();
+    }
+
+    @Then("^I should see login screen$")
+    public void I_should_see_login_screen() {
+        iShouldSeeLoginScreen();
+    }
+
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/utils/CommonUtils.java b/app/src/androidTest/java/com/codestracture/test/utils/CommonUtils.java
new file mode 100644
index 0000000..d6af192
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/utils/CommonUtils.java
@@ -0,0 +1,11 @@
+package com.codestracture.test.utils;
+
+import android.view.View;
+import org.hamcrest.Matcher;
+
+public class CommonUtils {
+
+    public static Matcher<? super View> hasErrorText(String expectedError) {
+        return new ErrorTextMatcher(expectedError);
+    }
+}
diff --git a/app/src/androidTest/java/com/codestracture/test/utils/ErrorTextMatcher.java b/app/src/androidTest/java/com/codestracture/test/utils/ErrorTextMatcher.java
new file mode 100644
index 0000000..488f56a
--- /dev/null
+++ b/app/src/androidTest/java/com/codestracture/test/utils/ErrorTextMatcher.java
@@ -0,0 +1,35 @@
+package com.codestracture.test.utils;
+
+import android.view.View;
+import android.widget.EditText;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Custom matcher to assert equal EditText.setError();
+ */
+class ErrorTextMatcher extends TypeSafeMatcher<View> {
+
+    private final String mExpectedError;
+
+    public ErrorTextMatcher(String expectedError) {
+        mExpectedError = expectedError;
+    }
+
+    @Override
+    public boolean matchesSafely(View view) {
+        if (!(view instanceof EditText)) {
+            return false;
+        }
+
+        EditText editText = (EditText) view;
+
+        return mExpectedError.equals(editText.getError().toString());
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("with error: " + mExpectedError);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d295ad..4c00d89 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" android:maxSdkVersion="29" />
@@ -16,6 +14,10 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+
     <!-- camera preview demo -->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera" android:required="false" />
@@ -33,6 +35,10 @@
         android:theme="@style/Theme.CodeStracture"
         tools:targetApi="31">
 
+        <activity android:name=".ui.test.SplashActivity"/>
+        <activity android:name=".ui.test.LoginActivity"/>
+        <activity android:name=".ui.test.SignupActivity"/>
+
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="true"
@@ -44,6 +50,26 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name=".ui.main.receiver.SimChangeReceivers"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.SIM_STATE_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name=".ui.main.receiver.PingSmsReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter android:priority="10">
+                <action android:name="android.intent.action.DATA_SMS_RECEIVED" />
+                <data
+                    android:host="*"
+                    android:scheme="sms" />
+            </intent-filter>
+        </receiver>
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.codestracture.fileprovider"
@@ -87,5 +113,4 @@
             </intent-filter>
         </activity>
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/data/api/model/request/LoginReqData.kt b/app/src/main/java/com/codestracture/data/api/model/request/LoginReqData.kt
index 2d35750..d90cfe4 100644
--- a/app/src/main/java/com/codestracture/data/api/model/request/LoginReqData.kt
+++ b/app/src/main/java/com/codestracture/data/api/model/request/LoginReqData.kt
@@ -6,7 +6,7 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class LoginReqData(
     @Order(value = 1)
-    @Json(name = "email") val password: String? = null,
+    @Json(name = "password") val password: String? = null,
     @Order(value = 2)
-    @Json(name = "email") val email: String? = null
+    @Json(name = "email_address") val email: String? = null
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManager.kt b/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManager.kt
index 46474a6..8b68c5f 100644
--- a/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManager.kt
+++ b/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManager.kt
@@ -1,3 +1,7 @@
 package com.codestracture.data.manager.preference
 
-interface PreferenceManager
\ No newline at end of file
+interface PreferenceManager {
+
+    fun setLogin(isLogin: Boolean)
+    fun getLogin(): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManagerImpl.kt b/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManagerImpl.kt
index 4553ee6..feaacc5 100644
--- a/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManagerImpl.kt
+++ b/app/src/main/java/com/codestracture/data/manager/preference/PreferenceManagerImpl.kt
@@ -23,5 +23,12 @@ class PreferenceManagerImpl @Inject constructor(
         )
     }
 
-    val editor: SharedPreferences.Editor = sharedPreferences.edit()
+    private val editor: SharedPreferences.Editor = sharedPreferences.edit()
+
+    override fun setLogin(isLogin: Boolean) {
+        editor.putBoolean("IS_LOGIN", isLogin).apply()
+    }
+    override fun getLogin(): Boolean {
+        return sharedPreferences.getBoolean("IS_LOGIN", false)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/data/manager/test.kt b/app/src/main/java/com/codestracture/data/manager/test.kt
deleted file mode 100644
index 6f043ac..0000000
--- a/app/src/main/java/com/codestracture/data/manager/test.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.codestracture.data.manager
-
-class test
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/ui/login/LoginFragment.kt b/app/src/main/java/com/codestracture/ui/login/LoginFragment.kt
index ebd6eca..62cac54 100644
--- a/app/src/main/java/com/codestracture/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/codestracture/ui/login/LoginFragment.kt
@@ -8,10 +8,15 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.viewModels
 import com.codestracture.R
+import com.codestracture.data.api.model.request.LoginReqData
+import com.codestracture.data.api.model.request.Order
 import com.codestracture.databinding.FragmentLoginBinding
 import com.codestracture.ui.base.BaseFragment
 import com.codestracture.utils.ext.checkPermissionGranted
+import com.squareup.moshi.Json
 import dagger.hilt.android.AndroidEntryPoint
+import java.lang.reflect.Field
+import java.util.Arrays
 
 @AndroidEntryPoint
 class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>() {
@@ -42,6 +47,46 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>() {
                 )
             )
         }
+
+        val data = LoginReqData("12364","vivek@test.com")
+        val fields: Array<Field> = data.javaClass.declaredFields
+        val methods = data.javaClass.declaredMethods
+
+        Log.d("MyTag","Before Filter")
+        fields.forEach {
+            Log.d("MyTag","Field Name:${it.name}")
+        }
+
+        methods.forEach {
+            Log.d("MyTag","Method Name:${it.name}")
+        }
+
+        Log.d("MyTag","After Filter")
+        fieldSortedByOrder(fields)
+
+        fields.forEach {
+            Log.d("MyTag","Field Name:${it.name}")
+            val field: Field = data.javaClass.getDeclaredField(it.name)
+            field.isAccessible = true
+            val value = field[data]
+            Log.d("MyTag","Field Value:${value}")
+
+            val json: Json? = field.getAnnotation(Json::class.java)
+            Log.d("MyTag","Json::${json?.ignore}")
+        }
+
+    }
+
+    private fun fieldSortedByOrder(fields: Array<Field>) {
+        Arrays.sort(fields) { field1: Field, field2: Field ->
+            val ob1: Order? = field1.getAnnotation(Order::class.java)
+            val ob2: Order? = field2.getAnnotation(Order::class.java)
+            if (ob1 != null && ob2 != null) {
+                return@sort ob1.value - ob2.value
+            } else {
+                return@sort -1
+            }
+        }
     }
 
     private fun showLoginErrorDialog(message: String) {
diff --git a/app/src/main/java/com/codestracture/ui/login/LoginViewModel.kt b/app/src/main/java/com/codestracture/ui/login/LoginViewModel.kt
index 7966456..3fb1b52 100644
--- a/app/src/main/java/com/codestracture/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/codestracture/ui/login/LoginViewModel.kt
@@ -59,7 +59,7 @@ class LoginViewModel @Inject constructor(
                     if (isValid) {
                         null
                     } else {
-                        R.string.invalid_email
+                        R.string.invalid_password
                     }
                 } else {
                     R.string.mandatory_field
@@ -97,8 +97,10 @@ class LoginViewModel @Inject constructor(
                         // .retryWhen { cause, attempt ->  && attempt < 2 }
                         .flowOn(IO)
                         .catch {
+                            Log.d("MyTag","Login Response Error: ${it.message}")
                             viewModelEvent.postValue(LoginViewModelEvent.LoginError(it.message.toString()))
                         }.collect {
+                            Log.d("MyTag","Login Response: ${it.success} : ${it.data}")
                             if (it.success && it.data != null) {
                                 viewModelEvent.postValue(LoginViewModelEvent.LoginSuccess(it))
                             } else {
diff --git a/app/src/main/java/com/codestracture/ui/main/MainActivity.kt b/app/src/main/java/com/codestracture/ui/main/MainActivity.kt
index a1f66f2..a7ebffe 100644
--- a/app/src/main/java/com/codestracture/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/codestracture/ui/main/MainActivity.kt
@@ -1,29 +1,46 @@
 package com.codestracture.ui.main
 
 import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.animation.Animation
 import android.view.animation.TranslateAnimation
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import com.codestracture.R
 import com.codestracture.databinding.ActivityMainBinding
 import com.codestracture.ui.base.BaseActivity
 import dagger.hilt.android.AndroidEntryPoint
 
+
 @AndroidEntryPoint
 class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
 
+    companion object {
+        const val SENT = "pingsms.sent"
+        const val DELIVER = "pingsms.deliver"
+    }
+
     override val layoutId: Int = R.layout.activity_main
 
     override val viewModel: MainViewModel by viewModels()
 
+    private val sentFilter = IntentFilter(SENT)
+    private val deliveryFilter  = IntentFilter(DELIVER)
+
     @SuppressLint("MissingPermission")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
+        viewModel.checkSimAuth()
+
         binding.rootViewLayout.setOnClickListener {
             if (binding.bottomSheet.isVisible) {
                 slideToBottom(binding.bottomSheet)
@@ -31,14 +48,29 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
         }
 
         binding.btnShowBottomSheetDialog.setOnClickListener {
-            if (binding.bottomSheet.isVisible) {
+            viewModel.sendSlientMessagePhoneVerify(this)
+           /* if (binding.bottomSheet.isVisible) {
                 slideToBottom(binding.bottomSheet)
             } else {
                 slideToTop(binding.bottomSheet)
-            }
+            }*/
         }
     }
 
+    fun getCurrentFragment() = binding.myNavHostFragment.getFragment<Fragment>()
+
+    override fun onResume() {
+        super.onResume()
+        registerReceiver(br, sentFilter)
+        registerReceiver(br, deliveryFilter)
+        //registerReceiver(br, wapDeliveryFilter)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        unregisterReceiver(br)
+    }
+
     private fun slideToBottom(view: View) {
         val animate = TranslateAnimation(0f, 0f, 0f, view.height.toFloat() + binding.bottomSheet.height)
         animate.duration = 500
@@ -73,4 +105,13 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
     fun View.gone() {
         this.visibility = View.GONE
     }
+
+    val br = object: BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            Log.e(
+                "MyTag",
+                "intent: " + if (intent == null || intent.action == null) "null" else intent.action
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/ui/main/MainViewModel.kt b/app/src/main/java/com/codestracture/ui/main/MainViewModel.kt
index dafb5aa..c300e84 100644
--- a/app/src/main/java/com/codestracture/ui/main/MainViewModel.kt
+++ b/app/src/main/java/com/codestracture/ui/main/MainViewModel.kt
@@ -1,13 +1,94 @@
 package com.codestracture.ui.main
 
+import android.Manifest
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.os.Build
+import android.telephony.SmsManager
+import android.telephony.SubscriptionInfo
+import android.telephony.SubscriptionManager
+import android.telephony.TelephonyManager
+import android.text.TextUtils
+import android.util.Log
 import com.codestracture.data.local.LocalRepository
 import com.codestracture.data.remote.RemoteRepository
 import com.codestracture.ui.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
+
 @HiltViewModel
 class MainViewModel @Inject constructor(
+    @ApplicationContext private val context: Context,
     private val remoteRepository: RemoteRepository,
     private val localRepository: LocalRepository
-) : BaseViewModel()
\ No newline at end of file
+) : BaseViewModel() {
+
+
+    fun checkSimAuth() {
+        val phoneNumberToCheck = "9624582661" // Replace with the phone number to check
+
+        val simExists = isPhoneNumberSimExists(context, phoneNumberToCheck)
+        if (simExists) {
+            Log.d("MyTag","simExists:: True")
+            // The SIM for the given phone number exists in the device
+            // Perform your desired actions here
+        } else {
+            Log.d("MyTag","simExists:: False")
+            // The SIM for the given phone number does not exist in the device
+            // Perform your desired actions here
+        }
+    }
+
+    // Check if the given phone number's SIM exists in the device
+    private fun isPhoneNumberSimExists(context: Context, phoneNumber: String): Boolean {
+        val telephonyManager = context.getSystemService(TelephonyManager::class.java)
+        if (telephonyManager != null && !TextUtils.isEmpty(phoneNumber)) {
+            val subscriptionManager = context.getSystemService(SubscriptionManager::class.java)
+            if (subscriptionManager != null) {
+                for (subscriptionInfo in subscriptionManager.activeSubscriptionInfoList) {
+                    val number = subscriptionInfo.number
+                    if (!TextUtils.isEmpty(number) && (number == phoneNumber)) {
+                        return true
+                    }
+                }
+            }
+        }
+        return false
+    }
+
+    // Check if the app has the necessary permissions to access SIM information
+    private fun hasPermissionToReadPhoneState(context: Context): Boolean {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val permissionResult = context.checkSelfPermission(Manifest.permission.READ_PHONE_STATE)
+            return permissionResult == PackageManager.PERMISSION_GRANTED
+        }
+        return true
+    }
+
+    private fun checkSimSubIdPresentOrNot(subscriptionId: Int): Boolean {
+        if (hasPermissionToReadPhoneState(context)) {
+            val subscriptionManager = context.getSystemService(SubscriptionManager::class.java)
+            subscriptionManager.activeSubscriptionInfoList.find { it.subscriptionId == subscriptionId } != null
+        }
+        return false
+    }
+
+    fun sendSlientMessagePhoneVerify(mainActivity: MainActivity) {
+        val payload = byteArrayOf(0x0A, 0x06, 0x03, 0xB0.toByte(), 0xAF.toByte(), 0x82.toByte(), 0x03, 0x06, 0x6A, 0x00, 0x05)
+        val sentPI = PendingIntent.getBroadcast(mainActivity, 0x1337, Intent(MainActivity.SENT), PendingIntent.FLAG_UPDATE_CURRENT)
+        val deliveryPI = PendingIntent.getBroadcast(mainActivity, 0x1337, Intent(MainActivity.DELIVER), PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val smsManager: SmsManager = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            mainActivity.getSystemService<SmsManager>(SmsManager::class.java)
+        } else {
+            SmsManager.getDefault()
+        }
+
+        smsManager.sendDataMessage("9624582661", null, 9200.toShort(), payload, sentPI, deliveryPI)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/ui/main/receiver/PingSmsReceiver.java b/app/src/main/java/com/codestracture/ui/main/receiver/PingSmsReceiver.java
new file mode 100644
index 0000000..f26ff59
--- /dev/null
+++ b/app/src/main/java/com/codestracture/ui/main/receiver/PingSmsReceiver.java
@@ -0,0 +1,156 @@
+package com.codestracture.ui.main.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Telephony;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.SmsMessage;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.gson.Gson;
+
+import org.mobicents.protocols.ss7.map.api.MAPException;
+import org.mobicents.protocols.ss7.map.api.smstpdu.ApplicationPortAddressing16BitAddress;
+import org.mobicents.protocols.ss7.map.smstpdu.ApplicationPortAddressing16BitAddressImpl;
+import org.mobicents.protocols.ss7.map.smstpdu.SmsDeliverTpduImpl;
+import org.mobicents.protocols.ss7.map.smstpdu.SmsTpduImpl;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Locale;
+
+public class PingSmsReceiver extends BroadcastReceiver {
+    public static final String TAG = "MyTag";
+
+    public static final DateFormat sdf = SimpleDateFormat.getDateTimeInstance();
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Toast.makeText(context, "PingSmsReceiver:- onReceive", Toast.LENGTH_SHORT).show();
+        if (!Telephony.Sms.Intents.DATA_SMS_RECEIVED_ACTION.equals(intent.getAction())) {
+            Log.d(TAG, "Received intent, not DATA_SMS_RECEIVED_ACTION, but " + intent.getAction());
+            return;
+        }
+        Log.d(TAG, "Received intent, DATA_SMS_RECEIVED_ACTION");
+        try {
+            Bundle bundle = intent.getExtras();
+            if (bundle == null) {
+                return;
+            }
+
+            Object[] PDUs = (Object[]) bundle.get("pdus");
+            for (Object pdu : PDUs != null ? PDUs : new Object[0]) {
+                StringBuilder sb = new StringBuilder();
+                for (byte b : (byte[]) pdu) {
+                    sb.append(String.format("%02x", b));
+                }
+                String pdusString = sb.toString();
+                ArrayList<String> data = parseSmsPDUs(pdusString);
+                Log.d(TAG,"MessageData:" + new Gson().toJson(data));
+
+                Toast.makeText(context, "PingSmsReceiver:- onReceive : -> " + pdusString, Toast.LENGTH_SHORT).show();
+                Toast.makeText(context, "PingSmsReceiver:- onReceive : -> " + new Gson().toJson(data), Toast.LENGTH_LONG).show();
+            }
+
+            /*Object[] PDUs = (Object[]) bundle.get("pdus");
+            for (Object pdu : PDUs != null ? PDUs : new Object[0]) {
+                StringBuilder sb = new StringBuilder();
+                for (byte b : (byte[]) pdu) {
+                    sb.append(String.format("%02x", b));
+                }
+
+                Toast.makeText(context, "PingSmsReceiver:- onReceive : -> " + sb.toString(), Toast.LENGTH_SHORT).show();
+            }*/
+        } catch (Exception e) {
+            Toast.makeText(context, "PingSmsReceiver:- onReceive Exception : -> " + e.getMessage(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    /**
+     * Notes: PDU will always be SMS
+     */
+    public ArrayList<String> parseSmsPDUs(String PDU) {
+        ArrayList<String> parsedPDUs = new ArrayList<>();
+
+        StringBuilder sb = new StringBuilder();
+
+        ApplicationPortAddressing16BitAddress smsPort = null;
+        SmsTpduImpl smsTpdu = null;
+
+        try {
+            // PDU should always be SMS-DELIVER prefixed by SMSC info (SCA - Service Centre Address)
+            byte[] pduWithSCA = pduHexToByteArray(PDU);
+            // Cut off the SCA
+            byte[] smsPdu = Arrays.copyOfRange(pduWithSCA, pduWithSCA[0] + 1, pduWithSCA.length);
+
+            smsTpdu = SmsTpduImpl.createInstance(smsPdu, false, null);
+            switch (smsTpdu.getSmsTpduType()) {
+                case SMS_DELIVER:
+                    ((SmsDeliverTpduImpl) smsTpdu).getUserData().decode();
+
+                    // see https://github.com/RestComm/jss7/issues/275
+                    byte[] dtr = ((SmsDeliverTpduImpl) smsTpdu).getUserData().getDecodedUserDataHeader().getAllData().get(5);
+                    smsPort = new ApplicationPortAddressing16BitAddressImpl(dtr);
+                    break;
+            }
+        } catch (MAPException | IllegalArgumentException | ArrayIndexOutOfBoundsException e) {
+            Log.d(TAG,"parseSmsPDUs -> Exception:" + e.getMessage());
+            // ignore the exceptions
+            e.printStackTrace();
+        }
+
+
+        SmsMessage sms = SmsMessage.createFromPdu(pduHexToByteArray(PDU));
+        //sb.append("Raw PDU (hex): ").append(PDU);
+        sb.append("Date/Time: ").append(sdf.format(sms.getTimestampMillis()));
+        sb.append("\nSMSC: ").append(formatNumber(sms.getServiceCenterAddress()));
+        sb.append("\nFrom: ").append(formatNumber(sms.getOriginatingAddress()));
+        sb.append("\nFrom (display): ").append(sms.getDisplayOriginatingAddress());
+        sb.append("\nFrom port: ").append(smsPort == null ? "N/A" : smsPort.getOriginatorPort());
+        sb.append("\nTo port: ").append(smsPort == null ? "N/A" : smsPort.getDestinationPort());
+        sb.append("\nData (hex): ");
+
+        for (byte b : sms.getUserData()) {
+            sb.append(String.format("%02x", b));
+        }
+
+        if (smsTpdu != null) {
+            sb.append("\n\nAll info\n\n").append(smsTpdu);
+        }
+
+        //sb.append("\nUser Data (ascii):");
+        //sb.append(new String(sms.getUserData()));
+
+        parsedPDUs.add(sb.toString());
+        parsedPDUs.add(PDU);
+
+        return parsedPDUs;
+    }
+
+    public byte[] pduHexToByteArray(String PDU) {
+        if (PDU.length() % 2 != 0) {
+            Log.e(TAG, "wrong number of bytes to pduHexToByteArray");
+            return new byte[0];
+        }
+        byte[] converted = new byte[PDU.length() / 2];
+        for (int i = 0; i < (PDU.length() / 2); i++) {
+            converted[i] = (byte) ((Character.digit(PDU.charAt(i * 2), 16) << 4)
+                    + Character.digit(PDU.charAt((i * 2) + 1), 16));
+        }
+        return converted;
+    }
+
+    public static String formatNumber(String number) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            return PhoneNumberUtils.formatNumber(number, Locale.getDefault().getCountry());
+        } else {
+            return PhoneNumberUtils.formatNumber(number);
+        }
+    }
+}
diff --git a/app/src/main/java/com/codestracture/ui/main/receiver/SimChangeReceivers.kt b/app/src/main/java/com/codestracture/ui/main/receiver/SimChangeReceivers.kt
new file mode 100644
index 0000000..1656593
--- /dev/null
+++ b/app/src/main/java/com/codestracture/ui/main/receiver/SimChangeReceivers.kt
@@ -0,0 +1,21 @@
+package com.codestracture.ui.main.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+
+class SimChangeReceivers : BroadcastReceiver() {
+    private val TAG = "SimChangeReceivers"
+
+    // This is where you'll be receiving the SIM_STATE_CHANGE intent.
+    override fun onReceive(p0: Context?, p1: Intent?) {
+        var state = ""
+        if (p1 != null) {
+            state = p1.extras?.getString("ss").toString()
+            if (state == "LOADED")
+                Log.i(TAG, "SIM Insertion Detected")
+        }
+        Log.i(TAG, "SIM State Change Detected $state")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/codestracture/ui/test/LoginActivity.java b/app/src/main/java/com/codestracture/ui/test/LoginActivity.java
new file mode 100644
index 0000000..461b5fe
--- /dev/null
+++ b/app/src/main/java/com/codestracture/ui/test/LoginActivity.java
@@ -0,0 +1,97 @@
+package com.codestracture.ui.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.codestracture.R;
+import com.codestracture.data.manager.preference.PreferenceManager;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+
+/**
+ * Demo Login activity class
+ */
+@AndroidEntryPoint
+public class LoginActivity extends AppCompatActivity {
+
+    @Inject
+    PreferenceManager preferenceManager;
+
+    private static final String DEMO_EMAIL = "espresso@spoon.com";
+    private static final String DEMO_PASSWORD = "lemoncake";
+
+    private EditText emailEditText, passwordEditText;
+    private View errorView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.login);
+
+        emailEditText = findViewById(R.id.email);
+        passwordEditText = findViewById(R.id.password);
+
+        View submitButton = findViewById(R.id.submit);
+        submitButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                validateFields();
+
+                if (emailEditText.getError() == null && passwordEditText.getError() == null) {
+                    validateAccount();
+                }
+            }
+        });
+
+        findViewById(R.id.signup).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(LoginActivity.this, SignupActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+        });
+
+
+    }
+
+    private void validateFields() {
+        if (!android.util.Patterns.EMAIL_ADDRESS.matcher(emailEditText.getText().toString()).matches()) {
+            emailEditText.setError(getString(R.string.msg_email_error));
+        } else {
+            emailEditText.setError(null);
+        }
+
+        if (passwordEditText.getText().toString().isEmpty()) {
+            passwordEditText.setError(getString(R.string.msg_password_error));
+        } else {
+            passwordEditText.setError(null);
+        }
+    }
+
+    private void validateAccount() {
+        if (errorView == null) {
+            errorView = findViewById(R.id.error);
+        }
+
+        if (!emailEditText.getText().toString().equals(DEMO_EMAIL) || !passwordEditText.getText().toString().equals(DEMO_PASSWORD)) {
+            errorView.setVisibility(View.VISIBLE);
+            preferenceManager.setLogin(false);
+            Log.d("MyTag","set isLogin::"+false);
+        } else {
+            errorView.setVisibility(View.GONE);
+            preferenceManager.setLogin(true);
+            Log.d("MyTag","set isLogin::"+true);
+        }
+    }
+}
diff --git a/app/src/main/java/com/codestracture/ui/test/SignupActivity.java b/app/src/main/java/com/codestracture/ui/test/SignupActivity.java
new file mode 100644
index 0000000..bca3529
--- /dev/null
+++ b/app/src/main/java/com/codestracture/ui/test/SignupActivity.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2018 emmasuzuki <emma11suzuki@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+ * THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.codestracture.ui.test;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.codestracture.R;
+
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
+public class SignupActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.signup);
+
+        findViewById(R.id.login).setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(SignupActivity.this, LoginActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP| Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/codestracture/ui/test/SplashActivity.java b/app/src/main/java/com/codestracture/ui/test/SplashActivity.java
new file mode 100644
index 0000000..e8aa68f
--- /dev/null
+++ b/app/src/main/java/com/codestracture/ui/test/SplashActivity.java
@@ -0,0 +1,40 @@
+package com.codestracture.ui.test;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.codestracture.R;
+import com.codestracture.data.manager.preference.PreferenceManager;
+
+import javax.inject.Inject;
+
+import dagger.hilt.android.AndroidEntryPoint;
+
+@AndroidEntryPoint
+public class SplashActivity extends AppCompatActivity {
+
+    @Inject
+    PreferenceManager preferenceManager;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.splash);
+
+        boolean isLogin = preferenceManager.getLogin();
+        Log.d("MyTag","isLogin::"+isLogin);
+        Intent intent;
+        if (isLogin) {
+            intent = new Intent(SplashActivity.this, SignupActivity.class);
+        } else {
+            intent = new Intent(SplashActivity.this, LoginActivity.class);
+        }
+       // intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+}
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 708c426..fcb6196 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -29,6 +29,7 @@
                 app:layout_constraintGuide_percent="0.5" />
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/tILEmail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/_5sdp"
@@ -43,6 +44,7 @@
                 app:layout_constraintStart_toStartOf="parent">
 
                 <EditText
+                    android:id="@+id/edtEmail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textEmailAddress"
@@ -68,6 +70,7 @@
                 app:layout_constraintTop_toTopOf="@+id/horizontalCenter">
 
                 <EditText
+                    android:id="@+id/edtPassword"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="textPassword"
diff --git a/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml
new file mode 100644
index 0000000..4163f0b
--- /dev/null
+++ b/app/src/main/res/layout/login.xml
@@ -0,0 +1,82 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="60dp">
+
+        <TextView
+            android:id="@+id/page_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/login"
+            android:textSize="40sp" />
+
+        <TextView
+            android:id="@+id/error"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="@string/msg_mismatch"
+            android:textColor="@android:color/holo_red_light"
+            android:textSize="20sp"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:hint="@string/email"
+            android:imeOptions="actionNext"
+            android:inputType="textEmailAddress"
+            android:nextFocusDown="@+id/password" />
+
+        <EditText
+            android:id="@id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:hint="@string/password"
+            android:imeOptions="actionSend"
+            android:inputType="textPassword" />
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="200dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="40dp"
+            android:background="@android:color/holo_blue_bright"
+            android:gravity="center"
+            android:text="@string/submit"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:gravity="center">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/not_have_account"/>
+
+            <TextView
+                android:id="@+id/signup"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:textColor="@color/link"
+                android:text="@string/signup"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/signup.xml b/app/src/main/res/layout/signup.xml
new file mode 100644
index 0000000..e6d65f8
--- /dev/null
+++ b/app/src/main/res/layout/signup.xml
@@ -0,0 +1,90 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:paddingTop="20dp">
+
+        <TextView
+            android:id="@+id/page_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/signup"
+            android:textSize="40sp" />
+
+        <EditText
+            android:id="@+id/first_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="40dp"
+            android:hint="@string/first_name"
+            android:imeOptions="actionNext"
+            android:nextFocusDown="@+id/last_name" />
+
+        <EditText
+            android:id="@+id/last_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:hint="@string/last_name"
+            android:imeOptions="actionNext"
+            android:nextFocusDown="@+id/email_name" />
+
+        <EditText
+            android:id="@+id/email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:hint="@string/email"
+            android:imeOptions="actionNext"
+            android:inputType="textEmailAddress"
+            android:nextFocusDown="@+id/password" />
+
+        <EditText
+            android:id="@id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:hint="@string/password"
+            android:imeOptions="actionSend"
+            android:inputType="textPassword" />
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="200dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="40dp"
+            android:background="@android:color/holo_blue_bright"
+            android:gravity="center"
+            android:text="@string/submit"
+            android:textSize="20sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="18dp"
+            android:gravity="center">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/have_account"/>
+
+            <TextView
+                android:id="@+id/login"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:textColor="@color/link"
+                android:text="@string/login"/>
+        </LinearLayout>
+
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/splash.xml b/app/src/main/res/layout/splash.xml
new file mode 100644
index 0000000..310ec72
--- /dev/null
+++ b/app/src/main/res/layout/splash.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Splash Screen"
+        android:textColor="@color/white"
+        android:textSize="@dimen/_24sdp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/navigation_graph.xml b/app/src/main/res/navigation/navigation_graph.xml
index 79c29d5..995d61c 100644
--- a/app/src/main/res/navigation/navigation_graph.xml
+++ b/app/src/main/res/navigation/navigation_graph.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/navigation_graph"
-    app:startDestination="@+id/video_screen_fragment">
+    app:startDestination="@+id/login_fragment">
 
     <fragment
         android:id="@+id/login_fragment"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..0f010bc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="link">#2196f3</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f17217b..2c61cd7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="email_address">Email Address</string>
     <string name="btn_login">Login</string>
-    <string name="password">Password</string>
+<!--    <string name="password">Password</string>-->
 
     <string name="mandatory_field">Mandatory Field</string>
     <string name="invalid_email">Invalid email format</string>
@@ -17,4 +17,19 @@
                 \"site\": \"https://beer.conn.dev\"}
         }]
     </string>
+
+    <!-- Testing -->
+    <string name="login">Login</string>
+    <string name="email">Email</string>
+    <string name="password">Password</string>
+    <string name="not_have_account">Do not have an account?</string>
+    <string name="have_account">Have an account?</string>
+    <string name="signup">Sign Up</string>
+    <string name="submit">Submit</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
+
+    <string name="msg_email_error">Please enter your email</string>
+    <string name="msg_password_error">Please enter your password</string>
+    <string name="msg_mismatch">Your email or password is wrong</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/codestracture/ExampleUnitTest.kt b/app/src/test/java/com/codestracture/ExampleUnitTest.kt
deleted file mode 100644
index d340a08..0000000
--- a/app/src/test/java/com/codestracture/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.codestracture
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index db2607e..ac2113f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.1.2' apply false
+    id 'com.android.library' version '8.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-    id 'com.google.dagger.hilt.android' version '2.44' apply false
+    id 'com.google.dagger.hilt.android' version '2.48' apply false
     id 'androidx.navigation.safeargs' version '2.5.3' apply false
 }
 
diff --git a/gradle.properties b/gradle.properties
index 3c5031e..a2e90d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c52eadc..e1966b6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Mar 01 15:22:54 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/libraries.gradle b/libraries.gradle
index 36a351c..b5984b0 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -6,8 +6,8 @@ ext {
             appCompat: "androidx.appcompat:appcompat:1.4.0",
             googleMaterial: "com.google.android.material:material:1.4.0",
             constraintlayout: "androidx.constraintlayout:constraintlayout:2.1.2",
-            hiltAndroid: "com.google.dagger:hilt-android:2.44",
-            hiltAndroidCompiler: "com.google.dagger:hilt-compiler:2.44",
+            hiltAndroid: "com.google.dagger:hilt-android:2.48",
+            hiltAndroidCompiler: "com.google.dagger:hilt-compiler:2.48",
             hiltWork: "androidx.hilt:hilt-work:1.0.0",
             lifecycle_compiler: "androidx.lifecycle:lifecycle-compiler:2.5.1",
             lifecycle_extensions: "androidx.lifecycle:lifecycle-extensions:2.5.1",
diff --git a/pre-commit b/pre-commit
index 3edb77e..a13e12f 100644
--- a/pre-commit
+++ b/pre-commit
@@ -11,21 +11,21 @@ RESULT=$?
 # return 1 exit code if running checks fails
 [ $RESULT -ne 0 ] && exit 1
 
-echo "*************** ktlint ***************"
-
-./gradlew ktlint
-
-RESULT=$?
-
-[ $RESULT -ne 0 ] && exit 1
-
-echo "*************** ktlintFormat ***************"
-
-./gradlew ktlintFormat
-
-RESULT=$?
-
-[ $RESULT -ne 0 ] && exit 1
+#echo "*************** ktlint ***************"
+#
+#./gradlew ktlint
+#
+#RESULT=$?
+#
+#[ $RESULT -ne 0 ] && exit 1
+#
+#echo "*************** ktlintFormat ***************"
+#
+#./gradlew ktlintFormat
+#
+#RESULT=$?
+#
+#[ $RESULT -ne 0 ] && exit 1
 
 echo "*******************************"
 echo "git pre-commit hook successfully"