Skip to content

Commit

Permalink
refactor: Transition from Tusky to Pachli
Browse files Browse the repository at this point in the history
- Rename packages to app.pachli.*
- Switch to Pachli icons (blue / orange)
- Reset database schema version to 1
- Reset versionCode to 1 and versionName to "1.0"
- Update colour scheme, use colorPrimary etc through the app
- Use Material UI components for toolbars
- Use "Pachli" in strings (UI, constants, etc)
- Update copyright on code I contributed
- Update README
- Update fastlane metadata
  • Loading branch information
nikclayton committed Sep 5, 2023
1 parent a441576 commit 1bf13b1
Show file tree
Hide file tree
Showing 1,353 changed files with 5,359 additions and 46,409 deletions.
1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
run: ./gradlew clean ktlintCheck

- name: Regular lint
run: ./gradlew app:lintGreenDebug
run: ./gradlew app:lintOrangeDebug

- name: Test
run: ./gradlew app:testGreenDebugUnitTest
run: ./gradlew app:testOrangeDebugUnitTest

- name: Build
run: ./gradlew app:buildGreenDebug
run: ./gradlew app:buildOrangeDebug
2 changes: 1 addition & 1 deletion .github/workflows/ktlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

- uses: actions/setup-java@v3
with:
distribution: 'corretto'
distribution: 'temurin'
java-version: '17'
cache: 'gradle'

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/populate-gradle-build-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build:
name: app:buildGreenDebug
name: app:buildOrangeDebug
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -30,5 +30,5 @@ jobs:
with:
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}

