Skip to content
This repository has been archived by the owner on Feb 9, 2018. It is now read-only.

Commit

Permalink
Merge branch 'wip-ghost-1.0'
Browse files Browse the repository at this point in the history
Closes #162
  • Loading branch information
vickychijwani committed Aug 23, 2017
2 parents fddc61f + 97f786d commit 0bb6c1c
Show file tree
Hide file tree
Showing 148 changed files with 6,578 additions and 4,760 deletions.
21 changes: 14 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ repositories {
mavenCentral()
maven { url 'https://maven.fabric.io/public' }
maven { url 'https://github.com/uPhyca/stetho-realm/raw/master/maven-repo' }
maven { url 'https://jitpack.io' }
}

// don't lint for every build (run it manually when you want it to run)
tasks.whenTaskAdded { task ->
if (task.name.equals('lint')) {
if (task.name == 'lint') {
task.enabled = false
}
}
Expand All @@ -39,10 +40,11 @@ android {

defaultConfig {
applicationId 'me.vickychijwani.spectre'
minSdkVersion 15
minSdkVersion 16
targetSdkVersion 25
versionCode 1_005_006 // 3 digits each for major, minor, patch
versionName '1.5.6'
versionCode 2_00_00_01 // 2 digits each for major, minor, patch, build number
// example: 2.0.0-beta1 => 2_00_00_00, 2.0.0 => 2_00_00_01
versionName '2.0.0-beta2'

// enable support for vector drawables on API < 21
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -84,7 +86,7 @@ android {
// Fabric / Crashlytics keys are mandatory for release builds
task checkFabricPropertiesExists << {
if (!file('fabric.properties').exists()) {
throw new GradleException('Missing fabric.properties file for Fabric / Crashlytics!')
throw new FileNotFoundException('Missing fabric.properties file for Fabric / Crashlytics!')
}
}

Expand All @@ -100,10 +102,11 @@ dependencies {
compile "io.reactivex.rxjava2:rxandroid:2.0.1"

// networking / communication / data storage
compile("com.squareup.retrofit2:retrofit:2.1.0") {
compile("com.squareup.retrofit2:retrofit:$rootProject.ext.retrofitVersion") {
exclude module: "okhttp"
}
compile "com.squareup.retrofit2:converter-gson:2.1.0"
compile "com.squareup.retrofit2:converter-gson:$rootProject.ext.retrofitVersion"
compile "com.squareup.retrofit2:adapter-rxjava2:$rootProject.ext.retrofitVersion"
compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okhttpVersion"
compile "com.squareup.okhttp3:logging-interceptor:$rootProject.ext.okhttpVersion"
compile "com.squareup.picasso:picasso:2.5.2"
Expand Down Expand Up @@ -131,8 +134,10 @@ dependencies {
compile "com.github.hotchemi:permissionsdispatcher:$rootProject.ext.permissionsDispatcherVersion"
annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$rootProject.ext.permissionsDispatcherVersion"
compile "com.github.slugify:slugify:2.1.3"
compile "com.jakewharton.timber:timber:4.5.1"

// debug
debugCompile "nl.littlerobots.rxlint:rxlint:+"
debugCompile "com.squareup.leakcanary:leakcanary-android:1.5"
debugCompile "com.jakewharton.scalpel:scalpel:1.1.2"
debugCompile "io.palaima.debugdrawer:debugdrawer:0.7.0"
Expand All @@ -147,6 +152,8 @@ dependencies {
// test
testCompile "junit:junit:4.12"
testCompile "org.hamcrest:hamcrest-library:1.3"
testCompile "org.mockito:mockito-core:2.7.+"
testCompile "com.squareup.retrofit2:retrofit-mock:$rootProject.ext.retrofitVersion"
testCompile "org.json:json:20140107" // don't depend on Android's JSONObject: http://stackoverflow.com/a/30759769/504611
testCompile "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okhttpVersion"
}
9 changes: 0 additions & 9 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@
android:value=".view.PostListActivity"/>
</activity>

<activity
android:name=".view.BrowserActivity"
android:parentActivityName=".view.PostListActivity"
android:windowSoftInputMode="adjustResize">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".view.PostListActivity"/>
</activity>

<activity
android:name=".view.PostConflictResolutionActivity"
android:parentActivityName=".view.PostListActivity"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/assets/markdown-converter.js

Large diffs are not rendered by default.

17 changes: 2 additions & 15 deletions app/src/main/assets/post-preview.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,9 @@
<link rel="stylesheet" href="file:///android_asset/css/main.css" />
<link rel="stylesheet" href="file:///android_asset/css/defer.css" />

<script type="text/javascript" src="file:///android_asset/showdown-ghost/showdown.js"></script>
<script type="text/javascript" src="file:///android_asset/showdown-ghost/extensions/ghostgfm.js"></script>
<script type="text/javascript" src="file:///android_asset/showdown-ghost/extensions/footnotes.js"></script>
<script type="text/javascript" src="file:///android_asset/showdown-ghost/extensions/highlight.js"></script>
<script type="text/javascript" src="file:///android_asset/markdown-converter.js"></script>
<script type="text/javascript" src="file:///android_asset/js/prism.min.js"></script>
<script type="text/javascript">
// https://github.com/TryGhost/Ghost/blob/master/core/client/app/helpers/gh-format-markdown.js#L8
var showdown = new Showdown.converter({
extensions: [
// 'ghostimagepreview',
'ghostgfm',
'footnotes',
'highlight'
]
});

var content = undefined, title = undefined;
window.addEventListener('load', function () {
content = document.getElementsByClassName('post-content')[0];
Expand All @@ -45,7 +32,7 @@
}
markdown = POST.getMarkdown();

var html = showdown.makeHtml(markdown),
var html = MarkdownConverter.render(markdown),
blogUrl = POST.getBlogUrl();

html = html
Expand Down
44 changes: 0 additions & 44 deletions app/src/main/assets/showdown-ghost/extensions/autolink.js

This file was deleted.

94 changes: 0 additions & 94 deletions app/src/main/assets/showdown-ghost/extensions/footnotes.js

This file was deleted.

Loading

0 comments on commit 0bb6c1c

Please sign in to comment.