From 74706288b1a60d36f62a0a2b7ce1749f7619a454 Mon Sep 17 00:00:00 2001 From: babonneau Date: Fri, 17 Mar 2023 17:07:44 +0100 Subject: [PATCH] debug --- app/src/main/AndroidManifest.xml | 2 +- .../baptistearthur/geocaching/model/Stub.kt | 6 ++++ .../geocaching/ui/activity/MainWindow.kt | 10 ++---- app/src/main/res/layout-land/main_window.xml | 35 +++++++++++++++++++ app/src/main/res/layout/fragment_roadtrip.xml | 5 +-- 5 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt create mode 100644 app/src/main/res/layout-land/main_window.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0fdc512..6733191 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Geocaching" - tools:targetApi="31" > + tools:targetApi="31"> diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt new file mode 100644 index 0000000..f2c610e --- /dev/null +++ b/app/src/main/java/uca/baptistearthur/geocaching/model/Stub.kt @@ -0,0 +1,6 @@ +package uca.baptistearthur.geocaching.model + +class Stub { + + +} \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt index ceb0f0c..d68ce9c 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt @@ -4,14 +4,14 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import com.google.android.material.bottomnavigation.BottomNavigationView - import uca.baptistearthur.geocaching.R import uca.baptistearthur.geocaching.ui.fragment.Map +import uca.baptistearthur.geocaching.ui.fragment.RoadTrip class MainWindow: AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { - val map = Map(); + val map = Map() super.onCreate(savedInstanceState) setContentView(R.layout.main_window) @@ -21,16 +21,12 @@ class MainWindow: AppCompatActivity() { navigation.selectedItemId= R.id.map navigation.setOnItemSelectedListener { when (it.itemId) { -// R.id.profile -> { -// loadFragment(Profile()) -// true -// } R.id.map -> { loadFragment(map) true } R.id.roadTrip -> { - loadFragment(uca.baptistearthur.geocaching.ui.fragment.RoadTrip()) + loadFragment(RoadTrip()) true } else -> false diff --git a/app/src/main/res/layout-land/main_window.xml b/app/src/main/res/layout-land/main_window.xml new file mode 100644 index 0000000..a82a89e --- /dev/null +++ b/app/src/main/res/layout-land/main_window.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_roadtrip.xml b/app/src/main/res/layout/fragment_roadtrip.xml index 23cccd5..272b3ab 100644 --- a/app/src/main/res/layout/fragment_roadtrip.xml +++ b/app/src/main/res/layout/fragment_roadtrip.xml @@ -5,9 +5,10 @@ android:layout_height="match_parent" tools:context=".ui.fragment.RoadTrip"> - + /> \ No newline at end of file