Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/main/java/org/billthefarmer/editor/Editor.java
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public class Editor extends Activity

public final static String PREF_FILE = "pref_file";
public final static String PREF_HIGH = "pref_high";
public final static String PREF_TYPEWRITER = "pref_typewriter";
public final static String PREF_PATHS = "pref_paths";
public final static String PREF_SAVE = "pref_save";
public final static String PREF_LAST = "pref_last";
Expand Down Expand Up @@ -418,6 +419,9 @@ public class Editor extends Activity
private final static int SH_SYNTAX = 6;
private final static int DEF_SYNTAX = 7;

// sounds
private final static int SOUND_KEY_DOWN = 1;

private Uri uri;
private File file;
private String path;
Expand All @@ -439,6 +443,8 @@ public class Editor extends Activity

private boolean highlight = false;

private boolean typewriter = false;

private boolean last = false;
private boolean save = false;
private boolean edit = false;
Expand All @@ -457,6 +463,8 @@ public class Editor extends Activity

private int syntax;

private SoundManager mSoundManager;

// onCreate
@Override
protected void onCreate(Bundle savedInstanceState)
Expand All @@ -476,6 +484,7 @@ protected void onCreate(Bundle savedInstanceState)
wrap = preferences.getBoolean(PREF_WRAP, false);
suggest = preferences.getBoolean(PREF_SUGGEST, true);
highlight = preferences.getBoolean(PREF_HIGH, false);
typewriter = preferences.getBoolean(PREF_TYPEWRITER, false);

theme = preferences.getInt(PREF_THEME, LIGHT);
size = preferences.getInt(PREF_SIZE, MEDIUM);
Expand Down Expand Up @@ -615,6 +624,10 @@ else if (text != null)
break;
}

mSoundManager = new SoundManager();
mSoundManager.initSounds(getBaseContext());
mSoundManager.addSound(SOUND_KEY_DOWN, R.raw.typewriter);

setListeners();
}

Expand Down Expand Up @@ -680,7 +693,11 @@ public void beforeTextChanged(CharSequence s,
public void onTextChanged(CharSequence s,
int start,
int before,
int count) {}
int count) {
if (typewriter) {
mSoundManager.playSound(SOUND_KEY_DOWN);
}
}
});

// onFocusChange
Expand Down Expand Up @@ -828,6 +845,7 @@ public void onPause()
editor.putBoolean(PREF_WRAP, wrap);
editor.putBoolean(PREF_SUGGEST, suggest);
editor.putBoolean(PREF_HIGH, highlight);
editor.putBoolean(PREF_TYPEWRITER, typewriter);

editor.putInt(PREF_THEME, theme);
editor.putInt(PREF_SIZE, size);
Expand Down Expand Up @@ -909,6 +927,7 @@ public boolean onPrepareOptionsMenu(Menu menu)
menu.findItem(R.id.wrap).setChecked(wrap);
menu.findItem(R.id.suggest).setChecked(suggest);
menu.findItem(R.id.highlight).setChecked(highlight);
menu.findItem(R.id.typewriter).setChecked(typewriter);

switch (theme)
{
Expand Down Expand Up @@ -1086,6 +1105,9 @@ public boolean onOptionsItemSelected(MenuItem item)
case R.id.highlight:
highlightClicked(item);
break;
case R.id.typewriter:
typewriterClicked(item);
break;
case R.id.light:
lightClicked(item);
break;
Expand Down Expand Up @@ -1919,6 +1941,13 @@ private void highlightClicked(MenuItem item)
checkHighlight();
}

// highlightClicked
private void typewriterClicked(MenuItem item)
{
typewriter = !typewriter;
item.setChecked(typewriter);
}

