Mirrors/Frost-for-Facebook
1
0
Fork 0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-08 20:12:39 +01:00
Code Issues Releases Activity

Update travis

Browse Source
This commit is contained in:
Allan Wang 2017-06-16 15:25:24 -07:00
parent 980fb3eecd
commit 7994cb1e92
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -5,10 +5,13 @@ android:
components: components:
- tools - tools
- platform-tools - platform-tools
- build-tools-25.0.2 - build-tools-26.0.0
- android-25 - android-26
- extra-google-m2repository - extra-android-support
- extra-android-m2repository - extra-android-m2repository
- extra-google-m2repository
licenses:
- '.+'
before_install: before_install:
- chmod +x gradlew - chmod +x gradlew
- export JAVA8_HOME=/usr/lib/jvm/java-8-oracle - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle

2
app/src/main/AndroidManifest.xml
View File

@ -98,7 +98,7 @@
android:theme="@style/FrostTheme" /> android:theme="@style/FrostTheme" />
<activity <activity
android:name=".SettingsActivity" android:name=".SettingsActivity"
android:theme="@style/FrostTheme" /> android:theme="@style/FrostTheme.Transparent" />
<service <service
android:name=".services.NotificationService" android:name=".services.NotificationService"

3
app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
View File

@ -13,7 +13,6 @@ import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
import com.mikepenz.materialdrawer.util.DrawerImageLoader import com.mikepenz.materialdrawer.util.DrawerImageLoader
import com.mikepenz.materialdrawer.util.DrawerUIUtils import com.mikepenz.materialdrawer.util.DrawerUIUtils
import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.FbCookie
import com.pitchedapps.frost.services.requestNotifications
import com.pitchedapps.frost.utils.CrashReportingTree import com.pitchedapps.frost.utils.CrashReportingTree
import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.Prefs
import com.raizlabs.android.dbflow.config.FlowConfig import com.raizlabs.android.dbflow.config.FlowConfig
@ -45,7 +44,7 @@ class FrostApp : Application() {
Timber.plant(CrashReportingTree()) Timber.plant(CrashReportingTree())
} }
FlowManager.init(FlowConfig.Builder(this).build()) FlowManager.init(FlowConfig.Builder(this).build())
Prefs.initialize(this, "${com.pitchedapps.frost.BuildConfig.APPLICATION_ID}.prefs") Prefs.initialize(this, "${BuildConfig.APPLICATION_ID}.prefs")
FbCookie() FbCookie()
super.onCreate() super.onCreate()
//Drawer profile loading logic //Drawer profile loading logic

3
app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
View File

@ -27,7 +27,7 @@ class SettingsActivity : KPrefActivity() {
if (item.pref != which) { if (item.pref != which) {
item.pref = which item.pref = which
reload() reload()
setFrostTheme() setFrostTheme(true)
themeExterior() themeExterior()
} }
true true
@ -99,6 +99,7 @@ class SettingsActivity : KPrefActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
themeExterior(false) themeExterior(false)
setFrostTheme(true)
} }
fun themeExterior(animate: Boolean = true) { fun themeExterior(animate: Boolean = true) {

4
app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
View File

@ -75,8 +75,8 @@ fun MaterialDialog.Builder.theme(): MaterialDialog.Builder {
return this return this
} }
fun Activity.setFrostTheme() { fun Activity.setFrostTheme(forceTransparent: Boolean = false) {
val isTransparent = Color.alpha(Prefs.bgColor) != 255 val isTransparent = (Color.alpha(Prefs.bgColor) != 255) || forceTransparent
if (Prefs.bgColor.isColorDark()) if (Prefs.bgColor.isColorDark())
setTheme(if (isTransparent) R.style.FrostTheme_Transparent else R.style.FrostTheme) setTheme(if (isTransparent) R.style.FrostTheme_Transparent else R.style.FrostTheme)
else else