Commit graph

536 commits

Author SHA1 Message Date
Brion VIBBER
e9b1218a88 Merge "Update Github repo address" 2013-10-18 18:17:17 +00:00
YuviPanda
f1ebb5f04b Provide usable menu actions for Media object pagination too
Change-Id: Iae25f59fb713ddcf615b47959f141a595bbbed1d
2013-10-18 18:13:53 +00:00
Brion VIBBER
786e1eb580 Merge "Merge branch 'campaigns'" 2013-10-18 18:07:21 +00:00
YuviPanda
1bc0b781d1 Fix which menu items get displayed at which state
Only show actions that are applicable to each state.
Also clarify that 'abort' actually only 'deleted' failed
uploads. We have no way to abort an in-progress upload yet

Change-Id: I2c18273e603e3ca6b1e03f83b7404e96b6d8bad0
2013-10-16 02:13:54 +05:30
YuviPanda
064dbb0df6 Merge branch 'campaigns'
Conflicts:
	commons/res/values/strings.xml
	commons/src/main/java/org/wikimedia/commons/Media.java

Change-Id: Ib8c74cbf88630f11b3fbfee903800e7acf7b2fd4
2013-10-15 22:54:03 +05:30
Translation updater bot
b7c1f44d1e Localisation updates from http://translatewiki.net.
Change-Id: I525dda76b79e20e1c82a7411ad9b2cee2f526612
2013-10-14 08:52:22 +00:00
Timothy Gu
168b09918e Update Github repo address
Signed-off-by: Timothy Gu <timothygu99@gmail.com>

Change-Id: I5c3c834956ef2e9c51c8b2f404f620a2d8cbc364
2013-10-11 20:36:30 -07:00
Brion Vibber
9206e78e34 Merge "Extract and show license key" 2013-10-09 21:09:13 +00:00
Brion Vibber
e0e3d21ab7 bump to 1.0beta12
Change-Id: I60144c5293ab652f0da509d1a82010b644c17b32
2013-10-09 13:38:47 -07:00
Brion Vibber
4c45c88ade Extract and show license key
List of available licenses is pre-extracted from UploadWizard
MediaWiki extension. This should eventually be switched to use
some live query to the site configuration.

The license display is more or less localizable, for known templates.
Unrecognized templates specified as parameters to {{self}} will be
recognized (unlocalized) but others may not be.

Change-Id: I9df5fe807798a191a3bb0a45464760c75f19e366
2013-10-09 11:17:16 -07:00
Translation updater bot
d58c473726 Localisation updates from http://translatewiki.net.
Change-Id: I4f163709b5f3cb264a6695bf8fc491f87153d0c3
2013-10-07 19:46:01 +00:00
Translation updater bot
cb842cc540 Localisation updates from http://translatewiki.net.
Change-Id: I937f2b05bb052e39902f4ef79a576f5bfd6003d5
2013-10-07 19:45:33 +00:00
Translation updater bot
4ccdf3510c Localisation updates from http://translatewiki.net.
Change-Id: Iaaa732ca6119ff3455b36f0a484d0773c01f0001
2013-10-05 21:47:28 +00:00
Translation updater bot
dde64dc4d2 Merge "Localisation updates from http://translatewiki.net." 2013-09-29 20:33:04 +00:00
Brion Vibber
a3e5b8343a Merge "Fix media URL generation for non-ASCII filenames" 2013-09-27 22:19:17 +00:00
Brion Vibber
709a820973 Fix media URL generation for non-ASCII filenames
Characters in the filename weren't being encoded when generating
a URL, which seems to break something in the network fetching.

Change-Id: I10a18d1e5e32a4806cdae03b4a510a18eba9802b
2013-09-27 15:17:00 -07:00
Brion Vibber
e98cf731a8 Fix for getMultilingualText when there's only monolingual text
Change-Id: I0b69a21225ed6bcf8607f5cef06a298e87820037
2013-09-27 14:59:23 -07:00
Translation updater bot
8ac76533a6 Localisation updates from http://translatewiki.net.
Change-Id: I1a340698cb73978c059d0b4a50a187cd067e1637
2013-09-26 12:12:22 +00:00
YuviPanda
4da4f7c5e9 Turn on Campaigns Sync by default
Change-Id: Ief0f8a9dacf21468b396cc406a19d1dcc63fed1f
2013-09-23 16:52:49 +05:30
YuviPanda
e0cae93c3c Display contributions from other people to the campaign
Attempts to be as minimally invasive as possible

