Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #4362, #1491: When reading text size is extra large, resume lesson page and revision tabs content is seen in normal size #5290

Merged
merged 78 commits into from
Aug 1, 2024
Merged

Fix #4362, #1491: When reading text size is extra large, resume lesson page and revision tabs content is seen in normal size #5290

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
d4c9168
fixed reading text size for lesson activity
Vishwajith-Shettigar Dec 25, 2023
e46ca6b
fixed reading text size for lesson activity
Vishwajith-Shettigar Dec 25, 2023
380562b
fixed reading text size for lesson activity
Vishwajith-Shettigar Dec 25, 2023
8386f62
fixed reading text size for lesson activity
Vishwajith-Shettigar Dec 25, 2023
a158e5f
fixed reading text size for lesson activity
Vishwajith-Shettigar Dec 25, 2023
1074505
fixed reading text size for revision
Vishwajith-Shettigar Dec 25, 2023
3c83b32
fixed reading text size for revision
Vishwajith-Shettigar Dec 25, 2023
e5ba6c3
set reading text size medium for revision option items
Vishwajith-Shettigar Dec 25, 2023
e393543
lint issue fix
Vishwajith-Shettigar Dec 25, 2023
7e634ad
lint issue fix
Vishwajith-Shettigar Dec 27, 2023
35a9b51
fix lint issue
Vishwajith-Shettigar Dec 28, 2023
7afe5a9
tool bar title size fixed
Vishwajith-Shettigar Jan 4, 2024
932d7a2
kdoc added
Vishwajith-Shettigar Jan 4, 2024
46c5ed0
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jan 10, 2024
5435338
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jan 13, 2024
da66a27
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jan 29, 2024
8e6e686
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Feb 2, 2024
c5a0431
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Feb 23, 2024
f420536
addressed comments
Vishwajith-Shettigar Feb 26, 2024
907654b
addressed comments
Vishwajith-Shettigar Feb 26, 2024
033ab60
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Feb 27, 2024
fe9a1d9
added tests for reumelesson fragment
Vishwajith-Shettigar Feb 29, 2024
7c8183b
added tests for reumelesson fragment
Vishwajith-Shettigar Feb 29, 2024
a84d759
test modified
Vishwajith-Shettigar Mar 1, 2024
caaf2c7
tests added for revision card fragment
Vishwajith-Shettigar Mar 1, 2024
d070084
tests fixed
Vishwajith-Shettigar Mar 1, 2024
e6d36b1
tests fixed
Vishwajith-Shettigar Mar 1, 2024
c1eacd4
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Mar 1, 2024
c3321d1
tests fixed
Vishwajith-Shettigar Mar 1, 2024
dbd3528
refinied
Vishwajith-Shettigar Mar 1, 2024
9b6444d
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Mar 7, 2024
a434c3e
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Mar 14, 2024
749f58a
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Apr 3, 2024
f2fc42f
addressed comments
Vishwajith-Shettigar Apr 3, 2024
20c80e2
fix klint
Vishwajith-Shettigar Apr 3, 2024
693b39a
Delete hs_err_pid7956.log
Vishwajith-Shettigar Apr 3, 2024
1087154
addressed comments
Vishwajith-Shettigar Apr 8, 2024
5ccabef
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Apr 8, 2024
28b1b5c
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Apr 17, 2024
4306527
support text scaling question player
Vishwajith-Shettigar Apr 27, 2024
fef59c7
clean up
Vishwajith-Shettigar Apr 27, 2024
0de4260
Merge branch 'develop' into readingsize
Vishwajith-Shettigar May 9, 2024
4e473c6
test fix
Vishwajith-Shettigar May 9, 2024
c723f4c
test fix
Vishwajith-Shettigar May 9, 2024
58a1055
tests fix
Vishwajith-Shettigar May 10, 2024
9088d30
tests fix
Vishwajith-Shettigar May 10, 2024
b68b6fc
tests added for question player
Vishwajith-Shettigar May 10, 2024
8d5c612
tests fix
Vishwajith-Shettigar May 10, 2024
cc7bf87
tests fixed
Vishwajith-Shettigar May 10, 2024
45b38ef
test changes
Vishwajith-Shettigar May 11, 2024
45df691
klint
Vishwajith-Shettigar May 11, 2024
6b8a9a8
test changes
Vishwajith-Shettigar May 11, 2024
e197107
fix
Vishwajith-Shettigar May 11, 2024
27f077f
marks test as flaky
Vishwajith-Shettigar May 14, 2024
ce57386
mark test as flaky
Vishwajith-Shettigar May 14, 2024
1d15e3e
Resolved conflicts
Vishwajith-Shettigar Jun 5, 2024
1b05539
Fixed tests for QuestionPLayerActivity
Vishwajith-Shettigar Jun 5, 2024
4f6f050
klint
Vishwajith-Shettigar Jun 5, 2024
ff7f685
Rename verify font size method
Vishwajith-Shettigar Jun 5, 2024
731d03e
Fixed unresolved reference
Vishwajith-Shettigar Jun 5, 2024
0a45fbb
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jun 16, 2024
c03807d
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jun 23, 2024
de916f0
resolve conflicts and merge
Vishwajith-Shettigar Jun 26, 2024
32b3f4d
klint
Vishwajith-Shettigar Jun 26, 2024
537913d
undo a change
Vishwajith-Shettigar Jun 26, 2024
92bfbd8
clear warnings
Vishwajith-Shettigar Jun 26, 2024
bb34669
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jun 29, 2024
260fd28
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jul 1, 2024
3ed839f
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jul 2, 2024
4a63da6
Resolved conflicts
Vishwajith-Shettigar Jul 24, 2024
65f44ed
Resolved conflicts
Vishwajith-Shettigar Jul 24, 2024
285e602
Fix test
Vishwajith-Shettigar Jul 24, 2024
2718a61
Experimenting-- removing device config from robolectric test passes o…
Vishwajith-Shettigar Jul 26, 2024
a68fa98
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jul 26, 2024
c35937b
Removed redundant configuration in tests
Vishwajith-Shettigar Jul 27, 2024
ff7683e
Merge branch 'develop' into readingsize
Vishwajith-Shettigar Jul 30, 2024
ba7939b
Addressed comments
Vishwajith-Shettigar Jul 30, 2024
93c6fe0
Fix static check
Vishwajith-Shettigar Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed reading text size for lesson activity
  • Loading branch information
