various minor fixes and release v1.3

TeamAmaze · Dec 12, 2014 · 08345e5 · 08345e5
1 parent bf73342
commit 08345e5
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 52 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -22,12 +22,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.amaze.filemanager"
-    android:versionCode="3"
-    android:versionName="1.2" >
+    android:versionCode="4"
+    android:versionName="1.3" >
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission
         android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
     <uses-sdk 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12+'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -23,7 +23,6 @@ dependencies {
     compile 'com.melnykov:floatingactionbutton:1.0.7'
     compile fileTree(dir: 'libs', include: '*.jar')
     compile files('libs/RootTools')
-    compile files('libs/libGoogleAnalyticsServices')
     compile files('libs/nineoldandroids-2.4.0')
     compile files('raroscope-1.0')
 }

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -239,5 +239,6 @@
     <string name="license">Open Source Lizenzen</string>
     <string name="feedback">Feedback senden</string>
     <string name="hiddenfiles">Versteckte Dateien</string>
+    <string name="addshortcut">Schnellwahl</string>
 </resources>
 
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -240,4 +240,5 @@
     <string name="rootdirectory">Raíz</string>
     <string name="new_string">Nuevo</string>
     <string name="setringtone">Establecer como tono de llamada</string>
+    <string name="addshortcut">Añadir acceso directo</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -239,5 +239,5 @@
     <string name="license">Licences Open Source</string>
     <string name="feedback">Envoyer votre avis</string>
     <string name="hiddenfiles">Masquer des fichiers</string>
-    <string name="addshortcut">Ajouter Raccourci</string>
+    <string name="addshortcut">Ajouter un raccourci </string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -228,5 +228,6 @@
     <string name="license">Licenza Open Source</string>
     <string name="feedback">Invia Feedback</string>
     <string name="hiddenfiles">File Nascosti</string>
+    <string name="addshortcut">Aggiungi Shortcut </string>
 
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
@@ -240,5 +240,6 @@
     <string name="type">Тип</string>
     <string name="typeDesc">Тип (по убыванию)</string>
     <string name="exit">Выйти</string>
+    <string name="addshortcut">Добавить ярлык</string>
 
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
@@ -254,4 +254,5 @@
     <string name="new_string">新建</string>
     <string name="setringtone">设置为铃声</string>
     <string name="copy_path">复制路径</string>
+    <string name="addshortcut">添加快捷方式</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -142,6 +142,12 @@
                                       - Added bookmarks to navigation drawer&lt;br>
                                       - Added material dialogs&lt;br>
                                       - more...&lt;br>&lt;br></string>
+    <string name="changelog_version_3">&lt;font color="#524ef8">&lt;b>v1.3&lt;/font>&lt;/b>&lt;i>&lt;font color="#5299f2">&lt;br>Dec 13, 2014&lt;/i>&lt;/font>&lt;br></string>
+    <string name="changelog_change_3">- Added Spanish&lt;br>
+                                      - Various Zip Viewer fixes&lt;br>
+                                      - Can view apk and jar files&lt;br>
+                                      - Various text editor fixes&lt;br>
+                                      - more...&lt;br>&lt;br></string>
 
     <!-- New -->
     <!-- Array -->
@@ -262,5 +268,8 @@
     <string name="view">View</string>
     <string name="install">Install</string>
     <string name="pitext">This is a package installer. What action would you like to perform?</string>
+    <string name="xda_title">XDA</string>
+    <string name="xda_summary">Q&amp;A, Help &amp; Troubleshooting</string>
+    <string name="invalid_dir">Invalid Directory</string>
 </resources>
 
diff --git a/res/xml/analytics.xml b/res/xml/analytics.xml
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -94,15 +94,19 @@
     <PreferenceCategory android:title="@string/about">
         <PreferenceScreen
             android:title="@string/aboutFileManager" >
+            <Preference
+                android:title="@string/version"
+                android:summary="v1.3"/>
             <Preference
                 android:key="authors"
                 android:title="@string/authors" />
