Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multimedia editing features merge request #112

Open
wants to merge 99 commits into
base: v2.1-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
f899cb9
support for zeemote plugin
iniju Oct 11, 2012
1845842
Merge branch 'master' of git://github.com/nobnago/Anki-Android into z…
iniju Oct 26, 2012
554ddc3
Merge branch 'master' of git://github.com/nicolas-raoul/Anki-Android …
iniju Nov 15, 2012
3d6c56b
further fix for latex, issue 1368
iniju Nov 15, 2012
7e66444
First local changes, Zaur
qutorial Dec 21, 2012
58854cf
Merge branch 'master' of https://github.com/nicolas-raoul/Anki-Android
qutorial Dec 21, 2012
0838a8b
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p…
iniju Dec 31, 2012
2ff2f57
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p…
iniju Dec 31, 2012
add7f16
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p…
iniju Dec 31, 2012
badbf87
uncomment logs
nobnago Jan 3, 2013
b41eddb
Merge branch 'android_market_2.0'
nobnago Jan 3, 2013
050e7a1
change icons back to red (needs to be undone before releasing 2.1)
nobnago Jan 3, 2013
68fd246
bump version to 2.1alpha0
nobnago Jan 3, 2013
ec18a0d
version 32
nobnago Jan 3, 2013
3076809
clear newfeatures list
nobnago Jan 3, 2013
b85175e
localisation
nobnago Jan 3, 2013
c4895fe
Merge branch 'zeemote_plugin' of https://github.com/iniju/Anki-Android
nobnago Jan 3, 2013
71a0191
update new features
nobnago Jan 3, 2013
fbd15b3
localisation
nobnago Jan 3, 2013
1b3ef69
bump version to 2.1alpha1
nobnago Jan 3, 2013
ec9b043
Information on individual packages
bibstha Jan 3, 2013
d4671dc
Multimedia editing started
qutorial Jan 5, 2013
6213d32
Controllers started
qutorial Jan 9, 2013
61adfc6
The same activity to edit image
qutorial Jan 9, 2013
87e20eb
Implemented BasicImageFieldController
bibstha Jan 9, 2013
0dd0b36
Syntax corrected a bit
qutorial Jan 9, 2013
5852405
Field changing implementation started
qutorial Jan 9, 2013
513c183
Controller refactoring, step to field cloning
qutorial Jan 11, 2013
e7f02a7
IField can say if the contained media is temporary
bibstha Jan 11, 2013
496c607
Merged with Qutorial FragmentActivity
bibstha Jan 11, 2013
b519ebc
Cloning made
qutorial Jan 11, 2013
885c2cc
AudioView implmentation in progress
bibstha Jan 12, 2013
b1456e9
AudioView supports listening to recordfinishevent
bibstha Jan 12, 2013
4c52f18
Glosbe integration finished, first iteration
qutorial Jan 15, 2013
28a9a37
Pronunciation mp3 file address computed from Beolingus
qutorial Jan 18, 2013
7d566b5
Before adding support for many languages
qutorial Jan 18, 2013
5dd6402
Multiple languagesm pronunciation loading
qutorial Jan 18, 2013
9cac86b
Finished audio controller
bibstha Jan 19, 2013
9ff68ee
Merge branch 'qutorial_master'
bibstha Jan 19, 2013
66000d3
Refactoring : beolingus parsing separated
qutorial Jan 20, 2013
ce37009
Merging hard :)
qutorial Jan 20, 2013
9908a48
Towards playin pronunciation
qutorial Jan 20, 2013
798bc1f
Activity behavior bugs fixed
qutorial Jan 20, 2013
b0c59ee
Two translation bugs fixed
qutorial Jan 20, 2013
3b179a5
Translation continued
qutorial Jan 20, 2013
9bd332b
Pronunciation and translation activities translated
qutorial Jan 20, 2013
5c121c0
Fixed issue with null audioString
bibstha Jan 20, 2013
523b6d1
Merging with upstream
qutorial Jan 20, 2013
8c35394
Merge remote-tracking branch 'bibstha/master'
qutorial Jan 20, 2013
311d81b
Merged with upstream and Bibek, player not working
qutorial Jan 20, 2013
e794e22
More condition check on MediaPlayer status
bibstha Jan 21, 2013
4525996
Merging with bibek
qutorial Jan 21, 2013
2bc2052
ColorDict integrated
qutorial Jan 21, 2013
fe42be7
Image search half way
qutorial Jan 21, 2013
b4fe3f8
Visual lifts, image search ready
qutorial Jan 22, 2013
5bd88f7
Activity fixes, translation fixes
qutorial Jan 23, 2013
9917c4c
Activity image files removed from git
qutorial Jan 23, 2013
bd0c65d
Adding new card works
bibstha Jan 23, 2013
1cce3f4
Missing files added
bibstha Jan 23, 2013
73f3fe9
Cleanup: removed .orig files
bibstha Jan 23, 2013
020c381
Testing with 2.1
qutorial Jan 23, 2013
55815cb
Merging with bibek
qutorial Jan 23, 2013
4727b2f
1.6 bug solved, images look better
qutorial Jan 23, 2013
0602a7a
Text field controller translated
qutorial Jan 23, 2013
955f020
Text field controller well commented
qutorial Jan 23, 2013
b46ac18
MultimediaCardEditor now supports change of Models
bibstha Jan 23, 2013
27dd47a
Merge branch 'master' of https://github.com/qutorial/Anki-Android
bibstha Jan 23, 2013
8b4c848
Editing loads properly, saving not tested yet
bibstha Jan 24, 2013
3fcddad
bug fixing, towards audio view
qutorial Jan 24, 2013
cdc4cf0
Media fixes
qutorial Jan 24, 2013
900f406
MultimediaCardEditor can now edit notes and cards
bibstha Jan 24, 2013
2cebfd9
Merging with Bibek
qutorial Jan 24, 2013
11d2d4c
Fixed slide movements
bibstha Jan 24, 2013
13030bd
Crashes with images
qutorial Jan 24, 2013
5b19dd6
preventing null pointer in bitmaputil
bibstha Jan 24, 2013
c37e2d8
Different html for different Android versions in Image Search
qutorial Jan 24, 2013
b3c9763
Before rotation photo bug correction
qutorial Jan 24, 2013
0f9f577
AudioView state transition fixed
bibstha Jan 24, 2013
e4af83c
Card Delete implemented
bibstha Jan 24, 2013
e1a7a78
Image rotation bug
qutorial Jan 24, 2013
10dc96c
Fixes by bibek, incl delete button
qutorial Jan 24, 2013
f696810
Change of deck possible in MMCardEditor
bibstha Jan 24, 2013
2a9ef1b
Fixed scrolling
bibstha Jan 24, 2013
7f252ab
Null field bug fix
qutorial Jan 24, 2013
4cac7a8
merged with Bibek, there ScrollView added
qutorial Jan 24, 2013
268d47b
Deckpicker also uses MMCardEditor
bibstha Jan 24, 2013
300bdee
Multimedia Editor throws replaced, translated
qutorial Jan 24, 2013
86adc42
Merged with bibek, new improvements ot Multimedia Activity
qutorial Jan 24, 2013
f3dc460
Before merging with 2.1
qutorial Jan 25, 2013
22467fe
Fixes for storage and Activity states
qutorial Jan 25, 2013
8407c66
trash removed
qutorial Jan 25, 2013
86fe5f5
tittle removed from colordict integration text
qutorial Jan 27, 2013
971d128
Fix in glosbe translation, when no results
qutorial Jan 28, 2013
b7bafda
Null pointer bug fixed in bitmap util
qutorial Jan 28, 2013
c45bf03
Audio View corrections
qutorial Jan 28, 2013
7920dc5
Swap feature
qutorial Jan 29, 2013
cc66692
Deleted mixed field
qutorial Jan 29, 2013
b41c95d
Half merged
qutorial Feb 1, 2013
ffe06e0
Merging done
qutorial Feb 1, 2013
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#.classpath
.project
.settings

