Skip to content

Commit

Permalink
Merge branch 'release/2.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
adrian-miasik committed Mar 30, 2022
2 parents 5c61744 + 9f465c6 commit c878f6d
Show file tree
Hide file tree
Showing 80 changed files with 836 additions and 1,429 deletions.
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
name: User Bug Report
about: Please use this template to submit and report bugs to the project.
title: ''
labels: ''
assignees: ''

---

# User Bug Report
> Please remove each quote `>` section and populate the fields accordingly.
> To see an example of a properly formatted bug report please refer to this correctly submitted [issue.](https://github.com/adrian-miasik/unity-pomodoro/issues/20)
>
> **Note: This quote section can be deleted without filling in any information.**
## Description
> [REQUIRED]
>
> - A clear and concise description of what the bug is
## Reproduction Steps
> [REQUIRED]
> 1. Go to '...'
> 2. Click on '....'
> 3. Scroll down to '....'
> 4. ...
## Impacted Version(s)
> [REQUIRED]
> - Version: 2.0.0
## Impacted Platform(s)
> [REQUIRED]
> - Windows - Universal Windows Platform / UWP
> - Windows
> - Mac
> - Linux
## Expected Behaviour
> [OPTIONAL]
> - A clear and concise description of what you expected to happen.
## Screenshots
> [OPTIONAL]
> If applicable, add screenshots to help explain your problem.
## Additional Context/Comments
> [OPTIONAL]
> - Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Thank you again for your contribution!

You're almost there. There's a couple more steps left, please make sure you鈥檝e:

- [ ] Create a discussion page for your contribution / this PR (and provide a link below).
- [ ] Adhereing to a very similar/same coding style in your code.
- [ ] Tested this PR on as many target platforms as you could. If you鈥檝e not tested this on certain platforms, please list out which one鈥檚 you haven鈥檛 tested below.

---

- Discussion URL:
- Platforms that need further testing:
- Platform One
- Platform Two
- Etc...

---

Once you鈥檝e done the above...
- [ ] Please assign this PR to our maintainer: (@adrian-miasik)
90 changes: 90 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# Contributor Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate as they see fit.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are to respect the privacy and security of the
reporter of any incident as they see fit.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).

[homepage]: https://www.contributor-covenant.org

For answers to common questions about the attributed code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.

---

We may modify these terms / this conduct at any time without prior notice.
If you do not agree to this code of conduct or it does not align with you, we advise you don't engage in the community or come forward with a proposal to our code of conduct.
We strive to be open to any changes that are proposed, but reserve the right to decline or not move forward with any proposal.
This code of conduct is a general guideline to our community and we will be examining each situation on a case-by-case basis.
User discretion advised.
9 changes: 9 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Contributing to Unity Pomodoro
馃帀 First off, thanks for taking the time to contribute! 馃帀

