Merge pull request #31 from k0shk0sh/master [skip ci]

Update from original repo

.github/CONTRIBUTING.md

@@ -1,6 +1,14 @@
+# How to submit Issue/Feature Request to *FastHub*
+
+- Make sure the included template is filled ( using FastHub will fill them up automatically ). 
+- If you planning to report multiple FRs/Issues that falls under the same feature __PLEASE REPORT THEM IN ONE TICKET__.
+- Make sure you are always on latest (FastHub/About & Click on version name).
+- Make sure the issue doesn't exists, lets keep things clean & tidy here :).  
+
+
 # How to contribute & build *FastHub*
 
-If you have a question in mind, feel free to come our public [Slack](https://rebrand.ly/fasthub) channel.
+If you have a question in mind, feel free to come our public [Slack](http://rebrand.ly/fasthub-slack) channel.
 
 ### Optional
 

.github/ISSUE_TEMPLATE.md

@@ -4,13 +4,20 @@
    - Make sure that you are always on the latest version.
    - Search issue before submitting a new one.
    
-   Public Slack channel: https://rebrand.ly/fasthub
+   Public Slack channel: https://rebrand.ly/fasthub-slack
+   Discord: https://discord.gg/V6afZWf
+   
+   #### How to submit Issue/Feature Request to *FastHub*
+   - Make sure the included template is filled ( using FastHub will fill them up automatically ). 
+   - If you planning to report multiple FRs/Issues that falls under the same category ~PLEASE REPORT THEM IN ONE TICKET~.
+   - Make sure you are always on latest (FastHub/About & Click on version name).
+   - Make sure the issue doesn't exists, lets keep things clean & tidy here :).  
 -->
 
-**FastHub Version:**  
+**FastHub Version:**  <!-- Don't forget to mention "Enterprise" here if needed. -->  <>
 **Android Version:**  
 **Device Information:**  
-- <!-- MANUFACTURER: e.g. Yota Devices Limited -->  
-- <!-- BRAND: e.g. YotaPhone -->  
-- <!-- MODEL: e.g. YD201 -->  
----
+- MANUFACTURER: <!-- e.g. Yota Devices Limited -->  
+- BRAND: <!-- e.g. YotaPhone -->  
+- MODEL: <!-- e.g. YD201 -->  
+---

README.md

@@ -1,9 +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&[email protected])
+[![Releases](https://img.shields.io/github/release/k0shk0sh/FastHub.svg)](https://github.com/k0shk0sh/FastHub/releases/latest) [![Discord](https://img.shields.io/badge/chat-discord-7289DA.svg)](https://discord.gg/V6afZWf)
 
 ![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.  
 <!--
 [<img src="https://f-droid.org/badge/get-it-on.png"
@@ -19,18 +20,21 @@ Yet another **open-source** GitHub client app but unlike any other app, FastHub
 
 #### Snapshots / Test builds
 
-We have configurated snapshots of FastHub, which can be downloaded from [AppVeyor CI](https://ci.appveyor.com/project/k0shk0sh/fasthub/build/artifacts).
+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)
+  - Three login types (Basic Auth), (Access Token) or via (OAuth)
+  - Multiple Accounts
+  - Enterprise Accounts
   - Themes mode
   - Offline-mode
   - Markdown and code highlighting support
   - Notifications overview and "Mark all as read"
   - Search users/orgs, repos, issues/prs & code.
   - Pinned Repos
   - Trending
+  - Wiki
 - **Repositories**
   - Browse & Read Wiki
   - Search Repos
@@ -52,7 +56,8 @@ We have configurated snapshots of FastHub, which can be downloaded from [AppVeyo
   - Assign people and add Labels and Milestones to Issues/PRs
   - Manage Milestones
   - Merge PRs
-  - PRs reviews(reply, react with emojies, delete & edit comment)
+  - PRs reviews (reply, react with emojies, delete & edit comment)
+  - PRs request review changes/approve & comment.
   - PRs statuses
 - **Commits and Gists**
   - Search Code/Gists
@@ -61,13 +66,14 @@ We have configurated snapshots of FastHub, which can be downloaded from [AppVeyo
   - Manage Commit/Gist comments
   - Create/Delete Gists
   - React to Commit comments with reactions
+  - Comment on line number in Files/Code changes.
 - **Orgs**
     - Overview
     - Feeds
     - Teams & Teams repos
     - Repos
 - **Users**
-  - Follow/unfollow users
+  - Follow/Unfollow users
   - View user feeds
   - Contribution graph.
   - Search Users, Repos, Issues,Pull Requests and Code
@@ -90,7 +96,7 @@ _Ads currently not available._
 - [**Android State**](https://github.com/evernote/android-state) for saving instance states
 - [**Lombok**](https://projectlombok.github.io) for getters and setters
 - [**Material-BottomNavigation**](https://github.com/sephiroth74/Material-BottomNavigation) for `BottomBar` tabs 
-- [**Android-Universal-Image-Loader**](https://github.com/nostra13/Android-Universal-Image-Loader) for loading images
+- [**Glide**](https://github.com/bumptech/glide) for loading images
 - [**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
@@ -157,13 +163,13 @@ Read the [**contribution guide**](.github/CONTRIBUTING.md) for more detailed inf
 
 ## Screenshots
 
-| Mobile Light | Mobile Dark |
+| Feeds | Drawer |
 |:-:|:-:|
-| ![Main Screen Light](/.github/assets/mobile_light.png?raw=true) | ![Main Screen Dark](/.github/assets/mobile_night.png?raw=true) |
+| ![First](/.github/assets/first.png?raw=true) | ![Sec](/.github/assets/sec.png?raw=true) |
 
-| Tablet Light | Tablet Dark |
+| Repo | Profile |
 |:-:|:-:|
-| ![Main Screen Light](/.github/assets/tablet_light.png?raw=true) | ![Main Screen Dark](/.github/assets/tablet_night.png?raw=true) |
+| ![Third](/.github/assets/third.png?raw=true) | ![Fourth](/.github/assets/fourth.png?raw=true) |
 
 ## FastHub Logo
 

app/build.gradle

@@ -28,8 +28,8 @@ android {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 320
-        versionName "3.2.0"
+        versionCode 403
+        versionName "4.0.3"
         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
@@ -116,6 +116,7 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:appcompat-v7:${supportVersion}"
+    implementation 'com.jaredrummler:android-device-names:1.1.4'
     implementation "com.android.support:design:${supportVersion}"
     implementation "com.android.support:cardview-v7:${supportVersion}"
     implementation "com.android.support:recyclerview-v7:${supportVersion}"
@@ -127,11 +128,12 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:${retrofit}"
     implementation "com.squareup.retrofit2:converter-gson:${retrofit}"
     implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
-    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+    implementation "com.github.bumptech.glide:glide:3.7.0"
+//    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     implementation 'cn.gavinliu.android.lib:ShapedImageView:0.8.3'
     implementation "com.jakewharton:butterknife:${butterKnifeVersion}"
     implementation 'it.sephiroth.android.library.bottomnavigation:bottom-navigation:2.0.1-rc1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.0.7'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.8.0'
     implementation 'com.annimon:stream:1.1.7'
@@ -147,7 +149,10 @@ 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.google.firebase:firebase-database:${gms}"
+    implementation('com.github.b3er.rxfirebase:firebase-database-kotlin:11.2.0') { transitive = false }
+    implementation('com.github.b3er.rxfirebase:firebase-database:11.2.0') { transitive = false }
+    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/proguard-rules.pro

@@ -20,11 +20,7 @@
 -keep class butterknife.*
 -keepclasseswithmembernames class * { @butterknife.* <methods>; }
 -keepclasseswithmembernames class * { @butterknife.* <fields>; }
--dontwarn retrofit.**
 -keep class retrofit.** { *; }
--dontwarn sun.misc.Unsafe
--dontwarn com.octo.android.robospice.retrofit.RetrofitJackson**
--dontwarn retrofit.appengine.UrlFetchClient
 -keepattributes Signature
 -keepattributes Exceptions
 -keepclasseswithmembers class * {
@@ -37,19 +33,6 @@
 -keep class retrofit.** { *; }
 -keep class com.squareup.okhttp.** { *; }
 -keep interface com.squareup.okhttp.** { *; }
--dontwarn java.beans.**
--dontwarn javax.**
--dontwarn lombok.**
--dontwarn java.lang.invoke.*
--dontwarn rx.**
--dontwarn com.squareup.okhttp.**
--dontwarn okio.**
--dontwarn org.apache.**
--dontwarn android.net.http.AndroidHttpClient
--dontwarn retrofit.**
--dontwarn retrofit2.adapter.rxjava.CompletableHelper$**
--dontwarn retrofit2.Platform$Java8
--dontwarn sun.misc.**
 -keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
    long producerIndex;
    long consumerIndex;
@@ -66,7 +49,6 @@
  public static **[] values();
  public static ** valueOf(java.lang.String);
 }
--dontwarn icepick.**
 -keep class **$$Icepick { *; }
 -keepclasseswithmembernames class * {
     @icepick.* <fields>;
@@ -76,6 +58,22 @@
 -keepclassmembers class com.prettifier.pretty.callback.MarkDownInterceptorInterface {
    public *;
 }
+-keepclassmembers enum io.requery.** {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
+-keep class net.nightwhistler.** { *; }
+-keep class org.htmlcleaner.** { *; }
+-keeppackagenames org.jsoup.nodes
+-keep class com.github.b3er.** { *; }
+-keep class com.memoizrlabs.** { *; }
+
+-dontwarn com.github.b3er.**
+-dontwarn com.memoizrlabs.**
 -dontwarn java.lang.FunctionalInterface
 -dontwarn java.util.**
 -dontwarn java.time.**
@@ -93,17 +91,6 @@
 -dontwarn io.requery.query.**
 -dontwarn io.requery.android.sqlcipher.**
 -dontwarn io.requery.android.sqlitex.**
--keepclassmembers enum io.requery.** {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
--keep class .R
--keep class **.R$* {
-    <fields>;
-}
-
--keep class net.nightwhistler.** { *; }
--keep class org.htmlcleaner.** { *; }
 -dontwarn org.jaxen.**
 -dontwarn org.jdom.**
 -dontwarn com.google.android.gms.**
@@ -121,4 +108,20 @@
 -dontwarn kotlin.reflect.jvm.internal.impl.types.DescriptorSubstitutor
 -dontwarn kotlin.reflect.jvm.internal.impl.types.DescriptorSubstitutor
 -dontwarn kotlin.reflect.jvm.internal.impl.types.TypeConstructor
--keeppackagenames org.jsoup.nodes
+-dontwarn java.beans.**
+-dontwarn javax.**
+-dontwarn lombok.**
+-dontwarn java.lang.invoke.*
+-dontwarn rx.**
+-dontwarn com.squareup.okhttp.**
+-dontwarn okio.**
+-dontwarn org.apache.**
+-dontwarn android.net.http.AndroidHttpClient
+-dontwarn retrofit.**
+-dontwarn retrofit2.adapter.rxjava.CompletableHelper$**
+-dontwarn retrofit2.Platform$Java8
+-dontwarn sun.misc.**
+-dontwarn sun.misc.Unsafe
+-dontwarn com.octo.android.robospice.retrofit.RetrofitJackson**
+-dontwarn retrofit.appengine.UrlFetchClient
+-dontwarn icepick.**

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/res/values/secrets.xml

@@ -10,7 +10,7 @@
     <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>
+    <string name="enterprise_purchase" translatable="false">fasthub_enterprise</string>
+    <string name="fasthub_all_features_purchase" translatable="false">fasthub_all_features</string>
+    <string name="fasthub_enterprise_purchase" translatable="false">fasthub_enterprise</string>
 </resources>