Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
09a9d2f
Home Screen
Nov 2, 2023
54a435a
Components - Pictures - fonts
Nov 3, 2023
800e049
add category screen
Ommarragab52 Nov 4, 2023
398a718
Merge remote-tracking branch 'origin/develop' into develop
Ommarragab52 Nov 4, 2023
1213a26
edit some bugs
Ommarragab52 Nov 4, 2023
057f009
Modified Products Lazy Row
Nov 4, 2023
85e45fe
Merge remote-tracking branch 'origin/develop' into develop
Nov 4, 2023
fd1fe2d
Home - Categories - Sub Categories Done
Nov 4, 2023
9885d8e
Home
Nov 4, 2023
cbc2b80
Product Done!
Nov 4, 2023
7a4f502
add ProductsScreen & edit some bugs
Ommarragab52 Nov 5, 2023
5046858
add paging & fix some bugs
Ommarragab52 Nov 5, 2023
5f853a3
fix some bugs
Ommarragab52 Nov 6, 2023
47e64eb
Product Done!
Nov 6, 2023
50af784
fix some bugs
Ommarragab52 Nov 7, 2023
bf56fe3
Merge remote-tracking branch 'origin/develop' into develop
Ommarragab52 Nov 7, 2023
10baf3f
Resolved merge conflict by incorporating both suggestions.
MuhammedRefaatMetwally Nov 8, 2023
e23b26d
Merge remote-tracking branch 'origin/develop' into develop
MuhammedRefaatMetwally Nov 8, 2023
ac9f996
Fixed Conflict
MuhammedRefaatMetwally Nov 13, 2023
9ca93cb
refactored dots indicator
MuhammedRefaatMetwally Nov 13, 2023
9c65822
refactored dots indicator
MuhammedRefaatMetwally Nov 13, 2023
7ca3759
add get specific product useCase
Ommarragab52 Nov 13, 2023
bc474a8
Merge remote-tracking branch 'origin/develop' into develop
Ommarragab52 Nov 13, 2023
3b14083
add ProductDetailsScreen
Ommarragab52 Nov 15, 2023
07949f3
edit
Ommarragab52 Nov 15, 2023
6075c61
fix some errors
Ommarragab52 Nov 15, 2023
650d813
fix some errors
Ommarragab52 Nov 15, 2023
916d763
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 19, 2023
4b96f5a
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 19, 2023
9cb9c10
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 19, 2023
f17edc4
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 19, 2023
c61d289
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 19, 2023
761e51d
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 19, 2023
b54ef3f
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 23, 2023
486a5f4
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 23, 2023
0102563
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 25, 2023
06c6cd9
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 25, 2023
1b87be4
Merge remote-tracking branch 'origin/develop' into develop
ahmedsatour Nov 25, 2023
2aa311e
fix product Quantity & Total price
Ommarragab52 Nov 30, 2023
7a4ff16
Login Feature
MuhammedRefaatMetwally Nov 30, 2023
f0157ca
Merge remote-tracking branch 'origin/develop' into develop
MuhammedRefaatMetwally Nov 30, 2023
d25434f
fix bugs
Ommarragab52 Nov 30, 2023
8af7bd9
Merge remote-tracking branch 'origin/develop' into develop
Ommarragab52 Nov 30, 2023
48a80c9
Login Feature
MuhammedRefaatMetwally Nov 30, 2023
995074b
Merge remote-tracking branch 'origin/develop' into develop
MuhammedRefaatMetwally Nov 30, 2023
6aee846
Fixed Register Feature
MuhammedRefaatMetwally Nov 30, 2023
6b89fa9
add wishlist and cart apis implementation
Ommarragab52 Nov 30, 2023
5a8e1d5
Merge remote-tracking branch 'origin/develop' into develop
Ommarragab52 Nov 30, 2023
1b2c926
fix some errors
Ommarragab52 Nov 30, 2023
25678ac
add to cart logic
Ommarragab52 Dec 4, 2023
af756cd
Fixed CustomDialog
MuhammedRefaatMetwally Dec 4, 2023
bfe4e8c
Merge remote-tracking branch 'origin/develop' into develop
MuhammedRefaatMetwally Dec 4, 2023
7c99af5
fix error
Ommarragab52 Dec 4, 2023
8b4f464
Cart Feature
MuhammedRefaatMetwally Dec 6, 2023
e03b970
Delete Specific Cart Item APi Feature Done!
MuhammedRefaatMetwally Dec 6, 2023
0e04393
Update Product Quantity and Price APIS Done !
MuhammedRefaatMetwally Dec 10, 2023
2257cc4
WIsh List - Checkout Feature
MuhammedRefaatMetwally Dec 12, 2023
91448bf
Nested Navigation
MuhammedRefaatMetwally Dec 15, 2023
d3c6187
Nested Navigation
MuhammedRefaatMetwally Dec 18, 2023
60c3b05
% Modified The Navigation Graphs
MuhammedRefaatMetwally Jun 20, 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
4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

93 changes: 93 additions & 0 deletions OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2020 The Poppins Project Authors (https://github.com/itfoundry/Poppins)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
92 changes: 78 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'kotlin-kapt'
id 'com.google.dagger.hilt.android'
id 'kotlin-kapt'
id 'com.google.devtools.ksp'
}

