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

feat: Add review product screen ⭐ #119

Open
wants to merge 42 commits into
base: develop
Choose a base branch
from
Open

Conversation

MarwaEbrahem
Copy link
Contributor

No description provided.

commit d4b4382
Author: Ahmed M. Hassan <[email protected]>
Date:   Tue Aug 16 10:44:32 2022 +0200

    build: Add Cosmos View with a Bridge Stars View ⭐️ (#112)

    * add Cosmos package

    * add `StarsView`
@MarwaEbrahem MarwaEbrahem self-assigned this Aug 19, 2022
@MarwaEbrahem MarwaEbrahem requested a review from a team as a code owner August 19, 2022 02:56
Copy link
Contributor

@ahmdmhasn ahmdmhasn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Greeeat effort 🎉🔥

Comment on lines 44 to 49
struct ReviewerCellViewModel {
let reviewerImageUrl: String
let reviewerName: String
let reviewerComment: String
let rating: Double
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we've been using Nested ViewModel... Let's keep the convenience.

func configureCell(viewModel: ViewModel) {
#warning("Image will be configure after add kingfisher")
func configureCell(viewModel: ReviewerCellViewModel) {
reviewerImageView.setImage(with: viewModel.reviewerImageUrl, placeholderImage: UIImage(named: "star") ?? UIImage())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reviewerImageView.setImage(with: viewModel.reviewerImageUrl, placeholderImage: UIImage(named: "star") ?? UIImage())
reviewerImageView.setImage(with: viewModel.reviewerImageUrl, placeholderImage: .star)


override func layoutSubviews() {
super.layoutSubviews()
contentView.frame = contentView.frame.inset(by: UIEdgeInsets(top: 0, left: 0, bottom: 20, right: 0))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add this to awakeFromNib to make sure it performed only once.

Core/Sources/Core/Models/DomainConvertible/Reviews.swift Outdated Show resolved Hide resolved

/// Load Reviews
///
func loadReviews(completion: @escaping (Domain.Reviews?, Error?) -> Void)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if there are no reviews or errors? Let's use Result<Domain.Reviews, Error> instead

Networking/Sources/Networking/Models/Reviews.swift Outdated Show resolved Hide resolved
public class StarsView: CosmosView {}
public class StarsView: CosmosView {

public func applyStyleToView(_ rate: Double) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Violates single responsibility. Let's create one for updating the rate and another for apply style.

Comment on lines 189 to 190
static let tableViewCellName = "ReviewerTableViewCell"
static let cellReuseIdentifier = "ReviewerTableViewCell"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've helpers for register and dequeue so there's no reason for hardcoded values.

Comment on lines 87 to 101
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }

let message = self.viewModel.alertMessage
self.showErrorAlert(error: message)
}
}

viewModel.showNavBarClosure = { () in
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }

let rating = self.viewModel.navBarRating
self.configureNavBar(rating: rating)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not used DispatchQueue.main.async unless it's truly needed. This will affect unit testing.

Comment on lines 25 to 26
private var reviewCount: Int = 10
private var loadingCell: Bool = true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any logic should be added to the view model.

MarwaEbrahem and others added 18 commits September 2, 2022 00:49
Co-authored-by: Ahmed M. Hassan <[email protected]>
commit 4646663
Author: Ahmed M. Hassan <[email protected]>
Date:   Mon Sep 5 05:46:54 2022 +0200

    fix: UIViewFromNib Crash When Used With any Custom View 👻 (#123)

    * fix typo in `bundle`

    * Update access modifiers

    * fix issue when using `UIViewFromNib`

commit f9644ce
Author: RaniaZeid <[email protected]>
Date:   Thu Sep 1 13:31:29 2022 -0700

    feat: Get All Categories List to Category Remote  (#114)

    * create all category remote file

    * rename all category protocol and class file

commit 840d226
Author: Ahmed Nagy <[email protected]>
Date:   Sun Aug 21 23:23:23 2022 +0200

    fix: buttonsView compatibility with iOS 13 and above 📈 (#106)

    * add buttons view

    * fix ButtonsView not showing and change the favorite button color

    * delete the test code in SceneDelegate

    * change favorite button color

    * make product details screen the root viewController

    code added to SceneDelegate to launch the Product Details screen on launch to test out current tasks

    * fix: make buttonsView compatible starting from iOS 13 and above

    * adding access control to ButtonsView

    * resolving minor issues regarding last PR comments

    * fixing naming issues

    * fix: sellerImageProfile outlets connections

    * fix InfoSellerView outlets connections

commit e9d38ab
Merge: ed39eef 21d6b27
Author: claramounir <[email protected]>
Date:   Sat Aug 20 13:11:34 2022 +0200

    Merge pull request #65 from motoon-eg/feat/product-details-reviews-view

    feat: Add reviews section to product details page 🌠

commit 21d6b27
Merge: f6ff783 ed39eef
Author: claramounir <[email protected]>
Date:   Sat Aug 20 12:53:53 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

    # Conflicts:
    #	Dokan/Dokan.xcodeproj/project.pbxproj
    #	Dokan/Dokan/Scenes/ProductDetails/Views/ReviewerTableViewCell/ReviewerTableViewCell.swift

commit f6ff783
Author: claramounir <[email protected]>
Date:   Fri Aug 19 18:11:06 2022 +0200

    add reviews view

commit 3783ebd
Author: claramounir <[email protected]>
Date:   Fri Aug 19 18:07:21 2022 +0200

    add UIView+Extension

commit 8b9f921
Author: claramounir <[email protected]>
Date:   Sun Aug 7 01:30:24 2022 +0200

    delete duplicate files

commit daeb336
Merge: c8dbddc 6a5cbfb
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:39:31 2022 +0200

    Merge branch 'feat/product-details-reviews-view' of https://github.com/motoon-eg/dokan-store into feat/product-details-reviews-view

commit c8dbddc
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:35:53 2022 +0200

    reslove duplicate build error

commit 6a5cbfb
Merge: d181709 288c6c5
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:16:08 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit d181709
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:04:48 2022 +0200

    solve conflict

commit fd77eb5
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:58:23 2022 +0200

    Update ReviewsView.swift

commit 5e6d655
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:54:11 2022 +0200

    Update Dokan/Dokan/Scenes/ProductDetails/ReviewsView.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit ab944f9
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:53:50 2022 +0200

    Update Dokan/Dokan/Scenes/ProductDetails/Cell/ReviewerTableViewCell.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 8a6581d
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:52:07 2022 +0200

    Update ReviewerTableViewCell.swift

commit e504399
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:45:26 2022 +0200

    Update ReviewerTableViewCell.swift

commit 068aa17
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:38:54 2022 +0200

    Update Dokan/Dokan/Scenes/ProductDetails/Cell/ReviewerTableViewCell.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit de18a8f
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:38:34 2022 +0200

    Update ReviewerTableViewCell.swift

commit e726675
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:37:30 2022 +0200

    Update ReviewerTableViewCell.swift

commit f50ab4d
Merge: 73b6bcf 6ba5dca
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:35:20 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit 73b6bcf
Author: Ahmed M. Hassan <[email protected]>
Date:   Sat Aug 6 01:35:59 2022 +0200

    Fix indentation

commit 3a4a656
Author: Ahmed M. Hassan <[email protected]>
Date:   Sat Aug 6 01:31:16 2022 +0200

    Fix conflicts

commit e839b0a
Author: claramounir <[email protected]>
Date:   Sun Jul 31 22:41:26 2022 +0200

    ui changes

commit 786850b
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:25:28 2022 -0700

    create reviwer Table View Nib file

commit 437cbea
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:47:24 2022 +0200

    restore reviews view

commit 73289b5
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:34:11 2022 +0200

    solve review notes

commit 514382c
Author: claramounir <[email protected]>
Date:   Wed Jul 20 21:45:40 2022 +0200

    add review view design  :v:

commit ab0ee74
Merge: 34ddf7e c08c5b2
Author: Ahmed M. Hassan <[email protected]>
Date:   Sat Aug 6 01:11:29 2022 +0200

    Merge remote-tracking branch 'origin/develop' into feat/product-details-reviews-view

    # Conflicts:
    #	Dokan/Dokan/Assets.xcassets/star.imageset/star.png

commit 34ddf7e
Merge: cfe40eb a12ae42
Author: claramounir <[email protected]>
Date:   Thu Aug 4 12:42:29 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit cfe40eb
Merge: e084789 d258362
Author: claramounir <[email protected]>
Date:   Wed Aug 3 22:07:53 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit e084789
Author: claramounir <[email protected]>
Date:   Tue Aug 2 16:12:33 2022 +0200

    configure review cell

commit 3023d59
Author: claramounir <[email protected]>
Date:   Sun Jul 31 22:41:26 2022 +0200

    ui changes

commit 9d1556d
Author: claramounir <[email protected]>
Date:   Fri Jul 29 15:53:59 2022 +0200

    solve conflict

commit c2f35cf
Merge: 3845ac2 f661127
Author: claramounir <[email protected]>
Date:   Fri Jul 29 01:09:18 2022 +0200

    no message

commit 3845ac2
Author: claramounir <[email protected]>
Date:   Fri Jul 29 01:03:28 2022 +0200

    reviews view tests

commit f661127
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:50:21 2022 -0700

    add outlets and cell model

commit 307a54e
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:44:36 2022 -0700

    create reviewer cell design

commit 47e57bb
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:25:28 2022 -0700

    create reviwer Table View Nib file

commit e799b75
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:47:24 2022 +0200

    restore reviews view

commit 663a7de
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:34:11 2022 +0200

    solve review notes

commit 68c7eb8
Merge: 597352e 575cf24
Author: Ahmed M. Hassan <[email protected]>
Date:   Mon Jul 25 02:20:16 2022 +0200

    Merge remote-tracking branch 'origin/develop' into feat/product-details-reviews-view

    # Conflicts:
    #	Dokan/Dokan.xcodeproj/project.pbxproj

commit 597352e
Author: claramounir <[email protected]>
Date:   Thu Jul 21 18:01:49 2022 +0200

    Update ReviewsView.swift

commit b63ce25
Author: claramounir <[email protected]>
Date:   Wed Jul 20 21:45:40 2022 +0200

    add review view design  :v:

commit 8312a23
Merge: ea116fc de20275
Author: Ahmed M. Hassan <[email protected]>
Date:   Sun Jul 17 11:07:55 2022 +0200

    Merge branch 'develop' into feat/updateswiftversionto5.5

commit ea116fc
Merge: 6f03577 a581bb9
Author: Ahmed M. Hassan <[email protected]>
Date:   Sun Jul 17 11:02:47 2022 +0200

    Merge branch 'develop' into feat/updateswiftversionto5.5

commit 6f03577
Merge: d751c91 5cfba69
Author: RaniaZeid <[email protected]>
Date:   Sat Jul 16 20:33:47 2022 +0200

    Merge pull request #60 from motoon-eg/feat/updateverificationscene

    add action to resend and mainbutton

commit 5cfba69
Author: RaniaZeid <[email protected]>
Date:   Sat Jul 16 11:31:19 2022 -0700

    add action to resend and mainbutton

commit d751c91
Author: Ahmad Yasser <[email protected]>
Date:   Sat Jul 16 19:41:00 2022 +0200

    make OTCTextfield class open (#59)

commit b3339a9
Author: RaniaZeid <[email protected]>
Date:   Sat Jul 16 06:40:49 2022 -0700

    update swift version at domain and core
* feat: Add unit test to review product files

* fix: refactor test code

* fix: add mock view model to project

* Squashed commit of the following:

commit fb44a8b
Merge: 48904c6 4646663
Author: MarwaEbrahem <[email protected]>
Date:   Mon Sep 5 18:01:28 2022 +0200

    Merge branch 'develop' into review-screen

commit 4646663
Author: Ahmed M. Hassan <[email protected]>
Date:   Mon Sep 5 05:46:54 2022 +0200

    fix: UIViewFromNib Crash When Used With any Custom View 👻 (#123)

    * fix typo in `bundle`

    * Update access modifiers

    * fix issue when using `UIViewFromNib`

commit 48904c6
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 16:52:34 2022 -0700

    fix: setup view by using uiviewfromnib file

commit a16934e
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 16:37:51 2022 -0700

    feat: solve merge conflict

commit 03a6d5f
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 16:16:31 2022 -0700

    Squashed commit of the following:

    commit 4646663
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Mon Sep 5 05:46:54 2022 +0200

        fix: UIViewFromNib Crash When Used With any Custom View 👻 (#123)

        * fix typo in `bundle`

        * Update access modifiers

        * fix issue when using `UIViewFromNib`

    commit f9644ce
    Author: RaniaZeid <[email protected]>
    Date:   Thu Sep 1 13:31:29 2022 -0700

        feat: Get All Categories List to Category Remote  (#114)

        * create all category remote file

        * rename all category protocol and class file

    commit 840d226
    Author: Ahmed Nagy <[email protected]>
    Date:   Sun Aug 21 23:23:23 2022 +0200

        fix: buttonsView compatibility with iOS 13 and above 📈 (#106)

        * add buttons view

        * fix ButtonsView not showing and change the favorite button color

        * delete the test code in SceneDelegate

        * change favorite button color

        * make product details screen the root viewController

        code added to SceneDelegate to launch the Product Details screen on launch to test out current tasks

        * fix: make buttonsView compatible starting from iOS 13 and above

        * adding access control to ButtonsView

        * resolving minor issues regarding last PR comments

        * fixing naming issues

        * fix: sellerImageProfile outlets connections

        * fix InfoSellerView outlets connections

    commit e9d38ab
    Merge: ed39eef 21d6b27
    Author: claramounir <[email protected]>
    Date:   Sat Aug 20 13:11:34 2022 +0200

        Merge pull request #65 from motoon-eg/feat/product-details-reviews-view

        feat: Add reviews section to product details page 🌠

    commit 21d6b27
    Merge: f6ff783 ed39eef
    Author: claramounir <[email protected]>
    Date:   Sat Aug 20 12:53:53 2022 +0200

        Merge branch 'develop' into feat/product-details-reviews-view

        # Conflicts:
        #	Dokan/Dokan.xcodeproj/project.pbxproj
        #	Dokan/Dokan/Scenes/ProductDetails/Views/ReviewerTableViewCell/ReviewerTableViewCell.swift

    commit f6ff783
    Author: claramounir <[email protected]>
    Date:   Fri Aug 19 18:11:06 2022 +0200

        add reviews view

    commit 3783ebd
    Author: claramounir <[email protected]>
    Date:   Fri Aug 19 18:07:21 2022 +0200

        add UIView+Extension

    commit 8b9f921
    Author: claramounir <[email protected]>
    Date:   Sun Aug 7 01:30:24 2022 +0200

        delete duplicate files

    commit daeb336
    Merge: c8dbddc 6a5cbfb
    Author: claramounir <[email protected]>
    Date:   Sun Aug 7 00:39:31 2022 +0200

        Merge branch 'feat/product-details-reviews-view' of https://github.com/motoon-eg/dokan-store into feat/product-details-reviews-view

    commit c8dbddc
    Author: claramounir <[email protected]>
    Date:   Sun Aug 7 00:35:53 2022 +0200

        reslove duplicate build error

    commit 6a5cbfb
    Merge: d181709 288c6c5
    Author: claramounir <[email protected]>
    Date:   Sun Aug 7 00:16:08 2022 +0200

        Merge branch 'develop' into feat/product-details-reviews-view

    commit d181709
    Author: claramounir <[email protected]>
    Date:   Sun Aug 7 00:04:48 2022 +0200

        solve conflict

    commit fd77eb5
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:58:23 2022 +0200

        Update ReviewsView.swift

    commit 5e6d655
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:54:11 2022 +0200

        Update Dokan/Dokan/Scenes/ProductDetails/ReviewsView.swift

        Co-authored-by: Ahmed M. Hassan <[email protected]>

    commit ab944f9
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:53:50 2022 +0200

        Update Dokan/Dokan/Scenes/ProductDetails/Cell/ReviewerTableViewCell.swift

        Co-authored-by: Ahmed M. Hassan <[email protected]>

    commit 8a6581d
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:52:07 2022 +0200

        Update ReviewerTableViewCell.swift

    commit e504399
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:45:26 2022 +0200

        Update ReviewerTableViewCell.swift

    commit 068aa17
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:38:54 2022 +0200

        Update Dokan/Dokan/Scenes/ProductDetails/Cell/ReviewerTableViewCell.swift

        Co-authored-by: Ahmed M. Hassan <[email protected]>

    commit de18a8f
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:38:34 2022 +0200

        Update ReviewerTableViewCell.swift

    commit e726675
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:37:30 2022 +0200

        Update ReviewerTableViewCell.swift

    commit f50ab4d
    Merge: 73b6bcf 6ba5dca
    Author: claramounir <[email protected]>
    Date:   Sat Aug 6 07:35:20 2022 +0200

        Merge branch 'develop' into feat/product-details-reviews-view

    commit 73b6bcf
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Sat Aug 6 01:35:59 2022 +0200

        Fix indentation

    commit 3a4a656
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Sat Aug 6 01:31:16 2022 +0200

        Fix conflicts

    commit e839b0a
    Author: claramounir <[email protected]>
    Date:   Sun Jul 31 22:41:26 2022 +0200

        ui changes

    commit 786850b
    Author: RaniaZeid <[email protected]>
    Date:   Thu Jul 28 14:25:28 2022 -0700

        create reviwer Table View Nib file

    commit 437cbea
    Author: claramounir <[email protected]>
    Date:   Thu Jul 28 19:47:24 2022 +0200

        restore reviews view

    commit 73289b5
    Author: claramounir <[email protected]>
    Date:   Thu Jul 28 19:34:11 2022 +0200

        solve review notes

    commit 514382c
    Author: claramounir <[email protected]>
    Date:   Wed Jul 20 21:45:40 2022 +0200

        add review view design  :v:

    commit ab0ee74
    Merge: 34ddf7e c08c5b2
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Sat Aug 6 01:11:29 2022 +0200

        Merge remote-tracking branch 'origin/develop' into feat/product-details-reviews-view

        # Conflicts:
        #	Dokan/Dokan/Assets.xcassets/star.imageset/star.png

    commit 34ddf7e
    Merge: cfe40eb a12ae42
    Author: claramounir <[email protected]>
    Date:   Thu Aug 4 12:42:29 2022 +0200

        Merge branch 'develop' into feat/product-details-reviews-view

    commit cfe40eb
    Merge: e084789 d258362
    Author: claramounir <[email protected]>
    Date:   Wed Aug 3 22:07:53 2022 +0200

        Merge branch 'develop' into feat/product-details-reviews-view

    commit e084789
    Author: claramounir <[email protected]>
    Date:   Tue Aug 2 16:12:33 2022 +0200

        configure review cell

    commit 3023d59
    Author: claramounir <[email protected]>
    Date:   Sun Jul 31 22:41:26 2022 +0200

        ui changes

    commit 9d1556d
    Author: claramounir <[email protected]>
    Date:   Fri Jul 29 15:53:59 2022 +0200

        solve conflict

    commit c2f35cf
    Merge: 3845ac2 f661127
    Author: claramounir <[email protected]>
    Date:   Fri Jul 29 01:09:18 2022 +0200

        no message

    commit 3845ac2
    Author: claramounir <[email protected]>
    Date:   Fri Jul 29 01:03:28 2022 +0200

        reviews view tests

    commit f661127
    Author: RaniaZeid <[email protected]>
    Date:   Thu Jul 28 14:50:21 2022 -0700

        add outlets and cell model

    commit 307a54e
    Author: RaniaZeid <[email protected]>
    Date:   Thu Jul 28 14:44:36 2022 -0700

        create reviewer cell design

    commit 47e57bb
    Author: RaniaZeid <[email protected]>
    Date:   Thu Jul 28 14:25:28 2022 -0700

        create reviwer Table View Nib file

    commit e799b75
    Author: claramounir <[email protected]>
    Date:   Thu Jul 28 19:47:24 2022 +0200

        restore reviews view

    commit 663a7de
    Author: claramounir <[email protected]>
    Date:   Thu Jul 28 19:34:11 2022 +0200

        solve review notes

    commit 68c7eb8
    Merge: 597352e 575cf24
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Mon Jul 25 02:20:16 2022 +0200

        Merge remote-tracking branch 'origin/develop' into feat/product-details-reviews-view

        # Conflicts:
        #	Dokan/Dokan.xcodeproj/project.pbxproj

    commit 597352e
    Author: claramounir <[email protected]>
    Date:   Thu Jul 21 18:01:49 2022 +0200

        Update ReviewsView.swift

    commit b63ce25
    Author: claramounir <[email protected]>
    Date:   Wed Jul 20 21:45:40 2022 +0200

        add review view design  :v:

    commit 8312a23
    Merge: ea116fc de20275
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Sun Jul 17 11:07:55 2022 +0200

        Merge branch 'develop' into feat/updateswiftversionto5.5

    commit ea116fc
    Merge: 6f03577 a581bb9
    Author: Ahmed M. Hassan <[email protected]>
    Date:   Sun Jul 17 11:02:47 2022 +0200

        Merge branch 'develop' into feat/updateswiftversionto5.5

    commit 6f03577
    Merge: d751c91 5cfba69
    Author: RaniaZeid <[email protected]>
    Date:   Sat Jul 16 20:33:47 2022 +0200

        Merge pull request #60 from motoon-eg/feat/updateverificationscene

        add action to resend and mainbutton

    commit 5cfba69
    Author: RaniaZeid <[email protected]>
    Date:   Sat Jul 16 11:31:19 2022 -0700

        add action to resend and mainbutton

    commit d751c91
    Author: Ahmad Yasser <[email protected]>
    Date:   Sat Jul 16 19:41:00 2022 +0200

        make OTCTextfield class open (#59)

    commit b3339a9
    Author: RaniaZeid <[email protected]>
    Date:   Sat Jul 16 06:40:49 2022 -0700

        update swift version at domain and core

commit fa079d7
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 16:09:07 2022 -0700

    fix: refactor MockNetwork

commit 40d4b73
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 13:37:01 2022 -0700

    fix: update register ReviewerTableViewCell

commit 2e171d1
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 12:47:39 2022 -0700

    fix: refactor ReviewProductNavigationBarBehavior

commit 20af4f0
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 12:47:01 2022 -0700

    fix: refactor RatingDetailsViewModel

commit 2bcbcfd
Author: MarwaEbrahem <[email protected]>
Date:   Sun Sep 4 12:30:37 2022 -0700

    fix: Update ReviewerTableViewCell

commit 399858c
Author: MarwaEbrahem <[email protected]>
Date:   Sat Sep 3 10:36:27 2022 -0700

    fix: update code

commit d89c97e
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 01:00:39 2022 +0200

    fix: update state enum name

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 564f14d
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:57:59 2022 +0200

    Update Dokan/Dokan/Scenes/ReviewProduct/ReviewProductNavigationBarBehavior.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit b4c4601
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:57:11 2022 +0200

    fix: Update initialize of navBarRating variable

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 29e0f85
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:54:58 2022 +0200

    fix: Update initialize of alertMessage variable

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 083d01f
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:52:24 2022 +0200

    fix: Update initialize of cellViewModels variable

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit f2d4324
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:49:36 2022 +0200

    fix: Update initialize of reviewList variable

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 745ba58
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:42:11 2022 +0200

    fix: edit processFetchedReviews function

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit daadc30
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:34:36 2022 +0200

    Update Reviews init function style

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 2d17bf1
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:17:13 2022 +0200

    fix: change codable to decodable in model

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 19626e5
Author: MarwaEbrahem <[email protected]>
Date:   Fri Sep 2 00:15:32 2022 +0200

    fix: edit toDomain function

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit f9644ce
Author: RaniaZeid <[email protected]>
Date:   Thu Sep 1 13:31:29 2022 -0700

    feat: Get All Categories List to Category Remote  (#114)

    * create all category remote file

    * rename all category protocol and class file

commit 840d226
Author: Ahmed Nagy <[email protected]>
Date:   Sun Aug 21 23:23:23 2022 +0200

    fix: buttonsView compatibility with iOS 13 and above 📈 (#106)

    * add buttons view

    * fix ButtonsView not showing and change the favorite button color

    * delete the test code in SceneDelegate

    * change favorite button color

    * make product details screen the root viewController

    code added to SceneDelegate to launch the Product Details screen on launch to test out current tasks

    * fix: make buttonsView compatible starting from iOS 13 and above

    * adding access control to ButtonsView

    * resolving minor issues regarding last PR comments

    * fixing naming issues

    * fix: sellerImageProfile outlets connections

    * fix InfoSellerView outlets connections

commit e9d38ab
Merge: ed39eef 21d6b27
Author: claramounir <[email protected]>
Date:   Sat Aug 20 13:11:34 2022 +0200

    Merge pull request #65 from motoon-eg/feat/product-details-reviews-view

    feat: Add reviews section to product details page 🌠

commit 21d6b27
Merge: f6ff783 ed39eef
Author: claramounir <[email protected]>
Date:   Sat Aug 20 12:53:53 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

    # Conflicts:
    #	Dokan/Dokan.xcodeproj/project.pbxproj
    #	Dokan/Dokan/Scenes/ProductDetails/Views/ReviewerTableViewCell/ReviewerTableViewCell.swift

commit f6ff783
Author: claramounir <[email protected]>
Date:   Fri Aug 19 18:11:06 2022 +0200

    add reviews view

commit 3783ebd
Author: claramounir <[email protected]>
Date:   Fri Aug 19 18:07:21 2022 +0200

    add UIView+Extension

commit 8b9f921
Author: claramounir <[email protected]>
Date:   Sun Aug 7 01:30:24 2022 +0200

    delete duplicate files

commit daeb336
Merge: c8dbddc 6a5cbfb
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:39:31 2022 +0200

    Merge branch 'feat/product-details-reviews-view' of https://github.com/motoon-eg/dokan-store into feat/product-details-reviews-view

commit c8dbddc
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:35:53 2022 +0200

    reslove duplicate build error

commit 6a5cbfb
Merge: d181709 288c6c5
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:16:08 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit d181709
Author: claramounir <[email protected]>
Date:   Sun Aug 7 00:04:48 2022 +0200

    solve conflict

commit fd77eb5
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:58:23 2022 +0200

    Update ReviewsView.swift

commit 5e6d655
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:54:11 2022 +0200

    Update Dokan/Dokan/Scenes/ProductDetails/ReviewsView.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit ab944f9
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:53:50 2022 +0200

    Update Dokan/Dokan/Scenes/ProductDetails/Cell/ReviewerTableViewCell.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit 8a6581d
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:52:07 2022 +0200

    Update ReviewerTableViewCell.swift

commit e504399
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:45:26 2022 +0200

    Update ReviewerTableViewCell.swift

commit 068aa17
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:38:54 2022 +0200

    Update Dokan/Dokan/Scenes/ProductDetails/Cell/ReviewerTableViewCell.swift

    Co-authored-by: Ahmed M. Hassan <[email protected]>

commit de18a8f
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:38:34 2022 +0200

    Update ReviewerTableViewCell.swift

commit e726675
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:37:30 2022 +0200

    Update ReviewerTableViewCell.swift

commit f50ab4d
Merge: 73b6bcf 6ba5dca
Author: claramounir <[email protected]>
Date:   Sat Aug 6 07:35:20 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit 73b6bcf
Author: Ahmed M. Hassan <[email protected]>
Date:   Sat Aug 6 01:35:59 2022 +0200

    Fix indentation

commit 3a4a656
Author: Ahmed M. Hassan <[email protected]>
Date:   Sat Aug 6 01:31:16 2022 +0200

    Fix conflicts

commit e839b0a
Author: claramounir <[email protected]>
Date:   Sun Jul 31 22:41:26 2022 +0200

    ui changes

commit 786850b
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:25:28 2022 -0700

    create reviwer Table View Nib file

commit 437cbea
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:47:24 2022 +0200

    restore reviews view

commit 73289b5
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:34:11 2022 +0200

    solve review notes

commit 514382c
Author: claramounir <[email protected]>
Date:   Wed Jul 20 21:45:40 2022 +0200

    add review view design  :v:

commit ab0ee74
Merge: 34ddf7e c08c5b2
Author: Ahmed M. Hassan <[email protected]>
Date:   Sat Aug 6 01:11:29 2022 +0200

    Merge remote-tracking branch 'origin/develop' into feat/product-details-reviews-view

    # Conflicts:
    #	Dokan/Dokan/Assets.xcassets/star.imageset/star.png

commit 34ddf7e
Merge: cfe40eb a12ae42
Author: claramounir <[email protected]>
Date:   Thu Aug 4 12:42:29 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit cfe40eb
Merge: e084789 d258362
Author: claramounir <[email protected]>
Date:   Wed Aug 3 22:07:53 2022 +0200

    Merge branch 'develop' into feat/product-details-reviews-view

commit e084789
Author: claramounir <[email protected]>
Date:   Tue Aug 2 16:12:33 2022 +0200

    configure review cell

commit 3023d59
Author: claramounir <[email protected]>
Date:   Sun Jul 31 22:41:26 2022 +0200

    ui changes

commit 9d1556d
Author: claramounir <[email protected]>
Date:   Fri Jul 29 15:53:59 2022 +0200

    solve conflict

commit c2f35cf
Merge: 3845ac2 f661127
Author: claramounir <[email protected]>
Date:   Fri Jul 29 01:09:18 2022 +0200

    no message

commit 3845ac2
Author: claramounir <[email protected]>
Date:   Fri Jul 29 01:03:28 2022 +0200

    reviews view tests

commit f661127
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:50:21 2022 -0700

    add outlets and cell model

commit 307a54e
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:44:36 2022 -0700

    create reviewer cell design

commit 47e57bb
Author: RaniaZeid <[email protected]>
Date:   Thu Jul 28 14:25:28 2022 -0700

    create reviwer Table View Nib file

commit e799b75
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:47:24 2022 +0200

    restore reviews view

commit 663a7de
Author: claramounir <[email protected]>
Date:   Thu Jul 28 19:34:11 2022 +0200

    solve review notes

commit 68c7eb8
Merge: 597352e 575cf24
Author: Ahmed M. Hassan <[email protected]>
Date:   Mon Jul 25 02:20:16 2022 +0200

    Merge remote-tracking branch 'origin/develop' into feat/product-details-reviews-view

    # Conflicts:
    #	Dokan/Dokan.xcodeproj/project.pbxproj

commit 597352e
Author: claramounir <[email protected]>
Date:   Thu Jul 21 18:01:49 2022 +0200

    Update ReviewsView.swift

commit b63ce25
Author: claramounir <[email protected]>
Date:   Wed Jul 20 21:45:40 2022 +0200

    add review view design  :v:

commit 8312a23
Merge: ea116fc de20275
Author: Ahmed M. Hassan <[email protected]>
Date:   Sun Jul 17 11:07:55 2022 +0200

    Merge branch 'develop' into feat/updateswiftversionto5.5

commit ea116fc
Merge: 6f03577 a581bb9
Author: Ahmed M. Hassan <[email protected]>
Date:   Sun Jul 17 11:02:47 2022 +0200

    Merge branch 'develop' into feat/updateswiftversionto5.5

commit 6f03577
Merge: d751c91 5cfba69
Author: RaniaZeid <[email protected]>
Date:   Sat Jul 16 20:33:47 2022 +0200

    Merge pull request #60 from motoon-eg/feat/updateverificationscene

    add action to resend and mainbutton

commit 5cfba69
Author: RaniaZeid <[email protected]>
Date:   Sat Jul 16 11:31:19 2022 -0700

    add action to resend and mainbutton

commit d751c91
Author: Ahmad Yasser <[email protected]>
Date:   Sat Jul 16 19:41:00 2022 +0200

    make OTCTextfield class open (#59)

commit b3339a9
Author: RaniaZeid <[email protected]>
Date:   Sat Jul 16 06:40:49 2022 -0700

    update swift version at domain and core

* feat: Add mockReviewProductViewModel file
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants