Commit graph

302 commits

Author SHA1 Message Date
misaochan
cfdd4b2752 Modified ContributionController 2015-10-29 21:46:49 +13:00
misaochan
fff3cf05a9 Removed campaigns folder and modified ContributionsActivity 2015-10-29 21:44:40 +13:00
misaochan
4876501d50 Resolves merge conflict 2015-10-28 15:52:09 +13:00
misaochan
3972ab9fd3 Revert "Removed dead code behind Campaigns feature"
This reverts commit c64a64c905.

Conflicts:

	commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java

Changed version number

In preparation for uploading to Google Play
2015-10-28 15:00:44 +13:00
misaochan
6225e04f9a Fixed extra semicolon 2015-10-21 19:58:39 +13:00
misaochan
c64a64c905 Removed dead code behind Campaigns feature
- Removed entire Campaigns folder and associated classes
- Removed associated code in other classes (mostly that test for
campaign == null). I am assuming we want  to keep the behaviour where
campaign == null (ie campaigns are disabled) and discard the behaviour
where campaign != null
- Refactored code to fix spacing
2015-10-21 19:29:08 +13:00
misaochan
04ee167c64 Added "sign up" button
Fixes #6
2015-10-20 23:33:58 +13:00
misaochan
ad88bb3929 Changed directory to fr/free/nrw/commons
Fixes issue #14
2015-10-15 18:41:19 +13:00
Josephine Lim
23c73ab45a Removed Prefs.TRACKING_ENABLED condition in SettingsActivity.java 2015-10-04 23:58:08 +13:00
Josephine Lim
234c7ccd48 Removed EVENT_EVENTLOGGING_CHANGE Object in CommonsApplication 2015-10-04 23:56:57 +13:00
Tobias Preuss
a297dc39af Avoid indirection and redundant method calls. 2015-09-18 14:34:52 +02:00
Nicolas Raoul
5ceb9aba69 Fixed namespace typo 2015-09-08 16:37:39 +09:00
Nicolas Raoul
7786157913 Real API URL and other parameters, reverse-engineered from https://releases.wikimedia.org/mobile/android/commons/wikimedia-commons-1.0beta13.apk 2015-09-08 12:32:45 +09:00
Nicolas Raoul
97a57be47a Modified namespace so that app can be published on Google Play 2015-09-08 10:08:34 +09:00
Brion Vibber
47af8f6b0f fix intermittent crash in rotate-on-detail-view crash fix
Was sometimes crashing due to trying to remove observer too late
after detecting the newly loaded adapter. (Race condition?)

Change-Id: Ib62d78a2b7d863606070bf6d72ec37b9791bf243
2013-10-23 14:06:40 -07:00
YuviPanda
1824176c81 Load images from local disk if possible
Change-Id: I21c477131d714dde6029db7193ab1063809581b5
2013-10-24 01:27:18 +05:30
Brion Vibber
fed215a37a Crash fix for rotate in media detail view
We were crashing when rotating in the detail view, because the detail
view fragment had assumed that its parent activity had already loaded
up its cursor and such before it got created -- an assumption which
fails dramatically when rotating, or switching away and back after
we got paged out of memory.

Check whether we got an object, and if not ask the parent to ping us
when it's done loading.

Also tweaked one of the older delay hacks to avoid a second crash
related to the pager's adapter.

Change-Id: Ib91c0fef0d8ffd0e6b8e0e4874f3ee9be3e9cf34
2013-10-23 11:42:33 -07:00
YuviPanda
0fb60f04c3 Fix crash when looking at images in campaign view
Change-Id: I9254277065a89effa7c9835cc20451043561d16b
2013-10-23 20:07:19 +05:30
YuviPanda
da8db5a2ca Add refresh button only for Campaigns
Temp. hack to let people see new images when they come through

Change-Id: I986bc274ccebd53fef75dbaeffcdff891a4f77bf
2013-10-23 20:07:07 +05:30
YuviPanda
ad0e299f33 Show campaign title if we are displaying a campaign
Change-Id: I3982749fd4f8ce08a2bbf704db9c2f694456d5d5
2013-10-23 05:56:21 +05:30
Yuvipanda
e442f73374 Merge "UI matching in detail view to iOS version" 2013-10-22 20:47:57 +00:00
YuviPanda
5ad8171d51 Let people upload to the campaign they are looking at
FIXME: Show progress of upload as it happens, or at least
direct them to a place where that can happen

Change-Id: I7695fcb9de7d6c2ffdfa2bc60e116a20a6298e31
2013-10-21 22:32:25 +00:00
YuviPanda
884709b470 Switch to using ThreadedPoolConnectionManager
Is probably the cause of the IllegalStateExceptions.

Change-Id: I6160dcd42d77f49396fdb934643b5a8e00f6779f
2013-10-21 22:24:52 +00:00
Brion Vibber
e46a1fac88 UI matching in detail view to iOS version
* ListView -> LinearLayout for categories
* Add labels for fields
* Cool transparent rectangles!
* Padding adjustments...
* Darken image when scrolling detail panel up
* Placeholders for empty desc, license fields

Change-Id: I0e4c4348e741af3560d455ee4b793c2743626fbf
2013-10-21 14:47:26 -07: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
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
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
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
grunny
96de1dc54c Pipe user link in author field
Bug: 53669
Change-Id: I9da22e59a3f46a5ce10e975950cbf9abf3920da3
2013-09-04 00:34:55 +10: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
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
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
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
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