diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index c7eaa4f03..943aa713b 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -214,14 +214,30 @@ static NSString *const kURLHostVerifyPrefix = @"verify"; if (!iconView) { OWSFail(@"Database view registration overlay has unexpected contents."); } else { - UILabel *label = [UILabel new]; - label.text = NSLocalizedString( - @"DATABASE_VIEW_OVERLAY_TITLE", @"Indicates that the app is updating its database."); - label.font = [UIFont ows_mediumFontWithSize:18.f]; - label.textColor = [UIColor whiteColor]; - [rootView addSubview:label]; - [label autoHCenterInSuperview]; - [label autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:iconView withOffset:25.f]; + UILabel *bottomLabel = [UILabel new]; + bottomLabel.text = NSLocalizedString( + @"DATABASE_VIEW_OVERLAY_SUBTITLE", @"Subtitle shown while the app is updating its database."); + bottomLabel.font = [UIFont ows_mediumFontWithSize:16.f]; + bottomLabel.textColor = [UIColor whiteColor]; + bottomLabel.numberOfLines = 0; + bottomLabel.lineBreakMode = NSLineBreakByWordWrapping; + bottomLabel.textAlignment = NSTextAlignmentCenter; + [rootView addSubview:bottomLabel]; + + UILabel *topLabel = [UILabel new]; + topLabel.text = NSLocalizedString( + @"DATABASE_VIEW_OVERLAY_TITLE", @"Title shown while the app is updating its database."); + topLabel.font = [UIFont ows_mediumFontWithSize:20.f]; + topLabel.textColor = [UIColor whiteColor]; + topLabel.numberOfLines = 0; + topLabel.lineBreakMode = NSLineBreakByWordWrapping; + topLabel.textAlignment = NSTextAlignmentCenter; + [rootView addSubview:topLabel]; + + [bottomLabel autoPinWidthToSuperviewWithMargin:20.f]; + [topLabel autoPinWidthToSuperviewWithMargin:20.f]; + [bottomLabel autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:topLabel withOffset:10.f]; + [iconView autoPinEdge:ALEdgeTop toEdge:ALEdgeBottom ofView:bottomLabel withOffset:40.f]; } } diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index bacb91fc5..71b85b25d 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -328,7 +328,10 @@ /* Accessibility label for the create group new group button */ "CREATE_NEW_GROUP" = "Create new group"; -/* Indicates that the app is updating its database. */ +/* Subtitle shown while the app is updating its database. */ +"DATABASE_VIEW_OVERLAY_SUBTITLE" = "This can take a couple of minutes. Please be patient."; + +/* Title shown while the app is updating its database. */ "DATABASE_VIEW_OVERLAY_TITLE" = "Updating Database"; /* {{number of days}} embedded in strings, e.g. 'Alice updated disappearing messages expiration to {{5 days}}'. See other *_TIME_AMOUNT strings */