Skip to content

Commit

Permalink
Removed censorship. Added a Gab branding. Split output into abi speci…
Browse files Browse the repository at this point in the history
…fic apk's.
  • Loading branch information
johanw666 committed Feb 24, 2021
1 parent cf6e8bd commit 2ef3700
Show file tree
Hide file tree
Showing 86 changed files with 340 additions and 413 deletions.
24 changes: 6 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
[![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/) [![Build Status](https://app.bitrise.io/app/a3e773c3c57a894c/status.svg?token=qLu_Ti4Gp2LWcYT4eo2INQ&branch=master)](https://app.bitrise.io/app/a3e773c3c57a894c#/builds)
# Tusky
# Gab

![](/fastlane/metadata/android/en-US/images/icon.png)
Gab is a beautiful Android client for [Mastodon](https://github.com/tootsuite/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.

Tusky is a beautiful Android client for [Mastodon](https://github.com/tootsuite/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.

[<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)
Gab is a fork of Tusky (https://github.com/tuskyapp/Tusky) that does not censor free-speech nodes.

## Features

Expand All @@ -19,23 +15,15 @@ Tusky is a beautiful Android client for [Mastodon](https://github.com/tootsuite/
- Optimized for all screen sizes
- Completely open-source - no non-free dependencies like Google services

### Testing

The nightly build from master is [available on Google Play](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky.test).

### Support

Check out our [FAQs](https://github.com/tuskyapp/faq), your question may already be answered.
If you have any bug reports, feature requests or questions please open an issue or send us a toot at [[email protected]](https://mastodon.social/@Tusky)!
If you have any bug reports, feature requests or questions please open an issue.

For translating Tusky into your language, visit https://weblate.tusky.app/
For translating Gab-changed strings into your language, please open an issue.

### Head of development

This app was developed by [[email protected]](https://mastodon.social/@Vavassor).
The current maintainer is [[email protected]](https://chaos.social/@ConnyDuck).

### Development chatroom
https://riot.im/app/#/room/#Tusky:matrix.org
This port was done by johanw666.

###
20 changes: 19 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ apply plugin: 'kotlin-kapt'
apply from: "../instance-build.gradle"

def getGitSha = {
/*
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = stdout
}
return stdout.toString().trim()
*/
return ""; // JW
}

android {
Expand All @@ -21,16 +24,31 @@ android {
minSdkVersion 21
targetSdkVersion 29
versionCode 80
versionName "14.0"
versionName "14.0.0-JW"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true

resValue "string", "app_name", APP_NAME
setProperty("archivesBaseName", "Gab-$versionName") // JW: added

buildConfigField("String", "CUSTOM_LOGO_URL", "\"$CUSTOM_LOGO_URL\"")
buildConfigField("String", "CUSTOM_INSTANCE", "\"$CUSTOM_INSTANCE\"")
buildConfigField("String", "SUPPORT_ACCOUNT_URL", "\"$SUPPORT_ACCOUNT_URL\"")

// JW: add abifilters
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}

splits {
abi {
enable true
reset()
include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
universalApk true
}
}

kapt {
arguments {
arg("room.schemaLocation", "$projectDir/schemas")
Expand Down
Binary file modified app/src/blue/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/blue/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/blue/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/blue/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/green/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/green/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/green/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/green/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/green/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ class AboutActivity : BottomSheetActivity(), Injectable {
viewUrl(BuildConfig.SUPPORT_ACCOUNT_URL)
}

// JW: added
if(BuildConfig.SUPPORT_ACCOUNT_URL.isBlank()) {
tuskyProfileButton.hide()
}

aboutLicensesButton.setOnClickListener {
startActivityWithSlideInAnimation(Intent(this, LicenseActivity::class.java))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class NetworkModule {
val requestWithUserAgent = chain.request().newBuilder()
.header(
"User-Agent",
"Tusky/${BuildConfig.VERSION_NAME} Android/${Build.VERSION.RELEASE} OkHttp/${OkHttp.VERSION}"
"Gab/${BuildConfig.VERSION_NAME} Android/${Build.VERSION.RELEASE} OkHttp/${OkHttp.VERSION}" // JW: change user agent name
)
.build()
chain.proceed(requestWithUserAgent)
Expand Down
Binary file modified app/src/main/res/drawable-hdpi/ic_notify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-hdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/ic_notify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 0 additions & 51 deletions app/src/main/res/drawable-v24/ic_notoemoji.xml

This file was deleted.

14 changes: 0 additions & 14 deletions app/src/main/res/drawable-v26/ic_launcher_foreground.xml

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/drawable-v26/launcher_shadow_gradient.xml

This file was deleted.

Binary file modified app/src/main/res/drawable-xhdpi/ic_notify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_notify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxxhdpi/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

This file was deleted.

Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
6 changes: 3 additions & 3 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,9 @@
* the url can be changed to link to the localized version of the license.
-->
<string name="about_project_site">موقع المشروع :\n
https://tusky.app</string>
https://gab.app</string>
<string name="about_bug_feature_request_site">تقارير الأخطاء و طلبات التحسينات على :\n
https://github.com/tuskyapp/Tusky/issues</string>
https://github.com/johanw666/Gab/issues</string>
<string name="about_tusky_account">الملف الشخصي لتوسكي</string>
<string name="status_share_content">شارك محتوى التبويق</string>
<string name="status_share_link">شارك الرابط إلى التبويق</string>
Expand Down Expand Up @@ -463,7 +463,7 @@
<string name="title_bookmarks">الفواصل المرجعية</string>
<string name="action_bookmark">أضفه إلى الفواصل المرجعية</string>
<string name="action_view_bookmarks">الفواصل المرجعية</string>
<string name="about_powered_by_tusky">مدعوم بِـ Tusky</string>
<string name="about_powered_by_tusky">مدعوم بِـ Gab</string>
<string name="description_status_bookmarked">أضيف إلى الفواصل المرجعية</string>
<string name="select_list_title">اختر قائمة</string>
<string name="list">القائمة</string>
Expand Down
Loading

0 comments on commit 2ef3700

Please sign in to comment.