mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Conflicts

Browse source
This commit is contained in:
Neslihan 2017-03-21 01:03:20 +03:00
commit 235e2239c9
20 changed files with 187 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -16,6 +16,8 @@ dependencies {
compile "com.android.support:appcompat-v7:${project.supportLibVersion}"
compile "com.android.support:design:${project.supportLibVersion}"
compile 'com.google.code.gson:gson:2.7'
compile "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
annotationProcessor "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
testCompile 'junit:junit:4.12'
}

20
app/src/main/java/fr/free/nrw/commons/AboutActivity.java
View file

@ -7,23 +7,21 @@ import android.widget.TextView;
import fr.free.nrw.commons.theme.BaseActivity;
import butterknife.BindView;
import butterknife.ButterKnife;
public class AboutActivity extends BaseActivity {
private TextView versionText;
private TextView licenseText;
private TextView improveText;
private TextView privacyPolicyText;
private TextView uploadsToText;
@BindView(R.id.about_version) TextView versionText;
@BindView(R.id.about_license) TextView licenseText;
@BindView(R.id.about_improve) TextView improveText;
@BindView(R.id.about_privacy_policy) TextView privacyPolicyText;
@BindView(R.id.about_uploads_to) TextView uploadsToText;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
versionText = (TextView) findViewById(R.id.about_version);
licenseText = (TextView) findViewById(R.id.about_license);
improveText = (TextView) findViewById(R.id.about_improve);
privacyPolicyText = (TextView) findViewById(R.id.about_privacy_policy);
uploadsToText = (TextView) findViewById(R.id.about_uploads_to);
ButterKnife.bind(this);
uploadsToText.setText(CommonsApplication.EVENTLOG_WIKI);
versionText.setText(CommonsApplication.APPLICATION_VERSION);

2
app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
View file

@ -24,7 +24,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
getDelegate().installViewFactory();
getDelegate().onCreate(savedInstanceState);
// Check prefs on every activity starts
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
setTheme(R.style.DarkAppTheme);
}else {
setTheme(R.style.LightAppTheme); // default

37
app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
View file

@ -1,16 +1,12 @@
package fr.free.nrw.commons.auth;
import android.Manifest;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import java.io.IOException;
@ -24,24 +20,23 @@ public abstract class AuthenticatedActivity extends BaseAppCompatActivity {
CommonsApplication app;
private String authCookie;
public AuthenticatedActivity(String accountType) {
this.accountType = accountType;
this.accountType = accountType;
}
private class GetAuthCookieTask extends AsyncTask<Void, String, String> {
private Account account;
private AccountManager accountManager;
public GetAuthCookieTask(Account account, AccountManager accountManager) {
this.account = account;
this.accountManager = accountManager;
}
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
if (result != null) {
if(result != null) {
authCookie = result;
onAuthCookieAcquired(result);
} else {
@ -65,19 +60,19 @@ public abstract class AuthenticatedActivity extends BaseAppCompatActivity {
}
}
}
private class AddAccountTask extends AsyncTask<Void, String, String> {
private AccountManager accountManager;
public AddAccountTask(AccountManager accountManager) {
this.accountManager = accountManager;
}
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
if (result != null) {
Account curAccount = getCurrentAccount();
if(result != null) {
Account[] allAccounts =accountManager.getAccountsByType(accountType);
Account curAccount = allAccounts[0];
GetAuthCookieTask getCookieTask = new GetAuthCookieTask(curAccount, accountManager);
getCookieTask.execute();
} else {
@ -85,18 +80,6 @@ public abstract class AuthenticatedActivity extends BaseAppCompatActivity {
}
}
@Nullable
private Account getCurrentAccount() {
if (ActivityCompat.checkSelfPermission(AuthenticatedActivity.this, Manifest.permission.GET_ACCOUNTS) != PackageManager.PERMISSION_GRANTED) {
return null;
}
Account[] allAccounts = accountManager.getAccountsByType(accountType);
if (allAccounts == null) {
return null;
}
return allAccounts[0];
}
@Override
protected String doInBackground(Void... params) {
AccountManagerFuture<Bundle> resultFuture = accountManager.addAccount(accountType, null, null, null, AuthenticatedActivity.this, null, null);

20
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -50,11 +50,11 @@ public class LoginActivity extends AccountAuthenticatorActivity {
Button signupButton;
EditText usernameEdit;
EditText passwordEdit;
ProgressDialog dialog;
private class LoginTask extends AsyncTask<String, String, String> {
Activity context;
ProgressDialog dialog;
String username;
String password;
@ -69,7 +69,9 @@ public class LoginActivity extends AccountAuthenticatorActivity {
.log();
if (result.equals("Success")) {
dialog.dismiss();
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}
Toast successToast = Toast.makeText(context, R.string.login_success, Toast.LENGTH_SHORT);
successToast.show();
Account account = new Account(username, WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE);
@ -219,6 +221,20 @@ public class LoginActivity extends AccountAuthenticatorActivity {
}
}
@Override
protected void onDestroy() {
try {
// To prevent leaked window when finish() is called, see http://stackoverflow.com/questions/32065854/activity-has-leaked-window-at-alertdialog-show-method
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}
} catch (Exception e) {
e.printStackTrace();
}
super.onDestroy();
}
private void performLogin() {
String username = usernameEdit.getText().toString();
// Because Mediawiki is upercase-first-char-then-case-sensitive :)

42
app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
View file

@ -6,11 +6,16 @@ import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.util.DisplayMetrics;
import android.util.Log;
import android.util.TypedValue;
import android.view.Display;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@ -25,6 +30,8 @@ import android.widget.Toast;
import java.lang.reflect.Method;
import butterknife.BindView;
import butterknife.ButterKnife;
import fr.free.nrw.commons.AboutActivity;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.R;
@ -32,6 +39,7 @@ import fr.free.nrw.commons.SettingsActivity;
import fr.free.nrw.commons.nearby.NearbyActivity;
import static android.app.Activity.RESULT_OK;
import static android.content.Context.LOCATION_SERVICE;
public class ContributionsListFragment extends Fragment {
@ -39,9 +47,9 @@ public class ContributionsListFragment extends Fragment {
void refreshSource();
}
private GridView contributionsList;
private TextView waitingMessage;
private TextView emptyMessage;
@BindView(R.id.contributionsList) GridView contributionsList;
@BindView(R.id.waitingMessage) TextView waitingMessage;
@BindView(R.id.emptyMessage) TextView emptyMessage;
private ContributionController controller;
private static final String TAG = "ContributionsList";
@ -49,11 +57,7 @@ public class ContributionsListFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_contributions, container, false);
contributionsList = (GridView) v.findViewById(R.id.contributionsList);
waitingMessage = (TextView) v.findViewById(R.id.waitingMessage);
emptyMessage = (TextView) v.findViewById(R.id.emptyMessage);
ButterKnife.bind(this, v);
contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener)getActivity());
if(savedInstanceState != null) {
@ -229,6 +233,28 @@ public class ContributionsListFragment extends Fragment {
throw new RuntimeException(e);
}
}
MenuItem galleryMenu = menu.findItem(R.id.menu_from_gallery);
// Get background resource id to recognize current themes
TypedArray typedArray = getActivity().getTheme().obtainStyledAttributes(new int[] {R.attr.mainBackground});
int galleryIconResourceId = typedArray.getResourceId(0, 0);
typedArray.recycle();
// Get width in dp http://stackoverflow.com/questions/11999260/check-if-menuitem-is-in-actionbar-overflow
DisplayMetrics metrics = new DisplayMetrics();
Display display = getActivity().getWindowManager().getDefaultDisplay();
display.getMetrics(metrics);
float logicalDensity = metrics.density;
int dp = (int) (metrics.widthPixels / logicalDensity + 0.5);
if(dp < 360) { // only two icons, there is no room
if(galleryIconResourceId==getActivity().obtainStyledAttributes(R.style.LightAppTheme, new int[] {R.attr.mainBackground}).getResourceId(0, 0)){
galleryMenu.setIcon(R.drawable.ic_photo_black_24dp); //If theme is light, display dark icon on overlay menu
}else{
galleryMenu.setIcon(R.drawable.ic_photo_white_24dp); //If theme is dark, display light icon on overlay menu
}
}
}
super.onPrepareOptionsMenu(menu);
}

4
app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
View file

@ -13,7 +13,7 @@ public class BaseActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true;
setTheme(R.style.DarkAppTheme);
}else {
@ -26,7 +26,7 @@ public class BaseActivity extends Activity {
@Override
protected void onResume() {
// Restart activity if theme is changed
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
if(currentTheme!=newTheme){ // is activity theme changed
Intent intent = getIntent();
finish();

4
app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
View file

@ -12,7 +12,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
currentTheme = true;
setTheme(R.style.DarkAppTheme);
}else {
@ -25,7 +25,7 @@ public class BaseAppCompatActivity extends AppCompatActivity {
@Override
protected void onResume() {
// Restart activity if theme is changed
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
if(currentTheme!=newTheme){ //is activity theme changed
Intent intent = getIntent();
finish();

88
app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
View file

@ -29,20 +29,28 @@ import android.widget.TextView;
import java.util.ArrayList;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnItemSelected;
import butterknife.OnTouch;
import fr.free.nrw.commons.Prefs;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
public class SingleUploadFragment extends Fragment {
private SharedPreferences prefs;
private String license;
public interface OnUploadActionInitiated {
void uploadActionInitiated(String title, String description);
}
private EditText titleEdit;
private EditText descEdit;
private TextView licenseSummaryView;
private Spinner licenseSpinner;
@BindView(R.id.titleEdit) EditText titleEdit;
@BindView(R.id.descEdit) EditText descEdit;
@BindView(R.id.titleDescButton) Button titleDescButton;
@BindView(R.id.share_license_summary) TextView licenseSummaryView;
@BindView(R.id.licenseSpinner) Spinner licenseSpinner;
private OnUploadActionInitiated uploadActionInitiatedHandler;
@ -82,12 +90,7 @@ public class SingleUploadFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.fragment_single_upload, null);
titleEdit = (EditText)rootView.findViewById(R.id.titleEdit);
descEdit = (EditText)rootView.findViewById(R.id.descEdit);
Button titleDescButton = (Button) rootView.findViewById(R.id.titleDescButton);
licenseSpinner = (Spinner) rootView.findViewById(R.id.licenseSpinner);
licenseSummaryView = (TextView)rootView.findViewById(R.id.share_license_summary);
ButterKnife.bind(this, rootView);
ArrayList<String> licenseItems = new ArrayList<>();
@ -97,8 +100,8 @@ public class SingleUploadFragment extends Fragment {
licenseItems.add(getString(R.string.license_name_cc_by_four));
licenseItems.add(getString(R.string.license_name_cc_by_sa_four));
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
final String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3);
prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3);
Log.d("Single Upload fragment", license);
@ -190,25 +193,54 @@ public class SingleUploadFragment extends Fragment {
setLicenseSummary(license);
// Open license page on touch
licenseSummaryView.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setData(Uri.parse(Utils.licenseUrlFor(license)));
startActivity(intent);
return true;
} else {
return false;
}
}
});
return rootView;
}
@OnItemSelected(R.id.licenseSpinner) void onLicenseSelected(AdapterView<?> parent, View view, int position, long id) {
String licenseName = parent.getItemAtPosition(position).toString();
String license = Prefs.Licenses.CC_BY_SA_3; // default value
if(getString(R.string.license_name_cc0).equals(licenseName)) {
license = Prefs.Licenses.CC0;
} else if(getString(R.string.license_name_cc_by).equals(licenseName)) {
license = Prefs.Licenses.CC_BY_3;
} else if(getString(R.string.license_name_cc_by_sa).equals(licenseName)) {
license = Prefs.Licenses.CC_BY_SA_3;
} else if(getString(R.string.license_name_cc_by_four).equals(licenseName)) {
license = Prefs.Licenses.CC_BY_4;
} else if(getString(R.string.license_name_cc_by_sa_four).equals(licenseName)) {
license = Prefs.Licenses.CC_BY_SA_4;
}
setLicenseSummary(license);
SharedPreferences.Editor editor = prefs.edit();
editor.putString(Prefs.DEFAULT_LICENSE, license);
editor.commit();
}
@OnTouch(R.id.share_license_summary) boolean showLicence(View view, MotionEvent motionEvent) {
if (motionEvent.getActionMasked() == MotionEvent.ACTION_DOWN) {
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setData(Uri.parse(Utils.licenseUrlFor(license)));
startActivity(intent);
return true;
} else {
return false;
}
}
@OnClick(R.id.titleDescButton) void setTitleDescButton() {
//Retrieve last title and desc entered
SharedPreferences titleDesc = PreferenceManager.getDefaultSharedPreferences(getActivity());
String title = titleDesc.getString("Title", "");
String desc = titleDesc.getString("Desc", "");
Log.d(TAG, "Title: " + title + ", Desc: " + desc);
titleEdit.setText(title);
descEdit.setText(desc);
}
private void setLicenseSummary(String license) {
licenseSummaryView.setText(getString(R.string.share_license_summary, getString(Utils.licenseNameFor(license))));
}

4
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -78,6 +78,8 @@
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"/>
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout-land/welcome_dont_upload.xml
View file

@ -60,6 +60,8 @@
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"/>
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout-land/welcome_image_details.xml
View file

@ -45,6 +45,8 @@
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"/>
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout-land/welcome_wikipedia.xml
View file

@ -40,6 +40,8 @@
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"/>
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

1
app/src/main/res/layout/welcome_do_upload.xml
View file

@ -74,5 +74,6 @@
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>

1
app/src/main/res/layout/welcome_dont_upload.xml
View file

@ -53,5 +53,6 @@
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>

1
app/src/main/res/layout/welcome_image_details.xml
View file

@ -39,5 +39,6 @@
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>

1
app/src/main/res/layout/welcome_wikipedia.xml
View file

@ -37,5 +37,6 @@
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
</LinearLayout>

2
app/src/main/res/xml/preferences.xml
View file

@ -21,7 +21,7 @@
<CheckBoxPreference
android:title="@string/preference_theme"
android:defaultValue="false"
android:defaultValue="true"
android:summary="@string/preference_theme_summary"
android:key="theme" />