0
0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Commit Graph

7159 Commits

Author SHA1 Message Date
timrae
b82ade9473 Bumped version to 2.5alpha29
@branch-specific
2015-04-11 21:50:49 +09:00
Tim Rae
e32c5dafd4 Merge pull request #812 from timrae/info-screen
Fix Changelog and only show it for release versions
2015-04-11 21:49:32 +09:00
timrae
48446efebc Fix Changelog and only show it for release versions
A few changes:
Add actionbar to the Info screen
Add a progress bar to the Webview in Info screen
Only show the changelog for release versions
Load the changelog webpage from assets to prevent overloading server
Refactor the version utilities to a new class
2015-04-11 21:41:26 +09:00
Tim Rae
fd88b678e2 Merge pull request #811 from timrae/multimedia-editor-actionbar
Fix action bar in multimedia editor
2015-04-11 17:59:52 +09:00
Tim Rae
4d7be491d6 Merge pull request #809 from timrae/catch-runtime-exception-cookies
Catch runtime exceptions when trying to enable cookies
2015-04-11 17:22:35 +09:00
timrae
ea7b2f1ecd Fix action bar in Multimedia editor 2015-04-11 17:20:35 +09:00
Houssam Salem
83fa4a9be7 Merge pull request #804 from kerrickstaley/develop
Handle case where note ID is Integer, not Long
2015-04-11 15:08:56 +10:00
timrae
0e19c0f2cb Catch runtime exceptions when trying to enable cookies 2015-04-11 12:56:04 +09:00
Tim Rae
f9585a0662 Merge pull request #808 from timrae/remove-splash-screen
Replace the splash screen with a progress indicator in action bar
2015-04-11 12:46:05 +09:00
timrae
479edafa8f Replace the splash screen with a progress indicator in action bar
The splash screen wasn't working very well, and was actually unecessarily making the interface feel slower everytime the collection needed to be opened anyway.
This removes the splash screen entirely, and instead adds a progress indicator to the action bar when the collection is loading, and shows a toast when the external storage is not mounted before closing the app.
2015-04-11 12:36:54 +09:00
Tim Rae
dab0b0615d Merge pull request #807 from brunodea/add-right-remove-images
Added ic_remove_circle for 24dp and removed the others.
2015-04-11 12:35:39 +09:00
Bruno Azevedo
7451f43e81 Added ic_remove_circle for 24dp and removed the others. 2015-04-11 00:32:34 -03:00
Tim Rae
0282e21f16 Merge pull request #806 from brunodea/fix-search-in-correct-deck
Fix: correct search if using search term "deck:".
2015-04-11 08:59:19 +09:00
Bruno Azevedo
4d2293cbc5 Fix: correct search if using search term "deck:".
Description of the problem (from https://github.com/ankidroid/Anki-Android/pull/800#issuecomment-90987130):
> if you recall a search like "deck:default foo" while you have any deck other than the default selected then no cards will appear.
2015-04-10 20:46:45 -03:00
Kerrick Staley
d3fff6bb89 Handle case where note ID is Integer, not Long
When syncing my collection, I'm getting this error:

W/System.err(17831): java.lang.ClassCastException: java.lang.Integer cannot be cast to java.lang.Long
W/System.err(17831): 	at com.ichi2.libanki.sync.Syncer.mergeNotes(Syncer.java:881)
W/System.err(17831): 	at com.ichi2.libanki.sync.Syncer.applyChunk(Syncer.java:566)
W/System.err(17831): 	at com.ichi2.libanki.sync.Syncer.sync(Syncer.java:182)
[...]

So sometimes the note ID is an Integer rather than a Long.

Using Long.valueOf(((Number) foo).longValue()) will work for both Longs
and Integers.
2015-04-09 23:09:15 -07:00
timrae
6db393de8e Bumped version to 2.5alpha28
@branch-specific
2015-04-10 08:43:30 +09:00
Tim Rae
b60ce3c364 Merge pull request #800 from brunodea/feature-add-new-searches
Feature: add/remove saved searches.
2015-04-10 08:31:40 +09:00
Bruno Azevedo
8dc45532d5 Feature: add/remove saved searches.
Since I was already dealing with the subject, I decided to give it a try and implement the save/delete new searches.
2015-04-09 19:54:39 -03:00
Houssam Salem
11dd05939c Merge pull request #803 from hssm/widgetcolclose
Don't close the collection on every widget update
2015-04-07 21:49:32 +10:00
Houssam Salem
0e2d208b88 Don't close the collection on every widget update 2015-04-07 21:43:58 +10:00
timrae
eaafbda4e5 Bumped version to 2.5alpha27
@branch-specific
2015-04-07 14:07:34 +09:00
Houssam Salem
481787bad6 Merge pull request #802 from hssm/limitincreaserefresh
Refresh studyoptions if daily limits extended
2015-04-07 15:00:54 +10:00
Houssam Salem
ebe0948d64 Refresh studyoptions if daily limits extended 2015-04-07 14:46:17 +10:00
Houssam Salem
54abaab426 Merge pull request #801 from hssm/restoreplaybackimage
Restore playback image
2015-04-05 15:29:51 +10:00
Houssam Salem
1229542c15 Restore playback image
The lint check for unused resources earlier removed these files since they aren't referenced in code, but are instead dynamically loaded on cards. They are still required.
2015-04-05 15:08:19 +10:00
Houssam Salem
c92e4a5672 Merge pull request #798 from brunodea/feature-my-searches
Issue #2571: added menu item My Searches in cardbrowser.
2015-04-04 14:11:05 +11:00
Bruno Azevedo
964874f36e Issue #2571: added menu item My Searches in cardbrowser.
For now, it only shows a list of saved searches in the collection. Not able to add a new search from here.
2015-04-04 00:02:02 -03:00
timrae
fc0c1fc680 Bumped version to 2.5alpha26
@branch-specific
2015-04-04 09:29:08 +09:00
Tim Rae
d69fe824e9 Merge pull request #799 from eginhard/material
NavDrawer + OptionsMenu color fixes
2015-04-04 09:26:04 +09:00
Enno Hermann
cc4f57c4c4 NavDrawer + OptionsMenu color fixes
NavDrawer font size increased
ActionBar title toggling removed
Additional Settings toolbar removed
OptionsMenu now with legible colors
2015-04-04 02:00:50 +02:00
Tim Rae
230a40b9e9 Merge pull request #797 from hssm/removecompatv7
Remove v7 compat classes
2015-04-03 17:06:56 +09:00
Houssam Salem
ac9d3c3da4 Remove v7 compat classes
Additionally, removed some methods that are not required to be in the compat classes, including:
- Methods that are now available on all supported platforms after the recent minsdkversion bump
- Methods that are supported on all platform through the support library and don't gain any benefits from being in our compat classes
2015-04-03 14:28:25 +11:00
timrae
5098ae502c Run crowdin master script from root dir
By default look in $HOME/src/ for API key
Disable broken options in manage-crowdin.py
2015-04-02 17:08:12 +09:00
timrae
5ca1bcd3f3 Updated strings from Crowdin 2015-04-02 16:51:27 +09:00
timrae
a6a4d8b684 Bumped version to 2.5alpha25
@branch-specific
2015-04-02 15:45:33 +09:00
Tim Rae
21f2fd4d6d Merge pull request #795 from brunodea/fix-import-apkg-dialog
bug fix: kicked back to import dialog after selecting apkg file.
2015-04-02 15:16:27 +09:00
Bruno Azevedo
9b9c37c4ec bug fix: kicked back to import dialog after selecting apkg file.
Bug copied from de doc file: Dialog which does importing of apkg doesn’t work properly (probably due to changing the target SDK?). Instead of confirmation dialog appearing when you select an apkg, you get kicked back to the previous dialog.

I don't know exactly why, but calling executePendingTransactions() just after the transaction.commit() seems to have solved the issue.
2015-04-02 01:53:01 -03:00
timrae
8d6c557fef Bumped version to 2.5alpha24
@branch-specific
2015-04-02 11:32:26 +09:00
Houssam Salem
b8ea7f08a4 Merge pull request #794 from hssm/2.4.3cherrypicked
2.4.3cherrypicked
2015-04-02 13:30:09 +11:00
Houssam Salem
db847d5e45 don't bump mod time when moving cards into/out of a filtered deck
b0f7ddfefb
Conflicts:
	AnkiDroid/src/main/java/com/ichi2/libanki/Sched.java
2015-04-02 13:18:51 +11:00
Tim Rae
dcb91e7522 Merge pull request #793 from hssm/unusedcompat
Remove unused methods exposed by compat
2015-04-02 11:17:37 +09:00
Houssam Salem
af6bb42444 fix cont=False handling in sync
7024fed002

Additionally, remove all traces of the "media usn" value. The media syncer manages its own usn now.
Conflicts:
	AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java
	AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.java
	AnkiDroid/src/main/java/com/ichi2/async/Connection.java
2015-04-02 13:17:23 +11:00
Houssam Salem
bb9da0f70b Don't try to update showcaseview element if view not drawn yet 2015-04-02 13:13:56 +11:00
Houssam Salem
ca47a29cb6 Remove unused methods exposed by compat 2015-04-02 12:54:41 +11:00
Tim Rae
bb4a8fb6cf Include hotfix branches in Travis build 2015-04-02 09:49:32 +09:00
Tim Rae
32445a2dc0 Update build.gradle 2015-04-02 01:45:14 +09:00
Tim Rae
535a57da23 Merge pull request #791 from timrae/more-unused-resources
More unused resources
2015-04-02 01:41:43 +09:00
timrae
fc1bf98c67 ignore ellipsis lint warnings 2015-04-02 01:37:59 +09:00
timrae
3d9116cabf remove big widget resources 2015-04-02 01:37:26 +09:00
timrae
14cffcd05f Remove more unused drawables 2015-04-02 01:36:43 +09:00