Skip to content

Conversation

@Princejhabak
Copy link
Contributor

@Princejhabak Princejhabak commented Dec 4, 2018

Fixes #1449

Changes: [Add here what changes were made in this issue and if possible provide links.]

Screenshot/s for the changes:

screenshot_20181204-111641

Checklist:

  • I have used resources from strings.xml, dimens.xml and colors.xml without hard-coding them
  • No modifications done at the end of resource files strings.xml, dimens.xml or colors.xml
  • I have reformatted code in every file included in this PR
  • My code does not contain any extra lines or extra spaces
  • I have requested reviews from other members

APK for testing:
faq.zip

}

@Override

Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this annotation removed? Please add it back.

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#fafafa"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use resources for colors and strings without hardcoding them

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@CloudyPadmal I've made the changes as per requested.

@CloudyPadmal
Copy link
Collaborator

Please update the branch you are working on. It seems to have lot of changes from the main repo.

@Princejhabak
Copy link
Contributor Author

@CloudyPadmal, I've updated my working branch as per requested.

else return value;
}
}
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hi! Please do not make any modifications to files other than the ones addressed in the issue. Please revert this new line deletion entry.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@CloudyPadmal I apologize, it might have happened while I was resolving the merge conflicts. Also could you please tell me what to do as the curly brace was on line 136 and is still on line 136 and the code is reformatted, so what should I do ??

Copy link
Collaborator

Choose a reason for hiding this comment

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

This change relates to a deletion of a new line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@CloudyPadmal I've reverted the changes, however, I tried but I was not able to squash the
commits into a single commit.

@Princejhabak Princejhabak force-pushed the faq branch 2 times, most recently from e829913 to b945660 Compare December 8, 2018 19:30
@CloudyPadmal CloudyPadmal merged commit ac2777f into fossasia:development Dec 12, 2018
neel1998 pushed a commit to neel1998/pslab-android that referenced this pull request Jul 30, 2019
* feat: Add checkable behavior to menu items under other category in the navigation drawer

* feat: Add back button in the toolbar

* feat: Improve UI of FAQs

* feat: Improve UI of FAQs
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.

2 participants