Skip to content

Commit

Permalink
Cleanup (AllanWang#1087)
Browse files Browse the repository at this point in the history
* Feature/download manager (AllanWang#855)

* Add initial github release check

* Create update service

* Clean old manager directory

* Update kau

* Update updateActivity snippet

* Add back gradle keys

* Remove update service functionality

* Update changelog

* Misc (AllanWang#865)

* Clean up git code

* Update download link

* Update theme

* Reorder settings, resolvees AllanWang#856

* Do not log undeliverable exception

* Handle potential lack of webview

* Set notification epoch default to now, resolves AllanWang#857

* Fix notification epoch time init

* Update changelog

* Update theme

* Add slack url, resolves AllanWang#880

* Prepare for image update

* Fix view full image (AllanWang#882)

* Test including full photo viewer

* Test cookie in glide

* Fix parser and add redirects to view full image

* Update changelog

* Fix compilation and add new keys

* Update all versions

* Fix signing configs

* Fix exoplayer api update

* Change string usage

* Test scss on travis

* Test with node_js flag

* Add back css

* Update versions and fix video view
  • Loading branch information
AllanWang committed Sep 26, 2018
1 parent c5e769d commit 438affb
Show file tree
Hide file tree
Showing 31 changed files with 2,055 additions and 700 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,6 +2,7 @@
.gradle
/priv.properties
/local.properties
/signing.properties
/crowdin.properties
/.idea
.DS_Store
Expand Down
9 changes: 6 additions & 3 deletions .travis.yml
Expand Up @@ -5,15 +5,18 @@ android:
components:
- tools
- platform-tools
- build-tools-27.0.3
- android-27
- build-tools-28.0.2
- android-28
- extra-android-support
- extra-android-m2repository
- extra-google-m2repository
licenses:
- ".+"
before_install:
- yes | sdkmanager "platforms;android-27"
- openssl aes-256-cbc -K $encrypted_0454d0cf846c_key -iv $encrypted_0454d0cf846c_iv
-in files/frost.tar.enc -out files/frost.tar -d
- tar xvf files/frost.tar
- yes | sdkmanager "platforms;android-28"
after_success:
- chmod +x ./generate-apk-release.sh; ./generate-apk-release.sh
script:
Expand Down
3 changes: 3 additions & 0 deletions README.md
Expand Up @@ -8,6 +8,9 @@

[Download from XDA Labs](https://labs.xda-developers.com/store/app/com.pitchedapps.frost)

**Note** Some keystores are public for the sake of automatic builds and consistent signing across devices.
This means that others can build apps with the same signature. The only valid download sources are through my github releases and xda labs.

Frost is a third party Facebook wrapper geared towards design and functionality.
It contains many features, including:
* Support for multiple accounts and fast switching
Expand Down
33 changes: 22 additions & 11 deletions app/build.gradle
Expand Up @@ -43,7 +43,13 @@ android {
textOutput 'stdout'
}

def withReleaseSigning = file('../files/release.keystore').exists()
def testKeystoreFile = file('../files/test.keystore')
def testPropFile = file('../files/test.properties')
def withTestSigning = testKeystoreFile.exists() && testPropFile.exists()

def releaseKeystoreFile = file('../files/release.keystore')
def releasePropFile = file('../files/release.properties')
def withReleaseSigning = releaseKeystoreFile.exists() && releasePropFile.exists()

signingConfigs {

Expand All @@ -54,19 +60,24 @@ android {
keyPassword "debugKey"
}

test {
storeFile file("../files/test.keystore")
storePassword "testkey"
keyAlias "testKey"
keyPassword "testkey"
if (withTestSigning) {
def testProps = new Properties()
testPropFile.withInputStream { testProps.load(it) }

test {
storeFile testKeystoreFile
storePassword testProps.getProperty('storePassword')
keyAlias testProps.getProperty('keyAlias')
keyPassword testProps.getProperty('keyPassword')
}
}

if (withReleaseSigning) {
def releaseProps = new Properties()
file("../files/release.properties").withInputStream { releaseProps.load(it) }
releasePropFile.withInputStream { releaseProps.load(it) }

release {
storeFile file("../files/release.keystore")
storeFile releaseKeystoreFile
storePassword releaseProps.getProperty('storePassword')
keyAlias releaseProps.getProperty('keyAlias')
keyPassword releaseProps.getProperty('keyPassword')
Expand All @@ -92,7 +103,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
applicationIdSuffix ".test"
versionNameSuffix "-test"
signingConfig signingConfigs.test
if (withTestSigning) signingConfig signingConfigs.test
resValue "string", "frost_name", "Frost Test"
resValue "string", "frost_web", "Frost Web Test"
}
Expand Down Expand Up @@ -159,14 +170,14 @@ dependencies {

implementation "com.devbrackets.android:exomedia:${EXOMEDIA}"

implementation"com.mikepenz:fastadapter-extensions:${kau.fastAdapter}@aar"
implementation "com.mikepenz:fastadapter-extensions:${kau.fastAdapter}@aar"

//noinspection GradleDependency
implementation "com.github.bumptech.glide:okhttp3-integration:${kau.glide}"
//noinspection GradleDependency
kapt "com.github.bumptech.glide:compiler:${kau.glide}"

implementation "com.fasterxml.jackson.core:jackson-databind:2.9.3"
implementation "com.fasterxml.jackson.core:jackson-databind:${JACKSON}"

//noinspection GradleDependency
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${LEAK_CANARY}"
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/assets/css/components/round_icons.css
@@ -1 +1,4 @@
#threadlist_rows, [role*=presentation] img._1e_c, i.img.profpic:not(._1_0m), ._42b6._42b6._42b6, ._5i9c.img, img._2cu2, i.img.l, [id*=threadlist] i.img:not(._1_0m) { border-radius: 50% !important; }
#threadlist_rows, [role*=presentation] img._1e_c,
i.img.profpic:not(._1_0m), ._42b6._42b6._42b6, ._5i9c.img, img._2cu2, i.img.l, [id*=threadlist] i.img:not(._1_0m) {
border-radius: 50% !important;
}

0 comments on commit 438affb

Please sign in to comment.