diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9fdd934..4594e9d46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Russian πŸ‡·πŸ‡Ί [#124](https://github.com/LibreFitOrg/LibreFit/pull/124) +- Add 5 new exercises [#111](https://github.com/LibreFitOrg/LibreFit/pull/111): + - Wall Sit (Isometric squat against the wall) + - Plank Shoulder Taps + - Bottom Push-Up Hold + - Cobra Stretch + - Jumping Jacks ### Changed - diff --git a/README.md b/README.md index c382d4859..867440efc 100644 --- a/README.md +++ b/README.md @@ -224,11 +224,14 @@ Thanks to everyone who helped the project! ### πŸ‹ Dataset contributors - [b3nj5m1n](https://github.com/b3nj5m1n) : [#28](https://github.com/LibreFitOrg/LibreFit/pull/28) +- [ByYeah](https://github.com/ByYeah) : [#111](https://github.com/LibreFitOrg/LibreFit/pull/111) > [Contribute to dataset](CONTRIBUTING.md#improving-exercises-dataset) to be listed here. ### 🌐 Translators +> [Contribute to translations](CONTRIBUTING.md#translations) to be listed here. + #### Arabic πŸ‡ΈπŸ‡¦ - [AhmedAwad7](https://github.com/AhmedAwad7) [#32](https://github.com/LibreFitOrg/LibreFit/pull/32) @@ -309,8 +312,6 @@ Thanks to everyone who helped the project! - [Safi Ullah](https://github.com/Safi-Ullah-1060) [#97](https://github.com/LibreFitOrg/LibreFit/pull/97) -> [Contribute to translations](CONTRIBUTING.md#translations) to be listed here. - --- Made with ❀️ by [IamDg](https://github.com/IamDg) and [contributors](https://github.com/LibreFitOrg/LibreFit/graphs/contributors) diff --git a/app/src/main/assets/Bottom_Pushup_Hold/0.webp b/app/src/main/assets/Bottom_Pushup_Hold/0.webp new file mode 100644 index 000000000..d10e719b4 Binary files /dev/null and b/app/src/main/assets/Bottom_Pushup_Hold/0.webp differ diff --git a/app/src/main/assets/Bottom_Pushup_Hold/1.webp b/app/src/main/assets/Bottom_Pushup_Hold/1.webp new file mode 100644 index 000000000..006e70c62 Binary files /dev/null and b/app/src/main/assets/Bottom_Pushup_Hold/1.webp differ diff --git a/app/src/main/assets/Cobra_Stretch/0.webp b/app/src/main/assets/Cobra_Stretch/0.webp new file mode 100644 index 000000000..f2e66b557 Binary files /dev/null and b/app/src/main/assets/Cobra_Stretch/0.webp differ diff --git a/app/src/main/assets/Cobra_Stretch/1.webp b/app/src/main/assets/Cobra_Stretch/1.webp new file mode 100644 index 000000000..00bef5408 Binary files /dev/null and b/app/src/main/assets/Cobra_Stretch/1.webp differ diff --git a/app/src/main/assets/Jumping_Jacks/0.webp b/app/src/main/assets/Jumping_Jacks/0.webp new file mode 100644 index 000000000..b9fdfca71 Binary files /dev/null and b/app/src/main/assets/Jumping_Jacks/0.webp differ diff --git a/app/src/main/assets/Jumping_Jacks/1.webp b/app/src/main/assets/Jumping_Jacks/1.webp new file mode 100644 index 000000000..7cc0288df Binary files /dev/null and b/app/src/main/assets/Jumping_Jacks/1.webp differ diff --git a/app/src/main/assets/Plank_Shoulder_Taps/0.webp b/app/src/main/assets/Plank_Shoulder_Taps/0.webp new file mode 100644 index 000000000..8fed0ff36 Binary files /dev/null and b/app/src/main/assets/Plank_Shoulder_Taps/0.webp differ diff --git a/app/src/main/assets/Plank_Shoulder_Taps/1.webp b/app/src/main/assets/Plank_Shoulder_Taps/1.webp new file mode 100644 index 000000000..6c7c43013 Binary files /dev/null and b/app/src/main/assets/Plank_Shoulder_Taps/1.webp differ diff --git a/app/src/main/assets/Wall_Sit/0.webp b/app/src/main/assets/Wall_Sit/0.webp new file mode 100644 index 000000000..5ee29d6a5 Binary files /dev/null and b/app/src/main/assets/Wall_Sit/0.webp differ diff --git a/app/src/main/assets/Wall_Sit/1.webp b/app/src/main/assets/Wall_Sit/1.webp new file mode 100644 index 000000000..3d4f07b9f Binary files /dev/null and b/app/src/main/assets/Wall_Sit/1.webp differ diff --git a/app/src/main/java/org/librefit/ui/screens/about/AboutScreen.kt b/app/src/main/java/org/librefit/ui/screens/about/AboutScreen.kt index faae3309e..f230be49a 100644 --- a/app/src/main/java/org/librefit/ui/screens/about/AboutScreen.kt +++ b/app/src/main/java/org/librefit/ui/screens/about/AboutScreen.kt @@ -366,6 +366,16 @@ fun AboutScreen(navController: NavHostController) { ) } + item { + AboutItem( + icon = painterResource(R.drawable.ic_person), + text = stringResource(R.string.ByYeah), + onClick = { + url.value = resources.getString(R.string.url_ByYeah) + } + ) + } + item { HeadlineText(stringResource(R.string.translators)) } diff --git a/app/src/main/res/raw/exercises.json b/app/src/main/res/raw/exercises.json index 0b3edb6e9..df37613f3 100644 --- a/app/src/main/res/raw/exercises.json +++ b/app/src/main/res/raw/exercises.json @@ -2708,6 +2708,35 @@ ], "id": "Bosu_Ball_Cable_Crunch_With_Side_Bends" }, + { + "name": "Bottom Push-Up Hold", + "force": "static", + "level": "intermediate", + "mechanic": "compound", + "equipment": "body only", + "primaryMuscles": [ + "chest" + ], + "secondaryMuscles": [ + "shoulders", + "triceps", + "abdominals" + ], + "instructions": [ + "Start in a standard push-up position with your hands slightly wider than shoulder-width apart.", + "Lower your body slowly until your chest is about 2-3 inches above the ground.", + "Pause and hold this bottom position with your chest hovering just above the floor.", + "Keep your body in a straight line from head to heels with your core engaged.", + "Hold for the prescribed amount of time, maintaining tension in your chest, shoulders, and triceps.", + "Avoid letting your hips sag or pike up during the hold." + ], + "category": "strength", + "images": [ + "Bottom_Pushup_Hold/0.webp", + "Bottom_Pushup_Hold/1.webp" + ], + "id": "Bottom_Pushup_Hold" + }, { "name": "Bottoms-Up Clean From The Hang Position", "force": "pull", @@ -4809,6 +4838,34 @@ ], "id": "Close-Grip_Standing_Barbell_Curl" }, + { + "name": "Cobra Stretch", + "force": "static", + "level": "beginner", + "mechanic": "isolation", + "equipment": "body only", + "primaryMuscles": [ + "abdominals" + ], + "secondaryMuscles": [ + "chest", + "shoulders" + ], + "instructions": [ + "Lie face down on the floor with your legs extended behind you and the tops of your feet flat on the ground.", + "Place your hands directly under your shoulders with your palms flat on the floor and elbows bent.", + "Press through your hands to slowly lift your chest off the floor while keeping your hips and pelvis in contact with the ground.", + "Straighten your arms as much as comfortable, arching your back gently.", + "Look slightly upward and hold the stretch for 10-30 seconds while breathing deeply.", + "Slowly lower your chest back to the starting position." + ], + "category": "stretching", + "images": [ + "Cobra_Stretch/0.webp", + "Cobra_Stretch/1.webp" + ], + "id": "Cobra_Stretch" + }, { "name": "Cocoons", "force": "pull", @@ -9999,6 +10056,36 @@ ], "id": "Jogging_Treadmill" }, + { + "name": "Jumping Jacks", + "force": null, + "level": "beginner", + "mechanic": "compound", + "equipment": "body only", + "primaryMuscles": [ + "quadriceps" + ], + "secondaryMuscles": [ + "calves", + "glutes", + "hamstrings", + "shoulders" + ], + "instructions": [ + "Start standing with your feet together and your arms resting at your sides.", + "Jump and spread your feet wider than shoulder-width apart while simultaneously raising your arms above your head.", + "Your arms should be fully extended and your palms should meet or almost meet at the top.", + "Jump again and return to the starting position with your feet together and arms at your sides.", + "Land softly on the balls of your feet and bend your knees slightly to absorb impact.", + "Continue the motion in a fluid, rhythmic manner for the prescribed number of repetitions." + ], + "category": "cardio", + "images": [ + "Jumping_Jacks/0.webp", + "Jumping_Jacks/1.webp" + ], + "id": "Jumping_Jacks" + }, { "name": "Keg Load", "force": "pull", @@ -14474,6 +14561,36 @@ ], "id": "Plank" }, + { + "name": "Plank Shoulder Taps", + "force": "static", + "level": "intermediate", + "mechanic": "compound", + "equipment": "body only", + "primaryMuscles": [ + "abdominals" + ], + "secondaryMuscles": [ + "chest", + "shoulders", + "triceps" + ], + "instructions": [ + "Start in a high plank position with your hands directly under your shoulders and your body forming a straight line from head to heels.", + "Engage your core and glutes to keep your hips stable and prevent them from rotating.", + "Lift your right hand off the floor and tap your left shoulder.", + "Return your right hand to the starting position.", + "Lift your left hand off the floor and tap your right shoulder.", + "Return your left hand to the starting position.", + "Continue alternating taps for the prescribed number of repetitions, keeping your hips as still as possible." + ], + "category": "strength", + "images": [ + "Plank_Shoulder_Taps/0.webp", + "Plank_Shoulder_Taps/1.webp" + ], + "id": "Plank_Shoulder_Taps" + }, { "name": "Plate Pinch", "force": "static", @@ -22679,6 +22796,34 @@ ], "id": "Walking_Treadmill" }, + { + "name": "Wall Sit", + "force": "static", + "level": "beginner", + "mechanic": "compound", + "equipment": "body only", + "primaryMuscles": [ + "quadriceps" + ], + "secondaryMuscles": [ + "glutes", + "hamstrings", + "calves" + ], + "instructions": [ + "Stand with your back flat against a wall and your feet shoulder-width apart.", + "Slide your back down the wall until your thighs are parallel to the floor, creating a 90-degree angle at your knees.", + "Keep your knees aligned with your toes and do not let them go past your toes.", + "Hold this position with your core engaged and your back pressed flat against the wall.", + "Hold for the prescribed amount of time, keeping your breathing steady." + ], + "category": "strength", + "images": [ + "Wall_Sit/0.webp", + "Wall_Sit/1.webp" + ], + "id": "Wall_Sit" + }, { "name": "Weighted Ball Hyperextension", "force": "pull", diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 863d1c461..bf8caef5c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -121,6 +121,8 @@ tomel51733 T-Silverspoon https://github.com/T-Silverspoon + ByYeah + https://github.com/ByYeah