1
0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-09 20:42:34 +01:00

Update travis

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

View File

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

View File

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

View File

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

View File

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

View File

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