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

Test dependencies

This commit is contained in:
Allan Wang 2017-06-27 11:45:57 -07:00
parent ed3efcef75
commit 82e761f7cd
6 changed files with 60 additions and 11 deletions

View File

@ -85,7 +85,9 @@ dependencies {
})
testCompile 'junit:junit:4.12'
compile("ca.allanwang:kau:${KAU}")
compile("ca.allanwang:kau:${KAU}") {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
}
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:${KOTLIN}"
@ -109,14 +111,22 @@ dependencies {
compile "com.github.bumptech.glide:glide:${GLIDE}"
annotationProcessor "com.github.bumptech.glide:compiler:${GLIDE}"
compile("com.mikepenz:materialdrawer:${MATERIAL_DRAWER}@aar") {
transitive = true
// compile("com.mikepenz:materialdrawer:${MATERIAL_DRAWER}@aar") {
// transitive = true
// }
compile("co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}") {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
}
compile "co.zsmb:materialdrawer-kt:${MATERIAL_DRAWER_KT}"
compile "nz.bradcampbell:paperparcel:${PAPER_PARCEL}"
compile "nz.bradcampbell:paperparcel-kotlin:${PAPER_PARCEL}"
kapt "nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}"
compile("nz.bradcampbell:paperparcel:${PAPER_PARCEL}") {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
}
compile("nz.bradcampbell:paperparcel-kotlin:${PAPER_PARCEL}") {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
}
kapt("nz.bradcampbell:paperparcel-compiler:${PAPER_PARCEL}") {
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
}
compile "com.jude:swipebackhelper:${SWIPE_BACK}"

View File

@ -27,3 +27,8 @@
-keeppackagenames org.jsoup.nodes
# IAB
-keep class com.android.vending.billing.**
# About libs
-keep class .R
-keep class **.R$* {
<fields>;
}

View File

@ -0,0 +1,17 @@
//package com.pitchedapps.frost
//
//import android.os.Bundle
//import android.support.v7.app.AppCompatActivity
//import com.mikepenz.aboutlibraries.Libs
//
//
//
///**
// * Created by Allan Wang on 2017-06-26.
// */
//class AboutActivity : AppCompatActivity() {
// override fun onCreate(savedInstanceState: Bundle?) {
// super.onCreate(savedInstanceState)
// val libs = Libs.getInstance(this, R.string::class.java.fields)
// }
//}

View File

@ -12,6 +12,8 @@ import ca.allanwang.kau.kpref.items.KPrefColorPicker
import ca.allanwang.kau.kpref.items.KPrefItemBase
import ca.allanwang.kau.utils.*
import ca.allanwang.kau.views.RippleCanvas
import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.LibsBuilder
import com.mikepenz.community_material_typeface_library.CommunityMaterial
import com.mikepenz.google_material_typeface_library.GoogleMaterial
import com.pitchedapps.frost.facebook.FeedSort
@ -47,6 +49,20 @@ class SettingsActivity : KPrefActivity() {
descRes = R.string.notifications_desc
iicon = GoogleMaterial.Icon.gmd_notifications
}
plainText(R.string.about_frost) {
onClick = {
_, _, _ ->
LibsBuilder()
//provide a style (optional) (LIGHT, DARK, LIGHT_DARK_TOOLBAR)
.withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
//start the activity
.start(this@SettingsActivity)
true
}
}
if (BuildConfig.DEBUG) {
checkbox(R.string.custom_pro, { Prefs.debugPro }, { Prefs.debugPro = it })
}

View File

@ -1,6 +1,7 @@
<resources>
<string name="dev_email" translatable="false">pitchedapps@gmail.com</string>
<string name="play_store_package_id" translatable="false">com.pitchedapps.frost</string>
<string name="about_frost">About Frost for Facebook</string>
<string name="section_format">Hello World from section: %1$d</string>
<string name="feed">Feed</string>

View File

@ -19,8 +19,8 @@ BUILD_TOOLS=26.0.0
VERSION_CODE=5
VERSION_NAME=0.5
KAU=v1.3
KOTLIN=1.1.2-5
KAU=8179e50208
KOTLIN=1.1.3
MATERIAL_DRAWER=5.9.3
MATERIAL_DRAWER_KT=1.0.4
IICON_MATERIAL=2.2.0.2