diff --git a/README.md b/README.md index f180deb268..d88254d939 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ [![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) -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. +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. -[Get it on F-Droid](https://f-droid.org/repository/browse/?fdid=com.keylesspalace.tusky) -[Get it on Google Play](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 @@ -19,22 +18,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 -If you have any bug reports, feature requests or questions please open an issue or send us a toot at [Tusky@mastodon.social](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 [Vavassor@mastodon.social](https://mastodon.social/@Vavassor). -The current maintainer is [ConnyDuck@chaos.social](https://chaos.social/@ConnyDuck). - -### Development chatroom -https://riot.im/app/#/room/#Tusky:matrix.org +This port was done by johanw666. ### diff --git a/app/build.gradle b/app/build.gradle index 59f6a57963..f6bc12ee4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { @@ -21,16 +24,31 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 70 - versionName "10.0" + versionName "10.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") diff --git a/app/src/blue/res/mipmap-hdpi/ic_launcher.png b/app/src/blue/res/mipmap-hdpi/ic_launcher.png index 2a27b8c089..d27950f664 100644 Binary files a/app/src/blue/res/mipmap-hdpi/ic_launcher.png and b/app/src/blue/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-mdpi/ic_launcher.png b/app/src/blue/res/mipmap-mdpi/ic_launcher.png index cfd10bbdf9..bd594c323b 100644 Binary files a/app/src/blue/res/mipmap-mdpi/ic_launcher.png and b/app/src/blue/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-xhdpi/ic_launcher.png b/app/src/blue/res/mipmap-xhdpi/ic_launcher.png index 513aaf8b7c..4824ef5c9c 100644 Binary files a/app/src/blue/res/mipmap-xhdpi/ic_launcher.png and b/app/src/blue/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png b/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png index cc536fe618..7541408834 100644 Binary files a/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/blue/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png index c11643c51a..2efd676e50 100644 Binary files a/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/blue/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt index ce7d7294ab..2d645edfbf 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt @@ -44,6 +44,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)) } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java index 22e13e5ec2..2ef4c28e9c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java @@ -76,7 +76,7 @@ private static Interceptor getUserAgentInterceptor() { return chain -> { Request originalRequest = chain.request(); Request requestWithUserAgent = originalRequest.newBuilder() - .header("User-Agent", "Tusky/"+ BuildConfig.VERSION_NAME+" Android/"+Build.VERSION.RELEASE) + .header("User-Agent", "Gab/"+ BuildConfig.VERSION_NAME+" Android/"+Build.VERSION.RELEASE) // JW: change user agent name .build(); return chain.proceed(requestWithUserAgent); }; diff --git a/app/src/main/res/drawable-hdpi/ic_notify.png b/app/src/main/res/drawable-hdpi/ic_notify.png index 610161ea69..96f30e95a9 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_notify.png and b/app/src/main/res/drawable-hdpi/ic_notify.png differ diff --git a/app/src/main/res/drawable-hdpi/splash.png b/app/src/main/res/drawable-hdpi/splash.png index 965c97d30f..487215631f 100644 Binary files a/app/src/main/res/drawable-hdpi/splash.png and b/app/src/main/res/drawable-hdpi/splash.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_notify.png b/app/src/main/res/drawable-mdpi/ic_notify.png index b61143b07b..68ad5ab030 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_notify.png and b/app/src/main/res/drawable-mdpi/ic_notify.png differ diff --git a/app/src/main/res/drawable-mdpi/splash.png b/app/src/main/res/drawable-mdpi/splash.png index 019fc271ff..156eba79fd 100644 Binary files a/app/src/main/res/drawable-mdpi/splash.png and b/app/src/main/res/drawable-mdpi/splash.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_notify.png b/app/src/main/res/drawable-xhdpi/ic_notify.png index 37f60b5f1d..e2f4ba583e 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_notify.png and b/app/src/main/res/drawable-xhdpi/ic_notify.png differ diff --git a/app/src/main/res/drawable-xhdpi/splash.png b/app/src/main/res/drawable-xhdpi/splash.png index b7ed665bd1..28f17ebefe 100644 Binary files a/app/src/main/res/drawable-xhdpi/splash.png and b/app/src/main/res/drawable-xhdpi/splash.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notify.png b/app/src/main/res/drawable-xxhdpi/ic_notify.png index cf90f68879..90adcda569 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_notify.png and b/app/src/main/res/drawable-xxhdpi/ic_notify.png differ diff --git a/app/src/main/res/drawable-xxhdpi/splash.png b/app/src/main/res/drawable-xxhdpi/splash.png index 0ba150ca11..1e0e7ebc4e 100644 Binary files a/app/src/main/res/drawable-xxhdpi/splash.png and b/app/src/main/res/drawable-xxhdpi/splash.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/splash.png b/app/src/main/res/drawable-xxxhdpi/splash.png index 0b656a3056..e31346d928 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/splash.png and b/app/src/main/res/drawable-xxxhdpi/splash.png differ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f4e3ae8ef0..24ba7fdc14 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -218,8 +218,10 @@ %d nieuwe interacties Besloten account Over - Tusky %s - Tusky is opensource- en vrije software. De licentie valt onder de GNU Algemene Publieke Licentie versie 3. Je kunt de licentie hier bekijken: https://www.gnu.org/licenses/gpl-3.0.nl.html + Gab %s + Gab is opensource- en vrije software. De licentie valt onder de GNU Algemene Publieke Licentie versie 3. Je kunt de licentie hier bekijken: https://www.gnu.org/licenses/gpl-3.0.nl.html\n\n + Gab is een fork van Tusky (https://github.com/tuskyapp/Tusky) die geen nodes censureert die vrijheid van meningsuiting respecteren. + Projectwebsite:\n - https://tusky.app + https://gab.com Foutmeldingen & nieuwe functies aanvragen:\n - https://github.com/tuskyapp/Tusky/issues - Tusky\'s profiel + https://github.com/johanw666/Gab/issues + Gabs profiel Deel de inhoud van de toot Deel de link van de toot Afbeeldingen diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index a561d0e4a2..4339e3d512 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,10 +1,10 @@ - https://tusky.app + https://github.com/johanw666/Gab // JW: change string %1$s %2$s oauth2redirect - com.keylesspalace.tusky.PREFERENCES + com.gabai.gabby.PREFERENCES \@ # @@ -117,12 +117,10 @@ - gab.com - gab.ai - spinster.xyz + // JW: we do not censor - https://www.youtube.com/watch?v=dQw4w9WgXcQ + https://gab.com/ // JW: change domain :-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f6b49e1953..2a183ab05b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -279,26 +279,28 @@ Locked Account About - Tusky %s - Powered by Tusky - Tusky is free and open-source software. + Gab %s + Powered by Gab + Gab is free and open-source software. It is licensed under the GNU General Public License Version 3. - You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html + You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html .\n\n + Gab is a fork of Tusky (https://github.com/tuskyapp/Tusky) that does not censor free-speech nodes. + - + Project website:\n - https://tusky.app + https://gab.com - + Bug reports & feature requests:\n - https://github.com/tuskyapp/Tusky/issues + https://github.com/johanw666/Gab/issues - Tusky\'s Profile + Gabs Profile Share content of toot Share link to toot @@ -378,7 +380,7 @@ Expand/Collapse all statuses Open toot App restart required - You\'ll need to restart Tusky in order to apply these changes + You\'ll need to restart Gab in order to apply these changes Later Restart Your device\'s default emoji set @@ -394,7 +396,7 @@ Boost to original audience Unboost - Tusky contains code and assets from the following open source projects: + Gab contains code and assets from the following open source projects: Licensed under the Apache License (copy below) CC-BY 4.0 CC-BY-SA 4.0 diff --git a/instance-build.gradle b/instance-build.gradle index eec6fcac12..c4b8d95745 100644 --- a/instance-build.gradle +++ b/instance-build.gradle @@ -4,16 +4,16 @@ Note: Publishing a custom build on Google Play may violate the Google Play devel */ // The app name -ext.APP_NAME = "Tusky" +ext.APP_NAME = "Gab" // The application id. Must be unique, e.g. based on your domain -ext.APP_ID = "com.keylesspalace.tusky" +ext.APP_ID = "com.gabai.gabby" // url of a custom app logo. Recommended size at least 600x600. Keep empty to use the Tusky elephant friend. ext.CUSTOM_LOGO_URL = "" // e.g. mastodon.social. Keep empty to not suggest any instance on the signup screen -ext.CUSTOM_INSTANCE = "" +ext.CUSTOM_INSTANCE = "gab.com" // link to your support account. Will be linked on the about page when not empty. -ext.SUPPORT_ACCOUNT_URL = "https://mastodon.social/@Tusky" \ No newline at end of file +ext.SUPPORT_ACCOUNT_URL = "" \ No newline at end of file