- name: Run app:buildGreenDebug
run: ./gradlew app:buildGreenDebug
- name: Run app:buildOrangeDebug
run: ./gradlew app:buildOrangeDebug
Binary file modified .idea/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 50 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,64 @@
[![Translate - with Weblate](https://img.shields.io/badge/translate%20with-Weblate-green.svg?style=flat)](https://weblate.tusky.app/) [![OpenCollective](https://opencollective.com/tusky/backers/badge.svg)](https://opencollective.com/tusky/)
# Tusky
<!--
TODO: Update when Weblate is configured:
[![Translate - with Weblate](https://img.shields.io/badge/translate%20with-Weblate-green.svg?style=flat)](https://weblate.tusky.app/)
-->

<!--
TODO: Update when deployed to the different stores.
[<img src="/assets/fdroid_badge.png" alt="Get it on F-Droid" height="80" />](https://f-droid.org/repository/browse/?fdid=app.pachli)
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="80" />](https://play.google.com/store/apps/details?id=app.pachli)
-->
# Pachli

<img src="/fastlane/metadata/android/en-US/images/icon.png" width="120" height="120"/>

Tusky is a beautiful Android client for [Mastodon](https://github.com/mastodon/mastodon). Mastodon is an ActivityPub federated social network. That means no single entity controls the whole network, rather, like e-mail, volunteers and organisations operate their own independent servers, users from which can all interact with each other seamlessly.
Pachli is a full-featured Android client for Mastodon, with a cooperative development model.

Features include:

[<img src="/assets/fdroid_badge.png" alt="Get it on F-Droid" height="80" />](https://f-droid.org/repository/browse/?fdid=com.keylesspalace.tusky)
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="80" />](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky&utm_source=github&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1)
- Read, reply, filter, post, favourite, and boost posts
- Your timeline is cached locally, so you can read when offline
- Draft posts now to finish them later
- Write posts now and schedule them to send later
- Read and post from multiple accounts
- Manage who you follow with multiple lists
- Use different themes to customise the UI
- A variety of accessible fonts in different sizes
- Full control over how and when you receive notifications
- Explore trending posts, links, and hashtags

## Features
Pachli is open source.

- Material Design
- Most Mastodon APIs implemented
- Multi-Account support
- Dark, light and black themes with the possibility to auto-switch based on the time of day
- Drafts - compose posts and save them for later
- Choose between different emoji styles
- Optimized for all screen sizes
- Completely open-source - no non-free dependencies like Google services
Install the newest release from the [list of releases](https://github.com/tuskyapp/Tusky/releases) (links to Google Play and F-Droid will be here as soon as Pachli is available in those app stores)

### Testing
## Support

The nightly build containing the newest development code is [available on Google Play](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky.test).
<!-- TODO: Link to rewritten FAQ when complete -->

### Support
- Say "hi" on Mastodon, we're [@pachli@mastodon.social](https://mastodon.social/@pachli)
- Join the ongoing [discussions](https://github.com/pachli/pachli-android/discussions)
- Report a bug or make a feature request as a [new issue](https://github.com/pachli/pachli-android/issues)

Check out our [FAQs](https://github.com/tuskyapp/faq/blob/main/README.md), your question may already be answered.
If you have any bug reports, feature requests or questions please open an issue or send us a message at [[email protected]](https://mastodon.social/@Tusky)!
<!--
TODO: Rewrite and restore this section when the contributing guide is up to date
### Contributing
We always welcome new contributors! Please read our [contribution guide](https://github.com/tuskyapp/Tusky/blob/develop/CONTRIBUTING.md) to get started.
### Development chatroom
https://riot.im/app/#/room/#Tusky:matrix.org
-->

## Contributing

We actively welcome new contributors. `CONTRIBUTING.md` in this repository is functional but out of date at the moment, but should be fully fleshed out by the middle of September 2023.

If you want to contribute in the meantime please don't hesitate to ask questions.

## More information

More information about the application and the principals underpinning its development are at https://pachli.app.
26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ apply from: 'getGitSha.gradle'
final def gitSha = ext.getGitSha()

// The app name
final def APP_NAME = "Tusky"
final def APP_NAME = "Pachli"
// The application id. Must be unique, e.g. based on your domain
final def APP_ID = "com.keylesspalace.tusky"
// url of a custom app logo. Recommended size at least 600x600. Keep empty to use the Tusky elephant friend.
final def APP_ID = "app.pachli"
// url of a custom app logo. Recommended size at least 600x600. Keep empty to use the default logo.
final def CUSTOM_LOGO_URL = ""
// e.g. mastodon.social. Keep empty to not suggest any instance on the signup screen
final def CUSTOM_INSTANCE = ""
// link to your support account. Will be linked on the about page when not empty.
final def SUPPORT_ACCOUNT_URL = "https://mastodon.social/@Tusky"
final def SUPPORT_ACCOUNT_URL = "https://mastodon.social/@Pachli"

android {
compileSdk 33
namespace "com.keylesspalace.tusky"
namespace "app.pachli"
defaultConfig {
applicationId APP_ID
namespace "com.keylesspalace.tusky"
namespace "app.pachli"
minSdk 23
targetSdk 33
versionCode 113
versionName "23.0"
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true

Expand All @@ -52,9 +52,9 @@ android {
flavorDimensions += "color"
productFlavors {
blue {}
green {
resValue "string", "app_name", APP_NAME + " Test"
applicationIdSuffix ".test"
orange {
resValue "string", "app_name", APP_NAME + " Current"
applicationIdSuffix ".current"
versionNameSuffix "-" + gitSha
}
}
Expand Down Expand Up @@ -108,7 +108,7 @@ android {
}
applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
outputFileName = "Tusky_${variant.versionName}_${variant.versionCode}_${gitSha}_" +
outputFileName = "Pachli_${variant.versionName}_${variant.versionCode}_${gitSha}_" +
"${variant.flavorName}_${buildType.name}.apk"
}
}
Expand Down Expand Up @@ -178,7 +178,7 @@ dependencies {
implementation libs.unified.push

implementation libs.bundles.xmldiff

implementation libs.bundles.aboutlibraries

testImplementation libs.androidx.test.junit
Expand Down
Loading

0 comments on commit 1bf13b1

Please sign in to comment.