Skip to content

Commit

Permalink
Merge pull request #512 from zooniverse/release/v2.11.0
Browse files Browse the repository at this point in the history 
Release/v2.11.0
  • Loading branch information
@coryzoon
coryzoon committed Feb 20, 2024
2 parents 1b9eb58 + 5134b77 commit e3217ac
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 67 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ android {
applicationId "com.zooniversemobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 76
versionCode 78
versionName "2.11.0"
}
signingConfigs {
Expand Down
28 changes: 26 additions & 2 deletions ios/ZooniverseMobile.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2E064546FB3D4C388D642441 /* Karla-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 63CDDC79B999473B86AF6A88 /* Karla-Bold.ttf */; };
53D06EFAEA794E028A306B97 /* Karla-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EB37AAC8B6F44EFAA6324B6E /* Karla-Italic.ttf */; };
787318D492A44A599F5509FB /* Karla-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 596C160120BC4BDF95A7978D /* Karla-Regular.ttf */; };
9CAED0F1495FF0274C4D2F25 /* Pods_ZooniverseMobile_ZooniverseMobileTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FE35456BDD45379EC2E82793 /* Pods_ZooniverseMobile_ZooniverseMobileTests.framework */; };
BEBC6121A9944191B71262AC /* Karla-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0C8E9F986AFD4C80BFEFC636 /* Karla-BoldItalic.ttf */; };
D019609D0BCA1FB56D290CA7 /* Pods_ZooniverseMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E66FA795E38004D47C4D78D /* Pods_ZooniverseMobile.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -64,6 +68,7 @@
09D54E9F2AAF2663008D50C3 /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
09D54EA02AAF2663008D50C3 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; };
09FEDAC32AEFCA2F005F8BC6 /* ZooniverseMobile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = ZooniverseMobile.entitlements; path = ZooniverseMobile/ZooniverseMobile.entitlements; sourceTree = "<group>"; };
0C8E9F986AFD4C80BFEFC636 /* Karla-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Karla-BoldItalic.ttf"; path = "../assets/fonts/Karla-BoldItalic.ttf"; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* ZooniverseMobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ZooniverseMobile.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ZooniverseMobile/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = ZooniverseMobile/AppDelegate.mm; sourceTree = "<group>"; };
Expand All @@ -73,8 +78,11 @@
3B4392A12AC88292D35C810B /* Pods-ZooniverseMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZooniverseMobile.debug.xcconfig"; path = "Target Support Files/Pods-ZooniverseMobile/Pods-ZooniverseMobile.debug.xcconfig"; sourceTree = "<group>"; };
3E66FA795E38004D47C4D78D /* Pods_ZooniverseMobile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ZooniverseMobile.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5709B34CF0A7D63546082F79 /* Pods-ZooniverseMobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZooniverseMobile.release.xcconfig"; path = "Target Support Files/Pods-ZooniverseMobile/Pods-ZooniverseMobile.release.xcconfig"; sourceTree = "<group>"; };
596C160120BC4BDF95A7978D /* Karla-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Karla-Regular.ttf"; path = "../assets/fonts/Karla-Regular.ttf"; sourceTree = "<group>"; };
5B7EB9410499542E8C5724F5 /* Pods-ZooniverseMobile-ZooniverseMobileTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZooniverseMobile-ZooniverseMobileTests.debug.xcconfig"; path = "Target Support Files/Pods-ZooniverseMobile-ZooniverseMobileTests/Pods-ZooniverseMobile-ZooniverseMobileTests.debug.xcconfig"; sourceTree = "<group>"; };
63CDDC79B999473B86AF6A88 /* Karla-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Karla-Bold.ttf"; path = "../assets/fonts/Karla-Bold.ttf"; sourceTree = "<group>"; };
89C6BE57DB24E9ADA2F236DE /* Pods-ZooniverseMobile-ZooniverseMobileTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZooniverseMobile-ZooniverseMobileTests.release.xcconfig"; path = "Target Support Files/Pods-ZooniverseMobile-ZooniverseMobileTests/Pods-ZooniverseMobile-ZooniverseMobileTests.release.xcconfig"; sourceTree = "<group>"; };
EB37AAC8B6F44EFAA6324B6E /* Karla-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Karla-Italic.ttf"; path = "../assets/fonts/Karla-Italic.ttf"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
FE35456BDD45379EC2E82793 /* Pods_ZooniverseMobile_ZooniverseMobileTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ZooniverseMobile_ZooniverseMobileTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -193,6 +201,7 @@
83CBBA001A601CBA00E9B192 /* Products */,
2D16E6871FA4F8E400B85C8A /* Frameworks */,
BBD78D7AC51CEA395F1C20DB /* Pods */,
8DFA53389A4C4D21B3CC5F36 /* Resources */,
);
indentWidth = 2;
sourceTree = "<group>";
Expand All @@ -208,6 +217,17 @@
name = Products;
sourceTree = "<group>";
};
8DFA53389A4C4D21B3CC5F36 /* Resources */ = {
isa = PBXGroup;
children = (
63CDDC79B999473B86AF6A88 /* Karla-Bold.ttf */,
0C8E9F986AFD4C80BFEFC636 /* Karla-BoldItalic.ttf */,
EB37AAC8B6F44EFAA6324B6E /* Karla-Italic.ttf */,
596C160120BC4BDF95A7978D /* Karla-Regular.ttf */,
);
name = Resources;
sourceTree = "<group>";
};
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -319,6 +339,10 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
09C7A2502AB06FC000D82D95 /* LaunchScreen.storyboard in Resources */,
0906CF2D2AF9018100BF7B56 /* GoogleService-Info-Debug.plist in Resources */,
2E064546FB3D4C388D642441 /* Karla-Bold.ttf in Resources */,
BEBC6121A9944191B71262AC /* Karla-BoldItalic.ttf in Resources */,
53D06EFAEA794E028A306B97 /* Karla-Italic.ttf in Resources */,
787318D492A44A599F5509FB /* Karla-Regular.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -574,7 +598,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ZooniverseMobile/ZooniverseMobile.entitlements;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = 888MXXMABP;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ZooniverseMobile/Info.plist;
Expand Down Expand Up @@ -604,7 +628,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ZooniverseMobile/ZooniverseMobile.entitlements;
CURRENT_PROJECT_VERSION = 8;
CURRENT_PROJECT_VERSION = 10;
DEVELOPMENT_TEAM = 888MXXMABP;
INFOPLIST_FILE = ZooniverseMobile/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down
10 changes: 5 additions & 5 deletions ios/ZooniverseMobile/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>NSPhotoLibraryUsageDescription</key>
<string>Photo Library Access Warning</string>
<key>UIAppFonts</key>
Expand All @@ -56,10 +56,6 @@
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>Karla-Bold.ttf</string>
<string>Karla-BoldItalic.ttf</string>
<string>Karla-Italic.ttf</string>
<string>Karla-Regular.ttf</string>
<string>FontAwesome.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
Expand All @@ -72,6 +68,10 @@
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
<string>Fontisto.ttf</string>
<string>Karla-Bold.ttf</string>
<string>Karla-BoldItalic.ttf</string>
<string>Karla-Italic.ttf</string>
<string>Karla-Regular.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
Expand Down
10 changes: 3 additions & 7 deletions src/components/NotificationLandingPageScreen.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { setNavbarSettingsForPage } from '../actions/navBar';
import PageKeys from '../constants/PageKeys';
import Notification from './notifications/Notification';
import OverlaySpinner from './OverlaySpinner';
import { extractSwipeEnabledProjects } from '../utils/projectUtils';

function NotificationLandingPageScreen({ route }) {
const dispatch = useDispatch();
Expand All @@ -21,14 +20,11 @@ function NotificationLandingPageScreen({ route }) {
);
const checkedForProjects = useRef(false); // Used to ensure the setTimeout is only run once.

const filteredProjects = extractSwipeEnabledProjects(
projectList.filter( project => !project.isPreview && project.launch_approved )
);

// Take the list of notifications and associate with a cooresponding project.
const notificationsWithProject = [];
notifications.forEach((notification) => {
const hasProject = filteredProjects.find((p) => p.id === notification.projectId);
const hasProject = projectList.find((p) => p.id === notification.projectId);
if (hasProject) {
notificationsWithProject.push({ ...notification, project: hasProject });
}
Expand All @@ -47,7 +43,7 @@ function NotificationLandingPageScreen({ route }) {
if (checkedForProjects.current) return;
let projectTimeout;

if (filteredProjects.length === 0) {
if (projectList.length === 0) {
setLoading(true);
projectTimeout = setTimeout(() => {
checkedForProjects.current = true;
Expand All @@ -63,7 +59,7 @@ function NotificationLandingPageScreen({ route }) {
}

return () => clearTimeout(projectTimeout);
}, [filteredProjects]);
}, [projectList]);

// Update the navigation header with the title and zoon icon.
useEffect(() => {
Expand Down
102 changes: 51 additions & 51 deletions src/components/SideDrawerContent.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
Alert,
Image,
Linking,
ScrollView,
TouchableOpacity,
View
} from 'react-native'
Expand All @@ -13,7 +14,6 @@ import Fontisto from 'react-native-vector-icons/Fontisto'
import LinearGradient from 'react-native-linear-gradient';
import DeviceInfo from 'react-native-device-info'
import FontedText from './common/FontedText'
import Separator from './common/Separator'
import { signOut } from '../actions/auth'
import { connect } from 'react-redux'
import PropTypes from 'prop-types';
Expand Down Expand Up @@ -108,68 +108,68 @@ export class SideDrawerContent extends Component {
start={{ x: 0, y: 0 }}
end={{ x: 1, y: 0 }}
/>

<ScrollView>
<MenuButton
onPress={this.goHome}
text={'Home'}
/>

{ this.props.isGuestUser ?
onPress={this.goHome}
text={'Home'}
/>

{ this.props.isGuestUser ?
<MenuButton
onPress={this.signIn}
text={'Sign In / Register'}
/>
: null
}

<MenuButton
onPress={this.signIn}
text={'Sign In / Register'}
/>
: null
}

<MenuButton
onPress={this.goToAbout}
text={'About the Zooniverse'}
/>

<MenuButton
onPress={() => this.openLink('https://www.zooniverse.org/about/publications')}
text={'Publications'}
externalOpenIcon={true}
/>
onPress={this.goToAbout}
text={'About the Zooniverse'}
/>

<MenuButton
onPress={this.settings}
text={'Settings'}
/>
<MenuButton
onPress={() => this.openLink('https://www.zooniverse.org/about/publications')}
text={'Publications'}
externalOpenIcon={true}
/>

<MenuButton
onPress={this.notifications}
text={'Notifications'}
/>
<MenuButton
onPress={this.settings}
text={'Settings'}
/>

<Menuheader title="ABOUT" />
<MenuButton
onPress={this.notifications}
text={'Notifications'}
/>

<MenuButton
onPress={() => this.openLink('https://www.zooniverse.org/privacy')}
text={'Privacy'}
externalOpenIcon={true}
/>
<Menuheader title="ABOUT" />

<MenuButton
text={`Version ${DeviceInfo.getVersion()}/${DeviceInfo.getBuildNumber()}`}
/>
<MenuButton
onPress={() => this.openLink('https://www.zooniverse.org/privacy')}
text={'Privacy'}
externalOpenIcon={true}
/>

<Menuheader title="HELP" />
<MenuButton
text={`Version ${DeviceInfo.getVersion()}/${DeviceInfo.getBuildNumber()}`}
/>

<MenuButton
onPress={() => this.openLink('https://www.zooniverse.org/about/contact')}
text={'Contact us'}
externalOpenIcon={true}
/>
<Menuheader title="HELP" />

{ this.props.isGuestUser ? null :
<MenuButton
onPress={this.signOut}
text={'Sign Out'}
onPress={() => this.openLink('https://www.zooniverse.org/about/contact')}
text={'Contact us'}
externalOpenIcon={true}
/>
}

{ this.props.isGuestUser ? null :
<MenuButton
onPress={this.signOut}
text={'Sign Out'}
/>
}
</ScrollView>
</View>
)
}
Expand Down Expand Up @@ -275,7 +275,7 @@ const styles = EStyleSheet.create({
justifyContent: 'space-between',
},
logoStyle: {
width: 173.77,
width: '70%',
height: 20,
resizeMode: 'contain',
},
Expand Down
1 change: 0 additions & 1 deletion src/components/settings/Settings.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ const styles = StyleSheet.create({
scrollViewContainer: {
padding: 16,
backgroundColor: '#fff',
flex: 1,
},
});

Expand Down

0 comments on commit e3217ac

Please sign in to comment.