From df24d6fec5e00db15fedac86450e1faefa05d586 Mon Sep 17 00:00:00 2001
From: zt515 <kiva515@foxmail.com>
Date: Mon, 3 Jul 2017 18:38:30 +0800
Subject: [PATCH] UI: SetupActivity

---
 app/build.gradle                              |  6 ++++-
 app/proguard-rules.pro                        | 27 ++++++++++++++++---
 .../java/io/neoterm/ui/setup/SetupActivity.kt | 14 ++++++++++
 app/src/main/res/layout/ui_setup.xml          |  6 +++++
 4 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt
 create mode 100644 app/src/main/res/layout/ui_setup.xml

diff --git a/app/build.gradle b/app/build.gradle
index 79ca1f2..6c22ef8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,6 +20,7 @@ android {
         versionCode 4
         versionName "1.1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        resConfigs "zh"
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11"
@@ -35,6 +36,8 @@ android {
     buildTypes {
         release {
             minifyEnabled true
+            zipAlignEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
             proguardFile 'app/proguard-rules.pro'
@@ -61,5 +64,6 @@ dependencies {
     compile 'com.github.wrdlbrnft:modular-adapter:0.2.0.6'
     compile 'com.github.wrdlbrnft:sorted-list-adapter:0.2.0.19'
     compile 'com.simplecityapps:recyclerview-fastscroll:1.0.16'
-
+    compile 'com.ramotion.cardslider:card-slider:0.1.0'
+    compile 'com.github.igalata:Bubble-Picker:v0.2.4'
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 891bb78..3abb7b8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -38,7 +38,26 @@
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
 
-# Only required if you use AsyncExecutor
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(java.lang.Throwable);
-}
\ No newline at end of file
+## Only required if you use AsyncExecutor
+#-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+#    <init>(java.lang.Throwable);
+#}
+
+#rxjava
+-dontwarn rx.**
+#-keep class rx.** { *; }
+
+#skf4j
+-dontwarn org.slf4j.**
+
+-dontwarn sun.misc.**
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+ long producerIndex;
+ long consumerIndex;
+}
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+ rx.internal.util.atomic.LinkedQueueNode producerNode;
+}
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
+ rx.internal.util.atomic.LinkedQueueNode consumerNode;
+}
diff --git a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt
new file mode 100644
index 0000000..7b2b4fa
--- /dev/null
+++ b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt
@@ -0,0 +1,14 @@
+package io.neoterm.ui.setup
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+
+/**
+ * @author kiva
+ */
+class SetupActivity :AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/ui_setup.xml b/app/src/main/res/layout/ui_setup.xml
new file mode 100644
index 0000000..3509b84
--- /dev/null
+++ b/app/src/main/res/layout/ui_setup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file