diff --git a/.idea/misc.xml b/.idea/misc.xml index 54d5acd..282e8b8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,4 +7,11 @@ + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/shakecraft/BossFragment.kt b/app/src/main/java/com/example/shakecraft/BossFragment.kt new file mode 100644 index 0000000..e29b92d --- /dev/null +++ b/app/src/main/java/com/example/shakecraft/BossFragment.kt @@ -0,0 +1,59 @@ +package com.example.shakecraft + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +// TODO: Rename parameter arguments, choose names that match +// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER +private const val ARG_PARAM1 = "param1" +private const val ARG_PARAM2 = "param2" + +/** + * A simple [Fragment] subclass. + * Use the [BossFragment.newInstance] factory method to + * create an instance of this fragment. + */ +class BossFragment : Fragment() { + // TODO: Rename and change types of parameters + private var param1: String? = null + private var param2: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + arguments?.let { + param1 = it.getString(ARG_PARAM1) + param2 = it.getString(ARG_PARAM2) + } + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_boss, container, false) + } + + companion object { + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment BossFragment. + */ + // TODO: Rename and change types and number of parameters + @JvmStatic + fun newInstance(param1: String, param2: String) = + BossFragment().apply { + arguments = Bundle().apply { + putString(ARG_PARAM1, param1) + putString(ARG_PARAM2, param2) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/backgroundboss.png b/app/src/main/res/drawable/backgroundboss.png new file mode 100644 index 0000000..5c54fa9 Binary files /dev/null and b/app/src/main/res/drawable/backgroundboss.png differ diff --git a/app/src/main/res/drawable/custom_boss_progressbar.xml b/app/src/main/res/drawable/custom_boss_progressbar.xml new file mode 100644 index 0000000..f3f6c2f --- /dev/null +++ b/app/src/main/res/drawable/custom_boss_progressbar.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_collect_progressbar.xml b/app/src/main/res/drawable/custom_collect_progressbar.xml new file mode 100644 index 0000000..43e1b02 --- /dev/null +++ b/app/src/main/res/drawable/custom_collect_progressbar.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/custom_level_progressbar.xml b/app/src/main/res/drawable/custom_level_progressbar.xml new file mode 100644 index 0000000..b04a88f --- /dev/null +++ b/app/src/main/res/drawable/custom_level_progressbar.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/image_boss.png b/app/src/main/res/drawable/image_boss.png new file mode 100644 index 0000000..9d09b93 Binary files /dev/null and b/app/src/main/res/drawable/image_boss.png differ diff --git a/app/src/main/res/drawable/image_collect.png b/app/src/main/res/drawable/image_collect.png new file mode 100644 index 0000000..dd835a6 Binary files /dev/null and b/app/src/main/res/drawable/image_collect.png differ diff --git a/app/src/main/res/drawable/shake_to_collect.png b/app/src/main/res/drawable/shake_to_collect.png new file mode 100644 index 0000000..4388d72 Binary files /dev/null and b/app/src/main/res/drawable/shake_to_collect.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5684609..7fab3aa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,7 +23,7 @@ android:background="@color/black_800" android:id="@+id/bottomNav" android:layout_width="match_parent" - android:layout_height="60dp" + android:layout_height="wrap_content" android:layout_alignParentBottom="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_boss.xml b/app/src/main/res/layout/fragment_boss.xml new file mode 100644 index 0000000..0bc344a --- /dev/null +++ b/app/src/main/res/layout/fragment_boss.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_collect.xml b/app/src/main/res/layout/fragment_collect.xml index 5b6d53a..03ce752 100644 --- a/app/src/main/res/layout/fragment_collect.xml +++ b/app/src/main/res/layout/fragment_collect.xml @@ -9,6 +9,7 @@ tools:context=".CollectFragment"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 11593c2..2d16725 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -67,6 +67,7 @@ + android:layout_weight="1" + android:max="100" + android:progress="20" + android:progressDrawable="@drawable/custom_level_progressbar" /> #343339 #2D2C32 #ADACB2 + #FF3D3D + #FADB68 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 442a4ec..3838a80 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Shake&Craft + ShakeCraft Inventory Home Plus