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: Text and icons adjustment project #364

Conversation

IvanStepanok
Copy link
Contributor

@IvanStepanok IvanStepanok commented Mar 21, 2024

Figma design changes: https://www.figma.com/file/iZ56YMjbRMShCCDxqrqRrR/Open-edX-Mobile-App-All-Screens-v2.1?type=design&node-id=9980-2&mode=design&t=ThvK5qvjJxh91mw2-0

Changed icon
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 28 48

Empty state’s title has been removed
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 27 30

Changed subtitle
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 22 32

Internet warning text has been changed
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 22 11

Changed subtitle. “Handouts” changed to “More”
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 21 44

Changed title and icon
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 21 17

Changed title and subtitle
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 17 53

Changed subtitle
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 15 58

The title of the message has been removed.
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 15 36

Changed icon, title, and subtitle
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 15 27

@openedx-webhooks openedx-webhooks added the open-source-contribution PR author is not from Axim or 2U label Mar 21, 2024
@openedx-webhooks
Copy link

openedx-webhooks commented Mar 21, 2024

Thanks for the pull request, @IvanStepanok! Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@volodymyr-chekyrta volodymyr-chekyrta self-requested a review March 21, 2024 14:23
@volodymyr-chekyrta volodymyr-chekyrta changed the title feat/text and icons adjustment project feat: Text and icons adjustment project Mar 21, 2024
@IvanStepanok IvanStepanok force-pushed the feat/text_and_icons_adjustment_project branch from c63386d to c605f7e Compare March 21, 2024 14:29
@volodymyr-chekyrta
Copy link
Contributor

@IvanStepanok, we need to check that we are using the text "Log out" and not "Logout" on the popup.
image
cc @sdaitzman

@volodymyr-chekyrta
Copy link
Contributor

@IvanStepanok correct text
Subtitle + button

image

@IvanStepanok
Copy link
Contributor Author

Ready

Screenshot 2024-03-25 at 19 45 43

@volodymyr-chekyrta volodymyr-chekyrta marked this pull request as ready for review March 26, 2024 09:02
@volodymyr-chekyrta volodymyr-chekyrta requested a review from rnr March 26, 2024 09:02
@IvanStepanok IvanStepanok force-pushed the feat/text_and_icons_adjustment_project branch from de503fd to a71c8a4 Compare March 26, 2024 10:48
@IvanStepanok IvanStepanok force-pushed the feat/text_and_icons_adjustment_project branch from a71c8a4 to a4da518 Compare March 26, 2024 10:49
Comment on lines +180 to +185
if viewModel.courseState() != .enrollOpen {
OfflineSnackBarView(connectivity: viewModel.connectivity,
reloadAction: {
await viewModel.getCourseDetail(courseID: courseID, withProgress: false)
})
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Question: Shouldn't the OfflineSnackBarView only appear if there's no internet connection? The condition seems to be checking something different.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was done to avoid duplicating the message about the lack of Internet in this case:
Simulator Screenshot - iPhone 15 Pro Max - 2024-03-20 at 15 22 11

Copy link
Contributor

@saeedbashir saeedbashir left a comment

Choose a reason for hiding this comment

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

Light and dark icons are added for most of icons. How about adding just one icon and then apply the color through code. This will help the open source community to configure the app according to their theme requirements.

  1. In figma, there isn't any cross button.
  1. Cross button is missing as per Figma file
  1. The icon is not properly visible in light mode.

@@ -268,19 +268,19 @@ public struct AlertView: View {
}, label: {
ZStack {
Text(CoreLocalization.Alert.logout)
.foregroundColor(Theme.Colors.primaryButtonTextColor)
.foregroundColor(.black)
Copy link
Contributor

Choose a reason for hiding this comment

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

Using a hardcoded color will limit the theming capability for the open source community. Please define a color in the theme and use that, so anyone can configure it as per their theming requirements.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  1. This is a great idea, let's go ahead with it but not as part of the current task.

  2. Regarding the cross button, I've remembered it being part of the project from the start, and I'm not sure it should be removed, as it aligns well with the concept of user-friendly UX/UI. Perhaps it should be included in the design?

  3. The icon matches the design, but you're right, I would fix that in the design.

  4. I added a new color, alertText

Thanks, Saeed!

.font(Theme.Fonts.labelLarge)
.frame(maxWidth: .infinity)
.padding(.horizontal, 16)
Image(systemName: "rectangle.portrait.and.arrow.right")
.foregroundColor(Theme.Colors.white)
.foregroundColor(.black)
Copy link
Contributor

Choose a reason for hiding this comment

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

Same is the case here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🫡

"COURSEWARE.BACK_TO_OUTLINE" = "Back to outline";
"COURSEWARE.SECTION" = "Section “";
"COURSEWARE.IS_FINISHED" = "“ is finished.";
"COURSEWARE.SECTION" = "You've completed “";
Copy link
Contributor

Choose a reason for hiding this comment

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

How about defining SECTION in such a way that it can take the section name as input? In this way, IS_FINISHED won't be needed. Assigning . to IS_FINISHED is looking good.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🫡

.padding(.bottom, 20)
Spacer()
}.padding(.leading, 10)

Copy link
Contributor

Choose a reason for hiding this comment

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

Extra new line, it can be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🫡

})

if viewModel.isShowProgress {
ProgressBar(size: 40, lineWidth: 8)
Copy link
Contributor

Choose a reason for hiding this comment

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

is this progress position expected?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed, thanks!

@IvanStepanok
Copy link
Contributor Author

Thanks guys🙌

Copy link
Contributor

@shafqat-muneer shafqat-muneer left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@volodymyr-chekyrta volodymyr-chekyrta merged commit 43056e0 into openedx:develop Mar 29, 2024
3 checks passed
@openedx-webhooks
Copy link

@IvanStepanok 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@volodymyr-chekyrta volodymyr-chekyrta deleted the feat/text_and_icons_adjustment_project branch March 29, 2024 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
open-source-contribution PR author is not from Axim or 2U
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants