Merge branch 'release/1.1.7'

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "jni/xsocks"]
-	path = jni/xsocks
-	url = https://github.com/lparam/xsocks.git
+    path = jni/xsocks
+    url = https://github.com/lparam/xsocks.git
+    ignore = dirty

CHANGES.md

@@ -1,3 +1,9 @@
-v1.1.5 (2015-5-20)
+v1.1.7 (2015-5-22)
+-----------
+* Change: Remove snackbar action
+* Change: Remove redundant code and icon
+
+
+v1.1.6 (2015-5-20)
 -----------
 * The first public version.

Makefile

@@ -3,8 +3,10 @@ all: app/src/main/jniLibs/armeabi/libsystem.so
 .PHONY: clean
 
 clean:
+	$(ANDROID_NDK_HOME)/ndk-build clean
 	rm -rf libs
 	rm -rf app/src/main/jniLibs
+	rm -rf jni/xsocks/xsocks-android-i686
 	rm -rf jni/xsocks/xsocks-android-armv7-a
 
 app/src/main/jniLibs/armeabi/libsystem.so: jni/system.cpp jni/Android.mk
@@ -21,7 +23,7 @@ app/src/main/jniLibs/armeabi/libsystem.so: jni/system.cpp jni/Android.mk
 	fi ;\
 	popd ;\
 	pushd jni ;\
-	$(ANDROID_NDK_HOME)/ndk-build NDK_LOG=1 V=1 || exit 1 ;\
+	$(ANDROID_NDK_HOME)/ndk-build NDK_LOG=1 V=0 || exit 1 ;\
 	popd ;\
 	rm -rf app/src/main/assets/x86 ;\
 	rm -rf app/src/main/assets/armeabi-v7a ;\

app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'me.tatarka.retrolambda'
 if(file('../sign.gradle').exists()) {
     apply from: '../sign.gradle'
 } else {
-    ogger.error('no such file: ../sign.gradle')
+    logger.error('no such file: ../sign.gradle')
 }
 
 android {
@@ -14,8 +14,8 @@ android {
         applicationId "io.github.xsocks"
         minSdkVersion 18
         targetSdkVersion 22
-        versionCode 116
-        versionName '1.1.6'
+        versionCode 117
+        versionName '1.1.7'
     }
     lintOptions {
         abortOnError true

app/src/main/java/io/github/xsocks/ui/AboutActivity.java

@@ -36,16 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 upArrow.setColorFilter(getResources().getColor(android.R.color.white), PorterDuff.Mode.SRC_IN);
             }
             ab.setHomeAsUpIndicator(upArrow);
-
-            String title = getString(R.string.about);
-
             ab.setDisplayHomeAsUpEnabled(true);
-            if (TextUtils.isEmpty(title)) {
-                ab.setDisplayShowTitleEnabled(false);
-            } else {
-                ab.setDisplayShowTitleEnabled(true);
-                ab.setTitle(title);
-            }
         }
 
         TextView aboutVersion = (TextView) findViewById(R.id.aboutVersion);

app/src/main/java/io/github/xsocks/ui/MainActivity.java

@@ -159,7 +159,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setLogo(R.drawable.ic_stat_xsocks);
+        toolbar.setLogo(R.drawable.ic_logo);
 
         switchButton = (Switch) toolbar.findViewById(R.id.switchButton);
         switchButton.setOnCheckedChangeListener(this);
@@ -225,7 +225,6 @@ protected void onCreate(Bundle savedInstanceState) {
                 .build();
 
         result.getListView().setVerticalScrollBarEnabled(false);
-        toolbar.setNavigationIcon(R.drawable.ic_drawer_light);
 
         prefsFragment = new PrefsFragment();
         getFragmentManager().beginTransaction().replace(R.id.content, prefsFragment).commit();
@@ -339,7 +338,7 @@ private void onStateChanged(int s, String m) {
                                     Snackbar.with(MainActivity.this)
                                             .text(String.format(getString(R.string.vpn_error), m))
                                             .duration(Snackbar.SnackbarDuration.LENGTH_LONG)
-                                            .actionLabel(R.string.error));
+                                            .swipeToDismiss(false));
                         }
                         prefsFragment.setPreferenceEnabled(true);
                         break;
@@ -474,9 +473,9 @@ private void showAbout() {
             SnackbarManager.show(
                     Snackbar.with(this)
                             .text("There are no email applications installed.")
+                            .textColor(Color.RED)
                             .duration(Snackbar.SnackbarDuration.LENGTH_LONG)
-                            .actionLabel(R.string.error)
-                            .actionColor(Color.RED));
+                            .swipeToDismiss(false));
         }
     }
 
@@ -640,8 +639,7 @@ private boolean isTextEmpty(String s, String msg) {
                     Snackbar.with(this)
                             .text(msg)
                             .duration(Snackbar.SnackbarDuration.LENGTH_LONG)
-                            .actionLabel(R.string.error)
-                            .actionColor(Color.RED));
+                            .swipeToDismiss(false));
             return true;
         }
         return false;
