merge dev

This commit is contained in:
k0shk0sh 2020-01-05 13:54:06 +01:00
commit d23d7c8b9b
7 changed files with 90 additions and 37 deletions

12
.github/FUNDING.yml vendored Normal file
View File

@ -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: FastHub
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: https://paypal.me/imkosh

View File

@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FR]"
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -1,7 +1,7 @@
#### FastHub is currently under a huge refactoring, please make sure to submit an issue only if necessary.
##### Any Pull requests that are not directed to v5 branch will be ignored. You could follow the development on this [PR](https://github.com/k0shk0sh/FastHub/pull/2599)
##### You could follow the development on V5 in this [PR](https://github.com/k0shk0sh/FastHub/pull/2599)
[![Build Status](https://travis-ci.org/k0shk0sh/FastHub.svg?branch=master)](https://travis-ci.org/k0shk0sh/FastHub)
[![Build Status](https://app.bitrise.io/app/abd1afbd2a03e0e4/status.svg?token=txykViMUFzx1WkvjixD01A&branch=development)](https://app.bitrise.io/app/abd1afbd2a03e0e4)
[![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)
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
@ -190,10 +190,10 @@ Read the [**contribution guide**](.github/CONTRIBUTING.md) for more detailed inf
## FastHub Logo
**FastHub** logo is designed by **Cookicons**.
[Google+](https://plus.google.com/+CookiconsDesign) | [Twitter](https://twitter.com/mcookie)
[Twitter](https://twitter.com/mcookie)
Designer website [Cookicons](https://cookicons.co/).
**OLD FastHub** logo was designed by **Kevin Aguilar**.
[Google+](https://plus.google.com/+KevinAguilarC) | [Twitter](https://twitter.com/kevttob)
[Twitter](https://twitter.com/kevttob)
Designer at [Kevin Aguilar](http://kevaguilar.com/).
Laus Deo Semper

View File

@ -1,61 +1,37 @@
{
"project_info": {
"project_id": "this-is-a-sample",
"project_number": "999999999999",
"name": "FastHub Sample",
"firebase_url": "https://this-is-a-sample-do-not-use.firebaseio.com",
"storage_bucket": "this-is-a-sample-do-not-use.storage.firebase.com"
"project_number": "535903042804",
"firebase_url": "https://fasthub-dev-a1309.firebaseio.com",
"project_id": "fasthub-dev-a1309",
"storage_bucket": "fasthub-dev-a1309.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:999999999999:android:0000000000000000",
"mobilesdk_app_id": "1:535903042804:android:516309017e0298c938b2a1",
"android_client_info": {
"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.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.debug",
"certificate_hash": "0000000000000000000000000000000000000000"
}
},
{
"client_id": "this-is-a-sample-do-not-use.apps.googleusercontent.com",
"client_id": "535903042804-14481m7poceb7ojv5roddqm28pg4ch5n.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "000000000000000000000000000000000000000"
"current_key": "AIzaSyBbRQtQN1UxFRgeSSfjZwQ5TRulc2lZUzI"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "this-is-a-sample-do-not-use.apps.googleusercontent.com",
"client_id": "535903042804-14481m7poceb7ojv5roddqm28pg4ch5n.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}

View File

@ -0,0 +1,15 @@
package com.fastaccess.data.dao
import com.google.gson.annotations.SerializedName
/**
* Created by Hashemsergani on 18.10.17.
*/
data class GitHubStatusModel(
@SerializedName("status") var status: GithubStatus? = null
)
data class GithubStatus(
@SerializedName("description") var description: String? = null,
@SerializedName("indicator") var indicator: String? = null
)

View File

@ -0,0 +1,31 @@
package com.fastaccess.data.dao.wiki
data class FirebaseWikiConfigModel(
var sideBarListTitle: String = "a",
var sideBarUl: String = ".js-wiki-sidebar-toggle-display > ul",
var sideBarList: String = "li",
var wikiWrapper: String = "#wiki-wrapper",
var wikiHeader: String = ".gh-header > h1.gh-header-title",
var sideBarListLink: String = "href",
var wikiBody: String = "#wiki-body",
var wikiSubHeader: String = ".gh-header-meta",
var wikiContent: String = "#wiki-content"
) {
companion object {
fun map(map: HashMap<String, String>?): FirebaseWikiConfigModel {
val model = FirebaseWikiConfigModel()
map?.let {
model.sideBarListTitle = it.getOrElse("sideBarListTitle") { model.sideBarListTitle }
model.sideBarUl = it.getOrElse("sideBarUl") { model.sideBarUl }
model.sideBarList = it.getOrElse("sideBarList") { model.sideBarList }
model.wikiWrapper = it.getOrElse("wikiWrapper") { model.wikiWrapper }
model.wikiHeader = it.getOrElse("wikiHeader") { model.wikiHeader }
model.sideBarListLink = it.getOrElse("sideBarListLink") { model.sideBarListLink }
model.wikiBody = it.getOrElse("wikiBody") { model.wikiBody }
model.wikiSubHeader = it.getOrElse("wikiSubHeader") { model.wikiSubHeader }
model.wikiContent = it.getOrElse("wikiContent") { model.wikiContent }
}
return model
}
}
}

View File

@ -1,5 +1,4 @@
# Below API Keys are meant for debugging purpose & they aren't being used in production.
org.gradle.jvmargs=-Xmx2536M
android_store_password=kosh2010
android_key_password=kosh2010
android_key_alias=FastAccess