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 #2593: Migrate to androidX (#2594)

Browse source 
* Update dependencies and migrate to androidX
* Make gradle properties tidy
This commit is contained in:
Vivek Maskara 2019-03-16 16:52:37 +05:30 • committed by Adam Jones
parent 5b1b0037c3
commit 57e685cf6c
173 changed files with 518 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/build.gradle
View file

@ -40,6 +40,7 @@ dependencies {
implementation 'com.karumi:dexter:5.0.0'
implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
// Logging
implementation 'ch.acra:acra:4.9.2'
implementation 'com.jakewharton.timber:timber:4.7.1'
@ -65,10 +66,10 @@ dependencies {
// Android testing
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIB_VERSION"
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test:rules:1.1.2-alpha02'
androidTestImplementation 'androidx.test:runner:1.1.2-alpha02'
androidTestImplementation "androidx.annotation:annotation:1.0.2"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha02'
androidTestImplementation 'org.mockito:mockito-core:2.10.0'
// Debugging
@ -78,12 +79,12 @@ dependencies {
testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY_VERSION"
// Support libraries
implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.appcompat:appcompat:1.0.2"
implementation "com.google.android.material:material:1.1.0-alpha04"
implementation "androidx.browser:browser:1.0.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
//swipe_layout
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
@ -92,8 +93,8 @@ dependencies {
}
android {
compileSdkVersion project.compileSdkVersion
buildToolsVersion project.buildToolsVersion
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
applicationId 'fr.free.nrw.commons'
@ -103,10 +104,15 @@ android {
minSdkVersion 15
targetSdkVersion 28
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
packagingOptions {
exclude 'META-INF/androidx.*'
exclude 'META-INF/proguard/androidx-annotations.pro'
}
testOptions {
unitTests.returnDefaultValues = true
@ -154,6 +160,10 @@ android {
signingConfigs.release.keyPassword = System.getenv("key_password")
}
configurations.all {
resolutionStrategy.force 'androidx.annotation:annotation:1.0.2'
}
flavorDimensions 'tier'
productFlavors {
prod {

22
app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java
View file

@ -1,12 +1,12 @@
package fr.free.nrw.commons;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.matcher.PreferenceMatchers;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.espresso.Espresso;
import androidx.test.espresso.matcher.PreferenceMatchers;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
@ -17,11 +17,11 @@ import fr.free.nrw.commons.kvstore.BasicKvStore;
import fr.free.nrw.commons.settings.Prefs;
import fr.free.nrw.commons.settings.SettingsActivity;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.replaceText;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.replaceText;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;

6
app/src/main/AndroidManifest.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="fr.free.nrw.commons">
<uses-permission android:name="android.permission.INTERNET" />
@ -30,7 +31,10 @@
android:theme="@style/LightAppTheme"
android:largeHeap="true"
android:hardwareAccelerated="false"
android:supportsRtl="true" >
android:supportsRtl="true"
tools:replace="android:appComponentFactory"
android:appComponentFactory="commons"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="org.acra.CrashReportDialog"
android:theme="@android:style/Theme.Dialog"

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

@ -8,7 +8,7 @@ import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.os.Build;
import android.os.Process;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;
import com.facebook.drawee.backends.pipeline.Fresco;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* represents Licence object

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

@ -2,7 +2,7 @@ package fr.free.nrw.commons;
import android.app.Activity;
import android.content.res.Resources;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Date;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import org.w3c.dom.Document;

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

@ -1,7 +1,7 @@
package fr.free.nrw.commons;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import fr.free.nrw.commons.mwapi.MediaWikiApi;

8
app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java
View file

@ -1,10 +1,10 @@
package fr.free.nrw.commons;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.util.LruCache;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import androidx.collection.LruCache;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.Toast;

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

@ -1,7 +1,7 @@
package fr.free.nrw.commons;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public class PageTitle {
private final String namespace;

6
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -7,9 +7,9 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.customtabs.CustomTabsIntent;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.content.ContextCompat;
import android.view.View;
import android.widget.Toast;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import com.viewpagerindicator.CirclePageIndicator;

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

@ -1,8 +1,8 @@
package fr.free.nrw.commons;
import android.net.Uri;
import android.support.annotation.Nullable;
import android.support.v4.view.PagerAdapter;
import androidx.annotation.Nullable;
import androidx.viewpager.widget.PagerAdapter;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;

8
app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file

@ -9,10 +9,10 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.content.FileProvider;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.core.content.FileProvider;
import androidx.core.content.res.ResourcesCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.util.DisplayMetrics;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons.auth;
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import fr.free.nrw.commons.BuildConfig;
import timber.log.Timber;

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

@ -9,14 +9,14 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.ColorRes;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.NavUtils;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatDelegate;
import androidx.annotation.ColorRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import com.google.android.material.textfield.TextInputLayout;
import androidx.core.app.NavUtils;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatDelegate;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.MenuInflater;

4
app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java
View file

@ -9,8 +9,8 @@ import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import fr.free.nrw.commons.BuildConfig;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons.auth;
import android.accounts.AbstractAccountAuthenticator;
import android.content.Intent;
import android.os.IBinder;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import fr.free.nrw.commons.di.CommonsDaggerService;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.bookmarks;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
/**
* Data class for handling a bookmark fragment and it title

6
app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
View file

@ -4,9 +4,9 @@ import android.content.Context;
import android.content.Intent;
import android.database.DataSetObserver;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.ViewPager;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.AdapterView;

8
app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java
View file

@ -1,10 +1,10 @@
package fr.free.nrw.commons.bookmarks;
import android.content.Context;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import android.widget.ListAdapter;
import java.util.ArrayList;

2
app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsContentProvider.java
View file

@ -5,7 +5,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import javax.inject.Inject;

2
app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java
View file

@ -5,7 +5,7 @@ import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.RemoteException;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.List;

8
app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java
View file

@ -2,10 +2,10 @@ package fr.free.nrw.commons.bookmarks.locations;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

2
app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesContentProvider.java
View file

@ -5,7 +5,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import javax.inject.Inject;

2
app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java
View file

@ -5,7 +5,7 @@ import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.RemoteException;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.List;

4
app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesFragment.java
View file

@ -2,8 +2,8 @@ package fr.free.nrw.commons.bookmarks.pictures;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

4
app/src/main/java/fr/free/nrw/commons/campaigns/CampaignView.java
View file

@ -3,8 +3,8 @@ package fr.free.nrw.commons.campaigns;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.TextView;

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

@ -6,7 +6,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import javax.inject.Inject;

4
app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
View file

@ -5,8 +5,8 @@ import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.RemoteException;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Date;

8
app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
View file

@ -4,10 +4,10 @@ import android.content.Context;
import android.content.Intent;
import android.database.DataSetObserver;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.ViewPager;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.category;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.w3c.dom.Element;
import org.w3c.dom.Node;

4
app/src/main/java/fr/free/nrw/commons/category/CategoryImagesActivity.java
View file

@ -4,8 +4,8 @@ import android.content.Context;
import android.content.Intent;
import android.database.DataSetObserver;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;

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

@ -2,7 +2,7 @@ package fr.free.nrw.commons.category;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

6
app/src/main/java/fr/free/nrw/commons/category/SubCategoryListFragment.java
View file

@ -4,9 +4,9 @@ package fr.free.nrw.commons.category;
import android.content.Intent;
import android.content.res.Configuration;
import android.os.Bundle;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.concurrency;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import fr.free.nrw.commons.BuildConfig;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.concurrency;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public interface ExceptionHandler {
void onException(@NonNull Throwable t);

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.concurrency;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;

4
app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
View file

@ -3,8 +3,8 @@ package fr.free.nrw.commons.contributions;
import android.content.Context;
import android.net.Uri;
import android.os.Parcel;
import android.support.annotation.NonNull;
import android.support.annotation.StringDef;
import androidx.annotation.NonNull;
import androidx.annotation.StringDef;
import java.lang.annotation.Retention;
import java.text.SimpleDateFormat;

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

@ -5,7 +5,7 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.List;

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

@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.net.Uri;
import android.os.RemoteException;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import fr.free.nrw.commons.settings.Prefs;
import fr.free.nrw.commons.utils.StringUtils;

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

@ -6,7 +6,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import javax.inject.Inject;

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

@ -11,16 +11,16 @@ import android.database.DataSetObserver;
import android.os.Build;
import android.os.Bundle;
import android.os.IBinder;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.support.v4.widget.CursorAdapter;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader;
import androidx.loader.content.Loader;
import androidx.cursoradapter.widget.CursorAdapter;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

@ -2,7 +2,7 @@ package fr.free.nrw.commons.contributions;
import android.content.Context;
import android.database.Cursor;
import android.support.v4.widget.CursorAdapter;
import androidx.cursoradapter.widget.CursorAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

@ -1,8 +1,8 @@
package fr.free.nrw.commons.contributions;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.FloatingActionButton;
import androidx.annotation.Nullable;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

14
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -5,13 +5,13 @@ import android.app.AlertDialog;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.ViewPager;
import android.support.v4.widget.DrawerLayout;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.core.view.GravityCompat;
import androidx.viewpager.widget.ViewPager;
import androidx.drawerlayout.widget.DrawerLayout;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;

6
app/src/main/java/fr/free/nrw/commons/contributions/UnswipableViewPager.java
View file

@ -1,9 +1,9 @@
package fr.free.nrw.commons.contributions;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.view.ViewPager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;

8
app/src/main/java/fr/free/nrw/commons/delete/DeleteTask.java
View file

@ -3,8 +3,8 @@ package fr.free.nrw.commons.delete;
import android.app.NotificationManager;
import android.content.Context;
import android.os.AsyncTask;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationCompat.Builder;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationCompat.Builder;
import android.view.Gravity;
import android.widget.Toast;
@ -22,8 +22,8 @@ import fr.free.nrw.commons.di.ApplicationlessInjection;
import fr.free.nrw.commons.mwapi.MediaWikiApi;
import timber.log.Timber;
import static android.support.v4.app.NotificationCompat.DEFAULT_ALL;
import static android.support.v4.app.NotificationCompat.PRIORITY_HIGH;
import static androidx.core.app.NotificationCompat.DEFAULT_ALL;
import static androidx.core.app.NotificationCompat.PRIORITY_HIGH;
public class DeleteTask extends AsyncTask<Void, Integer, Boolean> {

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

@ -5,7 +5,7 @@ import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.ContentProvider;
import android.content.Context;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import javax.inject.Inject;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons.di;
import android.app.Activity;
import android.content.ContentProviderClient;
import android.content.Context;
import android.support.v4.util.LruCache;
import androidx.collection.LruCache;
import android.view.inputmethod.InputMethodManager;
import com.google.gson.Gson;

6
app/src/main/java/fr/free/nrw/commons/di/CommonsDaggerAppCompatActivity.java
View file

@ -2,9 +2,9 @@ package fr.free.nrw.commons.di;
import android.app.Activity;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AppCompatActivity;
import javax.inject.Inject;

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

@ -2,10 +2,10 @@ package fr.free.nrw.commons.di;
import android.app.Activity;
import android.content.Context;
import android.support.v4.app.Fragment;
import javax.inject.Inject;
import androidx.fragment.app.Fragment;
import dagger.android.AndroidInjector;
import dagger.android.DispatchingAndroidInjector;
import dagger.android.support.HasSupportFragmentInjector;

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

@ -2,7 +2,7 @@ package fr.free.nrw.commons.di;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;

12
app/src/main/java/fr/free/nrw/commons/explore/SearchActivity.java
View file

@ -2,12 +2,12 @@ package fr.free.nrw.commons.explore;
import android.database.DataSetObserver;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils;
import android.view.View;
import android.widget.FrameLayout;

6
app/src/main/java/fr/free/nrw/commons/explore/ViewPagerAdapter.java
View file

@ -1,8 +1,8 @@
package fr.free.nrw.commons.explore;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import java.util.ArrayList;
import java.util.List;

6
app/src/main/java/fr/free/nrw/commons/explore/categories/SearchCategoryFragment.java
View file

@ -4,9 +4,9 @@ package fr.free.nrw.commons.explore.categories;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

6
app/src/main/java/fr/free/nrw/commons/explore/images/SearchImageFragment.java
View file

@ -5,9 +5,9 @@ import android.annotation.SuppressLint;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

2
app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesContentProvider.java
View file

@ -6,7 +6,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import javax.inject.Inject;

4
app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDao.java
View file

@ -5,8 +5,8 @@ import android.content.ContentValues;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.RemoteException;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Date;

2
app/src/main/java/fr/free/nrw/commons/explore/recentsearches/RecentSearchesFragment.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.explore.recentsearches;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.filepicker;
import android.support.v4.content.FileProvider;
import androidx.core.content.FileProvider;
public class ExtendedFileProvider extends FileProvider {

6
app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
View file

@ -13,9 +13,9 @@ import android.os.Build;
import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.text.TextUtils;
import java.io.File;

4
app/src/main/java/fr/free/nrw/commons/filepicker/PickedFiles.java
View file

@ -5,8 +5,8 @@ import android.content.Context;
import android.media.MediaScannerConnection;
import android.net.Uri;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.v4.content.FileProvider;
import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import android.webkit.MimeTypeMap;
import java.io.File;

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

@ -2,7 +2,7 @@ package fr.free.nrw.commons.kvstore;
import android.content.Context;
import android.content.SharedPreferences;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;

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

@ -4,7 +4,7 @@ import android.location.Location;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* a latitude and longitude point with accuracy information, often of a picture

4
app/src/main/java/fr/free/nrw/commons/location/LocationServiceManager.java
View file

@ -9,8 +9,8 @@ import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import java.util.HashSet;
import java.util.List;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.logging;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;
import org.slf4j.Logger;

6
app/src/main/java/fr/free/nrw/commons/logging/LogsSender.java
View file

@ -3,9 +3,9 @@ package fr.free.nrw.commons.logging;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.FileProvider;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.FileProvider;
import org.acra.collector.CrashReportData;
import org.acra.sender.ReportSender;

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

@ -7,7 +7,7 @@ import android.database.DataSetObserver;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.Html;
import android.text.TextUtils;
import android.util.TypedValue;

14
app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -9,13 +9,13 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
import com.google.android.material.snackbar.Snackbar;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.ViewPager;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;

4
app/src/main/java/fr/free/nrw/commons/media/model/ExtMetadata.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.media.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.gson.annotations.SerializedName;

4
app/src/main/java/fr/free/nrw/commons/media/model/ImageInfo.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.media.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.gson.annotations.SerializedName;

4
app/src/main/java/fr/free/nrw/commons/media/model/MwQueryPage.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.media.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.gson.annotations.SerializedName;

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

@ -6,7 +6,7 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;
import javax.inject.Inject;

4
app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java
View file

@ -3,8 +3,8 @@ package fr.free.nrw.commons.mwapi;
import android.content.Context;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.gson.Gson;

4
app/src/main/java/fr/free/nrw/commons/mwapi/LogEventResult.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Date;
import java.util.List;

4
app/src/main/java/fr/free/nrw/commons/mwapi/MediaWikiApi.java
View file

@ -1,8 +1,8 @@
package fr.free.nrw.commons.mwapi;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.io.IOException;
import java.io.InputStream;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.mwapi;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.apache.http.Header;
import org.apache.http.HttpRequest;

4
app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.gson.Gson;

4
app/src/main/java/fr/free/nrw/commons/mwapi/model/MwException.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
public class MwException extends RuntimeException {
@SuppressWarnings("unused")

4
app/src/main/java/fr/free/nrw/commons/mwapi/model/MwQueryResponse.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.google.gson.annotations.SerializedName;

4
app/src/main/java/fr/free/nrw/commons/mwapi/model/MwQueryResult.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;

4
app/src/main/java/fr/free/nrw/commons/mwapi/model/MwResponse.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.gson.annotations.SerializedName;

4
app/src/main/java/fr/free/nrw/commons/mwapi/model/MwServiceError.java
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Collections;
import java.util.List;

2
app/src/main/java/fr/free/nrw/commons/mwapi/model/Page.java
View file

@ -1,6 +1,6 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public class Page {
public String title;

2
app/src/main/java/fr/free/nrw/commons/mwapi/model/ServiceError.java
View file

@ -1,6 +1,6 @@
package fr.free.nrw.commons.mwapi.model;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* The API reported an error in the payload.

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

@ -1,7 +1,7 @@
package fr.free.nrw.commons.nearby;
import android.os.Parcel;
import android.support.annotation.DrawableRes;
import androidx.annotation.DrawableRes;
import java.util.HashMap;
import java.util.Map;

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

@ -1,7 +1,7 @@
package fr.free.nrw.commons.nearby;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import com.pedrogomez.renderers.ListAdapteeCollection;
import com.pedrogomez.renderers.RVRendererAdapter;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons.nearby;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.support.graphics.drawable.VectorDrawableCompat;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import com.mapbox.mapboxsdk.annotations.IconFactory;

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

@ -6,13 +6,15 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.constraint.ConstraintLayout;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.Snackbar;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.google.android.material.snackbar.Snackbar;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -164,7 +166,7 @@ public class NearbyFragment extends CommonsDaggerSupportFragment
private void removeMapFragment() {
if (nearbyMapFragment != null) {
android.support.v4.app.FragmentManager fm = getFragmentManager();
FragmentManager fm = getFragmentManager();
fm.beginTransaction().remove(nearbyMapFragment).commit();
nearbyMapFragment = null;
}
@ -180,7 +182,7 @@ public class NearbyFragment extends CommonsDaggerSupportFragment
private void removeListFragment() {
if (nearbyListFragment != null) {
android.support.v4.app.FragmentManager fm = getFragmentManager();
FragmentManager fm = getFragmentManager();
fm.beginTransaction().remove(nearbyListFragment).commit();
nearbyListFragment = null;
}

10
app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
View file

@ -2,8 +2,6 @@ package fr.free.nrw.commons.nearby;
import android.content.Context;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -19,16 +17,17 @@ import java.util.List;
import javax.inject.Inject;
import javax.inject.Named;
import dagger.android.support.AndroidSupportInjection;
import dagger.android.support.DaggerFragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.contributions.ContributionController;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.kvstore.BasicKvStore;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.location.LatLng;
import timber.log.Timber;
public class NearbyListFragment extends DaggerFragment {
public class NearbyListFragment extends CommonsDaggerSupportFragment {
private Bundle bundleForUpdates; // Carry information from activity about changed nearby places and current location
private static final Type LIST_TYPE = new TypeToken<List<Place>>() {
@ -52,7 +51,6 @@ public class NearbyListFragment extends DaggerFragment {
@Override
public void onAttach(Context context) {
AndroidSupportInjection.inject(this);
super.onAttach(context);
}

14
app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
View file

@ -8,13 +8,13 @@ import android.graphics.Bitmap;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.FloatingActionButton;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v7.app.AlertDialog;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import androidx.appcompat.app.AlertDialog;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.LayoutInflater;

4
app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java
View file

@ -1,8 +1,8 @@
package fr.free.nrw.commons.nearby;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.Button;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons.nearby;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.nearby.model.NearbyResultItem;

12
app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
View file

@ -2,12 +2,12 @@ package fr.free.nrw.commons.nearby;
import android.content.Intent;
import android.net.Uri;
import android.support.transition.TransitionManager;
import android.support.v4.app.Fragment;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import androidx.transition.TransitionManager;
import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.appcompat.widget.PopupMenu;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;

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

@ -3,7 +3,7 @@ package fr.free.nrw.commons.nearby;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* Handles the links to Wikipedia, Commons, and Wikidata that are displayed for a Place

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.notification;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
public class MarkReadResponse {
@SuppressWarnings("unused") @Nullable

10
app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file

@ -5,11 +5,11 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.constraint.ConstraintLayout;
import android.support.design.widget.Snackbar;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.google.android.material.snackbar.Snackbar;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;

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

@ -1,6 +1,6 @@
package fr.free.nrw.commons.notification;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.pedrogomez.renderers.ListAdapteeCollection;
import com.pedrogomez.renderers.RVRendererAdapter;

Some files were not shown because too many files have changed in this diff Show more