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

Fixed #2652 #5265

Closed
wants to merge 1 commit into from
+11 −4
Closed

Fixed #2652 #5265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ dependencies {
'androidx.appcompat:appcompat:1.0.2',
'androidx.constraintlayout:constraintlayout:1.1.3',
'androidx.core:core-ktx:1.0.2',
'androidx.legacy:legacy-support-v4:1.0.0',
'androidx.lifecycle:lifecycle-extensions:2.0.0',
'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0-alpha03',
'androidx.navigation:navigation-fragment:2.0.0',
Expand Down Expand Up @@ -180,7 +179,11 @@ dependencies {
'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1',
'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1',
'org.mockito:mockito-core:2.7.22',
'com.github.oppia:android-spotlight:ebde38335bfb56349eae57e705b611ead9addb15'
'com.github.oppia:android-spotlight:ebde38335bfb56349eae57e705b611ead9addb15',

//Sambhrant Tiwari
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the comment. All attributions are handled by git when you make a commit with your username.

'com.intuit.ssp:ssp-android:1.0.5',
'com.intuit.sdp:sdp-android:1.0.5'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think adding the sdp lib only is sufficient, and there is a newer version, 'com.intuit.sdp:sdp-android:1.1.0',

)
compileOnly(
'jakarta.xml.bind:jakarta.xml.bind-api:2.3.2',
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/splash_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

<ImageView
android:id="@+id/splash_oppia_logo"
android:layout_width="228dp"
android:layout_height="88dp"
android:layout_width="@dimen/width_228dp"
android:layout_height="@dimen/height_88dp"
Comment on lines +38 to +39
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
android:layout_width="@dimen/width_228dp"
android:layout_height="@dimen/height_88dp"
android:layout_width="@dimen/splash_imageview_width"
android:layout_height="@dimen/splash_imageview_height"

android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="width_228dp">228dp</dimen>

<!-- Example dimension for height -->
<dimen name="height_88dp">88dp</dimen>
Comment on lines +4 to +7
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is organized according to screen name, kindly add splash screen related dimens under the relevant category, or create one if it does not exist. Please stick to the patterns in the file.

Additionally, Your dimensions are in dp, contrary to the fix you proposed in #2652 (comment).

Just adding the dependency and not using it does not fix the issue.

<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="match_parent">-2px</dimen>
Expand Down
Loading