-            <Preference
-                android:title="@string/version"
-                android:summary="v1.1"/>
             <Preference
                 android:key="changelog"
                 android:title="@string/changelog" />
+            <Preference
+                android:key="xda"
+                android:title="@string/xda_title"
+                android:summary="@string/xda_summary"/>
             <Preference
                 android:key="rate"
                 android:title="@string/rate" />

diff --git a/src/com/amaze/filemanager/activities/MainActivity.java b/src/com/amaze/filemanager/activities/MainActivity.java
@@ -76,7 +76,6 @@
 import com.amaze.filemanager.utils.IconUtils;
 import com.amaze.filemanager.utils.RootHelper;
 import com.amaze.filemanager.utils.Shortcuts;
-import com.google.analytics.tracking.android.EasyTracker;
 import com.pnikosis.materialishprogress.ProgressWheel;
 import com.readystatesoftware.systembartint.SystemBarTintManager;
 
@@ -129,7 +128,6 @@ public class MainActivity extends android.support.v4.app.FragmentActivity {
     private static final Pattern DIR_SEPARATOR = Pattern.compile("/");
     public ArrayList<String> list;
     public int theme1;
-    private EasyTracker easyTracker = null;
     boolean rootmode;
     public boolean mRingtonePickerIntent = false,restart=false;
     /**
@@ -143,10 +141,6 @@ public void onCreate(Bundle savedInstanceState) {
         s=new Shortcuts(this);
         path=getIntent().getStringExtra("path");
         restart=getIntent().getBooleanExtra("restart",false);
-        // Google Analytics
-        // Get a Tracker (should auto-report)
-        //((Amaze) getApplication()).getTracker(Amaze.TrackerName.APP_TRACKER);
-        easyTracker = EasyTracker.getInstance(this);
         val = getStorageDirectories();
         rootmode = Sp.getBoolean("rootmode", false);
         theme = Integer.parseInt(Sp.getString("theme", "0"));
@@ -196,14 +190,14 @@ public void onClick(View view) {
             }
         });
 
-        /*intent = getIntent();
+        intent = getIntent();
         if (intent.getAction().equals(Intent.ACTION_GET_CONTENT) || intent.getAction().equals(RingtoneManager.ACTION_RINGTONE_PICKER)) {
             mReturnIntent = true;
             if (intent.getAction().equals(RingtoneManager.ACTION_RINGTONE_PICKER)) {
                 mRingtonePickerIntent = true;
             }
             Toast.makeText(this, utils.getString(con,R.string.pick_a_file), Toast.LENGTH_LONG).show();
-        }*/
+        }
 
         skin = PreferenceManager.getDefaultSharedPreferences(this).getString("skin_color", "#5677fc");
         RelativeLayout linearLayout = (RelativeLayout) findViewById(R.id.action_bar);
@@ -891,20 +885,4 @@ protected void onPostExecute(ArrayList<String> strings) {
             showDialog();
         }
     }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-
-        //Get an Analytics tracker to report app starts & uncaught exceptions etc.
-        EasyTracker.getInstance(this).activityStart(this);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-        //Stop the analytics tracking
-        EasyTracker.getInstance(this).activityStop(this);
-    }
 }
