From fdee2342000fc37a8ae296fe3b9a01614a360949 Mon Sep 17 00:00:00 2001
From: biloute02 <fionadamien@gmail.com>
Date: Wed, 6 Dec 2023 13:07:07 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20navGraph=20et=20la=20structure=20d?=
 =?UTF-8?q?es=20activit=C3=A9s.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                     |  2 +-
 .idea/misc.xml                                       |  1 +
 app/build.gradle.kts                                 |  3 ++-
 app/src/main/AndroidManifest.xml                     |  2 +-
 .../palto/{MainActivity.kt => PaltoActivity.kt}      | 12 ++----------
 .../layout/{activity_main.xml => activity_login.xml} |  2 +-
 app/src/main/res/layout/activity_palto.xml           |  6 ++++++
 app/src/main/res/navigation/nav_graph.xml            |  5 +++++
 build.gradle.kts                                     |  2 +-
 9 files changed, 20 insertions(+), 15 deletions(-)
 rename app/src/main/java/com/example/palto/{MainActivity.kt => PaltoActivity.kt} (78%)
 rename app/src/main/res/layout/{activity_main.xml => activity_login.xml} (95%)
 create mode 100644 app/src/main/res/layout/activity_palto.xml
 create mode 100644 app/src/main/res/navigation/nav_graph.xml

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 @@
         <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="gradleJvm" value="jbr-17 (2)" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
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">
         <activity
-            android:name=".MainActivity"
+            android:name=".PaltoActivity"
             android:exported="true" >
 
             <intent-filter>
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">
 
     <TextView
         android:id="@+id/test_text"
diff --git a/app/src/main/res/layout/activity_palto.xml b/app/src/main/res/layout/activity_palto.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/activity_palto.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph" />
\ 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