@Vishwajith-Shettigar
Vishwajith-Shettigar committed Dec 25, 2023
commit 380562ba17a68e583635f793106e9d76ee285194
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package org.oppia.android.app.resumelesson
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.Log
import org.oppia.android.app.activity.ActivityComponentImpl
import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
import org.oppia.android.app.home.RouteToExplorationListener
Expand Down
9 changes: 3 additions & 6 deletions app/src/main/java/org/oppia/android/app/resumelesson/ResumeLessonFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.oppia.android.app.resumelesson

import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand All @@ -14,26 +13,24 @@ import org.oppia.android.app.model.EphemeralChapterSummary
import org.oppia.android.app.model.ExplorationActivityParams
import org.oppia.android.app.model.ExplorationCheckpoint
import org.oppia.android.app.model.ProfileId
import org.oppia.android.app.model.ReadingTextSize
import org.oppia.android.app.model.ResumeLessonFragmentArguments
import org.oppia.android.app.translation.AppLanguageResourceHandler
import org.oppia.android.app.utility.FontScaleConfigurationUtil
import org.oppia.android.app.viewmodel.ViewModelProvider
import org.oppia.android.databinding.ResumeLessonFragmentBinding
import org.oppia.android.domain.exploration.ExplorationDataController
import org.oppia.android.domain.oppialogger.OppiaLogger
import org.oppia.android.domain.profile.ProfileManagementController
import org.oppia.android.domain.topic.TopicController
import org.oppia.android.domain.translation.TranslationController
import org.oppia.android.util.data.AsyncResult
import org.oppia.android.util.data.DataProviders.Companion.toLiveData
import org.oppia.android.util.extensions.getProto
import org.oppia.android.util.extensions.putProto
import org.oppia.android.util.gcsresource.DefaultResourceBucketName
import org.oppia.android.util.parser.html.HtmlParser
import javax.inject.Inject
import org.oppia.android.app.model.ExplorationFragmentArguments
import org.oppia.android.app.model.ReadingTextSize
import org.oppia.android.app.player.exploration.ExplorationFragmentPresenter
import org.oppia.android.domain.profile.ProfileManagementController
import org.oppia.android.util.extensions.putProto

/** The presenter for [ResumeLessonFragment]. */
class ResumeLessonFragmentPresenter @Inject constructor(
Expand Down
Loading