Skip to content
This repository has been archived by the owner on Jul 25, 2024. It is now read-only.

Fixes #433, Fixed disappearing ProgressDialog on touch #446

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

DravitLochan
Copy link
Collaborator

@DravitLochan DravitLochan commented Mar 5, 2017

Fix:433

Summary of changes

While connecting to server, refreshing, deleting a db or at the time of logout, Progress dialog box won't be dismissed by taping outside the box.

  • Code is formatted.

  • Run the lint tests with ./gradlew lintDebug and make sure BUILD is SUCCESSFUL

  • If new feature is implemeted then it is compatible with Night theme too.

  • Commit messages are well-written.

@smarx
Copy link

smarx commented Mar 5, 2017

Automated message from Dropbox CLA bot

@DravitLochan, it looks like you've already signed the Dropbox CLA. Thanks!

@@ -2095,9 +2095,6 @@ public void onClick(
//else Narrow to Today
onNarrow(new NarrowFilterByDate());
break;
case R.id.isStarred:
onNarrow(new NarrowFilterStar());
break;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why removing this?
I see your branch is not up-to-date with master.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i'll update it

@DravitLochan DravitLochan force-pushed the master branch 2 times, most recently from 23ba45b to 3db202c Compare March 5, 2017 10:38
@kunall17
Copy link
Collaborator

kunall17 commented Mar 6, 2017

Again you are calling setCancelable before showWithMessage!

@DravitLochan
Copy link
Collaborator Author

Ya. It's working fine.

made the branch even with master

on selecting refres from overflow menu,progress dialog appears only if connected to network
@DravitLochan DravitLochan changed the title Fixed disappearing ProgressDialog on touch Fixes #433, Fixed disappearing ProgressDialog on touch Mar 7, 2017
@DravitLochan
Copy link
Collaborator Author

@saketkumar95 is there anything to change in this pr?

@DravitLochan
Copy link
Collaborator Author

@kunall17 ???

@brainwane
Copy link
Contributor

@DravitLochan Hi and thanks for your pull request. I am not an Android developer so I can't really review your code, but I can help you with the style of your PR to make it easier for others to review!

Here's a guide to help you write commit messages that are more consistent with our style, which makes it easier for us in the future -- when someone's trying to solve a new problem, if commit messages are all in the same format, it's easier to skim them in logs and quickly understand what's happening.

Here are some tips on tidying your commit history, including changing your commit messages. And when you update your code or your commit message, you can update your pull request and the changes will appear here. :)

@DravitLochan
Copy link
Collaborator Author

Thanks @brainwane I have once again gone through the link you've attached. But I think I have followed them. please correct me if I am wrong...
thanks once again!

@brainwane
Copy link
Contributor

@DravitLochan Please take another look at https://zulip.readthedocs.io/en/latest/version-control.html#commit-messages . Zulip’s preferred style for this is to have the final paragraph of the commit message have the issue number with "Fixes:" before it, as in:

Fixes: #nnn.

Also, please use complete sentences, with proper punctuation, spacing, capitalization, etc. We have free English tutoring sessions in the next few weeks and days that can help you with grammar more generally! Here your commit message could be something like:

Fix disappearing ProgressDialog on touch.

When the user selects "refresh" from the overflow menu,
the progress dialog should only appear if the user is connected
to the network.

Fixes: #433.

If anything in my suggested commit message is inaccurate then of course please fix the inaccuracy in your revised message. :) Thanks.

@DravitLochan
Copy link
Collaborator Author

@brainwane I think you caught something wrong. The purpose ain't that. {When the user selects "refresh" from the overflow menu,
the progress dialog should only appear if the user is connected
to the network.}

@kunall17 can you please make the changes so that I can get to know where I am doing wrong?

@zulipbot
Copy link
Member

zulipbot commented May 4, 2017

@DravitLochan, your pull request has developed a merge conflict! Please review the most recent commit (f791888) for conflicting changes and resolve your pull request's merge conflicts.

@brainwane
Copy link
Contributor

@DravitLochan if I've misunderstood the purpose of your commit, then please explain the purpose so someone can clearly understand it. Thanks! :)

@DravitLochan
Copy link
Collaborator Author

I think functionality has been added properly. It's just the commit messages. That would be great help if someone from mentors can make the changes and guide me. :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants