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

[Mobile] - Android crashes and card scrolling #559

Merged
merged 14 commits into from
Mar 10, 2023
Merged

[Mobile] - Android crashes and card scrolling #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3698b52
attempt to resolve crash 1 from
drewjhart Mar 4, 2023
62e333e
update version code
drewjhart Mar 4, 2023
1de184e
reverting hermes enable
drewjhart Mar 5, 2023
bbed730
version
drewjhart Mar 5, 2023
f3e5037
substituting text for textinput in roundtexticon
drewjhart Mar 5, 2023
0ab723e
substitute text for textinput
drewjhart Mar 5, 2023
b0b98cb
revert version (using codepush)
drewjhart Mar 5, 2023
e5d1c3a
mobile ui updates
drewjhart Mar 6, 2023
6d24fc8
fix team icon on leaderboard
drewjhart Mar 6, 2023
9aaec89
leaderboard fix 2
drewjhart Mar 6, 2023
39e58b8
leaderboard fix
drewjhart Mar 6, 2023
29dc77f
card scrolling
drewjhart Mar 7, 2023
9ecfc24
scrolling on phase one and phase 2
drewjhart Mar 7, 2023
192519a
formatting
drewjhart Mar 10, 2023
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
2 changes: 1 addition & 1 deletion mobile/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ android {
applicationId "com.rightonnew"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 6
versionCode 8
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the correct build number (and version 8 has been built through Android Studio). There was some last minute builds trying to get better crash reporting through bugsnap to understand the crash more but ultimately it was simpler to just swap out the unneeded and problematic TextInput

versionName "0.1"
multiDexEnabled true
ndk {
Expand Down
1 change: 1 addition & 0 deletions mobile/android/app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:editTextBackground">@android:color/transparent</item>
</style>

</resources>
12 changes: 3 additions & 9 deletions mobile/src/Student/components/RoundTextIcon/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react"
import { StyleSheet, View, TextInput, Image, Pressable } from "react-native"
import { StyleSheet, View, Text, Image, Pressable } from "react-native"
import { scale, verticalScale } from "react-native-size-matters"
import { fontFamilies, fonts } from "../../../utils/theme"

Expand Down Expand Up @@ -27,15 +27,9 @@ const RoundTextIcon = ({
style={[styles.container, { height, borderColor, backgroundColor, marginHorizontal }, { ...style }]}
pointerEvents={readonly ? "none" : "auto"}
>
<TextInput
editable={!readonly}
style={styles.input}
onSubmitEditing={(event) =>
onTextChanged(data, event.nativeEvent.text)
}
>
<Text style={styles.input}>
{text}
</TextInput>
</Text>
{(showIcon === undefined ? false : showIcon) ? (
<Image source={icon} style={styles.icon} />
) : null}
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/Student/screens/Game/Components/AnswerOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const AnswerOptions = ({
? require("../img/Picked.png")
: require("../img/gray_circle.png")
}
text={`${indexToLetter(index)} ${item.text}`}
text={`${indexToLetter(index)}. ${item.text}`}
height={45}
backgroundColor={"white"}
borderColor={
Expand Down
10 changes: 6 additions & 4 deletions mobile/src/Student/screens/Game/Leaderboard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ const Leaderboard = ({
const sortedTeamsByScore = gameSession.teams.sort((a, b) => b.score - a.score)

const teamName = team.name ? team.name : "Team Name"
const findTeamNum = (index) => {
if (index === 0)
const findTeamNum = (name, index) => {
if (name === teamName)
return teamAvatar.id
else
else if (index <= 4)
return index+1
else
return null
}

return (
Expand Down Expand Up @@ -56,7 +58,7 @@ const Leaderboard = ({
renderItem={({ item, index }) => (
<TeamItem
teamName={item.name}
teamNo={findTeamNum(index)}
teamNo={findTeamNum(item.name, index)}
score={item.score}
/>
)}
Expand Down
37 changes: 22 additions & 15 deletions mobile/src/Student/screens/Game/PhaseOneBasicGamePlay/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
SafeAreaView,
StyleSheet,
Text,
ScrollView,
View
} from "react-native"
import LinearGradient from "react-native-linear-gradient"
Expand Down Expand Up @@ -102,8 +103,13 @@ const PhaseOneBasicGamePlay = ({
let cards = [
<View key={"questions"}>
<Text style={styles.cardHeadingText}>Question</Text>
<Card headerTitle="Question" key={"question"}>
<ScrollableQuestion question={question} />
<Card headerTitle="Question" key={"question"} extraStyle={styles.hintsViewCard}>
<ScrollView
style={{alignContent: 'center', marginBottom: verticalScale(50)}}
showsVerticalScrollIndicator={false}
>
<Question question={question} />
</ScrollView>
</Card>
</View>,
<View key={"answers"}>
Expand Down Expand Up @@ -158,17 +164,19 @@ const PhaseOneBasicGamePlay = ({
<Text style={styles.hintsViewCorrectAnswer}>{indexToLetter(selectedAnswerIndex)}. {correctAnswerText}</Text>
{(availableHints && availableHints.length > 0) ? (
<Card extraStyle={styles.hintsViewCard}>
<Question question={question} style={styles.hintsViewQuestion} />
<RoundTextIcon
icon={require("../img/checkmark_checked.png")}
text={`${indexToLetter(selectedAnswerIndex)} ${correctAnswerText}`}
height={45}
marginHorizontal={scale(15)}
borderColor={"#EBFFDA"}
backgroundColor={"#EBFFDA"}
showIcon
readonly />
<HintsView hints={availableHints} />
<View style={{ marginBottom: verticalScale(50)}}>
<Question question={question} style={styles.hintsViewQuestion} />
<RoundTextIcon
icon={require("../img/checkmark_checked.png")}
text={`${indexToLetter(selectedAnswerIndex)} ${correctAnswerText}`}
height={45}
marginHorizontal={scale(15)}
borderColor={"#EBFFDA"}
backgroundColor={"#EBFFDA"}
showIcon
readonly />
<HintsView hints={availableHints} />
</View>
</Card>
) : null}
</View>
Expand Down Expand Up @@ -336,9 +344,8 @@ const styles = StyleSheet.create({
marginBottom: verticalScale(50)
},
hintsViewCard: {
marginTop: -verticalScale(40),
paddingVertical: 0,
maxHeight: verticalScale(500)
maxHeight: verticalScale(500),
},
hintsViewQuestion: {
paddingVertical: verticalScale(30)
Expand Down
29 changes: 24 additions & 5 deletions mobile/src/Student/screens/Game/PhaseTwoBasicGamePlay/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import ScrollableQuestion from "../Components/ScrollableQuestion"
import AnswerOptionsPhaseTwo from "./AnswerOptionsPhaseTwo"
import HintsView from "../Components/HintsView"
import RoundTextIcon from "../../../components/RoundTextIcon"
import Question from "../Components/Question"

//finds the letter matching the index
const indexToLetter = (index) => {
Expand Down Expand Up @@ -152,8 +153,13 @@ const PhaseTwoBasicGamePlay = ({
const questionScreen =
<>
<Text style={styles.cardHeadingText}>Question</Text>
<Card>
<ScrollableQuestion question={question} />
<Card extraStyle={styles.hintsViewCard}>
<ScrollView
style={{alignContent: 'center', marginBottom: verticalScale(50)}}
showsVerticalScrollIndicator={false}
>
<Question question={question} />
</ScrollView>
</Card>
</>

Expand Down Expand Up @@ -204,7 +210,12 @@ const PhaseTwoBasicGamePlay = ({
<Card
key={correctAnswer.id}
>
<ScrollableQuestion question={question} />
<ScrollView
style={{alignContent: 'center', marginBottom: verticalScale(50)}}
showsVerticalScrollIndicator={false}
>
<Question question={question} />
</ScrollView>
<RoundTextIcon
icon={require("../img/checkmark_checked.png")}
text={`${indexToLetter(selectedAnswerIndex)} ${correctAnswerText}`}
Expand Down Expand Up @@ -260,12 +271,16 @@ const PhaseTwoBasicGamePlay = ({
{gameSession?.currentState ===
GameSessionState.CHOOSE_TRICKIEST_ANSWER ? (
<HorizontalPageView initialPage={0}>
<ScrollView showsVerticalScrollIndicator={false}>
<>
<View>
{questionScreen}
</ScrollView>
</View>
</>
<>
<ScrollView>
{submitAnswerScreen}
</ScrollView>
</>
</HorizontalPageView>) : null}
{gameSession?.currentState ===
GameSessionState.PHASE_2_DISCUSS ? (
Expand Down Expand Up @@ -388,6 +403,10 @@ const styles = StyleSheet.create({
width: "100%",
marginBottom: verticalScale(18),
},
hintsViewCard: {
paddingVertical: 0,
maxHeight: verticalScale(500)
},
reasonsText: {
marginVertical: verticalScale(10),
marginHorizontal: scale(15),
Expand Down