Removed censorship. Added a Gab branding. Split output into abi speci…

…fic apk's.

README.md

@@ -1,41 +1,29 @@
-[![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=develop)](https://app.bitrise.io/app/a3e773c3c57a894c) 
-# Tusky
+# Gab
 
-<img src="/fastlane/metadata/android/en-US/images/icon.png" width="120" height="120"/>
+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/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.
-
-[<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
 
 - 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
+- Drafts - compose toots 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
 
-### 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 message 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.
 
 ### 

app/build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'kotlin-parcelize'
 apply from: "../instance-build.gradle"
 
 def getGitSha = {
+/*
     def stdout = new ByteArrayOutputStream()
     try {
         exec {
@@ -16,6 +17,8 @@ def getGitSha = {
         return "unknown"
     }
     return stdout.toString().trim()
+*/
+    return ""; // JW
 }
 
 android {
@@ -25,16 +28,31 @@ android {
         minSdkVersion 23
         targetSdkVersion 33
         versionCode 97
-        versionName "20.0"
+        versionName "20.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")

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()) {
+            binding.tuskyProfileButton.hide()
+        }
+
         binding.aboutLicensesButton.setOnClickListener {
             startActivityWithSlideInAnimation(Intent(this, LicenseActivity::class.java))
         }

app/src/main/java/com/keylesspalace/tusky/di/NetworkModule.kt

@@ -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)

app/src/main/res/drawable/ic_splash.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="240dp"
-    android:layout_width="240dp">
-
-    <item android:drawable="@color/icon_background" />
-
-    <item
-        android:drawable="@drawable/ic_launcher_foreground" />
-
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/tusky_grey_20"/>
+    </item>
+    <item>
+        <bitmap
+            android:src="@drawable/splash"
+            android:gravity="center" />
+    </item>
 </layer-list>

app/src/main/res/values-ar/strings.xml

@@ -231,9 +231,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.com</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="post_share_content">شارك محتوى التبويق</string>
     <string name="post_share_link">شارك الرابط إلى التبويق</string>
@@ -475,7 +475,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_post_bookmarked">أضيف إلى الفواصل المرجعية</string>
     <string name="select_list_title">اختر قائمة</string>
     <string name="list">القائمة</string>

app/src/main/res/values-bg/strings.xml

@@ -103,7 +103,7 @@
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
     <string name="license_apache_2">Лицензиран под лиценза Apache (копие по-долу)</string>
-    <string name="license_description">Tusky съдържа код и активи от следните проекти с отворен код:</string>
+    <string name="license_description">Gab съдържа код и активи от следните проекти с отворен код:</string>
     <string name="unreblog_private">Отсподеляне</string>
     <string name="reblog_private">Споделяне с оригиналната аудитория</string>
     <string name="account_moved_description">%1$s се премести в:</string>
@@ -116,7 +116,7 @@
     <string name="caption_systememoji">Емоджи комплектът по подразбиране в устройство ви</string>
     <string name="restart">Рестартиране</string>
     <string name="later">По-късно</string>
-    <string name="restart_emoji">Ще трябва да рестартирате Tusky, за да приложите тези промени</string>
+    <string name="restart_emoji">Ще трябва да рестартирате Gab, за да приложите тези промени</string>
     <string name="restart_required">Изисква се рестартиране на приложението</string>
     <string name="action_open_post">Отваряне на публикация</string>
     <string name="expand_collapse_all_posts">Разгъване/свиване на всички състояния</string>
@@ -187,14 +187,14 @@
     <string name="post_media_images">Изображения</string>
     <string name="post_share_link">Споделяне на връзка към публикация</string>
     <string name="post_share_content">Споделяне на съдържание на публикация</string>
-    <string name="about_tusky_account">Профилът на Tusky</string>
+    <string name="about_tusky_account">Профилът на Gab</string>
     <string name="about_bug_feature_request_site">Доклади за грешки и заявки за функции:
-\n https://github.com/tuskyapp/Tusky/issues</string>
+\n https://github.com/johanw666/Gab/issues</string>
     <string name="about_project_site">Уебсайт на проекта:
-\n https://tusky.app</string>
-    <string name="about_tusky_license">Tusky е свободен софтуер с отворен код. Той е лицензиран под Общият публичен лиценз на GNU Версия 3. Можете да видите лиценза тук: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
-    <string name="about_powered_by_tusky">Осъществено от Tusky</string>
-    <string name="about_tusky_version">Tusky %s</string>
+\n https://gab.com</string>
+    <string name="about_tusky_license">Gab е свободен софтуер с отворен код. Той е лицензиран под Общият публичен лиценз на GNU Версия 3. Можете да видите лиценза тук: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
+    <string name="about_powered_by_tusky">Осъществено от Gab</string>
+    <string name="about_tusky_version">Gab %s</string>
     <string name="about_title_activity">Относно</string>
     <string name="description_account_locked">Заключен акаунт</string>
     <plurals name="notification_title_summary">

app/src/main/res/values-bn-rBD/strings.xml

@@ -103,9 +103,9 @@
     <string name="post_share_content">টুট এর কন্টেন্ট ভাগ করুন</string>
     <string name="about_tusky_account">টাস্কির প্রোফাইল</string>
     <string name="about_bug_feature_request_site">বাগ রিপোর্ট এবং বৈশিষ্ট্য অনুরোধ: 
-\nhttps://github.com/tuskyapp/Tusky/issues</string>
+\nhttps://github.com/johanw666/Gab/issues</string>
     <string name="about_project_site">প্রকল্প ওয়েবসাইট: 
-\nhttps://tusky.app</string>
+\nhttps://gab.com</string>
     <string name="about_tusky_license">টাস্কি মুক্ত এবং ওপেন সোর্স সফ্টওয়্যার। এটি GNU জেনারেল পাবলিক লাইসেন্স সংস্করণ 3 এর অধীনে লাইসেন্সযুক্ত। আপনি এখানে লাইসেন্স দেখতে পারেন: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <string name="about_tusky_version">টাস্কি %s</string>
     <string name="about_title_activity">সম্পর্কিত</string>

app/src/main/res/values-bn-rIN/strings.xml

@@ -237,9 +237,9 @@
          * the url can be changed to link to the localized version of the license.
     -->
     <string name="about_project_site">প্রকল্প ওয়েবসাইট:
-\nhttps://tusky.app</string>
+\nhttps://gab.com</string>
     <string name="about_bug_feature_request_site">বাগ রিপোর্ট এবং বৈশিষ্ট্য অনুরোধ:
-\nhttps://github.com/tuskyapp/Tusky/issues</string>
+\nhttps://github.com/johanw666/Gab/issues</string>
     <string name="about_tusky_account">টাস্কির প্রোফাইল</string>
     <string name="post_share_content">টুট এর কন্টেন্ট ভাগ করুন</string>
     <string name="post_share_link">টুট এর সাথে লিংক ভাগ করুন</string>