### How to Start
- Please see our [code of conduct](/CODE_OF_CONDUCT.md) prior to contribution.
- The best way to start contributing is to open a line of dialog in our [discussions page](https://github.com/adrian-miasik/unity-pomodoro/discussions). I'm asking potential contributors to come forward with a discussion prior to doing any work.
- In the discussions page you can propose ideas, pull requests, and discuss how you'd like to help out. Even fixing typos is highly appreciated!
- We reserve the right to decline any proposals but likely will accept any help we can get. 馃槂
- Once your contribution is accepted and merged we will modify the credits bubble to include your github name and link if you'd like.
25 changes: 10 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
<a href="https://adrian-miasik.github.io/unity-pomodoro-docs/">Documentation</a> &bull;
<a href="#downloads">Downloads</a> &bull;
<a href="#media">Screenshots</a> &bull;
<a href="https://github.com/adrian-miasik/unity-pomodoro/wiki">Wiki</a> &bull;
<a href="#author-notes">Author Notes</a> &bull;
<a href="#donate">Donate</a> &bull;
<a href="#contribute">Contribute</a> &bull;
<a href="/CONTRIBUTING.md">Contribute</a> &bull;
<a href="#contact-us--support-line">Support</a> &bull;
<a href="#contact-us--support-line">Contact</a>
</p>
Expand All @@ -25,33 +24,34 @@

Unity Pomodoro is an open source countdown timer app created in Unity designed primarily for desktop use. Unity Pomodoro is a time management tool based on the pomodoro technique, the aim is to improve your productivity by introducing timers for both your work and break sessions. Quickly swap between the two timers to keep you on track and focused.

**Platforms**: Windows, Mac, & Linux
**Platforms**: Windows, Mac, & Linux. (Android coming soon!)

**Version**: 1.9.0
**Version**: 2.0.0

**Author**: **[`Adrian Miasik`](https://adrian-miasik.com)**

**License**: [GPL-3.0](LICENSE)

**Contributor(s)**: `-`
Want to help? If you're interested in contributing to the project, please see the <a href="#contribute">contribute</a> section.
Want to help? If you're interested in contributing to the project, please see our <a href="/CONTRIBUTING.md">contribution</a> document.

&nbsp;
## Downloads
### [Latest Release - v1.9.0](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.9.0)
### [Latest Release - v2.0.0](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v2.0.0)
#### Direct
- Windows
- [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.9.0/unity-pomodoro-1.9.0-windows-desktop-64-bit.zip)
- [32-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.9.0/unity-pomodoro-1.9.0-windows-desktop-32-bit.zip)
- [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v2.0.0/unity-pomodoro-2.0.0-windows-desktop-64-bit.zip)
- [32-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v2.0.0/unity-pomodoro-2.0.0-windows-desktop-32-bit.zip)
- Mac
- [Universal](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.9.0/unity-pomodoro-1.9.0-mac-desktop-universal.zip)
- [Universal](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v2.0.0/unity-pomodoro-2.0.0-mac-desktop-universal.zip)
- Linux
- [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v1.9.0/unity-pomodoro-1.9.0-linux-desktop-64-bit.zip)
- [64-bit](https://github.com/adrian-miasik/unity-pomodoro/releases/download/v2.0.0/unity-pomodoro-2.0.0-linux-desktop-64-bit.zip)
#### Platform Specific
- [Microsoft Store (Universal Windows Platform)](https://www.microsoft.com/en-us/p/unity-pomodoro/9nbzqpmx9x7n)
- The UWP version provides **Windows Notifications** when the timer is complete.
- The UWP version provides **Windows Launcher** when a user interacts with a URL.
### Previous Releases
- [v1.9.0 - Release Media Generator & 'Set Pomodoro Count' Settings Option](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.9.0)
- [v1.8.0 - End Timestamp, Skip Button, Sidebar Improvements, Toggle Long Breaks, and More!](https://github.com/adrian-miasik/unity-pomodoro/tree/v1.8.0)
- [v1.7.1 - Long Breaks, Documentation, and Bugfixes](https://github.com/adrian-miasik/unity-pomodoro/tree/v1.7.1)
- [v1.6.0 - Confirmation Dialogs & 'Mute Audio When Out Of Focus' Settings Option](https://github.com/adrian-miasik/unity-pomodoro/releases/tag/v1.6.0)
Expand Down Expand Up @@ -108,11 +108,6 @@ Want to help? If you're interested in contributing to the project, please see th
## Donate
If you'd like to support my work, you can donate to help support this project via [GitHub Sponsors](https://github.com/sponsors/adrian-miasik) 鉂わ笍

## Contribute
Interested in contributing?
Send me an email `[email protected]` & poke me to make a contributing doc.
We will also modify the credits bubble to include contributors if people start contributing.

## Contact Us / Support Line
Need help? Found a bug?
Send your questions, bug reports, and other support related inquiries to:
Expand Down
19 changes: 14 additions & 5 deletions UnityPomodoro/Assembly-CSharp-Editor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -683,12 +683,15 @@
<Reference Include="Unity.RenderPipelines.Universal.Shaders">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll</HintPath>
</Reference>
<Reference Include="Unity.Recorder.Base">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
<Reference Include="Unity.Notifications">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Notifications.dll</HintPath>
</Reference>
<Reference Include="Unity.RenderPipelines.Universal.Runtime">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll</HintPath>
</Reference>
<Reference Include="Unity.Recorder.Base">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Recorder.Base.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference>
Expand All @@ -713,15 +716,15 @@
<Reference Include="Unity.2D.Sprite.Editor">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Services.Analytics">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Services.Analytics.dll</HintPath>
</Reference>
<Reference Include="Unity.RenderPipelines.Core.Runtime">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.UI">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
</Reference>
<Reference Include="Unity.Services.Analytics">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Services.Analytics.dll</HintPath>
</Reference>
<Reference Include="Unity.Rider.Editor">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
</Reference>
Expand All @@ -731,6 +734,9 @@
<Reference Include="UnityEngine.UI">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="Unity.Notifications.iOS">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Notifications.iOS.dll</HintPath>
</Reference>
<Reference Include="Unity.Services.Core">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Services.Core.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -764,6 +770,9 @@
<Reference Include="Unity.Mathematics.Editor">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Notifications.Android">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.Notifications.Android.dll</HintPath>
</Reference>
<Reference Include="Unity.RenderPipelines.Core.Editor">
<HintPath>C:/Users/user/Documents/RBLB/git-repositories/unity-pomodoro/UnityPomodoro/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll</HintPath>
</Reference>
Expand Down
Loading

0 comments on commit c878f6d

Please sign in to comment.