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

Version 4.0.1 #866

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+9 −4
Open

Version 4.0.1 #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7cddf0e
add optional contact us text setting
Feb 12, 2025
24c6be2
Merge pull request #865 from Autofleet/aut-23590
lieblichaaron Feb 18, 2025
d5ee517
remove popup background
sephina Mar 25, 2025
5bb5b0f
Merge branch 'version_4.0.1' into aut-21044-
sephina Mar 26, 2025
d8d9c66
Merge pull request #870 from Autofleet/aut-21044-
sephina Mar 30, 2025
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
1 change: 0 additions & 1 deletion examples/client/Locomotion/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 @@ -5,7 +5,6 @@
<!-- Customize your theme here. -->
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="android:textColor">#000000</item>
<item name="android:popupBackground">#ffffff</item>
<item name="android:colorBackground">#ffffff</item>
<item name="android:windowBackground">@drawable/splash_screen</item>
<item name="android:statusBarColor">@color/color_primary</item>
Expand Down
4 changes: 2 additions & 2 deletions examples/client/Locomotion/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
AppsFlyerFramework: 971521cf5b890c2afeab2f2c91734547b8b169ca
boost: 57d2868c099736d80fcd648bf211b4431e51a558
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
Expand Down Expand Up @@ -1108,6 +1108,6 @@ SPEC CHECKSUMS:
Yoga: c618b544ff8bd8865cdca602f00cbcdb92fd6d31
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 6a43fa9c77c3b3cce3caf9d98acbe87eca852130
PODFILE CHECKSUM: 60efc9f5f49fb780edb55aa41fe1652f3e0a6ef3

COCOAPODS: 1.15.2
1 change: 1 addition & 0 deletions examples/client/Locomotion/src/context/settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import settingsKeys from './keys';
const FIVE_MINS_IN_SECONDS = 5 * 60;
const fieldNameToSettingKeyMap = {
contactUsUrl: settingsKeys.CONTACT_US_URL,
contactUsText: settingsKeys.CONTACT_US_TEXT,
termsOfUseUrl: settingsKeys.TERMS_OF_USE_URL,
privacyPolicyUrl: settingsKeys.PRIVACY_POLICY_URL,
contactEmail: settingsKeys.CONTACT_EMAIL,
Expand Down
1 change: 1 addition & 0 deletions examples/client/Locomotion/src/context/settings/keys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export default {
ENFORCE_PROFILE_PICTURE: 'riderApp.enforceProfilePicture',
MIN_APP_VERSION: 'riderApp.minAppVersion',
CONTACT_US_URL: 'riderApp.contactUsUrl',
CONTACT_US_TEXT: 'riderApp.contactUsText',
TERMS_OF_USE_URL: 'riderApp.termsOfUseUrl',
PRIVACY_POLICY_URL: 'riderApp.privacyPolicyUrl',
CONTACT_EMAIL: 'riderApp.contactEmail',
Expand Down
3 changes: 2 additions & 1 deletion examples/client/Locomotion/src/pages/ContactUs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export default ({ menuSide }) => {
termsUrl: null,
privacyUrl: null,
contactUsUrl: null,
contactUsText: null,
contactEmail: null,
contactPhone: null,
});
Expand Down Expand Up @@ -159,7 +160,7 @@ export default ({ menuSide }) => {
{settings.contactUsUrl ? (
<NoTitleCard onPress={() => openContactUs()}>
<LearnMoreButton onPress={() => openContactUs()}>
<LearnMoreText>{i18n.t('contactUs.learnMore')}</LearnMoreText>
<LearnMoreText>{settings.contactUsText || i18n.t('contactUs.learnMore')}</LearnMoreText>
<LearnMoreIcon Svg={arrowBack} fill="#24aaf2" />
</LearnMoreButton>
</NoTitleCard>
Expand Down
3 changes: 3 additions & 0 deletions examples/client/Locomotion/src/pages/ContactUs/styled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ export const LearnMoreButton = styled(Button)`

export const LearnMoreText = styled(Text)`
margin-right: 10px;
max-width: 80%;
flex-shrink: 1;
flex-wrap: wrap;
`;

export const ContactUsPageView = styled(SafeView)`
Expand Down
Loading