Merge pull request #13 from k0shk0sh/master

Syncing

.github/CONTRIBUTING.md

@@ -2,20 +2,16 @@
 
 If you have a question in mind, feel free to come our public [Slack](https://rebrand.ly/fasthub) channel.
 
-### Registering GitHub Account
+### Optional
 
-Before you clone the project, Please read the guide below to be able to login from FastHub.
-
-[GitHub Guide](https://auth0.com/docs/connections/social/github)
-
-- Please update debug_gradle.properties file and change below:
+- Please update debug_gradle.properties file and change below if you like to use your own keys otherwise keep them as they're debug keys:
     - github_client_id= your  github clientId
     - github_secret= your github secret
     - redirect_url= (redirect_url must match the url defined in `AndroidManifest` under `LoginView`)
 
 ### Before you import the project to Android Studio:
 
-- Make sure you have Android Studio 2.3 & above.
+- Make sure you have Android Studio 3.0 C4 & above.
 - Import Android Studio Settings (to ensure same code formatting) from this link [Click here](https://raw.githubusercontent.com/k0shk0sh/FastHub/master/fasthub_as_settings.jar)
 - Install Lombok Plugin from Android Studio Plugins & enable Annotations Processors from (Android Studio Preference).
 

.github/ISSUE_TEMPLATE.md

@@ -2,12 +2,15 @@
    - Please provide as much as detail and example as you can.
    - Add screenshots if appropriate.
    - Make sure that you are always on the latest version.
-   - Search issue before submitting new one.
+   - Search issue before submitting a new one.
    
    Public Slack channel: https://rebrand.ly/fasthub
 -->
----
 
- - FastHub Version: 
- - Android Version: 
- - Phone Model: 
+**FastHub Version:**  
+**Android Version:**  
+**Device Information:**  
+- <!-- MANUFACTURER: e.g. Yota Devices Limited -->  
+- <!-- BRAND: e.g. YotaPhone -->  
+- <!-- MODEL: e.g. YD201 -->  
+---

.travis.yml

@@ -3,16 +3,13 @@ android:
    components:
    - tools
    - tools
-   - platform-tools
-   - extra-android-m2repository
-   - extra-google-m2repository
 
 jdk: oraclejdk8
 
 sudo: required
 
 before_script:
-  - (while sleep 3; do echo "y"; done) | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.0-rc2" "platforms;android-25" --channel=2
+  - (while sleep 3; do echo "y"; done) | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "extras;android;m2repository" "extras;google;m2repository" "build-tools;26.0.0" "platforms;android-26"
 
 script:
   - ./gradlew clean assembleDebug --stacktrace
@@ -31,4 +28,4 @@ after_success:
 
 notifications:
   slack: fasthub:mjJWGD8UpgSgKawKa5OqMNlR
-  email: false
+  email: false

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at kosh20111@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -1,13 +1,10 @@
-
 [![Build Status](https://travis-ci.org/k0shk0sh/FastHub.svg?branch=master)](https://travis-ci.org/k0shk0sh/FastHub) [![Build status](https://ci.appveyor.com/api/projects/status/2yhxx7hu6hju24bk?svg=true)](https://ci.appveyor.com/project/k0shk0sh/fasthub)
 [![Releases](https://img.shields.io/github/release/k0shk0sh/FastHub.svg)](https://github.com/k0shk0sh/FastHub/releases/latest) [![Slack](https://img.shields.io/badge/slack-join-e01563.svg)](http://rebrand.ly/fasthub) [![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=kosh20111@gmail.com)
 
 ![Logo](/.github/assets/feature_graphic.png?raw=true "Logo")
 
 # FastHub  
-
-Yet another **open-source** GitHub client app but unlike any other app, FastHub was built from scratch.
-
+Yet another **open-source** GitHub client app but unlike any other app, FastHub was built from scratch.  
 <!--
 [<img src="https://f-droid.org/badge/get-it-on.png"
       alt="Get it on F-Droid"
@@ -20,12 +17,11 @@ Yet another **open-source** GitHub client app but unlike any other app, FastHub
       alt="Direct apk download" 
       height="80">](https://github.com/k0shk0sh/FastHub/releases/latest)
 
-#### FOSS
-
-grab **FastHub** from [Here](https://github.com/thermatk/FastHub-Libre) maintained by **_[thermatk](https://github.com/thermatk)_**
+#### Snapshots / Test builds
 
-# Features
+We have configured snapshots of FastHub, which can be downloaded from [AppVeyor CI](https://ci.appveyor.com/project/k0shk0sh/fasthub/build/artifacts).
 
+# Features  
 - **App**
   - Two login types (Basic Auth), (Access Token) or via (Browser)
   - Themes mode
@@ -78,10 +74,10 @@ grab **FastHub** from [Here](https://github.com/thermatk/FastHub-Libre) maintain
 - _**Much more...**_
   - _FastHub is actively developed. More features will come!_
 
-~~> **FastHub** contain Ads, which are disabled by default. You could enable them if you'd like to support the development.~~
-Ads are no longer available until further notice
+~~> **FastHub** contain Ads, which are disabled by default. You could enable them if you'd like to support the development.~~  
+_Ads currently not available._
 
-# Specs / Open-source libraries:
+## Specs / Open-source libraries:
 
 - Minimum **SDK 21**, _but AppCompat is used all the way ;-)_
 - **Kotlin** all new modules starting from 2.5.3 will be written in **#Kotlin**.
@@ -98,37 +94,68 @@ Ads are no longer available until further notice
 - [**commonmark**](https://github.com/atlassian/commonmark-java) for _Markdown_ conversion to html
 - [**Toasty**](https://github.com/GrenderG/Toasty) for displaying error/success messages
 - [**ShapedImageView**](https://github.com/gavinliu/ShapedImageView) for round avatars
-- [**MaterialTapTargetPrompt**](https://github.com/sjwall/MaterialTapTargetPrompt) for displaying tips throughout the app
 - [**Material-About-Library**](https://github.com/daniel-stoneuk/material-about-library) for the about screen
 - **Fabric** analytics & crash reporting.
 - **Android Support Libraries**, the almighty ;-)
 
-# Contribution
+## Contribution
 
 You love FastHub? You want new features or bug fixes?  
 Please **contribute** to the  project either by [_creating a PR_](https://github.com/k0shk0sh/FastHub/compare) or [_submitting an issue_](https://github.com/k0shk0sh/FastHub/issues/new) on GitHub.  
 Read the [**contribution guide**](.github/CONTRIBUTING.md) for more detailed information.
 
-### Language Contributors
+## Language Contributors
+
+<details>
+       <summary>Thanks for those who contributed to FastHub by adding their language</summary>
+           <p>- Chinese (Simplified) [@Devifish](https://github.com/Devifish)</p>
+           <p>- Chinese (Traditional) [@maple3142](https://github.com/maple3142)</p>
+           <p>- German [@failex234](https://github.com/failex234)</p>
+           <p>- Indonesian [@dikiaap](https://github.com/dikiaap)</p>
+           <p>- Italian [@Raffaele74](https://github.com/Raffaele74)</p>
+           <p>- Japanese [@Rintan](https://github.com/Rintan)</p>
+           <p>- Lithuanian [@mistermantas](https://github.com/mistermantas)</p>
+           <p>- Russian [@dedepete](https://github.com/dedepete)</p>
+           <p>- Turkish [@kutsan](https://github.com/kutsan)</p>
+           <p>- Portuguese [@caiorrs](https://github.com/caiorrs)</p>
+           <p>- Czech [@hejsekvojtech](https://github.com/hejsekvojtech)</p>
+           <p>- Spanish [@alete89](https://github.com/alete89)</p>
+</details>
+
+## FAQ
+
+<details>
+  <summary>Why can't I see my <b>Organizations</b> either <i>Private</i> or <i>Public</i> ones?</summary>
+  <p>Open up https://github.com/settings/applications and look for FastHub, open it then scroll to Organization access and click on Grant Button, 
+  alternatively login via <b>Access Token</b> which will ease this setup.</p>
+</details>
+
+<details>
+  <summary>I tried to login via Access Token & OTP but it does not work?</summary>
+  <p>You can't login via Access Token & OTP all together due to the lifetime of the OTP code, you'll be required to login in every few seconds.</p>
+</details>
+
+<details>
+  <summary>Why my Private Repo Wiki does not show up?</summary>
+  <p>It's due to FastHub scraping GitHub Wiki page & Private Repos require session token that FastHub doesn't have.</p>
+</details>
+
+<details>
+  <summary>I login with Enterprise account but can't interact with anything other than my Enterprise GitHub</summary>
+  <p>Well, logically, you can't access anything else other than your Enterprise, but FastHub made that possible but can't do much about it, 
+  in most cases since your login credential doesn't exists in GitHub server. But in <b>few</b> 
+  cases your GitHub account Oauth token will do the trick.</p>
+
+</details>
 
-- Turkish [@kutsan](https://github.com/kutsan)
-- German [@failex234](https://github.com/failex234)
-- Chinese [@Devifish](https://github.com/Devifish)
-- Indonesian [@dikiaap](https://github.com/dikiaap)
-- Russian [@dedepete](https://github.com/dedepete)
-- Japanese [@Rintan](https://github.com/Rintan)
-- Italian [@Raffaele74](https://github.com/Raffaele74)
-- Lithuanian [@mistermantas](https://github.com/mistermantas)
-- Traditional Chinese [@maple3142](https://github.com/maple3142)
-- Portuguese [@caiorrs](https://github.com/caiorrs)
 
-# License
+## License
 
-> Copyright (C) 2017 Kosh. 
-> Licensed under the [GPL-3.0](https://www.gnu.org/licenses/gpl.html) license.
+> Copyright (C) 2017 Kosh.  
+> Licensed under the [GPL-3.0](https://www.gnu.org/licenses/gpl.html) license.  
 > (See the [LICENSE](https://github.com/k0shk0sh/FastHub/blob/master/LICENSE) file for the whole license text.)
 
-# Screenshots
+## Screenshots
 
 | Mobile Light | Mobile Dark |
 |:-:|:-:|
@@ -138,12 +165,13 @@ Read the [**contribution guide**](.github/CONTRIBUTING.md) for more detailed inf
 |:-:|:-:|
 | ![Main Screen Light](/.github/assets/tablet_light.png?raw=true) | ![Main Screen Dark](/.github/assets/tablet_night.png?raw=true) |
 
-# FastHub Logo
+## FastHub Logo
 
-**FastHub** logo is designed by 
-
-**Kevin Aguilar** [Google+](https://plus.google.com/+KevinAguilarC) [Twitter](https://twitter.com/kevttob)
-
-Designer at [221 Pixels](https://www.221pixels.com/)
+**FastHub** logo is designed by **Cookicons**.  
+[Google+](https://plus.google.com/+CookiconsDesign) | [Twitter](https://twitter.com/mcookie)  
+Designer website [Cookicons](https://cookicons.co/).  
 
+**OLD FastHub** logo is designed by **Kevin Aguilar**.  
+[Google+](https://plus.google.com/+KevinAguilarC) | [Twitter](https://twitter.com/kevttob)  
+Designer at [221 Pixels](https://www.221pixels.com/).  
 Laus Deo Semper

app/build.gradle

@@ -22,15 +22,14 @@ android {
             storePassword((buildProperties.secrets['android_store_password'] | buildProperties.notThere['android_store_password']).string)
         }
     }
-    compileSdkVersion 25
+    compileSdkVersion 26
     buildToolsVersion "26.0.0"
     defaultConfig {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
         targetSdkVersion 26
         versionCode 320
         versionName "3.2.0"
-        signingConfig signingConfigs.signing
         buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
         buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string
         buildConfigString "IMGUR_CLIENT_ID", (buildProperties.secrets['imgur_client_id'] | buildProperties.notThere['imgur_client_id']).string
@@ -50,11 +49,18 @@ android {
         release {
             minifyEnabled true
             shrinkResources false
+            signingConfig signingConfigs.signing
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
+            if (!rootProject.file('gradle.properties').exists()) {
+                signingConfig signingConfigs.signing
+            }
+            applicationIdSuffix ".debug"
+            versionNameSuffix "-debug"
             ext.alwaysUpdateBuildId = false
         }
+
     }
 
     sourceSets {
@@ -116,7 +122,6 @@ dependencies {
     implementation "com.android.support:preference-v14:${supportVersion}"
     implementation "com.android.support:customtabs:${supportVersion}"
     implementation "com.android.support:palette-v7:${supportVersion}"
-//    implementation "com.android.support:support-emoji-appcompat:${supportVersion}"
     implementation "net.grandcentrix.thirtyinch:thirtyinch:${thirtyinchVersion}"
     implementation "net.grandcentrix.thirtyinch:thirtyinch-rx2:${thirtyinchVersion}"
     implementation "com.squareup.retrofit2:retrofit:${retrofit}"
@@ -131,9 +136,8 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
     implementation 'com.annimon:stream:1.1.7'
     implementation 'com.github.GrenderG:Toasty:1.1.3'
-    implementation 'com.github.JediBurrell:MaterialTapTargetPrompt:-SNAPSHOT'
     implementation 'com.github.k0shk0sh:RetainedDateTimePickers:1.0.2'
-    implementation 'com.github.k0shk0sh:material-about-library:master-SNAPSHOT'
+    implementation 'com.github.daniel-stoneuk:material-about-library:2.1.0'
     implementation "io.requery:requery:${requery}"
     implementation "io.requery:requery-android:${requery}"
     implementation('com.mikepenz:aboutlibraries:5.9.5@aar') { transitive = true }
@@ -143,7 +147,7 @@ dependencies {
     implementation 'com.atlassian.commonmark:commonmark:0.9.0'
     implementation "com.google.firebase:firebase-messaging:${gms}"
     implementation "com.google.android.gms:play-services-ads:${gms}"
-    implementation 'com.firebase:firebase-jobdispatcher:0.6.0'
+    implementation 'com.firebase:firebase-jobdispatcher:0.7.0'
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { transitive = true }
     implementation "com.github.miguelbcr:RxBillingService:0.0.3"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"

app/src/androidTest/java/com/fastaccess/ui/modules/login/LoginChooserActivityTest.java

@@ -6,6 +6,7 @@
 import android.support.test.runner.AndroidJUnit4;
 
 import com.fastaccess.R;
+import com.fastaccess.ui.modules.login.chooser.LoginChooserActivity;
 
 import org.junit.Rule;
 import org.junit.Test;

app/src/debug/google-services.json

@@ -11,23 +11,23 @@
       "client_info": {
         "mobilesdk_app_id": "1:999999999999:android:0000000000000000",
         "android_client_info": {
-          "package_name": "com.fastaccess.github"
+          "package_name": "com.fastaccess.github.debug"
         }
       },
       "oauth_client": [
         {
           "client_id": "this-is-a-sample-do-not-use.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.fastaccess.github",
+            "package_name": "com.fastaccess.github.debug",
             "certificate_hash": "0000000000000000000000000000000000000000"
           }
         },
         {
           "client_id": "this-is-a-sample-do-not-use.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.fastaccess.github",
+            "package_name": "com.fastaccess.github.debug",
             "certificate_hash": "0000000000000000000000000000000000000000"
           }
         },

app/src/debug/res/values/secrets.xml

@@ -9,4 +9,8 @@
     <string name="amlod_theme_purchase" translatable="false">android.test.purchased</string>
     <string name="midnight_blue_theme_purchase" translatable="false">android.test.purchased</string>
     <string name="theme_bluish_purchase" translatable="false">android.test.purchased</string>
+    <string name="fasthub_pro_purchase" translatable="false">fasthub_pro</string>
+    <string-array name="custom_endpoints">
+        <item>custom_urls</item>
+    </string-array>
 </resources>

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">FastHub Debug</string>
+</resources>