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

Moved Category and CategoryDao to the 'category' package

Browse source
This commit is contained in:
Paul Hawke 2018-01-04 21:52:12 -06:00 • committed by Paul Hawke
parent 1d3befcbd2
commit f2ed57a127
7 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,8 @@ import javax.inject.Named;
import dagger.android.AndroidInjector; import dagger.android.AndroidInjector;
import dagger.android.DaggerApplication; import dagger.android.DaggerApplication;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.category.CategoryDao;
import fr.free.nrw.commons.contributions.ContributionDao; import fr.free.nrw.commons.contributions.ContributionDao;
import fr.free.nrw.commons.data.CategoryDao;
import fr.free.nrw.commons.data.DBOpenHelper; import fr.free.nrw.commons.data.DBOpenHelper;
import fr.free.nrw.commons.di.CommonsApplicationComponent; import fr.free.nrw.commons.di.CommonsApplicationComponent;
import fr.free.nrw.commons.di.CommonsApplicationModule; import fr.free.nrw.commons.di.CommonsApplicationModule;

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

@ -35,8 +35,6 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import dagger.android.support.DaggerFragment; import dagger.android.support.DaggerFragment;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.data.Category;
import fr.free.nrw.commons.data.CategoryDao;
import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.upload.MwVolleyApi; import fr.free.nrw.commons.upload.MwVolleyApi;
import fr.free.nrw.commons.utils.StringSortingUtils; import fr.free.nrw.commons.utils.StringSortingUtils;

2
app/src/main/java/fr/free/nrw/commons/data/Category.java → app/src/main/java/fr/free/nrw/commons/category/Category.java
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.data; package fr.free.nrw.commons.category;
import android.net.Uri; import android.net.Uri;

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

@ -17,9 +17,9 @@ import fr.free.nrw.commons.data.DBOpenHelper;
import timber.log.Timber; import timber.log.Timber;
import static android.content.UriMatcher.NO_MATCH; import static android.content.UriMatcher.NO_MATCH;
import static fr.free.nrw.commons.data.CategoryDao.Table.ALL_FIELDS; import static fr.free.nrw.commons.category.CategoryDao.Table.ALL_FIELDS;
import static fr.free.nrw.commons.data.CategoryDao.Table.COLUMN_ID; import static fr.free.nrw.commons.category.CategoryDao.Table.COLUMN_ID;
import static fr.free.nrw.commons.data.CategoryDao.Table.TABLE_NAME; import static fr.free.nrw.commons.category.CategoryDao.Table.TABLE_NAME;
public class CategoryContentProvider extends ContentProvider { public class CategoryContentProvider extends ContentProvider {

6
app/src/main/java/fr/free/nrw/commons/data/CategoryDao.java → app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.data; package fr.free.nrw.commons.category;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentValues; import android.content.ContentValues;
@ -16,8 +16,6 @@ import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.inject.Provider; import javax.inject.Provider;
import fr.free.nrw.commons.category.CategoryContentProvider;
public class CategoryDao { public class CategoryDao {
private final Provider<ContentProviderClient> clientProvider; private final Provider<ContentProviderClient> clientProvider;
@ -159,7 +157,7 @@ public class CategoryDao {
onCreate(db); onCreate(db);
} }
static void onUpdate(SQLiteDatabase db, int from, int to) { public static void onUpdate(SQLiteDatabase db, int from, int to) {
if (from == to) { if (from == to) {
return; return;
} }

1
app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java
View file

@ -4,6 +4,7 @@ import android.content.Context;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import fr.free.nrw.commons.category.CategoryDao;
import fr.free.nrw.commons.contributions.ContributionDao; import fr.free.nrw.commons.contributions.ContributionDao;
import fr.free.nrw.commons.modifications.ModifierSequenceDao; import fr.free.nrw.commons.modifications.ModifierSequenceDao;

5
app/src/test/java/fr/free/nrw/commons/data/CategoryDaoTest.java → app/src/test/java/fr/free/nrw/commons/category/CategoryDaoTest.java
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.data; package fr.free.nrw.commons.category;
import android.content.ContentProviderClient; import android.content.ContentProviderClient;
import android.content.ContentValues; import android.content.ContentValues;
@ -27,8 +27,7 @@ import java.util.List;
import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.TestCommonsApplication; import fr.free.nrw.commons.TestCommonsApplication;
import fr.free.nrw.commons.category.CategoryContentProvider; import fr.free.nrw.commons.category.CategoryDao.Table;
import fr.free.nrw.commons.data.CategoryDao.Table;
import static fr.free.nrw.commons.category.CategoryContentProvider.BASE_URI; import static fr.free.nrw.commons.category.CategoryContentProvider.BASE_URI;
import static fr.free.nrw.commons.category.CategoryContentProvider.uriForId; import static fr.free.nrw.commons.category.CategoryContentProvider.uriForId;