Skip to content

Upload overhaul #1796

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

Closed
wants to merge 97 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
6e9331b
Skip textview added and onclick implemented
ujjwalagrawal17 May 1, 2018
b33bf38
Shared prefernce isloggedin added and menu displayed accordingly
ujjwalagrawal17 May 1, 2018
dc4222e
Login added in drawer and drawer made dynamic
ujjwalagrawal17 May 2, 2018
04d9685
fixed issue in logout
ujjwalagrawal17 May 2, 2018
c7a6c71
Merge branch 'master' into skip_login
ujjwalagrawal17 May 4, 2018
652c213
Added new upload activity that receives shared files from the gallery…
psh Feb 24, 2018
2105d56
Better handling of the view paging plus error handling for required f…
Mar 4, 2018
c7a60d4
Code cleanup to make things more readable.
psh Mar 5, 2018
af777ad
Extracted a model from the category search fragment that can possibly…
psh Mar 6, 2018
242cca7
Added category selection to the combined upload screen.
psh Mar 7, 2018
863f5f1
Cleanup before the home-stretch on the GUI.
psh Mar 8, 2018
2698e62
Adding license selection.
psh Mar 10, 2018
6718b02
Fixed build warnings + cleanup
psh Mar 28, 2018
a7096ef
Start to support the dark theme.
psh Mar 30, 2018
7f360f2
Work in progress to add quality checking.
psh Apr 2, 2018
b348272
Fixing merge.
psh Apr 7, 2018
ed241e0
resolving Login page switching issue
ujjwalagrawal17 May 14, 2018
68165c7
redirecting to category images Actovoty instead of Nearby now
ujjwalagrawal17 Jul 31, 2018
a474197
Indentation fix
ujjwalagrawal17 Jul 31, 2018
8732c79
Removed extra logo
ujjwalagrawal17 Jul 31, 2018
987fff0
Javadocs added
ujjwalagrawal17 Jul 31, 2018
67563e0
Changed skip login default value to false
ujjwalagrawal17 Jul 31, 2018
23a195f
Share from gallery for not loggedin fixed
ujjwalagrawal17 Jul 31, 2018
bf58fca
Fixed upload from gallery
ujjwalagrawal17 Aug 2, 2018
a651102
Merge remote-tracking branch 'commons-app/master' into upload-overhaul
ilgazer Aug 3, 2018
7ce0b56
GPSExtractor: optimized away the EXifInterface object
ilgazer Aug 4, 2018
970ed26
Implemented submit functionality, temporarily fixed jacoco crash by d…
ilgazer Aug 4, 2018
60c8a6a
Implemented uploading of categories along with the picture. The categ…
ilgazer Aug 4, 2018
f4fbac6
Merge branch 'upload-overhaul' into upload-overhaul
ilgazer Aug 4, 2018
ff9f43e
Only do http logging if a debug build is run (#1795)
misaochan Aug 4, 2018
e32f8d3
Fix title/desc prefill bug (#1794)
misaochan Aug 4, 2018
b73535f
added null check before initialising LatLng after receiving location …
ashishkumar468 Aug 4, 2018
462de42
Implemented caching of files. Did some work on picture quality detect…
ilgazer Aug 4, 2018
143ad00
Fix failed uploads (#1790)
Aug 4, 2018
651eb40
Implemented too dark picture detection.
ilgazer Aug 4, 2018
3af2b0f
Merge remote-tracking branch 'origin/upload-overhaul' into upload-ove…
ilgazer Aug 4, 2018
5d08d49
Added a side card for zoom and map buttons along with pretty animatio…
ilgazer Aug 5, 2018
6f86299
Localisation updates from https://translatewiki.net.
translatewiki Aug 6, 2018
98090de
Added duplicate image on commons checking and fixed files not getting…
ilgazer Aug 6, 2018
23014e0
Merge remote-tracking branch 'refs/remotes/origin/2.8-release'
misaochan Aug 6, 2018
ecf72ab
Added support for map button and switched in-app upload buttons to Up…
ilgazer Aug 6, 2018
f025e05
Pretty pretty animations!
ilgazer Aug 6, 2018
7d8b3ef
Implemented zoom functionality for th background image. Just pinching…
ilgazer Aug 6, 2018
f12f1d5
Merge branch 'skip_login' of github.com:ujjwalagrawal17/apps-android-…
nicolas-raoul Aug 7, 2018
b5e90be
Wikidata edit fix (#1800)
maskaravivek Aug 7, 2018
a5d4e8f
changed Icon (#1759)
tanvidadu Jul 28, 2018
825a529
Changed default value of skip login to false
ujjwalagrawal17 Aug 7, 2018
c93bcda
Updated API to get Author name too
ujjwalagrawal17 Aug 7, 2018
ecebe4c
Crash fixed due to notifyDataSetChange
ujjwalagrawal17 Aug 7, 2018
87b6568
search API duplicate images fixed
ujjwalagrawal17 Aug 7, 2018
e00f69a
Merged from 2.8-release
nicolas-raoul Aug 8, 2018
fa13c1b
Merge branch 'fix_skip_login_nearby_bug' of github.com:ujjwalagrawal1…
nicolas-raoul Aug 8, 2018
bf50e74
Fixes #1801 (Media details view for Browse is lacking author field) …
ujjwalagrawal17 Aug 8, 2018
634814e
Versioning and changelog for v2.8.0 (#1812)
misaochan Aug 8, 2018
98ed7be
Merge remote-tracking branch 'refs/remotes/origin/2.8-release'
misaochan Aug 8, 2018
78cab49
Merge branch 'master' of github.com:commons-app/apps-android-commons
nicolas-raoul Aug 8, 2018
b69b1cf
Added multi-language descriptions with categories by region.
ilgazer Aug 8, 2018
a4d9b05
Reimplemented the duplicate title checker and implemented a check aga…
ilgazer Aug 8, 2018
56675c9
Localisation updates from https://translatewiki.net.
translatewiki Aug 9, 2018
654ef80
Renamed Set wallpaper to Set as wallpaper #1813 (#1818)
VaishSiddharth Aug 9, 2018
81053a1
Username in nav drawer centrally aligned #1806 (#1817)
VaishSiddharth Aug 9, 2018
a9ee62c
Javadocs for Description and UploadPresenter, plus some general cleanup.
ilgazer Aug 9, 2018
cd1381f
Merge remote-tracking branch 'commons-app/master' into upload-overhaul
ilgazer Aug 10, 2018
5dd4afa
Implemented login checks for the Upload screen.
ilgazer Aug 10, 2018
f7ef9ea
Small code changes.
ilgazer Aug 10, 2018
704e96a
Implement receiving data from Nearby.
ilgazer Sep 3, 2018
6762536
Made Codacy happy.
ilgazer Sep 6, 2018
f1e9892
Fixes in grammar and punctuation in English translatable messages
amire80 Aug 11, 2018
44e49b3
Localisation updates from https://translatewiki.net.
translatewiki Aug 13, 2018
9645888
Fix category edits (#1823)
maskaravivek Aug 13, 2018
8af7ae8
Versioning and changelog for v2.8.1 (#1827)
misaochan Aug 14, 2018
386dfc5
Feature/bug fix#1793 (#1802)
ashishkumar468 Aug 16, 2018
30eec0d
Localisation updates from https://translatewiki.net.
translatewiki Aug 17, 2018
278396c
Use NotificationChannel and prevent crash in API 26 (#1835)
whym Aug 19, 2018
a7d7d9a
Localisation updates from https://translatewiki.net.
translatewiki Aug 20, 2018
c25b573
Fix issue where beta prod flavour could not be installed at the same …
maskaravivek Aug 20, 2018
e6d0378
Null checks for activity to prevent unwanted crashes (#1730)
maskaravivek Aug 20, 2018
1ed8b4d
Bug fix issue #1839, changes (#1845)
ashishkumar468 Aug 22, 2018
951b007
Localisation updates from https://translatewiki.net.
translatewiki Aug 23, 2018
59d1d29
Feature/nearby io fix (#1847)
ashishkumar468 Aug 24, 2018
ca3f9bb
Localisation updates from https://translatewiki.net.
translatewiki Aug 27, 2018
b807d3f
Work towards eliminating string literals from code. (#1861)
dbrant Aug 27, 2018
4622e8e
Add button on image details to copy wikicode to clipboard (#1849)
albendz Aug 27, 2018
032110e
Remove dependency on Glide, Picasso, SVG, and multidex. (#1859)
dbrant Aug 30, 2018
6decc53
Added CDATA tag (#1836)
Mansi449 Aug 31, 2018
aa2fc9c
Add angle bracket (#1868)
Mansi449 Sep 1, 2018
402d731
Localisation updates from https://translatewiki.net.
translatewiki Sep 3, 2018
1b2daad
Update credits.md
misaochan Sep 4, 2018
d455c35
Update credits.md
misaochan Sep 6, 2018
e2aadc9
Feature/permissions library (#1855)
ashishkumar468 Sep 6, 2018
884fe60
Abstarcted permission acquisition into new class DexterPermissionObta…
ilgazer Sep 9, 2018
072d99a
Fixed Nearby upload detection
ilgazer Sep 9, 2018
8854443
Migrated bad picture detection from AsyncTask to RxJava.
ilgazer Sep 10, 2018
f1a239f
Removed ShareActivity and related dead code
ilgazer Sep 16, 2018
3f022f7
Removed dead or duplicate code from FileProcessor
ilgazer Sep 16, 2018
c6e9fde
Added info button to title EditText
ilgazer Sep 16, 2018
1421038
Fixed the add description button not disappearing.
ilgazer Sep 16, 2018
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
Prev Previous commit
Next Next commit
Shared prefernce isloggedin added and menu displayed accordingly
  • Loading branch information
ujjwalagrawal17 committed May 1, 2018
commit b33bf387c66a54ae20c75d02b0987cf9be85827e
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
import fr.free.nrw.commons.WelcomeActivity;
import fr.free.nrw.commons.contributions.ContributionsActivity;
import fr.free.nrw.commons.di.ApplicationlessInjection;
import fr.free.nrw.commons.featured.FeaturedImagesActivity_MembersInjector;
import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.nearby.NearbyActivity;
import fr.free.nrw.commons.theme.NavigationBaseActivity;
import fr.free.nrw.commons.ui.widget.HtmlTextView;
import io.reactivex.Observable;
Expand Down Expand Up @@ -139,8 +141,10 @@ public void onCreate(Bundle savedInstanceState) {
}

private void skipLogin() {
NavigationBaseActivity.startActivityWithFlags(this, AboutActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
prefs.edit().putBoolean("isloggedin", false).apply();
NavigationBaseActivity.startActivityWithFlags(this, NearbyActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
finish();

}

private void forgotPassword() {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/fr/free/nrw/commons/settings/Prefs.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public class Prefs {
public static final String DEFAULT_LICENSE = "defaultLicense";
public static final String UPLOADS_SHOWING = "uploadsshowing";
public static final String IS_CONTRIBUTION_COUNT_CHANGED = "ccontributionCountChanged";
public static final String IS_LOGGED_IN = "isloggedin";

public static class Licenses {
public static final String CC_BY_SA_3 = "CC BY-SA 3.0";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,24 @@
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;

import javax.inject.Inject;
import javax.inject.Named;

import butterknife.BindView;
import fr.free.nrw.commons.AboutActivity;
import fr.free.nrw.commons.BuildConfig;
Expand All @@ -43,6 +48,7 @@ public abstract class NavigationBaseActivity extends BaseActivity
NavigationView navigationView;
@BindView(R.id.drawer_layout)
DrawerLayout drawerLayout;
@Inject @Named("application_preferences") SharedPreferences prefs;

private ActionBarDrawerToggle toggle;

Expand Down Expand Up @@ -97,6 +103,26 @@ private void setDrawerPaneWidth() {
navigationView.setLayoutParams(params);
}

@Override
public boolean onPrepareOptionsMenu(Menu menu) {
super.onPrepareOptionsMenu(menu);
if (prefs.getBoolean("isloggedin", true)) {
menu.findItem(R.id.action_login).setVisible(false);
menu.findItem(R.id.action_home).setVisible(true);
menu.findItem(R.id.action_notifications).setVisible(true);
menu.findItem(R.id.action_settings).setVisible(true);
menu.findItem(R.id.action_logout).setVisible(true);

}else {
menu.findItem(R.id.action_login).setVisible(true);
menu.findItem(R.id.action_home).setVisible(false);
menu.findItem(R.id.action_notifications).setVisible(false);
menu.findItem(R.id.action_settings).setVisible(false);
menu.findItem(R.id.action_logout).setVisible(false);
}
return true;
}

@Override
public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
final int itemId = item.getItemId();
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/menu/drawer.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/drawer_login">
<item
android:id="@+id/action_login"
android:visible="false"
android:icon="@drawable/ic_home_black_24dp"
android:title="@string/navigation_item_login" />
</group>
<group android:id="@+id/drawer_main">
<item
android:id="@+id/action_home"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,5 @@
<string name="about_translate_cancel">Cancel</string>
<string name="retry">Retry</string>
<string name="skip_login">Skip </string>
<string name="navigation_item_login">Login</string>
</resources>