Change-Id: I1c9d7080d046199d5277385da625c180a8bacbfa
2013-09-19 18:20:44 -07:00
YuviPanda
2da5453ec1 Make the ImageView to be of the specific type
Change-Id: I51ced26ea0b654457919d915e322d91eb211f781
2013-09-19 18:18:41 -07:00
YuviPanda
d7736f2048 Add tracking category when uploading with a Campaign
Change-Id: I0790fc499c0b4960590f03222a1738cc72d7b173
2013-09-19 18:04:05 -07:00
YuviPanda
92e8d437a1 Fix duplicated column definition
This is why copy pasting code is bad, but I've no idea how exactly
I can abstract out the ContentProvider related stuff

Change-Id: Ib668ad8cd2302b832afc69b97951f3a6b1dcfe5b
2013-09-19 18:01:01 -07:00
YuviPanda
119c973a06 Use parens to clarify intent & functionality of a condition
Precedence rules are for chumps.

Change-Id: I5e46899b3d2e2af32b627e8cd61f085ad28ef2a2
2013-09-19 17:41:53 -07:00
YuviPanda
16913eed4e Generate remote image URL if it isn't set
Since the imageURL can be generated if it isn't set, we can
generate it once and then just return it. This is overriden when
we explicitly set it if we get it back from the API

Change-Id: I55939f2d9c0c2679847ec104f8029d9e533e202b
2013-09-19 16:29:44 -07:00
Brion VIBBER
fa4a1d06ac Merge "Display contributions even when they overwrite an existing file" 2013-09-17 22:08:37 +00:00
YuviPanda
2503f54731 Use a SyncProvider to sync all Campaigns
The SyncService constantly deletes and re-creates the campaigns
in the background to make sure they are up to date

FIXME: Handle deleted or renamed campaigns

Change-Id: I5d03995ada219481ea38887a8ea6d59fa11d2ac8
2013-09-17 11:44:30 -07:00
YuviPanda
05b9a8106c Display contributions even when they overwrite an existing file
Bug: 54189
Change-Id: Ibe086a7d3096e6ef53b004e2eed8af453675e898
2013-09-16 15:10:31 -07:00
Translation updater bot
0055c74756 Localisation updates from http://translatewiki.net.
Change-Id: Id611e0609d6f0e84693b6ade7ec660f012e625f8
2013-09-09 18:49:26 +00:00
grunny
96de1dc54c Pipe user link in author field
Bug: 53669
Change-Id: I9da22e59a3f46a5ce10e975950cbf9abf3920da3
2013-09-04 00:34:55 +10:00
Translation updater bot
a12434ad2b Localisation updates from http://translatewiki.net.
Change-Id: Ib7d9801c2dbbfc998e41e3e24b181227188464c8
2013-09-02 18:54:11 +00:00
Brion Vibber
4df8ec8fa9 Media detail page redone as a "slide-up" panel.
Loads and displays default or English description, and categories.
No caching of this info yet.

Scrollable pane is a ListView, with the title/desc/category label
in a 'header' view along with a spacer view. The height of the spacer
is set dynamically to the height of the total fragment minus 48dp,
giving room for an initially-visible title section and a little
spillover so you can see it's scrollable.

Clicking on a category in the cats list opens the category page in
an external web browser. In the future this should open the category
within the app, but we don't have a per-cat view yet.

Description and category list are not yet editable.

GitHub: https://github.com/wikimedia/apps-android-commons/pull/41
Change-Id: I46d0a77481dbe64a268a72f3efe49ae72168541f
2013-08-27 03:51:14 +05:30
YuviPanda
a1d435f86e Minor fix to mvn build instructions
Change-Id: I20f08473c3c96981f77884b346374d2404964528
2013-08-27 03:44:00 +05:30
Brion Vibber
3400d6e426 bug 50733: Fix OOM error on low-memory devices
LRU bitmap cache ate too much memory on low-memory devices like the
old Nexus One and some of our testers' devices. Use the in memory
cache only for higher end devices

