support sort by

Author: isayan

Readme-ja.md

@@ -58,6 +58,14 @@ Disallow Application と Allow Application の２つのモードがあります
 画面上部の検索アイコン(![Menu](images/Search.png))から、アプリケーションを絞り込めます。
 アプリケーション名に指定したキーワードを含む、アプリケーションのみが表示されます。
 
+プリケーションリストは、画面上部のメニューアイコン（！[メニュー]（images / Menu.png））からソートできます。
+
+* アプリ名で並べ替え
+  * アプリケーション名でアプリケーションリストを並べ替えます。
+
+* パッケージ名で並べ替え
+  * パッケージ名でアプリケーションリストを並べ替えます。
+
 ### About
 アプリケーションバージョンを表示します。
 

Readme.md

@@ -53,11 +53,19 @@ The default is **Disallow Application** selected.
 
 ### Settings Search
 
-![Menu Settings](images/Menu-Settings-Search.png)
+![Menu Settings](images/Menu-Settings-Search.png) / ![Menu Settings](images/Menu-Settings-SortBy.png)
 
 You can narrow down the applications from the search icon.(![Menu](images/Search.png))
 Only applications that contain the keyword specified in the application name are displayed.
 
+The application list can be sorted from the menu icon  (![Menu](images/Menu.png)) at the top of the screen.
+
+* sort by app name 
+  * Sort application list by application name
+
+* sort by package name 
+  * Sort application list by package name
+
 ### About
 Display application version
 

android_app/app/build.gradle

