Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

Commit

Permalink
Release 5.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
nzcovidtracer-dev authored Jul 1, 2021
1 parent 15a018a commit a00dd66
Show file tree
Hide file tree
Showing 27 changed files with 676 additions and 417 deletions.
6 changes: 5 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,11 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+" // From node_modules
implementation 'com.facebook.fbjni:fbjni-java-only:0.0.4'
implementation('com.facebook.react:react-native:+') {
exclude group: 'com.facebook.fbjni', module: 'fbjni-java-only'
exclude group: 'com.facebook.yoga', module: 'proguard-annotations'
}
implementation 'com.google.crypto.tink:tink-android:1.5.0'
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"

Expand Down
8 changes: 6 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ buildscript {
minSdkVersion = 23
compileSdkVersion = 29
targetSdkVersion = 29
firebaseMessagingVersion = "21.1.0"
}
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath('com.android.tools.build:gradle:4.0.1')
Expand All @@ -30,7 +31,10 @@ allprojects {
}

google()
jcenter()
mavenCentral()
maven { url 'https://www.jitpack.io' }
flatDir {
dirs "$rootProject.projectDir/libs"
}
}
}
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android.useAndroidX=true
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.37.0
FLIPPER_VERSION=0.93.0

org.gradle.daemon=true
org.gradle.configureondemand=true
Expand Down
Binary file added android/libs/fbjni-java-only-0.0.3.jar
Binary file not shown.
Binary file added android/libs/proguard-annotations-1.14.1.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions lib/covidtracer_migration/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {

repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
Expand Down Expand Up @@ -56,7 +56,7 @@ android {

repositories {
mavenCentral()
jcenter()
mavenCentral()
google()

def found = false
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"android": "react-native run-android --variant=envEnfDebug",
"ios": "react-native run-ios",
"start": "react-native start",
"test": "yarn fix:test:realm && jest",
"test": "yarn fix:test:realm && jest --runInBand",
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
"clean": "react-native-clean-project",
"e2e:dev": "npx cavy run-ios --skipbuild --dev",
Expand Down
1 change: 1 addition & 0 deletions src/__snapshots__/config.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Object {
"DevLogModules": false,
"ENFCheckInterval": 180,
"ENFServerUrl": "",
"EasterEggPublicKey": "",
"ExposureEventsBaseUrl": "https://exposure-events.",
"Features": Set {},
"FeedbackEmailLink": "mailto:[email protected]?subject=NZ COVID Tracer App Feedback",
Expand Down
1 change: 1 addition & 0 deletions src/analytics/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const Events = {
ViewNHIFromMyProfile: "viewNHIFromMyProfile",
ViewNHIFromDashboard: "viewNHIFromDashboard",
ENFSupportRetrySuccess: "enfSupportRetrySuccess",
EasterEggTriggered: "easter_egg_triggered",
} as const;

const AnalyticsEvent = {
Expand Down
5 changes: 4 additions & 1 deletion src/components/atoms/PhoneInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ const CountryContainer = styled.View<{
`;

const TextInput = styled(TextInputInner)`
flex: 1;
flex: 0;
flex-grow: 1;
min-width: 50%;
`;

const Container = styled.View`
flex-direction: row;
flex-wrap: wrap;
`;

const DropDownContainer = styled.View`
Expand Down
5 changes: 3 additions & 2 deletions src/components/atoms/SectionHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const Section = styled.View`

const SectionTitleView = styled.View`
flex-direction: column;
flex-shrink: 1;
`;

const SectionTitle = styled(Text)`
Expand All @@ -33,8 +34,8 @@ const SectionSubTitle = styled(Text)`
const SectionCTA = styled.TouchableOpacity`
align-self: flex-end;
justify-content: center;
align-items: center;
height: 20px;
align-items: flex-end;
flex-shrink: 1;
`;

const SectionCTATitle = styled.Text`
Expand Down
16 changes: 14 additions & 2 deletions src/components/molecules/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export interface CardProps {
isConnected?: boolean;
titleAccessoryView?: React.ReactNode;
titleStyle?: ViewStyle;
maxFontSizeMultiplier?: number;
}

export const Card = ({
Expand All @@ -107,6 +108,7 @@ export const Card = ({
isConnected,
titleAccessoryView,
titleStyle,
maxFontSizeMultiplier,
}: CardProps) => {
return (
<Container
Expand All @@ -132,12 +134,22 @@ export const Card = ({
<TextContainer>
<TitleView>
{title ? (
<Title style={titleStyle}>{formatToLocaleString(title)}</Title>
<Title
maxFontSizeMultiplier={maxFontSizeMultiplier}
style={titleStyle}
>
{formatToLocaleString(title)}
</Title>
) : null}
{titleAccessoryView}
</TitleView>
{!!description && (
<Description isError={isError}>{description}</Description>
<Description
maxFontSizeMultiplier={maxFontSizeMultiplier}
isError={isError}
>
{description}
</Description>
)}
</TextContainer>

Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/Disclaimer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export function Disclaimer({ text }: DisclaimerProps) {
return (
<DisclaimerView>
<Image source={assets.lock} />
<DisclaimerText>{text}</DisclaimerText>
<DisclaimerText maxFontSizeMultiplier={1.5}>{text}</DisclaimerText>
</DisclaimerView>
);
}
3 changes: 3 additions & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export interface AppConfigRaw {
AssetWhitelist?: string;
HideLogs?: string;
ResourcesUrl?: string;
EasterEggPublicKey?: string;
}

export interface AppConfig {
Expand Down Expand Up @@ -77,6 +78,7 @@ export interface AppConfig {
AssetWhitelist: "*" | string[];
HideLogs: boolean;
ResourcesUrl: string;
EasterEggPublicKey: string;
}

export let disableAnimations = false;
Expand Down Expand Up @@ -197,6 +199,7 @@ const config: AppConfig = {
AssetWhitelist: readHostWhitelist(raw.AssetWhitelist),
HideLogs: raw.HideLogs === "1",
ResourcesUrl: raw.ResourcesUrl || "",
EasterEggPublicKey: raw.EasterEggPublicKey || "",
};

export function readHostWhitelist(raw: string | undefined): "*" | string[] {
Expand Down
79 changes: 0 additions & 79 deletions src/features/dashboard/components/StatsLoading.tsx

This file was deleted.

Loading

0 comments on commit a00dd66

Please sign in to comment.