// lightClicked
private void lightClicked(MenuItem item)
{
Expand Down
44 changes: 44 additions & 0 deletions src/main/java/org/billthefarmer/editor/SoundManager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package org.billthefarmer.editor;

import java.util.HashMap;

import android.content.Context;
import android.media.AudioManager;
import android.media.SoundPool;

public class SoundManager {
private SoundPool mSoundPool;
private HashMap<Integer, Integer> mSoundPoolMap;
private AudioManager mAudioManager;
private Context mContext;


public SoundManager()
{

}

public void initSounds(Context theContext) {
mContext = theContext;
mSoundPool = new SoundPool(4, AudioManager.STREAM_MUSIC, 0);
mSoundPoolMap = new HashMap<Integer, Integer>();
mAudioManager = (AudioManager)mContext.getSystemService(Context.AUDIO_SERVICE);
}

public void addSound(int Index,int SoundID)
{
mSoundPoolMap.put(1, mSoundPool.load(mContext, SoundID, 1));
}

public void playSound(int index) {

int streamVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
mSoundPool.play(mSoundPoolMap.get(index), streamVolume, streamVolume, 1, 0, 1f);
}

public void playLoopedSound(int index) {

int streamVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
mSoundPool.play(mSoundPoolMap.get(index), streamVolume, streamVolume, 1, -1, 1f);
}
}
6 changes: 6 additions & 0 deletions src/main/res/menu/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@
android:checked="false"
android:showAsAction="never"
android:title="@string/highlight" />
<item
android:id="@+id/typewriter"
android:checkable="true"
android:checked="false"
android:showAsAction="never"
android:title="@string/typewriter" />
</menu>
</item>
<item
Expand Down
Binary file added src/main/res/raw/typewriter.ogg
Binary file not shown.
1 change: 1 addition & 0 deletions src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<string name="wrap">تقسيم الأسطر الطويلة</string>
<string name="suggest">الاقتراحات</string>
<string name="highlight">تمييز بناء الجملة</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">السمة</string>
<string name="light">مضيء</string>
<string name="dark">مظلم</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Перанос радкоў</string>
<string name="suggest">Варыянты слоў</string>
<string name="highlight">Вылучыць сінтаксіс</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Тэма</string>
<string name="light">Светлая</string>
<string name="dark">Цёмная</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Zeilenumbruch</string>
<string name="suggest">Vorschläge</string>
<string name="highlight">Syntax hervorheben</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Thema</string>
<string name="light">Hell</string>
<string name="dark">Dunkel</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Αναδίπλωση λέξεων</string>
<string name="suggest">Προτάσεις</string>
<string name="highlight">Επισήμανση σύνταξης</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Θέμα</string>
<string name="light">Φωτεινό</string>
<string name="white">Άσπρος</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Salto de línea</string>
<string name="suggest">Recomendaciones</string>
<string name="highlight">Marcar la sintaxis</string>
<string name="typewriter">Sonido de máquina de escribir</string>
<string name="theme">Tema</string>
<string name="light">Claro</string>
<string name="dark">Oscuro</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Lerro-jausia</string>
<string name="suggest">Gomendioak</string>
<string name="highlight">Markatu sintaxia</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Gaia</string>
<string name="light">Argia</string>
<string name="dark">Iluna</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">پیچیدن کلمات</string>
<string name="suggest">پیشنهادات</string>
<string name="highlight">برجسته کردن سینتکس</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">شِما</string>
<string name="light">روشن</string>
<string name="dark">تاریک</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Retour à la ligne auto</string>
<string name="suggest">Suggestions</string>
<string name="highlight">Surligner la syntaxe</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Thème</string>
<string name="light">Clair</string>
<string name="dark">Foncé</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Szövegtördelés</string>
<string name="suggest">Javaslatok</string>
<string name="highlight">Szintaxiskiemelés</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Téma</string>
<string name="light">Világos</string>
<string name="dark">Sötét</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-is/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Línuskrið orða</string>
<string name="suggest">Tillögur</string>
<string name="highlight">Hápunktur setningafræði</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Þema</string>
<string name="light">Ljóst</string>
<string name="dark">Dökkt</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">A capo automatico</string>
<string name="suggest">Suggerimenti</string>
<string name="highlight">Evidenzia sintassi</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Tema</string>
<string name="light">Chiaro</string>
<string name="white">Bianco</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">画面端で折り返す</string>
<string name="suggest">提案</string>
<string name="highlight">シンタックスハイライト</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">テーマ</string>
<string name="light">ライト</string>
<string name="dark">ダーク</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-ku-rIQ/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">پێچانەوەی ووشە</string>
<string name="suggest">پێشنیازەکان</string>
<string name="highlight">بەرچاوکردنی ڕستەنووسی</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">ڕووکار</string>
<string name="light">کاڵ</string>
<string name="dark">تۆخ</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-lv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Vārdu aplaušana</string>
<string name="suggest">Ieteikumi</string>
<string name="highlight">Izcelt sintaksi</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Motīvs</string>
<string name="light">Gaišs</string>
<string name="dark">Tumšs</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Tekstomloop</string>
<string name="suggest">Suggesties</string>
<string name="highlight">Syntaxis markeren</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Thema</string>
<string name="light">Licht</string>
<string name="dark">Donker</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Zawijanie słów</string>
<string name="suggest">Sugestie</string>
<string name="highlight">Podświetl składnię</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Motyw</string>
<string name="light">Jasny</string>
<string name="dark">Ciemny</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Quebra as linhas</string>
<string name="suggest">Sugestões</string>
<string name="highlight">Destacar a sintaxe</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Tema</string>
<string name="light">Claro</string>
<string name="white">Branco</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Quebras de linha</string>
<string name="suggest">Mostrar sugestões</string>
<string name="highlight">Destacar sintaxe</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Tema</string>
<string name="light">Claro</string>
<string name="dark">Escuro</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Перенос строк</string>
<string name="suggest">Варианты слов</string>
<string name="highlight">Выделить синтаксис</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Тема</string>
<string name="light">Светлая</string>
<string name="dark">Тёмная</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Sözcük kaydırma</string>
<string name="suggest">Öneriler</string>
<string name="highlight">Sözdizimini vurgula</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Tema</string>
<string name="light">Açık</string>
<string name="dark">Koyu</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">Перенесення слів</string>
<string name="suggest">Пропозиції</string>
<string name="highlight">Підсвітка синтаксису</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Тема</string>
<string name="light">Світла</string>
<string name="dark">Темна</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">自动换行</string>
<string name="suggest">建议</string>
<string name="highlight">突出显示语法</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">主题</string>
<string name="light">亮</string>
<string name="dark">暗</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values-zh-rTW/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<string name="wrap">文字換列</string>
<string name="suggest">建議</string>
<string name="highlight">突顯語法</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">主題</string>
<string name="light">亮色</string>
<string name="dark">暗色</string>
Expand Down
1 change: 1 addition & 0 deletions src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<string name="wrap">Word wrap</string>
<string name="suggest">Suggestions</string>
<string name="highlight">Highlight syntax</string>
<string name="typewriter">Typewriter sound</string>
<string name="theme">Theme</string>
<string name="light">Light</string>
<string name="dark">Dark</string>
Expand Down