.directory
*.orig
bin/
gen/
/testbin/com/ichi2/anki/AllTests.class
Expand Down
Binary file added 20130108_163931.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 36 additions & 3 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<!--
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
-->

<supports-screens
android:anyDensity="true"
android:largeScreens="true"
Expand Down Expand Up @@ -190,7 +191,7 @@
android:name="android.appwidget.provider"
android:resource="@xml/widget_provider_small" />
</receiver>

<!-- Service to perform web API queries -->
<service android:name="com.ichi2.widget.AnkiDroidWidgetSmall$UpdateService" />

Expand Down Expand Up @@ -241,5 +242,37 @@
<data android:scheme="file" />
</intent-filter>
</receiver>

<activity
android:name="com.ichi2.anki.MultimediaCardEditorActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/fact_adder_intent_title" >
</activity>
<activity
android:name="com.ichi2.anki.EditFieldActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/title_activity_edit_text" >
</activity>
<activity
android:name="com.ichi2.anki.TranslationActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/title_activity_translation" >
</activity>
<activity
android:name="com.ichi2.anki.AudioRecorderActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/title_activity_audio_recorder" >
</activity>
<activity
android:name="com.ichi2.anki.LoadPronounciationActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/title_activity_load_pronounciation" >
</activity>
<activity
android:name="com.ichi2.anki.SearchImageActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/title_activity_search_image" >
</activity>
</application>
</manifest>