diff --git a/src/com/amaze/filemanager/activities/TextReader.java b/src/com/amaze/filemanager/activities/TextReader.java
@@ -93,7 +93,7 @@ public void onCreate(Bundle savedInstanceState) {
         path = this.getIntent().getStringExtra("path");
         if (path != null) {
             file=new File(path);
-            Toast.makeText(this, "" + path, Toast.LENGTH_SHORT).show();
+            //Toast.makeText(this, "" + path, Toast.LENGTH_SHORT).show();
             new LoadText().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, path);
         } else {
             Toast.makeText(this,utils.getString(this,R.string.cant_read_file) , Toast.LENGTH_LONG).show();

diff --git a/src/com/amaze/filemanager/fragments/BookmarksManager.java b/src/com/amaze/filemanager/fragments/BookmarksManager.java
@@ -122,13 +122,13 @@ public void onClick(View view) {
                     public void onPositive(MaterialDialog materialDialog) {
                         try {
                             File a = new File(edir.getText().toString());
-                            if (a.exists()) {
+                            if (a.isDirectory()) {
                                 s.addS(a);
                                 b.items.add(a);
                                 b.notifyDataSetChanged();
                                 Toast.makeText(getActivity(), utils.getString(getActivity(), R.string.success), Toast.LENGTH_LONG).show();
                             } else {
-                                Toast.makeText(getActivity(), utils.getString(getActivity(), R.string.filenotexists), Toast.LENGTH_LONG).show();
+                                Toast.makeText(getActivity(), utils.getString(getActivity(), R.string.invalid_dir), Toast.LENGTH_LONG).show();
                             }
                         } catch (Exception e) {
                             // TODO Auto-generated catch block

diff --git a/src/com/amaze/filemanager/fragments/Main.java b/src/com/amaze/filemanager/fragments/Main.java
@@ -799,9 +799,13 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
                     showOption(R.id.ex, menu);
 
                     hideOption(R.id.sethome, menu);
+                    hideOption(R.id.book, menu);
                     showOption(R.id.openwith,menu);
                     showOption(R.id.share, menu);
 
+                } else if (x.isFile()) {
+
+                    hideOption(R.id.book, menu);
                 } else {
                     /*if (x.getName().endsWith(".mp3"))
 
@@ -827,7 +831,6 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
                         if (x.isDirectory()) {
                             hideOption(R.id.share, menu);
                         }
-
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

diff --git a/src/com/amaze/filemanager/fragments/Preffrag.java b/src/com/amaze/filemanager/fragments/Preffrag.java
@@ -373,7 +373,9 @@ public boolean onPreferenceClick(Preference preference) {
                 MaterialDialog.Builder a = new MaterialDialog.Builder(getActivity());
                 if(theme==1)a.theme(Theme.DARK);
                 a.title(R.string.changelog);
-                a.content(Html.fromHtml(getActivity().getString(R.string.changelog_version_2) +
+                a.content(Html.fromHtml(getActivity().getString(R.string.changelog_version_3) +
+                        getActivity().getString(R.string.changelog_change_3) +
+                        getActivity().getString(R.string.changelog_version_2) +
                         getActivity().getString(R.string.changelog_change_2) +
                         getActivity().getString(R.string.changelog_version_1) +
                         getActivity().getString(R.string.changelog_change_1)));
@@ -590,6 +592,19 @@ public boolean onPreferenceClick(Preference preference) {
             }
         });
 
+        //xda
+        Preference preference6 = findPreference("xda");
+        preference6.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                Uri uri = Uri.parse("http://forum.xda-developers.com/android/apps-games/app-amaze-file-managermaterial-theme-t2937314");
+                Intent intent = new Intent();
+                intent.setData(uri);
+                startActivity(intent);
+                return false;
+            }
+        });
+
     }
 
     public static void restartPC(final Activity activity) {

diff --git a/src/com/amaze/filemanager/services/asynctasks/SearchTask.java b/src/com/amaze/filemanager/services/asynctasks/SearchTask.java
@@ -29,6 +29,7 @@
 import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.afollestad.materialdialogs.Theme;
 import com.amaze.filemanager.R;
 import com.amaze.filemanager.activities.MainActivity;
 import com.amaze.filemanager.fragments.Main;
@@ -58,6 +59,7 @@ public void onPreExecute() {
         a.title(futils.getString(tab.getActivity(), R.string.searching));
         a.positiveText(futils.getString(tab.getActivity(), R.string.cancel));
         a.positiveColor(Color.parseColor(m.skin));
+        if(m.theme1==1)a.theme(Theme.DARK);
         a.callback(new MaterialDialog.Callback() {
             @Override
             public void onPositive(MaterialDialog materialDialog) {