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

Jet fit #183

Closed
wants to merge 77 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
fd7b0dd
happy init commit
iBareq Feb 28, 2024
048cace
Feature/structure (#2)
yassenRamadan1 Mar 4, 2024
a7358ad
Feature/custom components (#3)
AndrewAboalhana Mar 6, 2024
391d8c7
add theme & colors and base components (#4)
amnah44 Mar 9, 2024
d839249
update library version
Abdurrahman-Salah-ad-Din Mar 15, 2024
b6e3023
add icons
Abdurrahman-Salah-ad-Din Mar 15, 2024
7eee165
add entities
Abdurrahman-Salah-ad-Din Mar 15, 2024
185cb90
add fake data
Abdurrahman-Salah-ad-Din Mar 15, 2024
23c49ae
add components
Abdurrahman-Salah-ad-Din Mar 15, 2024
b3ab1b5
create `BaseViewModel`
Abdurrahman-Salah-ad-Din Mar 15, 2024
a1fc08d
create routine entity feature
Abdurrahman-Salah-ad-Din Mar 15, 2024
f77fc57
create series entity feature
Abdurrahman-Salah-ad-Din Mar 15, 2024
bdfbc27
create workout entity feature
Abdurrahman-Salah-ad-Din Mar 15, 2024
885ba94
Feature/home (#5)
AmeerAmjed Mar 16, 2024
0be2a8e
feature/navigation-drawer (#9)
Asiasama710 Mar 16, 2024
ec2adec
Feature/audio player and video player (#11)
kamelkiko Mar 16, 2024
d714f84
Merge remote-tracking branch 'origin/JetFit' into feature/training-en…
Abdurrahman-Salah-ad-Din Mar 17, 2024
4526688
add navigation
Abdurrahman-Salah-ad-Din Mar 18, 2024
943a9cb
clean up code
Abdurrahman-Salah-ad-Din Mar 18, 2024
c017ae0
update data
Abdurrahman-Salah-ad-Din Mar 18, 2024
93028fa
create and enhance composable functions
Abdurrahman-Salah-ad-Din Mar 18, 2024
3116c06
move files
Abdurrahman-Salah-ad-Din Mar 18, 2024
4350983
rename method
Abdurrahman-Salah-ad-Din Mar 18, 2024
5643083
rename method
Abdurrahman-Salah-ad-Din Mar 18, 2024
5f00afb
Merge remote-tracking branch 'origin/feature/training-entities' into …
Abdurrahman-Salah-ad-Din Mar 18, 2024
08b4260
move files from 'trainingentities' package to 'training' package
Abdurrahman-Salah-ad-Din Mar 22, 2024
9a8bd22
Sort and Filter (#13)
Asiasama710 Mar 22, 2024
61348b9
make screens' content private
Abdurrahman-Salah-ad-Din Mar 22, 2024
7f7f36c
Feature/profile selector (#14)
AmeerAmjed Mar 22, 2024
0646d78
make challenge ui state in one file
Abdurrahman-Salah-ad-Din Mar 23, 2024
cf50863
rename file
Abdurrahman-Salah-ad-Din Mar 23, 2024
fba560a
remove text composable functions
Abdurrahman-Salah-ad-Din Mar 23, 2024
158ecab
rename and move functions
Abdurrahman-Salah-ad-Din Mar 23, 2024
9b93f3c
Merge remote-tracking branch 'origin/JetFit' into feature/training-en…
Abdurrahman-Salah-ad-Din Mar 23, 2024
d513eeb
solve conflicts
Abdurrahman-Salah-ad-Din Mar 23, 2024
0c07cd1
rename and enhance `RegimenCardItem` function
Abdurrahman-Salah-ad-Din Mar 23, 2024
325d6a4
update data
Abdurrahman-Salah-ad-Din Mar 23, 2024
56abccf
move files to composable package
Abdurrahman-Salah-ad-Din Mar 25, 2024
582522d
Feature/favourites (#12)
hassanwasfy Mar 25, 2024
48a49a6
More option screen (#7)
TarekIdrees Mar 25, 2024
a194fd8
Merge branch 'JetFit' into feature/training-entities
ahmedfikry24 Mar 26, 2024
758206a
Merge remote-tracking branch 'origin/feature/training-entities' into …
Abdurrahman-Salah-ad-Din Mar 26, 2024
55dcc2a
solve conflict
Abdurrahman-Salah-ad-Din Mar 26, 2024
84988b7
delete useless components
ahmedfikry24 Mar 27, 2024
566282a
add composables & design reusable component
ahmedfikry24 Mar 27, 2024
ef109c8
commit until review
ahmedfikry24 Mar 27, 2024
9b7bf88
update repo
ahmedfikry24 Mar 27, 2024
933d6ce
design training entity screen
ahmedfikry24 Mar 27, 2024
0ca6175
delete useless components
ahmedfikry24 Mar 28, 2024
2e48338
refactor screen logic
ahmedfikry24 Mar 28, 2024
8fa79dc
rename gradiant image
ahmedfikry24 Mar 28, 2024
27017dc
link screen with data
Abdurrahman-Salah-ad-Din Mar 28, 2024
abd9381
rename file
Abdurrahman-Salah-ad-Din Mar 28, 2024
8d8ab19
update dimensions
ahmedfikry24 Mar 28, 2024
e18b0a4
Merge pull request #8 from TheChance101/feature/training-entities
yassenRamadan1 May 10, 2024
f9d1930
Feature/refactor interaction (#15)
AmeerAmjed May 24, 2024
55dfdd0
Feature/settings UI (#16)
AndrewAboalhana May 24, 2024
b129dbe
Fix/remove const_theme scheme (#17)
amnah44 May 24, 2024
f0c6f31
Subscription Screen (#6)
TarekIdrees May 24, 2024
2865d76
adjust the navigation between screens (#19)
AndrewAboalhana May 24, 2024
8cf1df5
Feature/benchmark (#18)
yassenRamadan1 May 24, 2024
0f7cbe9
add more data same ui
AmeerAmjed May 27, 2024
fd47649
set size to CustomCard
AmeerAmjed May 27, 2024
bea82f8
display workout into training
AmeerAmjed May 27, 2024
7f7916c
implement tab in TrainingScreen
AmeerAmjed May 29, 2024
3279dc4
display hard level in training card
AmeerAmjed May 29, 2024
a5a0a1e
change source image figma upload to github repo and replace use examp…
AmeerAmjed May 30, 2024
76ddbc6
change fake url video url to real link in getWorkouts
AmeerAmjed May 30, 2024
2636fd7
change fake url video url to real link
AmeerAmjed May 30, 2024
8903e06
change source image figma upload to github repo and replace use examp…
AmeerAmjed May 30, 2024
c58ebe6
Merge pull request #21 from TheChance101/feature/image-sourcse
yassenRamadan1 Jun 19, 2024
2cb97e8
Merge pull request #20 from TheChance101/feature/training
yassenRamadan1 Jun 19, 2024
d2c5759
Feature/separate repository (#22)
amnah44 Jun 19, 2024
4643092
Feature/complete navigaition (#23)
yassenRamadan1 Jun 19, 2024
eb6e919
add video and audio composable (#24)
amnah44 Jun 19, 2024
42fd2c7
Merge branch 'android:main' into JetFit
iBareq Jun 19, 2024
61a39fd
Create README.md
iBareq Jun 19, 2024
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
24 changes: 24 additions & 0 deletions JetFit/LICENSES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Open source licenses and copyright notices

## [Coil](https://coil-kt.github.io/coil/#license)

Copyright 2022 Coil Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

## [Big Buck Bunny Video](https://peach.blender.org/about/)

This work is licensed under
a [Creative Commons Attribution 2.5](https://creativecommons.org/licenses/by/2.5/legalcode) license.

(c) copyright 2008, Blender Foundation / www.bigbuckbunny.org
9 changes: 9 additions & 0 deletions JetFit/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Jetpack Compose for TVSamples

This repository contains a set of individual Android Studio projects to help you learn about Compose in Android TV. Each sample demonstrates different use cases, complexity levels and APIs.

For more information, please read the documentation

💻 Requirements

To try out these sample apps, you need to use Android Studio. You can clone this repository or import the project from Android Studio following the steps here.
1 change: 1 addition & 0 deletions JetFit/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
117 changes: 117 additions & 0 deletions JetFit/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
import org.jetbrains.kotlin.gradle.model.Kapt

@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.kotlinAndroid)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.hilt)
alias(libs.plugins.ksp)
}

android {
namespace = "com.google.jetfit"
compileSdk = 34

defaultConfig {
applicationId = "com.google.jetfit"
minSdk = 24
targetSdk = 34
versionCode = 1
versionName = "1.0"
vectorDrawables {
useSupportLibrary = true
}

}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
create("benchmark") {
initWith(buildTypes.getByName("release"))
signingConfig = signingConfigs.getByName("debug")
matchingFallbacks += listOf("release")
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-benchmark-rules.pro"
)
isDebuggable = false
}

}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
buildFeatures {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
}
packaging {
pickFirst ("META-INF/gradle/incremental.annotation.processors")
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
}

dependencies {
implementation(libs.core.ktx)
implementation(libs.appcompat)
implementation(platform(libs.compose.bom))
implementation(libs.ui.tooling.preview)
implementation(libs.tv.foundation)
implementation(libs.tv.material)
implementation(libs.lifecycle.runtime.ktx)
implementation(libs.activity.compose)
implementation(libs.coil.compose)
androidTestImplementation(platform(libs.compose.bom))
androidTestImplementation(libs.ui.test.junit4)
debugImplementation(libs.ui.tooling)
debugImplementation(libs.ui.test.manifest)

// SplashScreen
implementation(libs.androidx.core.splashscreen)

// Hilt
implementation(libs.hilt.android)
implementation(libs.androidx.hilt.navigation.compose)
ksp(libs.hilt.compiler)

// ViewModel in Compose
implementation(libs.androidx.lifecycle.viewmodel.compose)

//lifecycle
implementation(libs.androidx.lifecycle.runtime.compose)

// Compose Navigation
implementation(libs.androidx.navigation.compose)

// Coil
implementation(libs.coil.compose)

// JSON parser
implementation(libs.kotlinx.serialization)

// Media3
implementation(libs.androidx.media3.exoplayer)
implementation(libs.androidx.media3.ui)

implementation(libs.constraint.layout)

// Baseline profile installer
implementation(libs.androidx.profileinstaller)

}
25 changes: 25 additions & 0 deletions JetFit/app/proguard-benchmark-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

# When generating the baseline profile we want the proper names of
# the methods and classes
-dontobfuscate
21 changes: 21 additions & 0 deletions JetFit/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
39 changes: 39 additions & 0 deletions JetFit/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature
android:name="android.software.leanback"
android:required="false" />

<application
android:name=".JetFitApplication"
android:allowBackup="true"
android:banner="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.JetFit"
android:usesCleartextTraffic="true">
<profileable
android:shell="true"
tools:targetApi="29" />

<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Loading