</manifest>
Binary file added assets/icon_source_svg/av_rec.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icon_source_svg/av_rec_stop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
170 changes: 170 additions & 0 deletions assets/icon_source_svg/record_buttons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 69 additions & 0 deletions assets/icon_source_svg/text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions doc/allclasses-frame.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_30) on Fri Nov 16 14:49:51 CET 2012 -->
<TITLE>
All Classes
</TITLE>

<META NAME="date" CONTENT="2012-11-16">

<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">


</HEAD>

<BODY BGCOLOR="white">
<FONT size="+1" CLASS="FrameHeadingFont">
<B>All Classes</B></FONT>
<BR>

<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
<TR>
<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/samskivert/mustache/Mustache.html" title="class in com.samskivert.mustache" target="classFrame">Mustache</A>
<BR>
<A HREF="com/samskivert/mustache/Mustache.Compiler.html" title="class in com.samskivert.mustache" target="classFrame">Mustache.Compiler</A>
<BR>
<A HREF="com/samskivert/mustache/Mustache.VariableFetcher.html" title="interface in com.samskivert.mustache" target="classFrame"><I>Mustache.VariableFetcher</I></A>
<BR>
</FONT></TD>
</TR>
</TABLE>

</BODY>
</HTML>
35 changes: 35 additions & 0 deletions doc/allclasses-noframe.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!--NewPage-->
<HTML>
<HEAD>
<!-- Generated by javadoc (build 1.6.0_30) on Fri Nov 16 14:49:51 CET 2012 -->
<TITLE>
All Classes
</TITLE>

<META NAME="date" CONTENT="2012-11-16">

<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">


</HEAD>

<BODY BGCOLOR="white">
<FONT size="+1" CLASS="FrameHeadingFont">
<B>All Classes</B></FONT>
<BR>

<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
<TR>
<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/samskivert/mustache/Mustache.html" title="class in com.samskivert.mustache">Mustache</A>
<BR>
<A HREF="com/samskivert/mustache/Mustache.Compiler.html" title="class in com.samskivert.mustache">Mustache.Compiler</A>
<BR>
<A HREF="com/samskivert/mustache/Mustache.VariableFetcher.html" title="interface in com.samskivert.mustache"><I>Mustache.VariableFetcher</I></A>
<BR>
</FONT></TD>
</TR>
</TABLE>

</BODY>
</HTML>
Loading