diff --git a/src/app/build.gradle b/src/app/build.gradle index 3329cf8..e700609 100644 --- a/src/app/build.gradle +++ b/src/app/build.gradle @@ -34,6 +34,8 @@ android { dependencies { implementation 'com.github.bumptech.glide:glide:4.12.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0' implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.6.1' diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml index deb52a2..fc1af9b 100644 --- a/src/app/src/main/AndroidManifest.xml +++ b/src/app/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ android:theme="@style/Theme.Scor_It" tools:targetApi="31"> diff --git a/src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt b/src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt deleted file mode 100644 index 7c6fe6d..0000000 --- a/src/app/src/main/java/uca/iut/clermont/view/FavoriteActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package uca.iut.clermont.view - -import android.app.Activity -import android.os.Bundle -import uca.iut.clermont.R - -class FavoriteActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_favorite) - } -} \ No newline at end of file diff --git a/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt b/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt new file mode 100644 index 0000000..bbcb975 --- /dev/null +++ b/src/app/src/main/java/uca/iut/clermont/view/FavoriteFragment.kt @@ -0,0 +1,18 @@ +package uca.iut.clermont.view + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import uca.iut.clermont.R + +class FavoriteFragment: Fragment() { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_favorite, container, false) + } +} \ No newline at end of file diff --git a/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt b/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt new file mode 100644 index 0000000..cda9eed --- /dev/null +++ b/src/app/src/main/java/uca/iut/clermont/view/HomeFragment.kt @@ -0,0 +1,28 @@ +package uca.iut.clermont.view + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import uca.iut.clermont.R + +class HomeFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + /*val adapterMatches = findViewById(R.id.ListRecentsMatches) + + with(adapterMatches) { + adapter = MatchesAdapter(manager.matchesMgr.getItems().toList().toTypedArray()) + } + + adapterMatches.layoutManager = LinearLayoutManager(this)*/ + + return inflater.inflate(R.layout.fragment_home, container, false) + } +} \ No newline at end of file diff --git a/src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt b/src/app/src/main/java/uca/iut/clermont/view/MainActivity.kt similarity index 50% rename from src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt rename to src/app/src/main/java/uca/iut/clermont/view/MainActivity.kt index 909d17d..0a23a58 100644 --- a/src/app/src/main/java/uca/iut/clermont/view/HomeActivity.kt +++ b/src/app/src/main/java/uca/iut/clermont/view/MainActivity.kt @@ -2,31 +2,27 @@ package uca.iut.clermont.view import android.app.Activity import android.os.Bundle -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView +import androidx.navigation.NavController +import androidx.navigation.findNavController +import androidx.navigation.fragment.NavHostFragment import uca.iut.clermont.R import uca.iut.clermont.data.StubData -import uca.iut.clermont.view.adapter.MatchesAdapter -class HomeActivity : Activity() { +class MainActivity : Activity() { private var manager = StubData() + private lateinit var navController: NavController + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_home) - //val imageFirstTeam = findViewById(R.id.ImageFirstTeam) - - val adapterMatches = findViewById(R.id.ListRecentsMatches) + setContentView(R.layout.activity_main) - with(adapterMatches) { - adapter = MatchesAdapter(manager.matchesMgr.getItems().toList().toTypedArray()) - } + val navHostFragment = findNavController(R.id.fragment) as NavHostFragment - adapterMatches.layoutManager = LinearLayoutManager(this) - - adapterMatches + navController = navHostFragment.navController + //val imageFirstTeam = findViewById(R.id.ImageFirstTeam) /*Glide.with(this) .load("https://crests.football-data.org/1765.svg") .error(R.drawable.imagenotfound) diff --git a/src/app/src/main/res/layout/activity_main.xml b/src/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..674d1e6 --- /dev/null +++ b/src/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/src/app/src/main/res/layout/activity_favorite.xml b/src/app/src/main/res/layout/fragment_favorite.xml similarity index 94% rename from src/app/src/main/res/layout/activity_favorite.xml rename to src/app/src/main/res/layout/fragment_favorite.xml index dbe4a6c..1863152 100644 --- a/src/app/src/main/res/layout/activity_favorite.xml +++ b/src/app/src/main/res/layout/fragment_favorite.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:paddingHorizontal="30dp" android:paddingVertical="30dp" - tools:context=".view.FavoriteActivity"> + tools:context=".view.FavoriteFragment"> + tools:context=".view.HomeFragment"> + + + + + + + + + \ No newline at end of file