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

Refactor: Campaign model (#4852)

Browse source 
* Refactor: move Campaign.kt to data.models

* Refactor: move campaign models to campaign/models
This commit is contained in:
Benard Mathu 2022-04-28 17:35:07 +03:00 • committed by GitHub
parent b2a901b9b3
commit d37cdef3c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/fr/free/nrw/commons/campaigns/CampaignResponseDTO.kt
View file

@ -1,6 +1,7 @@
package fr.free.nrw.commons.campaigns
import com.google.gson.annotations.SerializedName
import fr.free.nrw.commons.campaigns.models.Campaign
/**
* Data class to hold the response from the campaigns api

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

@ -10,6 +10,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import fr.free.nrw.commons.campaigns.models.Campaign;
import fr.free.nrw.commons.theme.BaseActivity;
import org.wikipedia.util.DateUtil;

1
app/src/main/java/fr/free/nrw/commons/campaigns/CampaignsPresenter.java
View file

@ -2,6 +2,7 @@ package fr.free.nrw.commons.campaigns;
import android.annotation.SuppressLint;
import fr.free.nrw.commons.campaigns.models.Campaign;
import java.text.ParseException;
import java.util.Collections;
import java.util.Date;

1
app/src/main/java/fr/free/nrw/commons/campaigns/ICampaignsView.java
View file

@ -1,6 +1,7 @@
package fr.free.nrw.commons.campaigns;
import fr.free.nrw.commons.MvpView;
import fr.free.nrw.commons.campaigns.models.Campaign;
/**
* Interface which defines the view contracts of the campaign view

2
app/src/main/java/fr/free/nrw/commons/campaigns/Campaign.kt → app/src/main/java/fr/free/nrw/commons/campaigns/models/Campaign.kt
View file

@ -1,4 +1,4 @@
package fr.free.nrw.commons.campaigns
package fr.free.nrw.commons.campaigns.models
/**
* A data class to hold a campaign

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

@ -33,7 +33,6 @@ import fr.free.nrw.commons.notification.Notification;
import fr.free.nrw.commons.notification.NotificationController;
import fr.free.nrw.commons.profile.ProfileActivity;
import fr.free.nrw.commons.theme.BaseActivity;
import java.text.ParseException;
import java.util.Date;
import java.util.List;
import javax.inject.Inject;
@ -43,7 +42,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.campaigns.Campaign;
import fr.free.nrw.commons.campaigns.models.Campaign;
import fr.free.nrw.commons.campaigns.CampaignView;
import fr.free.nrw.commons.campaigns.CampaignsPresenter;
import fr.free.nrw.commons.campaigns.ICampaignsView;

1
app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignViewUnitTests.kt
View file

@ -5,6 +5,7 @@ import android.view.View
import fr.free.nrw.commons.TestAppAdapter
import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.contributions.MainActivity
import fr.free.nrw.commons.campaigns.models.Campaign
import org.junit.Assert
import org.junit.Before
import org.junit.Test

1
app/src/test/kotlin/fr/free/nrw/commons/campaigns/CampaignsPresenterTest.kt
View file

@ -1,6 +1,7 @@
package fr.free.nrw.commons.campaigns
import com.nhaarman.mockitokotlin2.verify
import fr.free.nrw.commons.campaigns.models.Campaign
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
import io.reactivex.Single
import io.reactivex.disposables.Disposable

2
app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsFragmentUnitTests.kt
View file

@ -11,7 +11,7 @@ import androidx.fragment.app.FragmentTransaction
import fr.free.nrw.commons.R
import fr.free.nrw.commons.TestAppAdapter
import fr.free.nrw.commons.TestCommonsApplication
import fr.free.nrw.commons.campaigns.Campaign
import fr.free.nrw.commons.campaigns.models.Campaign
import fr.free.nrw.commons.campaigns.CampaignView
import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.media.MediaDetailPagerFragment