diff --git a/.gitignore b/.gitignore index 3168f64..f94a449 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ proguard/ # Android Studio .gradle -*.gradle *.jks /local.properties /.idea/workspace.xml diff --git a/Turbo Editor/build.gradle b/Turbo Editor/build.gradle new file mode 100644 index 0000000..92114cb --- /dev/null +++ b/Turbo Editor/build.gradle @@ -0,0 +1,30 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.5.+' + } +} +apply plugin: 'android' + +repositories { + mavenCentral() +} + +android { + compileSdkVersion 18 + buildToolsVersion "18.1.0" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 18 + } +} + +dependencies { + compile 'com.github.gabrielemariotti.changeloglib:library:1.2.0' + compile 'com.android.support:support-v13:18.0.0' + compile "commons-io:commons-io:2.4" + compile fileTree(dir: 'libs', include: '*.jar') +} diff --git a/Turbo Editor/libs/eventbus-2.0.2.jar b/Turbo Editor/libs/eventbus-2.0.2.jar new file mode 100644 index 0000000..183228f Binary files /dev/null and b/Turbo Editor/libs/eventbus-2.0.2.jar differ diff --git a/Turbo Editor/libs/eventbus-2.1.0-beta-1.jar b/Turbo Editor/libs/eventbus-2.1.0-beta-1.jar deleted file mode 100644 index c68edd4..0000000 Binary files a/Turbo Editor/libs/eventbus-2.1.0-beta-1.jar and /dev/null differ diff --git a/Turbo Editor/src/main/AndroidManifest.xml b/Turbo Editor/src/main/AndroidManifest.xml index 7fd3be3..62520f4 100644 --- a/Turbo Editor/src/main/AndroidManifest.xml +++ b/Turbo Editor/src/main/AndroidManifest.xml @@ -20,8 +20,8 @@ names) { - boolean isRoot = currentFolder.equals("/"); if (names != null) { + boolean isRoot = currentFolder.equals("/"); listView.setAdapter(new AdapterDetailedList(getBaseContext(), names, isRoot)); } super.onPostExecute(names); diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditDialogFragment.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditDialogFragment.java index bc22d85..9bd3a27 100644 --- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditDialogFragment.java +++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditDialogFragment.java @@ -45,13 +45,10 @@ public class EditDialogFragment extends DialogFragment implements TextView.OnEdi public static EditDialogFragment newInstance(final Actions action, final String hint) { final EditDialogFragment f = new EditDialogFragment(); - - // Supply num input as an argument. final Bundle args = new Bundle(); args.putSerializable("action", action); args.putString("hint", hint); f.setArguments(args); - return f; } diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java index 9b1b1e3..863d85c 100644 --- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java +++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/EditorFragment.java @@ -69,7 +69,7 @@ import java.util.regex.Pattern; import de.greenrobot.event.EventBus; -public class EditorFragment extends Fragment implements EditDialogFragment.EditDialogListener { +public class EditorFragment extends Fragment implements EditDialogFragment.EditDialogListener, SeekbarDialogFragment.onSeekbarDialogDismissed { private static final String TAG = "A0A"; private Editor mEditor; @@ -77,6 +77,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD // Editor Variables static boolean sWrapText; static boolean sColorSyntax; + static int sFontSize; // private boolean mUseMonospace; private String mCurrentEncoding; @@ -99,6 +100,12 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); + this.sFilePath = getArguments().getString("filePath"); + this.mCurrentEncoding = PreferenceHelper.getEncoding(getActivity()); + this.mUseMonospace = PreferenceHelper.getUseMonospace(getActivity()); + this.sColorSyntax = PreferenceHelper.getSyntaxHiglight(getActivity()); + this.sWrapText = PreferenceHelper.getWrapText(getActivity()); + this.sFontSize = PreferenceHelper.getFontSize(getActivity()); } @@ -107,10 +114,20 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - // Out custom layout View rootView = inflater.inflate(R.layout.fragment_editor, container, false); - // mEditor = (Editor) rootView.findViewById(R.id.editor); + mEditor.setHorizontallyScrolling(!this.sWrapText); + if (!this.sWrapText) { + int paddingLeft = (int) PixelDipConverter.convertDpToPixel(sFontSize * 1.5f, getActivity()); + mEditor.setPadding(paddingLeft, 0, 0, 0); + } else { + int paddingLeft = (int) PixelDipConverter.convertDpToPixel(5, getActivity()); + mEditor.setPadding(paddingLeft, 0, 0, 0); + } + if(this.mUseMonospace){ + mEditor.setTypeface(Typeface.MONOSPACE); + } + mEditor.setTextSize(sFontSize); return rootView; } @@ -121,18 +138,8 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - // - this.sFilePath = getArguments().getString("filePath"); - this.mCurrentEncoding = PreferenceHelper.getEncoding(getActivity()); - this.mUseMonospace = PreferenceHelper.getUseMonospace(getActivity()); - this.sColorSyntax = PreferenceHelper.getSyntaxHiglight(getActivity()); - this.sWrapText = PreferenceHelper.getWrapText(getActivity()); String fileName = FilenameUtils.getName(getArguments().getString("filePath")); - // getActivity().getActionBar().setTitle(fileName); - // - configureEditText(); - // try { final FileInputStream inputStream = new FileInputStream( @@ -174,7 +181,16 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD this.mEditor.onKeyShortcut(KeyEvent.KEYCODE_Y, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Y)); } else if (i == R.id.im_editor_encoding) { - showEncodingDialog(); + EditDialogFragment dialogFrag = EditDialogFragment.newInstance(EditDialogFragment.Actions.Encoding, this.mCurrentEncoding); + dialogFrag.setTargetFragment(this, 0); + dialogFrag.show(getFragmentManager().beginTransaction(), "dialog"); + } else if (i == R.id.im_text_size) { + int fontMax = 36; + float scaledDensity = getResources().getDisplayMetrics().scaledDensity; + int fontCurrent = (int) (mEditor.getTextSize() / scaledDensity); + SeekbarDialogFragment dialogFrag = SeekbarDialogFragment.newInstance(SeekbarDialogFragment.Actions.FileSize, fontCurrent, fontMax); + dialogFrag.setTargetFragment(this, 0); + dialogFrag.show(getFragmentManager().beginTransaction(), "dialog"); } else if (i == R.id.im_syntax_highlight) { item.setChecked(!item.isChecked()); PreferenceHelper.setSyntaxHiglight(getActivity(), item.isChecked()); @@ -191,13 +207,6 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD return super.onOptionsItemSelected(item); } - private void showEncodingDialog() { - EditDialogFragment dialogFrag = EditDialogFragment.newInstance(EditDialogFragment.Actions.Encoding, this.mCurrentEncoding); - dialogFrag.setTargetFragment(this, 0); - dialogFrag.show(getFragmentManager().beginTransaction(), "encodingDialog"); - } - - /** * {@inheritDoc} */ @@ -209,33 +218,50 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD } } + /** + * {@inheritDoc} + */ + @Override + public void onSeekbarDialogDismissed(SeekbarDialogFragment.Actions action, int value) { + PreferenceHelper.setFontSize(getActivity(), value); + updateTextEditor(); + } + private void updateTextEditor() { - final boolean countLines = PreferenceHelper.getWrapText(getActivity()); + final boolean wrapText = PreferenceHelper.getWrapText(getActivity()); final boolean syntaxHighlight = PreferenceHelper.getSyntaxHiglight(getActivity()); final boolean useMonospace = PreferenceHelper.getUseMonospace(getActivity()); final String encoding = PreferenceHelper.getEncoding(getActivity()); + final int fontSize = PreferenceHelper.getFontSize(getActivity()); - if (this.sWrapText != countLines) { - this.sWrapText = countLines; - final String s = this.mEditor.getText().toString(); - //inflateOfWrapText(); - this.mEditor.setText(s); - configureEditText(); + if (this.sWrapText != wrapText) { + this.sWrapText = wrapText; + this.mEditor.setText(this.mEditor.getText().toString()); + this.mEditor.setHorizontallyScrolling(!this.sWrapText); + if (!this.sWrapText) { + int paddingLeft = (int) PixelDipConverter.convertDpToPixel(sFontSize * 1.5f, getActivity()); + mEditor.setPadding(paddingLeft, 0, 0, 0); + } else { + int paddingLeft = (int) PixelDipConverter.convertDpToPixel(5, getActivity()); + mEditor.setPadding(paddingLeft, 0, 0, 0); + } } if (this.sColorSyntax != syntaxHighlight) { this.sColorSyntax = syntaxHighlight; - final String s = this.mEditor.getText().toString(); - //inflateOfWrapText(); - this.mEditor.setText(s); + this.mEditor.setText(this.mEditor.getText().toString()); } if (this.mUseMonospace != useMonospace) { this.mUseMonospace = useMonospace; this.mEditor.setTypeface(Typeface.MONOSPACE); - //final String s = this.mEditor.getText().toString(); - //inflateOfWrapText(); - //this.mEditor.setText(s); + } + + if (this.sFontSize != fontSize) { + this.sFontSize = fontSize; + int paddingLeft = (int) PixelDipConverter.convertDpToPixel(fontSize * 1.5f, getActivity()); + mEditor.setPadding(paddingLeft, 0, 0, 0); + this.mEditor.setTextSize(fontSize); } if (!this.mCurrentEncoding.equals(encoding)) { @@ -248,20 +274,6 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD } } - private void configureEditText() { - this.mEditor.setHorizontallyScrolling(!this.sWrapText); - if (!this.sWrapText) { - int paddingLeft = (int) PixelDipConverter.convertDpToPixel(25, getActivity()); - mEditor.setPadding(paddingLeft, 0, 0, 0); - } else { - int paddingLeft = (int) PixelDipConverter.convertDpToPixel(5, getActivity()); - mEditor.setPadding(paddingLeft, 0, 0, 0); - } - if(this.mUseMonospace){ - this.mEditor.setTypeface(Typeface.MONOSPACE); - } - } - class SaveFile extends AsyncTask { /** @@ -301,7 +313,6 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD ID_REDO = R.id.im_redo; private static final int SYNTAX_DELAY_MILLIS = 0; - private static final float textSize = 16; private final Handler updateHandler = new Handler(); private final TextPaint mPaintNumbers = @@ -346,11 +357,11 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD super(context, attrs); this.mScale = context.getResources() .getDisplayMetrics().density; - init(context); + init(); } // Init the class - private void init(final Context context) { + private void init() { mEditHistory = new EditHistory(); mChangeListener = new EditTextChangeListener(); @@ -361,7 +372,7 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD getTextColors().getDefaultColor()); this.mPaintNumbers .setTextSize( - textSize * this.mScale * 0.8f); + sFontSize); this.mPaintNumbers.setAntiAlias(true); // Syntax editor @@ -393,6 +404,12 @@ public class EditorFragment extends Fragment implements EditDialogFragment.EditD }}); } + @Override + public void setTextSize(float size) { + super.setTextSize(size); + this.mPaintNumbers.setTextSize(sFontSize); + } + /** * {@inheritDoc} */ diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java new file mode 100644 index 0000000..62c7b17 --- /dev/null +++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/fragment/SeekbarDialogFragment.java @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2013 Vlad Mihalachi + * + * This file is part of Turbo Editor. + * + * Turbo Editor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Turbo Editor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Turbo Editor. If not, see . + */ + +package com.vmihalachi.turboeditor.fragment; + +import android.app.Dialog; +import android.app.DialogFragment; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.SeekBar; + +import com.vmihalachi.turboeditor.R; + +// ... +public class SeekbarDialogFragment extends DialogFragment { + + SeekBar mSeekBar; + + public static SeekbarDialogFragment newInstance(final Actions action) { + return SeekbarDialogFragment.newInstance(action, 50, 100); + } + + public static SeekbarDialogFragment newInstance(final Actions action, final int current, final int max) { + final SeekbarDialogFragment f = new SeekbarDialogFragment(); + final Bundle args = new Bundle(); + args.putSerializable("action", action); + args.putInt("current", current); + args.putInt("max", max); + f.setArguments(args); + return f; + } + + @Override + public View onCreateView(final LayoutInflater inflater, final ViewGroup container, + final Bundle savedInstanceState) { + + final Dialog dialog = getDialog(); + final Actions action = (Actions) getArguments().getSerializable("action"); + final String title; + switch (action) { + case FileSize: + title = getString(R.string.text_size); + break; + default: + title = null; + break; + } + dialog.setTitle(title); + + final View view = inflater.inflate(R.layout.dialog_fragment_seekbar, container); + this.mSeekBar = (SeekBar) view.findViewById(android.R.id.input); + this.mSeekBar.setProgress(getArguments().getInt("current")); + this.mSeekBar.setMax(getArguments().getInt("max")); + + view.findViewById(android.R.id.button1) + .setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(final View v) { + returnData(); + } + }); + return view; + } + + void returnData(){ + try { + ((onSeekbarDialogDismissed) getTargetFragment()).onSeekbarDialogDismissed( + (Actions) getArguments().getSerializable("action"), + mSeekBar.getProgress() + ); + } catch (Exception e){ + try { + ((onSeekbarDialogDismissed) getActivity()).onSeekbarDialogDismissed( + (Actions) getArguments().getSerializable("action"), + mSeekBar.getProgress() + ); + } catch (Exception e2){ + } + } + this.dismiss(); + } + + public enum Actions { + FileSize + } + + public interface onSeekbarDialogDismissed { + void onSeekbarDialogDismissed(Actions action, int value); + } +} \ No newline at end of file diff --git a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java index 7013ff0..ca615db 100644 --- a/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java +++ b/Turbo Editor/src/main/java/com/vmihalachi/turboeditor/helper/PreferenceHelper.java @@ -57,6 +57,10 @@ public final class PreferenceHelper { return getPrefs(context).getString("editor_encoding", "UTF-8"); } + public static int getFontSize(Context context) { + return getPrefs(context).getInt("font_size", 18); + } + public static String getLastNavigatedFolder(Context context) { return getPrefs(context).getString("last_navigated_folder", SD_CARD_ROOT); } @@ -83,6 +87,10 @@ public final class PreferenceHelper { getEditor(context).putString("editor_encoding", value).commit(); } + public static void setFontSize(Context context, int value) { + getEditor(context).putInt("font_size", value).commit(); + } + public static void setLastNavigatedFolder(Context context, String value) { getEditor(context).putString("last_navigated_folder", value).commit(); } diff --git a/Turbo Editor/src/main/res/layout/dialog_fragment_seekbar.xml b/Turbo Editor/src/main/res/layout/dialog_fragment_seekbar.xml new file mode 100644 index 0000000..d13b291 --- /dev/null +++ b/Turbo Editor/src/main/res/layout/dialog_fragment_seekbar.xml @@ -0,0 +1,48 @@ + + + + + + + + + +