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

Dev #56

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open

Dev #56

wants to merge 30 commits into from

Commits on Mar 8, 2021

  1. Configuration menu
    Copy the full SHA
    9cdd2c7 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3 from Sprollie/feature/login

    Initial commit of login layouts
    minh-hd authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    3f484ae View commit details
    Browse the repository at this point in the history
  3. Edit the OtpView

    Tamkien committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    7d6c624 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    890aa48 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #4 from Sprollie/feature/login

    Feature/login
    Tamkien authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    175ce34 View commit details
    Browse the repository at this point in the history
  6. Create README.md

    minh-hd authored Mar 8, 2021
    Configuration menu
    Copy the full SHA
    bf55d8d View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Added Bottom Navigation.

    Tamkien committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    dc6075b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #8 from Sprollie/feature/bottom_navigation

    pull_request/add-bottom-navigation
    minh-hd authored Mar 9, 2021
    Configuration menu
    Copy the full SHA
    45be3b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    12d9a93 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2021

  1. Configuration menu
    Copy the full SHA
    9808b4c View commit details
    Browse the repository at this point in the history
  2. Merge pull request #13 from Sprollie/feature/theme

    Disabled Dark mode, Auto-rotate & Split screen.
    Tamkien authored Mar 10, 2021
    Configuration menu
    Copy the full SHA
    1861e57 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c704de9 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #14 from Sprollie/revert-13-feature/theme

    Revert "Disabled Dark mode, Auto-rotate & Split screen."
    minh-hd authored Mar 10, 2021
    Configuration menu
    Copy the full SHA
    486779d View commit details
    Browse the repository at this point in the history
  5. feature/theme

    * Disabled Dark mode, Auto-rotate & Split screen.
    
    * Update themes.xml
    
    Co-authored-by: Hoàng Duy Minh <[email protected]>
    Tamkien and minh-hd authored Mar 10, 2021
    Configuration menu
    Copy the full SHA
    f9c00cd View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Configuration menu
    Copy the full SHA
    686018f View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. Merged profile pull request #21

    * Added layout using RecycleView for ProfileFragment.
    
    * Fixed overlapped RecycleView.
    Tamkien authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    4c598d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2021

  1. Merged issue #22's resolve

    Fixed #22 issue
    Tamkien authored Mar 13, 2021
    Configuration menu
    Copy the full SHA
    840c531 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Merged new color palette

    * Fixed #22 issue.
    
    * Somehow the codes are duplicated. Fixed.
    
    * Changed main color to #ee1b24
    Tamkien authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    f61923c View commit details
    Browse the repository at this point in the history
  2. Merge new translation

    * Fixed #22 issue.
    
    * Somehow the codes are duplicated. Fixed.
    
    * Changed main color to #ee1b24
    
    * Removed rcvProfileMenu's margins except marginTop.
    
    * Edited Exit dialog's button labels.
    
    * Translated into Vietnamese
    Tamkien authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    87a2825 View commit details
    Browse the repository at this point in the history
  3. Merge typo resolve

    * Fixed #22 issue.
    
    * Somehow the codes are duplicated. Fixed.
    
    * Changed main color to #ee1b24
    
    * Removed rcvProfileMenu's margins except marginTop.
    
    * Edited Exit dialog's button labels.
    
    * Translated into Vietnamese
    
    * Fixed typos
    Tamkien authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    86605eb View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Configuration menu
    Copy the full SHA
    2427eff View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. merge/structure-refactor

    * Change application name
    
    * Add authentication validation
    
    * Modify login screen
    
    * Add Customer model
    
    * Add user authentication
    
    * Refactor project structure
    
    * Add FirestoreInstance
    minh-hd authored Mar 23, 2021
    Configuration menu
    Copy the full SHA
    5981f34 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. merge/refactor-firestore-model (#37)

    * Change application name
    
    * Add authentication validation
    
    * Modify login screen
    
    * Add Customer model
    
    * Add user authentication
    
    * Refactor project structure
    
    * Add FirestoreInstance
    
    * Refactor FirestoreInstance
    minh-hd authored Mar 26, 2021
    Configuration menu
    Copy the full SHA
    b290faa View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. Merged login activity

    * Change application name
    
    * Add authentication validation
    
    * Modify login screen
    
    * Add Customer model
    
    * Add user authentication
    
    * Refactor project structure
    
    * Add FirestoreInstance
    
    * Refactor FirestoreInstance
    
    * Add loading dialog
    
    * Edit Sign In behavior
    
    * Edit login text
    
    * Add theme for authentication EditText
    
    * Fix get login status
    
    * Edit build.gradle
    
    * Add toString for Customer
    
    * Edit login activity screen
    
    * Implement login via Firebase
    
    * Dismiss login loading dialog
    
    * Keep screen on when loading
    
    Co-authored-by: Hoàng Duy Minh <[email protected]>
    Co-authored-by: Hoàng Duy Minh <[email protected]>
    3 people authored Mar 29, 2021
    Configuration menu
    Copy the full SHA
    6fcf118 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Feature/firebase (#43)

    * Fixed wrong proxy setting.
    
    * get-product
    
    * anhntl-product
    
    * anhntl-product
    
    * anhntl
    
    * anhntl
    
    * optimize layout product
    
    * add search bar
    
    * Edit Product fragment
    
    * add categories to fragment product
    
    * optimized product fragment
    
    * Add on click listener for products
    
    * Add on click listener for products
    
    * implemented category fragment
    
    * edit ViewByCategoryActivity.kt
    
    * edit ViewByCategoryActivity.kt
    
    * anhntl
    
    * anhntl-search
    
    * implement View by Category
    
    * implemented ProductAdapterListener
    
    * anhntl-sort
    
    * anhntl-sort
    
    * add selector for ViewByCategoryActivity.kt
    
    * Rename .java to .kt
    
    * add sorter for ViewByCategoryActivity.kt
    
    * edit activity_product_details.xml
    
    * edit activity_product_details.xml
    
    Co-authored-by: binnienguyen <[email protected]>
    Tamkien and binnienguyen authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    7222892 View commit details
    Browse the repository at this point in the history
  2. Feature/firebase (#46)

    * Fixed wrong proxy setting.
    
    * get-product
    
    * anhntl-product
    
    * anhntl-product
    
    * anhntl
    
    * anhntl
    
    * optimize layout product
    
    * add search bar
    
    * Edit Product fragment
    
    * add categories to fragment product
    
    * optimized product fragment
    
    * Add on click listener for products
    
    * Add on click listener for products
    
    * implemented category fragment
    
    * edit ViewByCategoryActivity.kt
    
    * edit ViewByCategoryActivity.kt
    
    * anhntl
    
    * anhntl-search
    
    * implement View by Category
    
    * implemented ProductAdapterListener
    
    * anhntl-sort
    
    * anhntl-sort
    
    * add selector for ViewByCategoryActivity.kt
    
    * Rename .java to .kt
    
    * add sorter for ViewByCategoryActivity.kt
    
    * edit activity_product_details.xml
    
    * edit activity_product_details.xml
    
    Co-authored-by: binnienguyen <[email protected]>
    Tamkien and binnienguyen authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    4c6d8a6 View commit details
    Browse the repository at this point in the history
  3. minor fix

    Tamkien committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    9345b84 View commit details
    Browse the repository at this point in the history
  4. Merge minhhd

    * Change application name
    
    * Add authentication validation
    
    * Modify login screen
    
    * Add Customer model
    
    * Add user authentication
    
    * Refactor project structure
    
    * Add FirestoreInstance
    
    * Refactor FirestoreInstance
    
    * Add loading dialog
    
    * Edit Sign In behavior
    
    * Edit login text
    
    * Add theme for authentication EditText
    
    * Fix get login status
    
    * Edit build.gradle
    
    * Add toString for Customer
    
    * Edit login activity screen
    
    * Implement login via Firebase
    
    * Dismiss login loading dialog
    
    * Keep screen on when loading
    
    * Add edit profile screen
    
    * Edit reset password screen
    
    * Edit sign up screen
    
    * Add internal storage permissions
    
    * Delete redundant classes
    
    * Move authentication functions to controller
    
    * Add some libraries
    
    * Add new Edit profile activity
    
    * Edit component ids
    
    * Add sign in icon
    
    * Refactor login function
    
    * Delete model
    
    * Refactor user functions
    
    * Add recyclerview items event
    
    * Load component to view
    
    * Rebuild reset password
    
    * Replace loading text
    
    * Move sign up function to controller
    
    * Delete Customer
    
    * Fix email validation
    
    * Fix screen redirect
    
    * Fix UI
    minh-hd authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    4db3337 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. merge feature cart to dev (#51)

    * [DucHM12] Add Entity/CartItem.java
    
    * [DucHM12] Refactor document to documentID in CartItem.java
    
    * [DucHM12] Modified Entity/Cart.java
    
    * [DucHM12] Add Entity/Cart.java
    
    * Add 4 files for screen layout for feature_cart
    
    * Add build.gradle, string.xml, layout_row_cart_item.xml. Modified CartItem.java, Cart.java for screen layout for feature_cart
    
    * Add CartView interface, CartViewController to handle fragment changes. Refactor entity Cart, CartItem. Modified CartItemModel and CartAdapter.
    
    * Commit feaure_cart branch
    
    * Add UserSession to stores UID and current Cart ID
    
    * Replace hard coded UID and cartID with ID set by UserSession
    
    * Re-commit cart-fragment layout
    
    * Delete unused String
    
    * Re-commit app
    
    * Add UserSession validation check in CartFragment
    
    * Make UserSession final
    
    * Add addCartItem method
    
    * Add initial constructor for CartItem
    
    * Add firestore auth and storage depenencies and modifies AndroidManifest.
    TuesdayTaco71 authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    081aeee View commit details
    Browse the repository at this point in the history
  2. Merge cart feature

    * [DucHM12] Add Entity/CartItem.java
    
    * [DucHM12] Refactor document to documentID in CartItem.java
    
    * [DucHM12] Modified Entity/Cart.java
    
    * [DucHM12] Add Entity/Cart.java
    
    * Add 4 files for screen layout for feature_cart
    
    * Add build.gradle, string.xml, layout_row_cart_item.xml. Modified CartItem.java, Cart.java for screen layout for feature_cart
    
    * Add CartView interface, CartViewController to handle fragment changes. Refactor entity Cart, CartItem. Modified CartItemModel and CartAdapter.
    
    * Commit feaure_cart branch
    
    * Add UserSession to stores UID and current Cart ID
    
    * Replace hard coded UID and cartID with ID set by UserSession
    
    * Re-commit cart-fragment layout
    
    * Delete unused String
    
    * Re-commit app
    
    * Add UserSession validation check in CartFragment
    
    * Make UserSession final
    
    * Add addCartItem method
    
    * Add initial constructor for CartItem
    
    * Add firestore auth and storage depenencies and modifies AndroidManifest.
    
    * Fix bug cart
    
    * Fix fetchCurrentUserCart and addProductToCart
    
    * Fix layout elegentNumberButton
    
    * Fix layout elegentNumberButton
    
    * Make CartAdapter singleton and method to clear cart UI after logout
    
    * Re-commit feature_cart
    TuesdayTaco71 authored Apr 1, 2021
    Configuration menu
    Copy the full SHA
    b559971 View commit details
    Browse the repository at this point in the history