@@ -667,17 +665,15 @@ private boolean checkNumber(String key, Boolean low) {
                         Snackbar.with(this)
                                 .text(getString(R.string.port_alert))
                                 .duration(Snackbar.SnackbarDuration.LENGTH_LONG)
-                                .actionLabel(R.string.error)
-                                .swipeToDismiss(false)
-                                .actionColor(Color.RED));
+                                .swipeToDismiss(false));
                 return false;
             }
         } catch (Exception ex) {
             SnackbarManager.show(
                     Snackbar.with(this)
                             .text(getString(R.string.port_alert))
                             .duration(Snackbar.SnackbarDuration.LENGTH_LONG)
-                            .actionLabel(R.string.error));
+                            .swipeToDismiss(false));
             return false;
         }
         return true;

app/src/main/res/layout/activity_about.xml

@@ -10,8 +10,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         android:textStyle="bold"
-        android:title="@string/about"
-        android:elevation="4dp"/>
+        android:title="@string/about"/>
 
     <FrameLayout
         android:layout_below="@id/toolbar"
@@ -43,15 +42,15 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="4dp"
                 android:gravity="center"
-                android:textColor="@color/about_libraries_text_openSource"
+                android:textColor="@color/about_text"
                 tools:text="About version"/>
 
             <View
                 android:id="@+id/aboutDivider"
                 android:layout_width="match_parent"
                 android:layout_height="1px"
                 android:layout_marginTop="4dp"
-                android:background="@color/about_libraries_dividerDark_openSource"
+                android:background="@color/about_dividerDark"
                 />
 
             <TextView
@@ -62,7 +61,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="true"
-                android:textColor="@color/about"
+                android:textColor="@color/about_description"
                 tools:text="About description"/>
         </LinearLayout>
     </FrameLayout>

app/src/main/res/layout/activity_main.xml

@@ -10,9 +10,7 @@
         android:id="@id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"
-        android:titleTextAppearance="@android:style/TextAppearance.Small.Inverse">
+        android:background="?attr/colorPrimary">
 
         <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"

app/src/main/res/values-v21/styles.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+    <style name="AppTheme.DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">false</item>
         <item name="color">@android:color/white</item>
     </style>
@@ -17,9 +17,11 @@
         <item name="colorPrimaryDark">@color/primaryColorDark</item>
         <item name="colorAccent">@color/accentColor</item>
 
-        <item name="material_drawer_background">@color/drawer_background_light</item>
+        <!-- MaterialDrawer specific values -->
         <item name="background">@color/background_light</item>
-        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+        <item name="material_drawer_background">@color/drawer_background_light</item>
+
+        <item name="drawerArrowStyle">@style/AppTheme.DrawerArrowStyle</item>
 
     </style>
 

app/src/main/res/values/colors.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="title">#EEE</color>
     <color name="tool_title">@android:color/white</color>
-    <color name="about">#727272</color>
-    <color name="about_libraries_dividerDark_openSource">#AAA</color>
-    <color name="about_libraries_dividerLight_openSource">#DADADA</color>
-    <color name="about_libraries_text_openSource">#727272</color>
+
+    <color name="about_description">#727272</color>
+    <color name="about_dividerDark">#AAA</color>
+    <color name="about_dividerLight">#DADADA</color>
+    <color name="about_text">#727272</color>
 
     <color name="sk_material_green500">#4caf50</color>
     <color name="sk_material_green700">#388e3c</color>
@@ -20,12 +20,9 @@
     <color name="primaryColor">@color/sk_material_green500</color>
     <color name="primaryColorDark">@color/sk_material_green700</color>
 
-    <color name="drawer_background_light">#ffeeeeee</color>
     <color name="background_light">#ffe2e2e2</color>
-
+    <color name="drawer_background_light">#ffeeeeee</color>
     <color name="material_drawer_icons">#ff6a6a6a</color>
 
-    <color name="button_click_background">#4dffffff</color>
-
 
 </resources>

app/src/main/res/values/styles.xml

@@ -1,5 +1,10 @@
 <resources>
 
+    <style name="AppTheme.DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+        <item name="spinBars">true</item>
+        <item name="color">@android:color/white</item>
+    </style>
+
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/primaryColor</item>
         <item name="colorPrimaryDark">@color/primaryColorDark</item>
@@ -9,6 +14,9 @@
         <item name="background">@color/background_light</item>
         <item name="material_drawer_background">@color/drawer_background_light</item>
         <item name="material_drawer_primary_icon">@color/material_drawer_icons</item>
+
+        <item name="drawerArrowStyle">@style/AppTheme.DrawerArrowStyle</item>
+
     </style>
 
 </resources>