diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt index c3cc584..4766f63 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/CraftFragment.kt @@ -1,6 +1,5 @@ package com.example.shakecraft -import android.graphics.Color import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/ForgeFragment.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/ForgeFragment.kt index 080d001..39aa1cc 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/ForgeFragment.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/ForgeFragment.kt @@ -1,6 +1,5 @@ package com.example.shakecraft -import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import android.view.LayoutInflater diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt index 33c0a40..e1a7b33 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt @@ -11,8 +11,7 @@ import androidx.core.view.WindowInsetsControllerCompat import androidx.navigation.findNavController import androidx.navigation.ui.setupWithNavController import com.example.shakecraft.data.Stub -import com.example.shakecraft.model.Player -import com.example.shakecraft.model.Recipe + import com.google.android.material.bottomnavigation.BottomNavigationView class MainActivity : AppCompatActivity() { diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterInventory.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterInventory.kt index c1f9877..8779ea8 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterInventory.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterInventory.kt @@ -6,10 +6,9 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.Adapter import com.example.shakecraft.R import com.example.shakecraft.model.Item -import com.example.shakecraft.view.viewholder.ViewHolderInventory + class AdapterInventory(private val inventory: List) : RecyclerView.Adapter() { diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt index e4a7d8a..b7ab509 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterMaterials.kt @@ -6,11 +6,10 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.Adapter import com.example.shakecraft.R import com.example.shakecraft.model.Item import com.example.shakecraft.model.Player -import com.example.shakecraft.view.viewholder.ViewHolderInventory + class AdapterMaterials(private val materials: List, val currentplayer: Player) : RecyclerView.Adapter() { diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterRecipe.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterRecipe.kt index fce04a0..07e2d3b 100644 --- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterRecipe.kt +++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/view/adapter/AdapterRecipe.kt @@ -3,11 +3,9 @@ package com.example.shakecraft.view.adapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView.OnItemClickListener import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.example.shakecraft.MainActivity import com.example.shakecraft.R import com.example.shakecraft.model.Recipe diff --git a/ShakeAndCraft/app/src/main/res/layout/fragment_plus.xml b/ShakeAndCraft/app/src/main/res/layout/fragment_plus.xml index bbc5a23..bcf2fd4 100644 --- a/ShakeAndCraft/app/src/main/res/layout/fragment_plus.xml +++ b/ShakeAndCraft/app/src/main/res/layout/fragment_plus.xml @@ -4,8 +4,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".PlusFragment"> - - + + - + - + \ No newline at end of file diff --git a/ShakeAndCraft/app/src/test/java/com/example/shakecraft/ExampleUnitTest.kt b/ShakeAndCraft/app/src/test/java/com/example/shakecraft/ExampleUnitTest.kt index 606dabd..ed599a1 100644 --- a/ShakeAndCraft/app/src/test/java/com/example/shakecraft/ExampleUnitTest.kt +++ b/ShakeAndCraft/app/src/test/java/com/example/shakecraft/ExampleUnitTest.kt @@ -11,7 +11,7 @@ import org.junit.Assert.* */ class ExampleUnitTest { @Test - fun addition_isCorrect() { + fun additionIsCorrect() { assertEquals(4, 2 + 2) } } \ No newline at end of file