search

rob729 / Quiet_Hours

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

Added TimeStamp to profile. #29

Closed Haid-Faiz closed 4 years ago

Haid-Faiz commented 4 years ago

Fixes #2

Changes: Added TimeStamp feature to profile

Screenshots for the change: Screenshot_20201010-153304_Quiet Hours

Haid-Faiz commented 4 years ago

@rob729 Now, this time only one commit is there.. Please have a look.

rob729 commented 4 years ago

@Haid-Faiz I have also commented on some other things also. Please also have a look at them.

Haid-Faiz commented 4 years ago

@rob729 i directly updated item_row.xml from github itself but now again it is showing 2 commits on github,,. So, can we squash commits directly from github....??

Haid-Faiz commented 4 years ago

@Haid-Faiz I have also commented on some other things also. Please also have a look at them.

@rob729 ok

rob729 commented 4 years ago

I don't think we can squash commits from Github.

rob729 commented 4 years ago

You will have to learn about squashing commits. You can't escape it at least while contributing to this project.

Haid-Faiz commented 4 years ago

You will have to learn about squashing commits. You can't escape it at least while contributing to this project.

@rob729 Ok, let me squash them from git..

rob729 commented 4 years ago

@Haid-Faiz Share the git commands you are using for squashing the commits. It feels like this PR is also heading towards a mess.

Haid-Faiz commented 4 years ago

@Haid-Faiz Share the git commands you are using for squashing the commits. It feels like this PR is also heading towards a mess.

@rob729 i am facing some problem... I successfully squashed commits from android studio terminal but as i pushed those changes of squashed commits then it shows me error in pushing with option merge & rebase & cancel... i also read on google that firstly we need to pull before pushing so i also did in this way.... but after successfully squashing it shows error in pushing....

In this way i am squashing the commits..

Haid-Faiz commented 4 years ago

@rob729 as i am pushing after squashing then it is showing me this dialog..... Screenshot (171)

rob729 commented 4 years ago

I don't think you are squashing the commits properly, Have you seen the video shared in the Gitter channel properly?

Haid-Faiz commented 4 years ago

I don't think you are squashing the commits properly, Have you seen the video shared in the Gitter channel properly?

@rob729 Ya i watched it properly infect i watched some more tutorial and read articles...

and when does android studio/Git shows this dialog message (which i enclosed in screenshot.)

rob729 commented 4 years ago

git rebase -i HEAD~n where n is the number of commits you want to squash. Then you will be shown a list of commits and then pick only one commit and select s for other commits. Then you save the changes and after saving the changes the commit message list is shown. You keep only the relevant commit message and remove all other messages. Then save those changes and exit. After this, you will see that instead of n commits only one commit is present. Now when you will try to push those changes the terminal will show an error because the head of the local branch and branch present on Github is different. Use git push -f to push the new changes. In this whole process, no new commit will be added. If you follow the above instructions and the video shared in the Gitter channel then you should be able to do it properly. Before doing this process, get rid of those unnecessary commits you have added using the git reset command.

Haid-Faiz commented 4 years ago

@rob729 Updated... Now only one commit is there.... Thanks for your guidance... before i wasn't doing Forced pushed... Means that's why it was causing me error. :)

Haid-Faiz commented 4 years ago

@rob729 okk.... i forgot to update that margin

Haid-Faiz commented 4 years ago

@rob729 Kindly also Check my RoomDatabase migration policy code.... because i just Checked to install previous version from play store then on installing this latest version with migration policy... it's still getting crashed... Is i wrote the wrong code...??

rob729 commented 4 years ago

@Haid-Faiz https://github.com/rob729/Quiet_Hours/suites/1324886160/artifacts/21157792 Use this link to install the app. After installing the app, create some profiles in it. Now install the app from the android studio and it should act as an update to the already installed app. Check if the app is crashing or not. Incase the android studio prompts to uninstall the existing version of the app then inform me.

Haid-Faiz commented 4 years ago

@rob729 this app is not getting installed from above link... Screenshot_20201012-183511_Package installer.jpg

rob729 commented 4 years ago

Do you already have an installed version of quiet hours?

Haid-Faiz commented 4 years ago

@rob729 No, i deleted that before installing

rob729 commented 4 years ago

@Haid-Faiz I have checked the code for migration. It is fine. Change the top margin of the profile name and upload the screenshot.

Haid-Faiz commented 4 years ago

@rob729 Okk then... Thanks

Haid-Faiz commented 4 years ago

@rob729 Fix #29 Updated ProfileName top margin...

Screenshot_20201012-195915_Quiet_Hours 1

rob729 commented 4 years ago

give @Haid-Faiz 75 points

Haid-Faiz commented 4 years ago

@Haid-Faiz Congratulations on your 1st contribution to Quiet Hours.

@rob729 Thanks Robin Bhaiya... Actually before SLoP i didn't work on Git & Github very much... i only used to do basic git operations.... But now my level of Git has enhanced after this project & learned about new topics like conflicts & Squashing, etc. Thanks to you & SLoP 👍 .