diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 92ea0829ef..d79fdf06e9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,12 +22,10 @@ + android:versionCode="4" + android:versionName="1.3" > - - Open Source Lizenzen Feedback senden Versteckte Dateien + Schnellwahl diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index e6206a802e..2937b3fe56 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -240,4 +240,5 @@ Raíz Nuevo Establecer como tono de llamada + Añadir acceso directo \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 0af33e47b4..6319d0841b 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -239,5 +239,5 @@ Licences Open Source Envoyer votre avis Masquer des fichiers - Ajouter Raccourci + Ajouter un raccourci diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 24a6194ec5..81499378f2 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -228,5 +228,6 @@ Licenza Open Source Invia Feedback File Nascosti + Aggiungi Shortcut diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index cade5cb2ea..fe265c938a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -240,5 +240,6 @@ Тип Тип (по убыванию) Выйти + Добавить ярлык diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 408c14082a..ecb88d4a87 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -254,4 +254,5 @@ 新建 设置为铃声 复制路径 + 添加快捷方式 diff --git a/res/values/strings.xml b/res/values/strings.xml index 1bd6e3ee8b..aefc9f9374 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -142,6 +142,12 @@ - Added bookmarks to navigation drawer<br> - Added material dialogs<br> - more...<br><br> + <font color="#524ef8"><b>v1.3</font></b><i><font color="#5299f2"><br>Dec 13, 2014</i></font><br> + - Added Spanish<br> + - Various Zip Viewer fixes<br> + - Can view apk and jar files<br> + - Various text editor fixes<br> + - more...<br><br> @@ -262,5 +268,8 @@ View Install This is a package installer. What action would you like to perform? + XDA + Q&A, Help & Troubleshooting + Invalid Directory diff --git a/res/xml/analytics.xml b/res/xml/analytics.xml deleted file mode 100644 index d4805a7139..0000000000 --- a/res/xml/analytics.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - UA-50377504-2 - - - true - - - true - - \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index fb17ad1015..11dfcb11cf 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -94,15 +94,19 @@ + - + diff --git a/src/com/amaze/filemanager/activities/MainActivity.java b/src/com/amaze/filemanager/activities/MainActivity.java index ed99cf6d46..e92a9c6b69 100644 --- 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 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 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); - } } \ No newline at end of file diff --git a/src/com/amaze/filemanager/activities/TextReader.java b/src/com/amaze/filemanager/activities/TextReader.java index 04df0bdf98..f1099bbd5a 100644 --- 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 index 29763f5558..0764a3f938 100644 --- 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 index 1acfab55d8..2b3ebaac30 100644 --- 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 index 2a6853c04b..8af97965d7 100644 --- 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 index b9718d57ab..5e6ca04cae 100644 --- 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) {