android {
Expand All @@ -11,7 +14,7 @@ android {

defaultConfig {
applicationId "com.example.jet_ecommerce"
minSdk 24
minSdk 26
targetSdk 34
versionCode 1
versionName "1.0"
Expand Down Expand Up @@ -39,42 +42,86 @@ android {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion '1.3.2'
kotlinCompilerExtensionVersion '1.5.3'
}
packagingOptions {
resources {
excludes += '/META-INF/{AL2.0,LGPL2.1}'

}
}
}

dependencies {
configurations.configureEach {
resolutionStrategy {
force 'androidx.appcompat:appcompat:1.3.1'
}
}
implementation 'androidx.window:window:1.3.0'
def room_version = "2.6.1"

implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"

// To use Kotlin Symbol Processing (KSP)
// ksp "androidx.room:room-compiler:$room_version"
implementation 'com.stripe:stripe-android:20.44.1'
implementation "com.stripe:stripe-java:25.0.0"
implementation platform("androidx.compose:compose-bom:2024.03.00")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.stripe:stripeterminal:3.2.0"
implementation 'com.stripe:stripe-android:20.44.1'
implementation 'androidx.activity:activity-compose:1.9.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2'
implementation project(path: ':data')
implementation project(path: ':domain')
def lifecycle_version = "2.6.1"
implementation 'androidx.appcompat:appcompat:1.7.0'

def lifecycle_version = "2.6.2"
implementation "androidx.compose.runtime:runtime-livedata:1.6.8"

implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

//Navigation
def nav_version = "2.7.3"
implementation "androidx.navigation:navigation-compose:$nav_version"



implementation "androidx.paging:paging-runtime-ktx:3.3.0"
implementation 'androidx.paging:paging-compose:3.3.0'

//retrofit
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.1")
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3")

// Coil
implementation("io.coil-kt:coil-compose:2.5.0")

implementation "com.google.accompanist:accompanist-pager:0.22.0-rc"

//pagination
implementation "androidx.paging:paging-runtime-ktx:3.3.0"
implementation 'androidx.paging:paging-compose:3.3.0'

implementation("androidx.paging:paging-compose:3.3.0")
//hilt
implementation "com.google.dagger:hilt-android:2.44"
kapt "com.google.dagger:hilt-compiler:2.44"
implementation "com.google.dagger:hilt-android:2.50"
kapt "com.google.dagger:hilt-compiler:2.50"
implementation "androidx.hilt:hilt-navigation-compose:1.2.0"
implementation "androidx.hilt:hilt-navigation-fragment:1.2.0"
implementation "com.valentinilk.shimmer:compose-shimmer:1.0.3"
//view models
implementation 'androidx.fragment:fragment-ktx:1.6.1'
implementation 'androidx.fragment:fragment-ktx:1.6.2'

//kotlin flow
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'

implementation "androidx.compose.material:material:1.5.4"
implementation "androidx.compose.material:material:1.6.8"

def mockkVersion = "1.13.8"
//testing mocking
Expand All @@ -86,10 +133,22 @@ dependencies {
//3shan t2dr tsd5dm el viewModelScope fe el test (async)
testImplementation "androidx.arch.core:core-testing:2.2.0"

implementation 'androidx.core:core-ktx:1.8.0'
implementation "androidx.datastore:datastore-preferences:1.0.0"

implementation 'com.github.GrenderG:Toasty:1.5.2'

implementation 'androidx.fragment:fragment-ktx:1.6.2'

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
//constraint layout
implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version"
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
implementation 'androidx.activity:activity-compose:1.5.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation 'androidx.activity:activity-compose:1.9.0'
implementation platform('androidx.compose:compose-bom:2022.10.00')
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-graphics'
Expand All @@ -102,4 +161,9 @@ dependencies {
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
debugImplementation 'androidx.compose.ui:ui-tooling'
debugImplementation 'androidx.compose.ui:ui-test-manifest'
}
tasks.withType(KotlinCompile).all {
kotlinOptions {
languageVersion = "1.9"
}
}
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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"/>
<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/java/com/example/jet_ecommerce/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@ import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.example.jet_ecommerce.ui.navigation_comp.screensNav.ECommerceNavigation
import androidx.navigation.compose.rememberNavController
import com.example.jet_ecommerce.ui.navigation_comp.bottomNav.RootNavigationGraph
import com.example.jet_ecommerce.ui.theme.JetECommerceTheme
import dagger.hilt.android.AndroidEntryPoint



@AndroidEntryPoint
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -33,7 +36,7 @@ fun ECommerce() {
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
ECommerceNavigation()
RootNavigationGraph(navController = rememberNavController())
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/example/jet_ecommerce/MyApplication.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
package com.example.jet_ecommerce

import android.app.Application
import androidx.lifecycle.ViewModelProvider
import com.example.data.api.AppSharedReferences
import com.example.jet_ecommerce.ui.Consts
import com.example.jet_ecommerce.ui.features.main.wishlist.WishListViewModel
import com.stripe.android.BuildConfig
import com.stripe.android.PaymentConfiguration
import dagger.hilt.android.HiltAndroidApp

@HiltAndroidApp
class MyApplication : Application() {
override fun onCreate() {
super.onCreate()
PaymentConfiguration.init(applicationContext, Consts.STRIPE_PUBLISH_KEY)
AppSharedReferences.init(this)

}
}
11 changes: 11 additions & 0 deletions app/src/main/java/com/example/jet_ecommerce/ui/Consts.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.example.jet_ecommerce.ui

object Consts {

const val BASE_URL_STRIPE = "https://api.stripe.com/"
const val STRIPE_PUBLISH_KEY ="pk_test_51Ow3KlRsJ1oPTnGIDW5Ztxw3bOwxpseH8mWzkuXEJtMuZPVsprR9Hl5VtxRPXCHLwWY1mRO5uPMm6RktFhRYaWha00RY1MIpe2"
const val STRIPE_SECRET_KEY ="sk_test_51Ow3KlRsJ1oPTnGIdqzmjns9YW6Um1aphHt1Q9Vj1OMyHdMb3Dmz05GfxLWhQM09MjCYQx9tz0qTrWcE0460JcUq00Kwxt0A7W"



}
Loading