Update WLM camaign dates [Do not merge now, merge only after alpha release] (commons-app#4584)

* Updates dates for WML campaign

* Bug fix- campaign dates

* Fixed logic for WLM enablement - stick to the month of September

Author: ashishkumar468

app/src/main/java/fr/free/nrw/commons/Utils.java

@@ -218,12 +218,11 @@ public static void setUnderlinedText(TextView textView, int stringResourceName,
      * @param date
      * @return
      */
-    public static boolean isMonumentsEnabled(final Date date, final JsonKvStore store){
-        if(date.getDay()>=1 && date.getMonth()>=9 && date.getDay()<=31 && date.getMonth()<=10 ){
+    public static boolean isMonumentsEnabled(final Date date) {
+        if (date.getMonth() == 8) {
             return true;
         }
-
-        return store.getBoolean(CAMPAIGNS_DEFAULT_PREFERENCE) || true ;
+        return false;
     }
 
     /**
@@ -241,7 +240,7 @@ public static String getWLMStartDate() {
      * @return
      */
     public static String getWLMEndDate() {
-        return "31 Oct";
+        return "30 Sep";
     }
 
 }

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

@@ -117,9 +117,8 @@ public void init() {
                             .parse(campaign.getStartDate());
                         final Date endDate = CommonsDateUtil.getIso8601DateFormatShort()
                             .parse(campaign.getEndDate());
-                        tvDates.setText(
-                            String.format("%1s - %2s", startDate,
-                                endDate));
+                        tvDates.setText(String.format("%1s - %2s", DateUtil.getExtraShortDateString(startDate),
+                            DateUtil.getExtraShortDateString(endDate)));
                     }
                 } catch (final ParseException e) {
                     e.printStackTrace();

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

@@ -528,7 +528,7 @@ public void onLocationChangedMedium(LatLng latLng) {
      * of campaigns on the campaigns card
      */
     private void fetchCampaigns() {
-        if (Utils.isMonumentsEnabled(new Date(), store)) {
+        if (Utils.isMonumentsEnabled(new Date())) {
             campaignView.setCampaign(wlmCampaign);
             campaignView.setVisibility(View.VISIBLE);
         } else if (store.getBoolean(CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE, true)) {

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java

@@ -284,7 +284,7 @@ public boolean onMenuItemClick(MenuItem item) {
     public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         isDarkTheme = systemThemeUtils.isDeviceInNightMode();
-        if (Utils.isMonumentsEnabled(new Date(), applicationKvStore)) {
+        if (Utils.isMonumentsEnabled(new Date())) {
             rlContainerWLMMonthMessage.setVisibility(View.VISIBLE);
         } else {
             rlContainerWLMMonthMessage.setVisibility(View.GONE);
@@ -513,7 +513,7 @@ private void initViews() {
         setBottomSheetCallbacks();
         decideButtonVisibilities();
         addActionToTitle();
-        if(!Utils.isMonumentsEnabled(new Date(), applicationKvStore)){
+        if (!Utils.isMonumentsEnabled(new Date())) {
             chipWlm.setVisibility(View.GONE);
         }
     }
@@ -884,7 +884,7 @@ private void populatePlacesForCurrentLocation(final fr.free.nrw.commons.location
         final Observable<NearbyPlacesInfo> nearbyPlacesInfoObservable = Observable
             .fromCallable(() -> nearbyController
                 .loadAttractionsFromLocation(curlatLng, searchLatLng,
-                    false, true, Utils.isMonumentsEnabled(new Date(), applicationKvStore)));
+                    false, true, Utils.isMonumentsEnabled(new Date())));
 
         compositeDisposable.add(nearbyPlacesInfoObservable
             .subscribeOn(Schedulers.io())
@@ -908,7 +908,7 @@ private void populatePlacesForAnotherLocation(final fr.free.nrw.commons.location
         final Observable<NearbyPlacesInfo> nearbyPlacesInfoObservable = Observable
             .fromCallable(() -> nearbyController
                 .loadAttractionsFromLocation(curlatLng, searchLatLng,
-                    false, true, Utils.isMonumentsEnabled(new Date(), applicationKvStore)));
+                    false, true, Utils.isMonumentsEnabled(new Date())));
 
         compositeDisposable.add(nearbyPlacesInfoObservable
             .subscribeOn(Schedulers.io())