Change-Id: Ibe238c82d5891a8a25bddcab1ae3d3738a044c41
2013-08-23 02:25:44 +05:30
YuviPanda
c5042b0066 Explicitly mention version of CC licenses
Change-Id: Iccf82225f9f50b427380f790a2fd0fc25ca024ca
2013-08-21 01:04:42 +05:30
YuviPanda
6d9fec984c Updated CHANGELOG and bumped version number
Change-Id: I3e48ce6a621afb6034460380a123feb73435ba59
2013-08-20 23:17:35 +05:30
YuviPanda
0972ba6422 Use CC 3.0 licenses explictly
Bug: 52967
Change-Id: Ic4fee9a2dc2fd5571908f200431599c6047fb9c5
2013-08-19 01:00:32 +08:00
YuviPanda
a56fa072a1 Tone down the Java hate a little
Change-Id: Ib1efbce3df6c136c423a566535c1b064a1c77b1b
2013-08-04 18:03:07 +05:30
Translation updater bot
4fa4a741d7 Localisation updates from http://translatewiki.net.
Change-Id: I6e2af960708364621a31ea349baaea9d02597ebd
2013-07-30 17:43:09 +00:00
YuviPanda
e7a4672b82 Add UploadController, move upload related functionality to it
- Removes StartUploadActivity and children
- All 'filling in' of missing contribution data is now done
  in one place
- Campaigns are theoretically supported

Change-Id: I18bac1b672e4a0f95cdcdc467dd137177feaf8e6
2013-07-30 14:26:37 +05:30
YuviPanda
26b59085e5 Update ActionBarSherlock to 4.4.0
Change-Id: I21ede463315ba66040252f776ab4e80caf09461d
2013-07-30 02:43:54 +05:30
YuviPanda
75d9a9f618 Inherit About and Welcome screen from SherlockActivity
GitHub: https://github.com/wikimedia/apps-android-commons/pull/38
Change-Id: I3d75d6a23dfbb3787c3f68e013f02bad05097729
2013-07-26 21:54:36 +00:00
YuviPanda
5f3132718e Split up contributions related code into separate classes
A controller introduced to deal with common code for picking images
from the gallery or camera. We should probably start using similar
controller methods elsewhere.

Splitting this particular one up because I'll be using it elsewhere

GitHub: https://github.com/wikimedia/apps-android-commons/pull/39
Change-Id: Idc393414be921d9a0fd54fcb3e2dcd676d8cc08b
2013-07-26 02:42:03 +05:30
YuviPanda
27f4fe1481 Add Campaign Activity, Fragment and Fetcher
Exposed as a separate launcher icon. Will add more cohesive UI in
the future

Change-Id: I9f15a9ac850d636d72b4892f2b5153f7e2b8ba28
2013-07-26 01:48:27 +05:30
YuviPanda
0be6e87d5e Add Campaign & CampaignContribution classes
Change-Id: Ib300e32b0d8146321b661ab5feb20ba9714bfd52
2013-07-26 01:48:24 +05:30
YuviPanda
3465dc044c Update Support SDK to v18
Change-Id: I48b6c53719bf0e26eb9d667db72dea49ba5ebdb1
GitHub: https://github.com/wikimedia/apps-android-commons/pull/37
2013-07-24 18:29:06 +00:00
YuviPanda
bbf5e5af68 Re-organize classes to be a bit more organized
Change-Id: Ie3500c4520a09be28f1856447e66265dd499a680
GitHub: https://github.com/wikimedia/apps-android-commons/pull/36
2013-07-23 13:46:53 +00:00
Translation updater bot
3bab3be4a0 Localisation updates from http://translatewiki.net.
Change-Id: Iebcb3d08fa9f79d59ea77fbf246ff416ead5eaa2
2013-07-22 15:44:46 +00:00
YuviPanda
f0999f8012 Add Prateek to CREDITS
He did the new icons

Change-Id: I062723d247f62d0403430da8111081500f2970ca
GitHub: https://github.com/wikimedia/apps-android-commons/pull/34
2013-07-22 11:20:34 +00:00
YuviPanda
4687739bb5 Remove defunct androlog properties file
Change-Id: I5e2efee87fadd3391f2653e2e980dc178a8f6d77
GitHub: https://github.com/wikimedia/apps-android-commons/pull/33
2013-07-22 11:06:27 +00:00