From 68a9eba86839c2eaaf59ee527cdf16f59b3f017c Mon Sep 17 00:00:00 2001 From: Poussinou Date: Sat, 30 Jul 2022 18:22:09 +0200 Subject: [PATCH 1/3] Create FUNDING.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..c7d42493d --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: mastodon +open_collective: # Replace with a single Open Collective username e.g., user1 +ko_fi: # Replace with a single Ko-fi username e.g., user1 +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username e.g., user1 +issuehunt: # Replace with a single IssueHunt username e.g., user1 +otechie: # Replace with a single Otechie username e.g., user1 +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] From df1d451e829bb03ab759f60d93835008ab19685e Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 22 Nov 2022 04:28:10 +0100 Subject: [PATCH 2/3] Add note on contributions and trademarks to README --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8305ceda3..0f82c4dd4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ -# Mastodon for Android +Mastodon for Android +====================== + [![Crowdin](https://badges.crowdin.net/mastodon-for-android/localized.svg)](https://crowdin.com/project/mastodon-for-android) This is the repository for the official Android app for Mastodon. -Learn more about this app in the [blog post](https://blog.joinmastodon.org/2022/02/official-mastodon-for-android-app-is-coming-soon/). +## Contributing + +Our goal is delivering a polished, professionally designed and user-friendly app. We proceed according to wireframes provided by a professional UX designer that works with Mastodon gGmbH. This means that any outside contributions that change the app visually must first be coordinated with the UX designer. *This can take time.* Furthermore, we work off of an internal roadmap and aim for feature-parity and consistency with our iOS app. The iOS app is designated as the "primary" between the two, therefore, if you want to request features, please do so in the [Mastodon for iOS](https://github.com/mastodon/mastodon-ios) repository, as you are requesting a feature to be both in iOS and Android (exceptions being system integrations specific to Android). On the other hand, any contributions that improve existing functionality, performance, or accessibility should not have any roadblocks to being merged. ## Building @@ -17,4 +21,6 @@ As this app is using Java 17 features, you need JDK 17 or newer to build it. Oth ## License -This project is released under the [GPL-3 License](./LICENSE). \ No newline at end of file +This project is released under the [GPL-3 License](./LICENSE). + +The Mastodon name and logo are trademarks of Mastodon gGmbH. If you intend to redistribute a modified version of this app, use a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH. From 9facdb938d798e139b8da8bc9be6c7d344792ae8 Mon Sep 17 00:00:00 2001 From: Grishka Date: Tue, 22 Nov 2022 11:48:02 +0400 Subject: [PATCH 3/3] Add a section about translations to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0f82c4dd4..326d74f52 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ This is the repository for the official Android app for Mastodon. Our goal is delivering a polished, professionally designed and user-friendly app. We proceed according to wireframes provided by a professional UX designer that works with Mastodon gGmbH. This means that any outside contributions that change the app visually must first be coordinated with the UX designer. *This can take time.* Furthermore, we work off of an internal roadmap and aim for feature-parity and consistency with our iOS app. The iOS app is designated as the "primary" between the two, therefore, if you want to request features, please do so in the [Mastodon for iOS](https://github.com/mastodon/mastodon-ios) repository, as you are requesting a feature to be both in iOS and Android (exceptions being system integrations specific to Android). On the other hand, any contributions that improve existing functionality, performance, or accessibility should not have any roadblocks to being merged. +If you would like to help translate the app into your language, please go to [Crowdin](https://crowdin.com/project/mastodon-for-android). If your language is not listed in the Crowdin project, please create an issue and we will add it. Please do not create pull requests that modify `strings.xml` files for languages other than English. + ## Building As this app is using Java 17 features, you need JDK 17 or newer to build it. Other than that, everything is pretty standard. You can either import the project into Android Studio and build it from there, or run the following command in the project directory: