From bc197ad5769ee792d930ac5b634e1e9000230689 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Thu, 1 Jun 2017 18:09:43 -0700 Subject: integrate travis --- app/build.gradle | 25 +++++++++++++++++++++- app/src/main/assets/facebook.compact.css | 3 +++ .../com/pitchedapps/frost/injectors/CssAssets.kt | 5 +++-- app/src/main/res/values/strings.xml | 2 -- 4 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 app/src/main/assets/facebook.compact.css (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index 1e453524..b2929faa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,16 +18,39 @@ android { applicationVariants.all { variant -> variant.outputs.each { output -> output.outputFile = new File(output.outputFile.parent, - "${project.APP_ID}-v${variant.versionName}.apk") + "${project.APP_ID}-${variant.buildType.name}.apk") } } + + signingConfigs { + test { + storeFile file("../files/test.keystore") + storePassword "testkey" + keyAlias "testKey" + keyPassword "testkey" + } + } + buildTypes { + debug { + applicationIdSuffix ".debug" + versionNameSuffix "-debug" + resValue "string", "app_name", "Frost Debug" + } + releaseTest { + applicationIdSuffix ".test" + signingConfig signingConfigs.test + versionNameSuffix "-test" + resValue "string", "app_name", "Frost Test" + } release { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + resValue "string", "app_name", "Frost" } } + sourceSets { main.java.srcDirs += 'src/main/kotlin' test.java.srcDirs += 'src/test/kotlin' diff --git a/app/src/main/assets/facebook.compact.css b/app/src/main/assets/facebook.compact.css new file mode 100644 index 00000000..a3a67d95 --- /dev/null +++ b/app/src/main/assets/facebook.compact.css @@ -0,0 +1,3 @@ +#header[data-sigil="MTopBlueBarHeader"], #header-notices { display: None !important; } + +textarea, ._2gn4 { background-color: transparent !important; } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt index 74a55888..0482fdc9 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssAssets.kt @@ -6,9 +6,10 @@ import com.pitchedapps.frost.utils.L /** * Created by Allan Wang on 2017-05-31. */ -enum class CssAssets(val file: String) { - BASE("facebook.min.css"); +enum class CssAssets(f: String) { + BASE("facebook"); + var file = "$f.compact.css" var content: String? = null var injector: JsInjector? = null diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3b13ebb..8bf0e417 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,4 @@ - Frost for Facebook - Settings Hello World from section: %1$d -- cgit v1.2.3