search

rob729 / Quiet_Hours

No more trouble to make silent mode ON/OFF manually every time.
3 stars 9 forks source link

New Disabled touch on MaterialDayPicker in DetailsFragment. #38

Closed JanuKShah closed 4 years ago

JanuKShah commented 4 years ago

Fixes #17

Changes: Final changes for adding a hacky view.

rob729 commented 4 years ago

@JanuKShah First of all, you need to merge the master code properly, and in the case of merge conflicts need to solve it properly. The audio mode image view has nothing to do with this PR then why is it being shown as an addition.

JanuKShah commented 4 years ago

@JanuKShah First of all, you need to merge the master code properly, and in the case of merge conflicts need to solve it properly. The audio mode image view has nothing to do with this PR then why is it being shown as an addition.

Since I had to reset my previous commits some commits were coming in between so they were undone. That is why it is showing up as an addition.

rob729 commented 4 years ago

It is coming because either commits are not squashed properly or merge conflict not resolved properly. Have a look again at the PR.

rob729 commented 4 years ago

@JanuKShah Everything looks fine. Just squash your commits.

rob729 commented 4 years ago

@JanuKShah Any plans of squashing the commits?

JanuKShah commented 4 years ago

@JanuKShah Any plans of squashing the commits?

I am searching but it is not working since I resolved the issues on github itself

rob729 commented 4 years ago

Pull the changes to your system and then try to make the changes. I want #17 to be resolved as soon as possible because it a bug and not a feature request which can wait for a long time.