Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Injury page #20

Merged
merged 4 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
android:name=".ui.onboarding.activities.WelcomeScreenActivity"
android:exported="false" />
<activity
android:name=".ui.menu.activities.ChallengeActivity"
android:name=".ui.home.ui.more.activities.InjuryTodayWorkoutActivity"
android:exported="false" />
<activity
android:name=".ui.home.ui.more.activities.InjuryActivity"
android:exported="false" />
<activity
android:name=".ui.home.ui.more.activities.ChallengeActivity"
android:exported="false" />
<activity
android:name=".ui.home.ui.more.activities.NotificationActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modarb.android.ui.menu.activities
package com.modarb.android.ui.home.ui.more.activities

import android.os.Bundle
import android.view.View
Expand All @@ -7,6 +7,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.adapters.ActiveUsersAdapter
import com.modarb.android.ui.home.ui.more.adapters.ChallengeAdapter
import com.modarb.android.ui.home.ui.more.models.ChallengeModel
import com.modarb.android.ui.home.ui.more.models.User

class ChallengeActivity : AppCompatActivity() {
Expand All @@ -33,5 +35,19 @@ class ChallengeActivity : AppCompatActivity() {

val adapter = ActiveUsersAdapter(userList)
recyclerView.adapter = adapter


val recyclerView2: RecyclerView = findViewById(R.id.availableChallengesRecyclerView)
recyclerView2.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)

val challengeList = listOf(
ChallengeModel("Plank\nChallenge", R.drawable.rounded_gradient_rectangle2, "Join"),
ChallengeModel("Push-Up Power\nChallenge", R.drawable.rounded_gradient_rectangle3, "Join"),
ChallengeModel("Flex Friday Photo\nChallenge", R.drawable.rounded_gradient_rectangle4, "Join"),
ChallengeModel("Squat Squad\nChallenge", R.drawable.rounded_gradient_rectangle5, "Join")
)

recyclerView2.adapter = ChallengeAdapter(challengeList)

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.modarb.android.ui.home.ui.more.activities

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.adapters.CommonInjuriesAdapter
import com.modarb.android.ui.home.ui.more.adapters.RecoveryPlanAdapter

class InjuryActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_injury)

val imageView = findViewById<View>(R.id.backButton)
imageView.setOnClickListener {
finish()
}
val recoveryPlanList = listOf("JointEase Shoulder Renewal", "Your Comprehensive Guide\nto Healing")
val imageResources = listOf(
R.drawable.recovery_plan_img1,
R.drawable.recovery_plan_img2
)
val recyclerView: RecyclerView = findViewById(R.id.recoveryPlanRecyclerView)
recyclerView.layoutManager = LinearLayoutManager(this)
recyclerView.adapter = RecoveryPlanAdapter(recoveryPlanList, imageResources)
{ position ->
if (position == 0) {
val intent = Intent(this, InjuryTodayWorkoutActivity::class.java)
startActivity(intent)
}
}

val commonInjuriesList = listOf("Sprained Ankle", "Calf Strain", "Shoulder\nTendinitis")
val imageResources2 = listOf(
R.drawable.common_injuries_img1,
R.drawable.common_injuries_img2,
R.drawable.common_injuries_img3
)
val recyclerView2: RecyclerView = findViewById(R.id.commonInjuriesRecyclerView)
recyclerView2.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
recyclerView2.adapter = CommonInjuriesAdapter(commonInjuriesList, imageResources2)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.modarb.android.ui.home.ui.more.activities

import android.os.Bundle
import android.view.View
import android.widget.Button
import androidx.appcompat.app.AppCompatActivity
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.adapters.InjuryWorkoutAdapter
import com.modarb.android.ui.home.ui.more.models.InjuryWorkoutModel

class InjuryTodayWorkoutActivity : AppCompatActivity() {
private lateinit var recyclerView: RecyclerView
private lateinit var startButton: Button
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_injury_today_workout)

recyclerView = findViewById(R.id.recyclerView)
recyclerView.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
val itemList: ArrayList<InjuryWorkoutModel> = ArrayList()

val workout1 = InjuryWorkoutModel(R.drawable.daily_recovery_session1,"4 sets x 12-15 reps", 1)
val workout2 = InjuryWorkoutModel(R.drawable.daily_recovery_session2, "4 sets x 10-12 reps", 2)

itemList.add(workout1)
itemList.add(workout2)

val adapter = InjuryWorkoutAdapter(itemList)

recyclerView.adapter = adapter


startButton = findViewById(R.id.startButton)
startButton.setOnClickListener {
recyclerView.visibility = View.VISIBLE
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.modarb.android.ui.home.ui.more.adapters

import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.models.ChallengeModel

class ChallengeAdapter(private val dataList: List<ChallengeModel>) :
RecyclerView.Adapter<ChallengeAdapter.ViewHolder>() {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_challenge, parent, false)
return ViewHolder(view)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val challenge = dataList[position]
holder.itemView.setBackgroundResource(challenge.backgroundResId)
holder.bind(challenge.title)
}



override fun getItemCount(): Int {
return dataList.size
}

class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
private val challengeTitleTextView: TextView = itemView.findViewById(R.id.challengeTitleTextView)

fun bind(data: String) {
challengeTitleTextView.text = data
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.modarb.android.ui.home.ui.more.adapters

import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R

class CommonInjuriesAdapter(private val dataList: List<String>, private val imageResources: List<Int>) :
RecyclerView.Adapter<CommonInjuriesAdapter.ViewHolder>() {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_common_injuries, parent, false)
return ViewHolder(view)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val imageResource = imageResources[position % imageResources.size]
holder.itemView.setBackgroundResource(imageResource)
holder.bind(dataList[position])
}

override fun getItemCount(): Int {
return dataList.size
}

class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
private val textViewItem: TextView = itemView.findViewById(R.id.textViewItem)

fun bind(data: String) {
textViewItem.text = data
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.modarb.android.ui.home.ui.more.adapters

import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.models.InjuryWorkoutModel

class InjuryWorkoutAdapter(private val itemList: ArrayList<InjuryWorkoutModel>) :
RecyclerView.Adapter<InjuryWorkoutAdapter.ViewHolder>() {

inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
var workoutImage: ImageView = itemView.findViewById(R.id.imageView6)
var workoutDescription: TextView = itemView.findViewById(R.id.exerciseDesc)
}

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_injury_workout_details, parent, false)
return ViewHolder(view)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val item = itemList[position]

holder.workoutImage.setImageResource(item.imageResId)
holder.workoutDescription.text = item.description
}

override fun getItemCount(): Int {
return itemList.size
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.modarb.android.ui.home.ui.more.adapters

import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.modarb.android.R

class RecoveryPlanAdapter(private val dataList: List<String>, private val imageResources: List<Int>, private val itemClickListener: (Int) -> Unit) :
RecyclerView.Adapter<RecoveryPlanAdapter.ViewHolder>() {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_recovery_plan, parent, false)
return ViewHolder(view)
}

override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val imageResource = imageResources[position % imageResources.size]
holder.itemView.setBackgroundResource(imageResource)
holder.bind(dataList[position])
holder.itemView.setOnClickListener { itemClickListener(position) }
}

override fun getItemCount(): Int {
return dataList.size
}

class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
private val textViewItem: TextView = itemView.findViewById(R.id.textViewItem)

fun bind(data: String) {
textViewItem.text = data
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import com.modarb.android.R
import com.modarb.android.ui.home.ui.more.activities.InjuryActivity
import com.modarb.android.ui.home.ui.more.activities.ProfileActivity
import com.modarb.android.ui.home.ui.more.activities.ReminderActivity
import com.modarb.android.ui.home.ui.more.activities.SettingActivity
import com.modarb.android.ui.menu.activities.ChallengeActivity
import com.modarb.android.ui.home.ui.more.activities.ChallengeActivity

class MoreFragment : Fragment() {

Expand All @@ -27,18 +28,20 @@ class MoreFragment : Fragment() {
cardView.setOnClickListener {
startActivity(Intent(requireContext(), ProfileActivity::class.java))
}


val cardView2 = view.findViewById<View>(R.id.cardView4)
val cardView2 = view.findViewById<View>(R.id.cardView3)
cardView2.setOnClickListener {
startActivity(Intent(requireContext(), ChallengeActivity::class.java))
startActivity(Intent(requireContext(), InjuryActivity::class.java))
}
val cardView3 = view.findViewById<View>(R.id.cardView5)
val cardView3 = view.findViewById<View>(R.id.cardView4)
cardView3.setOnClickListener {
startActivity(Intent(requireContext(), ReminderActivity::class.java))
startActivity(Intent(requireContext(), ChallengeActivity::class.java))
}
val cardView4 = view.findViewById<View>(R.id.cardView6)
val cardView4 = view.findViewById<View>(R.id.cardView5)
cardView4.setOnClickListener {
startActivity(Intent(requireContext(), ReminderActivity::class.java))
}
val cardView5 = view.findViewById<View>(R.id.cardView6)
cardView5.setOnClickListener {
startActivity(Intent(requireContext(), SettingActivity::class.java))
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package com.modarb.android.ui.home.ui.more.models

data class ChallengeModel(val title: String, val backgroundResId: Int, val buttonText: String)

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.modarb.android.ui.home.ui.more.models

data class InjuryWorkoutModel(
val imageResId: Int, val description: String, val id: Int
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/injury_workout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/recovery_plan_img1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/recovery_plan_img2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading