forked from oppia/oppia-android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into profile_id_provision_feature
# Conflicts: # app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedFragmentPresenter.kt # app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/learneranalytics/ProfileAndDeviceIdActivityTest.kt # app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
- Loading branch information
Showing
164 changed files
with
8,838 additions
and
677 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
app/src/main/java/org/oppia/android/app/customview/SurveyOnboardingBackgroundView.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| package org.oppia.android.app.customview | ||
|
|
||
| import android.content.Context | ||
| import android.graphics.Canvas | ||
| import android.graphics.Color | ||
| import android.graphics.Paint | ||
| import android.graphics.Path | ||
| import android.util.AttributeSet | ||
| import android.view.View | ||
| import androidx.core.content.ContextCompat | ||
| import androidx.core.view.ViewCompat | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.FragmentManager | ||
| import org.oppia.android.R | ||
| import org.oppia.android.app.translation.AppLanguageResourceHandler | ||
| import org.oppia.android.app.view.ViewComponentFactory | ||
| import org.oppia.android.app.view.ViewComponentImpl | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * CustomView to add a background to [SurveyWelcomeDialogFragment] and [SurveyOutroDialogFragment]. | ||
| * Without chaptersFinished and totalChapters values this custom-view cannot be created. | ||
| * | ||
| * Reference: // https://proandroiddev.com/how-i-drew-custom-shapes-in-bottom-bar-c4539d86afd7 and | ||
| * // https://ciechanow.ski/drawing-bezier-curves/ | ||
| */ | ||
| class SurveyOnboardingBackgroundView : View { | ||
| @Inject | ||
| lateinit var resourceHandler: AppLanguageResourceHandler | ||
|
|
||
| private val isRtl by lazy { | ||
| resourceHandler.getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL | ||
| } | ||
|
|
||
| private lateinit var paint: Paint | ||
| private lateinit var path: Path | ||
| private var strokeWidth = 2f | ||
|
|
||
| constructor(context: Context) : super(context) | ||
| constructor(context: Context, attrs: AttributeSet) : super(context, attrs) | ||
| constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super( | ||
| context, | ||
| attrs, | ||
| defStyleAttr | ||
| ) | ||
|
|
||
| init { | ||
| setupCurvePaint() | ||
| } | ||
|
|
||
| override fun onDraw(canvas: Canvas) { | ||
| if (isRtl) | ||
| rotationY = 180f | ||
| super.onDraw(canvas) | ||
|
|
||
| canvas.drawPath(path, paint) | ||
| } | ||
|
|
||
| override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { | ||
| super.onSizeChanged(w, h, oldw, oldh) | ||
| val width = this.width.toFloat() | ||
| val height = this.height.toFloat() | ||
|
|
||
| val controlPoint1X = width * 0.5f | ||
| val controlPoint1Y = 0f | ||
|
|
||
| val controlPoint2X = width * 0.5f | ||
| val controlPoint2Y = height * 0.2f | ||
|
|
||
| val controlPoint3X = width * 1f | ||
| val controlPoint3Y = height * 0.1f | ||
|
|
||
| path.reset() | ||
| path.moveTo(0f, height * 0.1f) | ||
| path.cubicTo( | ||
| controlPoint1X, | ||
| controlPoint1Y, | ||
| controlPoint2X, | ||
| controlPoint2Y, | ||
| controlPoint3X, | ||
| controlPoint3Y | ||
| ) | ||
|
|
||
| path.lineTo(width, height) | ||
| path.lineTo(0f, height) | ||
| path.lineTo(0f, 0f) | ||
| } | ||
|
|
||
| private fun setupCurvePaint() { | ||
| path = Path() | ||
| paint = Paint(Paint.ANTI_ALIAS_FLAG) | ||
| paint.apply { | ||
| style = Paint.Style.FILL_AND_STROKE | ||
| strokeWidth = this@SurveyOnboardingBackgroundView.strokeWidth | ||
| color = ContextCompat.getColor( | ||
| context, | ||
| R.color.component_color_survey_popup_background_color | ||
| ) | ||
| } | ||
| setBackgroundColor(Color.TRANSPARENT) | ||
| } | ||
|
|
||
| override fun onAttachedToWindow() { | ||
| super.onAttachedToWindow() | ||
|
|
||
| val viewComponentFactory = FragmentManager.findFragment<Fragment>(this) as ViewComponentFactory | ||
| val viewComponent = viewComponentFactory.createViewComponent(this) as ViewComponentImpl | ||
| viewComponent.inject(this) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 0 additions & 110 deletions
110
app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryListAdapter.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.