Develop - #2
Open
MuhammedRefaatMetwally wants to merge 60 commits into
Open
Conversation
Categories Products
# Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/jet_ecommerce/ui/components/CustomButton.kt # app/src/main/java/com/example/jet_ecommerce/ui/components/SearchAppBar.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/categories/CategoriesScreen.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/main/categories/CategoriesViewModel.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/main/categories/subCategories/SubCategoriesContract.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/main/categories/subCategories/SubCategoriesScreen.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/main/categories/subCategories/SubCategoryViewModel.kt # app/src/main/java/com/example/jet_ecommerce/ui/navigation_comp/bottomNav/BottomNavigationComponent.kt # data/src/main/java/com/example/data/api/WebServices.kt # domain/src/main/java/com/example/domain/features/category/model/Category.kt
# Conflicts: # app/build.gradle # app/src/main/java/com/example/jet_ecommerce/ui/components/HomeProducts.LazyRow.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/main/home/HomeViewModel.kt
MuhammedRefaatMetwally
force-pushed
the
develop
branch
from
November 7, 2023 14:04
50af784 to
47e64eb
Compare
# Conflicts: # data/src/main/java/com/example/data/features/product/datasourceContract/ProductDataSource.kt # data/src/main/java/com/example/data/features/product/datasourceImpl/ProductDataSourceImpl.kt
# Conflicts: # data/src/main/java/com/example/data/features/products/dataSourceContract/ProductDataSource.kt # data/src/main/java/com/example/data/features/products/dataSourceImpl/ProductsDataSourceImpl.kt
Token Interceptor Authenticator Auth Interceptor Fixed Login UI
# Conflicts: # app/src/main/java/com/example/jet_ecommerce/ui/features/auth/login/LoginViewModel.kt # app/src/main/java/com/example/jet_ecommerce/ui/features/main/products/ProductsListScreen.kt # data/src/main/java/com/example/data/api/AuthenticateInterceptor.kt # data/src/main/java/com/example/data/api/WebServices.kt
Logout Feature Token Interceptor Authenticator Auth Interceptor Fixed Login UI
Added Custom Toast
# Conflicts: # app/src/main/java/com/example/jet_ecommerce/ui/features/main/products/productDetails/ProductDetailsScreen.kt
Clear Cart With longPress on Cart Icon Added Cart Count - Fixed some UI issues Fixed Toast Events Made it Single Event
+ Added Stripe Payment APIS & Methods + Added Constants % Modified Category Widget and Home Caategories Grids % Fixed some unnavigable spaces
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.