.clabot

@@ -0,0 +1,3 @@
+{
+  "contributors": ["Tlaster"]
+}

.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: twidere
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+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
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -1,5 +1,5 @@
 # Built application files
-/build
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -35,4 +35,7 @@ Thumbs.db
 /temp
 
 # JRE error dumps
-hs_err_*.log
+hs_err_*.log
+
+# NDK related
+.externalNativeBuild/

.travis.yml

@@ -1,26 +1,19 @@
 language: android
 
-sudo: required
+sudo: false
+dist: trusty
 
 jdk: oraclejdk8
 
 android:
   components:
     - tools
-    - tools # To fix https://github.com/travis-ci/travis-ci/issues/6040
     - platform-tools
-    - build-tools-25.0.3
-    - android-25
-
-    # Additional components
-    - extra-google-google_play_services
-    - extra-google-m2repository
+    - build-tools-29.0.3
+    - android-29
     - extra-android-m2repository
-
-  licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
+    - extra-google-m2repository
+    - extra-android-support
 
 env:
   global:
@@ -33,49 +26,60 @@ addons:
       - curl
       - tar
       - gzip
-      - patch
       - openssh-client
       - git
+      - ruby
 
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.m2/
+# before_cache:
+#   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+#   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+# cache:
+#   directories:
+#     - $HOME/.gradle/caches/
+#     - $HOME/.gradle/wrapper/
+#     - $HOME/.m2/
 
 before_install:
   - ./travis/scripts/decode_private_configs.sh
-
+  # https://github.com/travis-ci/travis-ci/issues/8651
+  - yes | sdkmanager "platforms;android-29"
+  -
 install:
+  - rvm default exec gem install fastlane
   - ./travis/scripts/fetch_private_files.sh
+  - cat ./travis/configs/gradle.properties > ./gradle.properties
 
 before_script:
-  # Validate if patches work
-  - ./travis/scripts/patch_sources.sh
   # Validate if Google components fetched successfully
   - ./travis/scripts/test_private_files.sh
 
 script:
-  - ./gradlew clean build
+  - ./gradlew build -x lint
 
 after_failure:
   - ./travis/scripts/upload_error_logs.sh
 
 deploy:
   - provider: releases
-    prerelease: true
     api_key:
-      secure: "WKtKwda3hegqO9QVujdonNoL2ESJUR80WHNq/13wDsbCABo/GNnuqHNYZmml3wAifEKKeCEYfNZRUuHQ8eHs54Lj5BlGRX5i+1LrGhhgnVFQgmrhIv4RJuVQ663kDEh+Jwo4vowJ2mxNDvLvOhfZwxjULPDiknqy6u5PyW3id5M="
+      secure: "S1GSwQPN1ffS1wMmkNwKY7HlZbVysfn3LJa318gKbIB2RdnNoLT6xuZSWhe5mAI41yG45wkUpfK9fah6ueZFEd74+xy4q2aqaJDhhi/xqys/8VkODaNsHMkE2aWqnWqAcRBNRA1j8eFFZDjgge1t2x924U7jDEQaOOHHHQ58lxA="
     file_glob: true
     file: '**/*-release.apk'
+    skip_cleanup: true
     on:
       repo: TwidereProject/Twidere-Android
       tags: true
+  # Publish to Google Play store
+  # - provider: script
+  #   script: ./travis/scripts/google_play_deploy.sh ./twidere/src/google/.supplyrc
+  #   skip_cleanup: true
+  #   on:
+  #     repo: TwidereProject/Twidere-Android
+  #     tags: true
+  # Upload common component library to Bintray
   - provider: script
-    script: ./gradlew publishGoogleRelease
+    script: ./gradlew twidere.component.common:bintrayUpload
+    skip_cleanup: true
     on:
       repo: TwidereProject/Twidere-Android
       tags: true

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 # How To Contribute #
 
 First of all, I'd like to express my appreciation to you for contributing to this project.
- 
+
 ## Working Branch ##
 
-You should make changes on `develop` branch, changes will be merged into `master` branch after a stable version released.
+You should make changes on the `maintenance` branch, changes will be merged into `master` branch after a stable version released.

ISSUE_TEMPLATE.md

@@ -35,7 +35,7 @@ App settings:
 
 - [ ] Custom API
 - [ ] Custom consumer key/secrets
