Merge pull request #414 from Mygod/master

Add more material design (3)

build.sbt

@@ -29,16 +29,12 @@ libraryDependencies ++= Seq(
   "com.github.kevinsawicki" % "http-request" % "6.0",
   "commons-net" % "commons-net" % "3.3",
   "com.google.zxing" % "android-integration" % "3.2.1",
-  "com.joanzapata.android" % "android-iconify" % "1.0.11",
   "net.glxn.qrgen" % "android" % "2.0",
-  "net.simonvt.menudrawer" % "menudrawer" % "3.0.6",
   "com.google.android.gms" % "play-services-base" % "8.1.0",
   "com.google.android.gms" % "play-services-ads" % "8.1.0",
   "com.google.android.gms" % "play-services-analytics" % "8.1.0",
-  "com.android.support" % "support-v4" % "23.1.0",
   "com.android.support" % "design" % "23.1.0",
   "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
-  "com.nostra13.universalimageloader" % "universal-image-loader" % "1.9.4",
   "com.j256.ormlite" % "ormlite-core" % "4.48",
   "com.j256.ormlite" % "ormlite-android" % "4.48"
 )
@@ -46,13 +42,9 @@ libraryDependencies ++= Seq(
 proguardOptions in Android ++= Seq("-keep class android.support.v4.app.** { *; }",
           "-keep interface android.support.v4.app.** { *; }",
           "-keep class android.support.v7.widget.Toolbar { <init>(...); }",
-          "-keep class com.actionbarsherlock.** { *; }",
-          "-keep interface com.actionbarsherlock.** { *; }",
           "-keep class org.jraf.android.backport.** { *; }",
           "-keep class com.github.shadowsocks.** { *; }",
           "-keep class * extends com.j256.ormlite.** { *; }",
-          "-keep class com.joanzapata.** { *; }",
           "-keepattributes *Annotation*",
           "-dontwarn com.google.android.gms.internal.zzhu",
-          "-dontwarn org.xbill.**",
-          "-dontwarn com.actionbarsherlock.**")
+          "-dontwarn org.xbill.**")

src/main/AndroidManifest.xml

@@ -22,7 +22,8 @@
             android:hardwareAccelerated="true"
             android:icon="@drawable/ic_launcher"
             android:backupAgent=".ShadowsocksBackupAgent"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Material">
 
         <meta-data android:name="com.google.android.gms.version"
                    android:value="@integer/google_play_services_version"/>
@@ -36,7 +37,6 @@
         <activity
                 android:name=".Shadowsocks"
                 android:label="@string/app_name"
-                android:theme="@style/Theme.Shadowsocks"
                 android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -63,10 +63,21 @@
         </activity>
 
         <activity
-                android:name=".AppManager"
-                android:theme="@style/Theme.Material"
+                android:name=".ProfileManagerActivity"
                 android:label="@string/app_name"
-                android:parentActivityName=".Shadowsocks">
+                android:parentActivityName=".Shadowsocks"
+                android:exported="false">
+            <intent-filter>
+                <action android:name="com.github.shadowsocks.ProfileManagerActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+                android:name=".AppManager"
+                android:label="@string/app_name"
+                android:parentActivityName=".Shadowsocks"
+                android:exported="false">
             <intent-filter>
                 <action android:name="com.github.shadowsocks.AppManager"/>
                 <category android:name="android.intent.category.DEFAULT"/>

src/main/res/drawable-anydpi-v21/ic_content_add.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>

src/main/res/drawable-anydpi-v21/ic_social_share.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>