add guatemala challenge

open-learning-exchange · Oct 28, 2024 · 38d5087 · 38d5087
1 parent ba27c06
commit 38d5087
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,9 +40,6 @@ proguard
 # Log files
 *.log
 
-# Raw folder
-assets
-
 # Android Studio Navigation editor temp folder
 .navigation
 

diff --git a/app/src/main/assets/images/october-challenge.png b/app/src/main/assets/images/october-challenge.png
diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -240,7 +240,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
         val currentMonth = calendar.get(Calendar.MONTH)
 
         if (currentMonth == Calendar.OCTOBER) {
-            if (settings.getString("serverURL", "") == "https://${BuildConfig.PLANET_LEARNING_URL}") {
+            if (settings.getString("serverURL", "") == "https://${BuildConfig.PLANET_GUATEMALA_URL}") {
                 val today = LocalDate.now()
                 val endOfMonth = today.withDayOfMonth(today.lengthOfMonth())
                 val remainingDays = ChronoUnit.DAYS.between(today, endOfMonth).toInt()
@@ -252,20 +252,10 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
 
     private fun challengeDialog(remainingDays: Int) {
         val markdownContent = """
-            ## myPlanet issues challenge
+            ## october challenge: $remainingDays days remaining
+            
+            <img src="file:///android_asset/images/october-challenge.png" width="100%">
 
-            ![issues challenge](file:///android_asset/images/github-filter-issues.png)
-
-            get ready for virtual intern github issues challenge!
-
-            **duration:** $remainingDays days remaining
-
-            ## steps to participate:
-            - Find an issue on myPlanet
-            - Take a screenshot/record a video
-            - create an issue on our github repository using link below
-
-            [new myPlanet issue](https://github.com/open-learning-exchange/myplanet/issues/new)
             """.trimIndent()
 
         MarkdownDialog.newInstance(markdownContent)

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -240,7 +240,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
         val currentMonth = calendar.get(Calendar.MONTH)
 
         if (currentMonth == Calendar.OCTOBER) {
-            if (settings.getString("serverURL", "") == "https://${BuildConfig.PLANET_LEARNING_URL}") {
+            if (settings.getString("serverURL", "") == "https://${BuildConfig.PLANET_GUATEMALA_URL}") {
                 val today = LocalDate.now()
                 val endOfMonth = today.withDayOfMonth(today.lengthOfMonth())
                 val remainingDays = ChronoUnit.DAYS.between(today, endOfMonth).toInt()
@@ -252,20 +252,10 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
 
     private fun challengeDialog(remainingDays: Int) {
         val markdownContent = """
-            ## myPlanet issues challenge
+            ## october challenge: $remainingDays days remaining
 
-            ![issues challenge](file:///android_asset/images/github-filter-issues.png)
+            <img src="file:///android_asset/images/october-challenge.png" width="100%">
 
-            get ready for virtual intern github issues challenge!
-
-            **duration:** $remainingDays days remaining
-
-            ## steps to participate:
-            - Find an issue on myPlanet
-            - Take a screenshot/record a video
-            - create an issue on our github repository using link below
-
-            [new myPlanet issue](https://github.com/open-learning-exchange/myplanet/issues/new)
             """.trimIndent()
 
         MarkdownDialog.newInstance(markdownContent)

diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/MarkdownDialog.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/MarkdownDialog.kt
@@ -57,6 +57,13 @@ class MarkdownDialog : DialogFragment() {
         setupCloseButton()
     }
 
+    override fun onStart() {
+        super.onStart()
+        val dialog = dialog ?: return
+
+        dialog.window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+    }
+
     private fun setupMarkdown() {
         setMarkdownText(dialogCampaignChallengeBinding.markdownTextView, markdownContent)
     }

diff --git a/app/src/main/res/layout/dialog_campaign_challenge.xml b/app/src/main/res/layout/dialog_campaign_challenge.xml
@@ -10,17 +10,17 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="Close dialog"
+        android:contentDescription="close dialog"
         android:src="@drawable/baseline_close_24"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/markdownTextView"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
         android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/closeButton" />