diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ae388c2..61d81f6 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index ac801d8..b0137f1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2402d4b..0ebe5a4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,11 +33,12 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.10.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.navigation:navigation-fragment-ktx:2.7.5") + implementation("androidx.navigation:navigation-ui-ktx:2.7.5") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7f7b9da..78a728f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:theme="@style/Theme.Palto" tools:targetApi="31"> diff --git a/app/src/main/java/com/example/palto/MainActivity.kt b/app/src/main/java/com/example/palto/PaltoActivity.kt similarity index 78% rename from app/src/main/java/com/example/palto/MainActivity.kt rename to app/src/main/java/com/example/palto/PaltoActivity.kt index 7936f6c..af7d27c 100644 --- a/app/src/main/java/com/example/palto/MainActivity.kt +++ b/app/src/main/java/com/example/palto/PaltoActivity.kt @@ -1,26 +1,18 @@ package com.example.palto -import android.app.PendingIntent -import android.content.Intent -import android.content.IntentFilter import android.nfc.NfcAdapter import android.nfc.Tag -import android.nfc.tech.IsoDep -import android.nfc.tech.NdefFormatable -import android.nfc.tech.NfcA -import android.os.Build import android.os.Bundle import android.util.Log -import android.widget.TextView import androidx.appcompat.app.AppCompatActivity -class MainActivity : AppCompatActivity() { +class PaltoActivity : AppCompatActivity() { private var nfcAdapter: NfcAdapter? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.activity_login) // get the NFC Adapter this.nfcAdapter = NfcAdapter.getDefaultAdapter(this) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_login.xml similarity index 95% rename from app/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_login.xml index 1b3bb02..0792b7e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".PaltoActivity"> + + + \ No newline at end of file diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml new file mode 100644 index 0000000..e6f0986 --- /dev/null +++ b/app/src/main/res/navigation/nav_graph.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index df06d44..ef164ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.1.2" apply false + id("com.android.application") version "8.1.4" apply false id("org.jetbrains.kotlin.android") version "1.9.0" apply false } \ No newline at end of file