From 82e761f7cd7154a802f94971e8b731c2dfcd0880 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 27 Jun 2017 11:45:57 -0700
Subject: Test dependencies

---
 app/build.gradle                                   | 24 +++++++++++++++-------
 app/proguard-rules.pro                             |  7 ++++++-
 .../kotlin/com/pitchedapps/frost/AboutActivity.kt  | 17 +++++++++++++++
 .../com/pitchedapps/frost/SettingsActivity.kt      | 16 +++++++++++++++
 app/src/main/res/values/strings.xml                |  1 +
 5 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/kotlin/com/pitchedapps/frost/AboutActivity.kt

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index d7b9e5fb..bdf3f831 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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}"
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 688a0d88..9e69be7a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -26,4 +26,9 @@
 # Jsoup
 -keeppackagenames org.jsoup.nodes
 # IAB
--keep class com.android.vending.billing.**
\ No newline at end of file
+-keep class com.android.vending.billing.**
+# About libs
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/AboutActivity.kt
new file mode 100644
index 00000000..fe753872
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/AboutActivity.kt
@@ -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)
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
index cf20aa0f..3900849b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
@@ -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 })
         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a276962b..6fcb2c54 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
-- 
cgit v1.2.3