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.

Sign up for GitHub

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

Jump to bottom

Development #91

Open
wants to merge 9 commits into
base: development
Choose a base branch
from
Open

Development #91

wants to merge 9 commits into from

Conversation

sagarpatel288
Copy link

Slack Id: U98P3E3H9
Slack handle: @sagar

  1. Add CustomButton that will work as both TextView and Button with color state list and Typeface support from both xml and java
  2. Add Ripple for Button (Button can be replaced by CustomButton)
  3. Add Various utils like TypefaceUtils, SharedPrefs, StringMethods, FileUtils, File provider, PermissionUtils etc... with secure singleton pattern wherever required
  4. Test ActivitySignIn (name should be in that order and not like SignInActivity) for custom views

nirbheek

@sagarpatel288
Modified .gitignore file
3ceda2a
@sagarpatel288
Modified .gitignore to original, better one
5fd53ca
@sagarpatel288
Slack Id: U98P3E3H9
b44e048 
Slack handle: @sagar
Test PR by adding _provider_ in _res/xml_ directory. Require in _AndroidManifest.xml_ file also.
@sagarpatel288
Slack Id: U98P3E3H9
26d702c 
Slack handle: @sagar
1. Add various utils like: customview, fileUtils, KeyboardUtils, PermissionUtils, SharedPreferences, StringUtils and TypefaceUtils with secure singleton where required.
2. Add _provider_ in _res/xml_ directory. Require in _AndroidManifest.xml_ file also.
3. Color state list for TextView through CustomButton
@sagarpatel288
Merge remote-tracking branch 'upstream/development' into development
1fd9866 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values/strings.xml
@sagarpatel288
Remove .MainActivity context from activity_main.xml
021ea5e
@sagarpatel288
Resolve strings.xml merge conflicts by manually copy paste as both pu…
13f5fc2 
…ll and fetch - merge failed somehow.
@sagarpatel288
1. Remove redundant activity_main.xml file
aad3350 
2. Add multiDex support
3. Add selector in action for activity_signin.xml
@sagarpatel288
Add json to gain access privileges (Should be added to .gitignore)
4cae266
@piedcipher
Copy link
Collaborator

Hello @sagarpatel288, it seems you forgot to commit your local changes. Currently there are 2 commits in PR #91 for gitignore file. You can push new commits to your fork and this PR will get modified automatically. Thank you for contributing. 👍

@piedcipher piedcipher added modifications-required PRs which requires modifications/changes enhancement New feature or request SignIn SignUp PRs For SignIn, SignUp Screen and removed modifications-required PRs which requires modifications/changes labels May 13, 2018
@piedcipher
Copy link
Collaborator

It was closed automatically due to a branch deletion. We apologize for any inconvenience.

Reopened #91

@piedcipher piedcipher reopened this May 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement New feature or request SignIn SignUp PRs For SignIn, SignUp Screen
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sagarpatel288 @piedcipher @vaishnavi-janardhan