@@ -6,7 +6,7 @@ android {
         applicationId "tun.proxy"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 100010
+        versionCode 100011
         versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

android_app/app/src/main/java/tun/proxy/MyApplication.java

@@ -43,6 +43,8 @@ public void onCreate() {
 
     public enum VPNMode {DISALLOW, ALLOW};
 
+    public enum AppSortBy {APPNAME, PKGNAME};
+
 //    public final String vpn_mode_key[] = {VPNMode.DISALLOW.name(), VPNMode.ALLOW.name()};
 
     private final String pref_key[] = {"vpn_disallowed_application", "vpn_allowed_application"};

android_app/app/src/main/java/tun/proxy/SimplePreferenceFragment.java

@@ -39,7 +39,7 @@ public void onCreate(Bundle savedInstanceState) {
             @Override
             public boolean onPreferenceChange(Preference preference, Object value) {
             if (preference instanceof ListPreference) {
-                ListPreference listPreference = (ListPreference) preference;
+                final ListPreference listPreference = (ListPreference) preference;
                 int index = listPreference.findIndexOfValue((String) value);
 
                 PreferenceScreen disallow = (PreferenceScreen) findPreference(VPN_DISALLOWED_APPLICATION_LIST);
@@ -102,11 +102,12 @@ private void transitionFragment(PreferenceFragment nextPreferenceFragment) {
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public static class PackageListPreferenceFragment extends PreferenceFragment implements SearchView.OnQueryTextListener, SearchView.OnCloseListener {
-        private MyApplication.VPNMode mode;
+        private MyApplication.VPNMode mode = MyApplication.VPNMode.DISALLOW;
+        private MyApplication.AppSortBy appSortBy = MyApplication.AppSortBy.APPNAME;
         private PreferenceScreen mRootPreferenceScreen;
 
         public static PackageListPreferenceFragment newInstance(MyApplication.VPNMode mode) {
-            PackageListPreferenceFragment fragment = new PackageListPreferenceFragment();
+            final PackageListPreferenceFragment fragment = new PackageListPreferenceFragment();
             fragment.mode = mode;
             return fragment;
         }
@@ -123,14 +124,18 @@ public void onCreate(Bundle savedInstanceState) {
         private SearchView searchView;
 
         protected void filter(String filter) {
+            this.filter(filter, this.appSortBy);
+        }
+
+        protected void filter(String filter, final MyApplication.AppSortBy sortBy) {
             if (filter == null) {
                 filter = searchFilter;
             }
             else {
                 searchFilter = filter;
             }
             removeAllPreferenceScreen();
-            buildPackagesPreferences(filter);
+            buildPackagesPreferences(filter, sortBy);
             loadSelectedPackage();
         }
 
@@ -140,7 +145,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
             // Menuの設定
             inflater.inflate(R.menu.menu_search, menu);
 
-            MenuItem menuItem = menu.findItem(R.id.search_menu_item);
+            final MenuItem menuItem = menu.findItem(R.id.menu_search_item);
 
             this.searchView = (SearchView)menuItem.getActionView();
             this.searchView.setOnQueryTextListener(this);
@@ -164,16 +169,23 @@ private void removeAllPreferenceScreen() {
             mRootPreferenceScreen.removeAll();
         }
 
-        private void buildPackagesPreferences(String filter) {
+        private void buildPackagesPreferences(String filter, final MyApplication.AppSortBy sortBy) {
             final Context context = MyApplication.getInstance().getApplicationContext();
             final PackageManager pm = context.getPackageManager();
             final List<PackageInfo> installedPackages = pm.getInstalledPackages(PackageManager.GET_META_DATA);
             Collections.sort(installedPackages, new Comparator<PackageInfo>() {
                 @Override
                 public int compare(PackageInfo o1, PackageInfo o2) {
-                    String t1 = o1.applicationInfo.loadLabel(pm).toString();
-                    String t2 = o2.applicationInfo.loadLabel(pm).toString();
-                    return t1.compareTo(t2);
+                    if (sortBy == MyApplication.AppSortBy.APPNAME) {
+                        String t1 = o1.applicationInfo.loadLabel(pm).toString();
+                        String t2 = o2.applicationInfo.loadLabel(pm).toString();
+                        return t1.compareTo(t2);
+                    }
+                    else {
+                        String t1 = o1.packageName;
+                        String t2 = o2.packageName;
+                        return t1.compareTo(t2);
+                    }
                 }
             });
             for (final PackageInfo pi : installedPackages) {
@@ -234,9 +246,20 @@ private void storeSelectedPackageSet(final Set<String> set) {
         @Override
         public boolean onOptionsItemSelected(MenuItem item) {
             int id = item.getItemId();
-            if (id == android.R.id.home) {
-                startActivity(new Intent(getActivity(), SimplePreferenceActivity.class));
-                return true;
+            switch (id) {
+                case android.R.id.home:
+                    startActivity(new Intent(getActivity(), SimplePreferenceActivity.class));
+                    return true;
+                case R.id.menu_sort_app_name:
+                    item.setChecked(!item.isChecked());
+                    this.appSortBy = MyApplication.AppSortBy.APPNAME;
+                    filter(null, this.appSortBy);
+                    break;
+                case R.id.menu_sort_pkg_name:
+                    item.setChecked(!item.isChecked());
+                    this.appSortBy = MyApplication.AppSortBy.PKGNAME;
+                    filter(null, this.appSortBy);
+                    break;
             }
             return super.onOptionsItemSelected(item);
         }

android_app/app/src/main/res/menu/menu_search.xml

@@ -2,10 +2,21 @@
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/search_menu_item"
+    <item android:id="@+id/menu_search_item"
         android:title="@string/search"
         android:icon="@android:drawable/ic_menu_search"
         app:showAsAction="always"
         android:orderInCategory="100"
         app:actionViewClass="android.widget.SearchView" />
+    <group android:checkableBehavior="single">
+        <item
+            android:id="@+id/menu_sort_app_name"
+            android:checked="true"
+            android:title="sort by app name"
+            app:showAsAction="never" />
+        <item
+            android:id="@+id/menu_sort_pkg_name"
+            android:title="sort by package name"
+            app:showAsAction="never" />
+    </group>
 </menu>

android_app/gradle.properties

@@ -13,7 +13,7 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 
 APP_NAME=TunProxy
-VERSION_NAME=1.1.0
+VERSION_NAME=1.1.1
 
 productKeyStore=../androidkeystore.jks
 productKeyAlias=key0