-- [ ] Official keys
+- [ ] [Official keys](https://gist.github.com/mariotaku/5465786)
 - [ ] Using [Thumbor](https://github.com/thumbor/thumbor)
 - [ ] Connected through proxy
 - [ ] Media preview enabled

README.md

@@ -1,10 +1,34 @@
 # Twidere for Android #
 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Twidere-brightgreen.svg?style=flat)](http://android-arsenal.com/details/3/2453)
-[![Travis status](https://api.travis-ci.org/TwidereProject/Twidere-Android.png)](https://travis-ci.org/TwidereProject/Twidere-Android/)
+[![Travis status](https://img.shields.io/travis/TwidereProject/Twidere-Android.svg)](https://travis-ci.org/TwidereProject/Twidere-Android/)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/twidere/localized.svg)](https://crowdin.com/project/twidere)
+[<img a src="https://c5.patreon.com/external/logo/become_a_patron_button.png" width="100" herf="https://www.patreon.com/bePatron?u=36020799"/>](https://www.patreon.com/bePatron?u=36020799)
 
-Material Design ready and feature rich Twitter app for Android 4.0+
+Material Design ready and feature rich Twitter/Mastodon/Fanfou app for Android 4.1+. Enjoy Fediverse now!
+
+Twidere-Android is maintained by community and supporter including [Dimension](https://dimension.im/).
+
+[<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=org.mariotaku.twidere)
+[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere)
+
+---
+
+We are working on the brand new Twidere X, in both Android and iOS
+
+**The open beta of Twidere X is here:**
+
+Android version: [PlayStore](https://play.google.com/store/apps/details?id=com.twidere.twiderex)
+
+iOS version: [TestFlight](https://testflight.apple.com/join/GJIDXvW7)
+
+Twidere X is still in a very early stage, our short term target is bringing back the most basic Twitter browsing features.
+
+If you have any ideas/requirements/comments/issues, just tell us in the following Twidere X repositories:
+
+[TwidereX-Android](https://github.com/TwidereProject/TwidereX-Android/issues)
+
+[TwidereX-iOS](https://github.com/TwidereProject/TwidereX-iOS/issues)
 
 ---
 
@@ -27,27 +51,22 @@ Material Design ready and feature rich Twitter app for Android 4.0+
 * Schedule tweets even when you're offline by [Buffer](https://buffer.com/)
 * Search & share GIFs by [GIPHY](https://giphy.com/)
 
-[<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=org.mariotaku.twidere)
-[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/repository/browse/?fdid=org.mariotaku.twidere)
-
 ---
-
 ## Credits ##
-
+### Initiator ###
+* [@mariotaku](https://twitter.com/mariotaku)
+### Maintainor ###
+* [@MTlaster](https://twitter.com/MTlaster)
 ### Material re-design ###
-
 * [@Uucky_Lee](https://twitter.com/Uucky_Lee)
-
 ### Icon designers ###
-
 * [@NovaDNG](https://twitter.com/NovaDNG)
 * [@Linkzero](https://twitter.com/Linkzero)
 * [@lordfriend](https://twitter.com/lordfriend)
 * [@ilovinheart](https://twitter.com/ilovinheart)
 * [@Rieya](https://twitter.com/Rieya)
 
 Thanks to their excellent design!
-
 ### Open source projects ###
 
 See dependencies in `build.gradle`
@@ -57,7 +76,6 @@ See dependencies in `build.gradle`
 ## Support my work ##
 
 ### Translation ###
-
 I started a crowdin project, so anyone can do something for Twidere. Visit this [crowdin project page](http://crowdin.net/project/twidere)
 
 ### Donation ###
@@ -66,21 +84,24 @@ I started a crowdin project, so anyone can do something for Twidere. Visit this
 
 Enhanced features on Google Play
 
-PayPal & AliPay: `String.format("%s@%s", "mariotaku.lee", "gmail.com");`
+Patreon: [<img a src="https://c5.patreon.com/external/logo/become_a_patron_button.png" width="100" herf="https://www.patreon.com/bePatron?u=36020799"/>](https://www.patreon.com/twidere)
+
+PayPal:  http://paypal.me/yisiliu2
 
-Bitcoin: `1FHAVAzge7cj1LfCTMfnLL49DgA3mVUCuW`
+AliPay: `String.format("%s@%s", "mariotaku.lee", "gmail.com");`
+
+Bitcoin: `3HGDdf9ptTPNaY7C53gREMUnUsUVUoqm8G`
+
+Ethereum & ERC20 Tokens: `0x6ff82FC45aff81D4081DA7B257fb8ee5F71A2CeC`
 
 **Sponsors**
 
 <a href='http://www.sujitech.com/'><img src='resources/logos/sujitech_logo.png' width='160'/></a>
 
-If you donate on behalf of an organization or company, feel free to contact me. I'll add your logo to this list. 
+If you donate on behalf of an organization or company, feel free to contact us. I'll add your logo to this list. 
 
 ---
-
 ## License ##
-
-
     /*
      * Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
      *
@@ -98,10 +119,4 @@ If you donate on behalf of an organization or company, feel free to contact me.
      * along with this program.  If not, see <http://www.gnu.org/licenses/>.
      */
 
----
-
-## Notes ##
-
-### Closed Source Licensing ###
 
-If you wish to use Twidere's code base but don't want to release your modified source code, please contact `mariotaku.lee@gmail.com`.