Fix tablet layout for in-app messaging #2032
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… width for tablet now
… every case except Thin Image, which blows up the height of the message card
…ine for easier debugging
|
We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google. |
paulb777
added
cla: yes
api: inappmessaging
|
A Googler has manually verified that the CLAs look good. (Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.) |
|
Thanks for the review, @paulb777 |
bstpierr
added a commit
that referenced
this pull request
Nov 9, 2018
* master: (128 commits) Add a nanopb string (#1839) Update Auth samples to sync with internal changes (#2056) Add clang-format installation instructions (#2057) Delete Firestore public C++ API (#2050) Porting Multi-Tab Structural Changes (#2049) Remove Mutation tombstones (#2052) Release 5.12.0 (#2051) Fix analyze errors (#2047) Isolate Firestore nanopb messages in C++ namespaces (#2046) Fix auth multi app support (#2043) Add missing nanopb flag (#2042) Delete deprecated files (#2038) Address travis timeout flakes (#2033) Fix tablet layout for in-app messaging (#2032) Held Write Acks Changelog (#2037) Remove Held Write Acks (#2029) Move #2034 into 5.12.0 (#2036) Partially revert "Update CHANGELOG for Firestore v0.14.0 (#2025)" (#2031) Revert "gRPC: replace Objective-C implementation with the new C++ implementation (#1968)" (#2030) Update CHANGELOG.md for #2034 (#2035) ...
rsgowman
added a commit
that referenced
this pull request
Nov 27, 2018
* Allow for custom domains in the FDL iOS SDK Allow for custo domains to be whitelisted by the info.plist file. * Fix style. Run ./scripts/style.sh * style * Update versions for Release 5.11.0 * Update Firestore Generated Protos (#1972) * Remove cruft from project file (#1975) * Lock reads and writes to session map * Changed FDL to use compatible __typeof__() operator. (#1982) typeof() is not supported in some C language dialects which causes issues when integrating FDL in projects that do use non-GNU compiler modes. For example, this causes problems when building in some versions of Unity firebase/quickstart-unity#228 * Changed FDL to use compatible __typeof__() operator. (#1982) typeof() is not supported in some C language dialects which causes issues when integrating FDL in projects that do use non-GNU compiler modes. For example, this causes problems when building in some versions of Unity firebase/quickstart-unity#228 * Bump DynamicLinks patch version * Add FDL to release manifest * Bump GoogleUtilities patch version to deliver fix for #1964 (#1987) * Wrap diagnostics notification in collection flag check. (#1979) * Wrap diagnostics notification in collection flag check. Some of the diagnostics notifications were missed and not covered by the data collection flag. * Remove redundant notification call, move Core diagnostics API call. * Removed configure with no options test. * Queue Storage Tasks on separate queue (#1981) * Increase timeout for testDispatchAfterDelay (#1988) * Update Storage Changelog (#1989) * Add missing FirebaseStorage release note (#1990) * Allow semicolon in file name (#1991) * Remove unnecessary notification flag (#1993) * Remove unnecessary notification flag. This was added when the Google pod could configure Firebase but the Google pod is deprecated and can only work with Firebase 3.X. These flags and conditional checks can be safely removed. * Resolve issues from commit split. * Style fixes. * Reduce singleton usage in FIRApp tests. (#1995) * Reduce singleton usage in FIRApp tests. There have been some issues while creating new tests of conflicts with mocks of classes and instances, this should alleviate some of those conflicts in the future. * Remove bad style changes. * Use default app name flag instead of local variable. * Comply with c99 standard (#1992) * Trigger travis for Firestore podspec changes * Use C99-compatible __typeof__ instead of typeof (#1985) `typeof` is only defined if you compile with GNU extensions, while `__typeof__` is always available. This is the Firestore equivalent of #1982. Note that Firestore won't yet build in this mode because among other things the Objective-C gRPC still uses `typeof`. Once we eliminate that dependency this might become possible. * Adding AppCode Diff (#1996) * Remove warning (#1999) * Add InAppMessaging to Carthage template (#2006) * Restore SafariServices framework (#2002) * SafariServices not available on tvOS and not used on osx * Force Firestore to conform to C99 and C++11. (#2001) Note that c++0x is how Xcode spells c++11. Also fix an issue where we were accidentally using a C++14 feature. * Changing the internal testing repo (#2003) * Clean up test. The issue has already been fixed and we are now running integration test with actual server instead of hexa. (#2007) * gRPC: replace Objective-C implementation with the new C++ implementation (#1968) * add support for SSL disabled to `GrpcConnection` (unfortunately, there currently is no way to verify this change actually works); * make gRPC calls using the C++ implementation: * make `FSTRemoteStore` create C++ streams instead of their Objective-C counterparts; * port firebase/firebase-js-sdk#1041: streams are now never recreated, only restarted; * make `FSTDatastore` delegate server calls to the C++ implementation; * port `MockWatchStream` and `MockWriteStream` to C++ (`FSTMockDatastore` is still in place, because `Datastore` is not fully ported yet); * no longer generate Objective-C gRPC service definitions from protos; * remove all references to Objective-C gRPC client; * check in gRPC root certificates file and load it at runtime (the check-in part is temporary until gRPC-C++.podspec provides the certificate). This makes SSL work. * Add component system documentation. * Fixed markdown layout issue. * Remove trailing whitespaces. * Add table of contents. * Remove extra parentheses from TOC. * Renamed SDKs to frameworks and products for accuracy. * Updated the Carthage installation instructions (#2012) * Add Rome instructions (#2014) * Attempt to fix frequent Auth Unit Test flake on OSX (#2017) * Increase timeouts in attempt to eliminate travis flakes (#2016) * Don't rely on test always being in foreground (#2021) * Fix log overflow in continuous fuzz testing (#2020) Prevent generating too many "Unrecognized selector" console messages that eventually make Travis kill the job due to log exceeding limits. * Assign the default app before posting notifications. (#2024) Although SDKs being configured should access the app through the dictionary being passed in (and soon the `FIRCoreConfigurable` protocol), the default app should be assigned before notifying SDKs that Core is ready. * Update CHANGELOG for Firestore v0.14.0 (#2025) * M37 Core release notes (#2027) * Add changelog to GoogleUtilities * Fix static analysis warning in Core. (#2034) Explicitly check for `nil` instead of using the `!` operator on the pointer. * Update CHANGELOG.md for #2034 (#2035) * Revert "gRPC: replace Objective-C implementation with the new C++ implementation (#1968)" (#2030) This reverts commit a514bd9. * Partially revert "Update CHANGELOG for Firestore v0.14.0 (#2025)" (#2031) This removes the changelog entry that describes our migration to gRPC-C++. * Move #2034 into 5.12.0 (#2036) * Remove Held Write Acks (#2029) * Drop acknowledged mutations in schema migration (#1818) Drop acknowledged mutations in schema migration as part of removing held write acks. Port of firebase/firebase-js-sdk#1149 * Change removeMutationBatch to remove a single batch (#1955) * Update Firestore Generated Protos * Adding UnknownDocument and hasCommittedMutations (#1971) * Removing held write batch handling from LocalStore (#1997) * View changes for held write acks (#2004) * Held Write Acks Unit Test Fixes (#2008) * Held Write Ack Removal Spec Tests (#2018) * Fix integration test * Held Write Acks Changelog (#2037) To be submitted when main PR goes in * Fix tablet layout for in-app messaging (#2032) * Rename fine-tuning methods to reflect size class rather than orientation * Modify existing constraints to de-portrait tablet layout, need a card width for tablet now * Further constraint tinkering, add identifiers for better auto layout debugging * More constraints for "landscape" appearance in tablet. Looks good for every case except Thin Image, which blows up the height of the message card * Fix fine tune layout methods to correctly fine tune for compact height and width * Update layout constraint identifiers to match titles in document outline for easier debugging * Revert superfluous method name changes for layout fine tuning methods * Address travis timeout flakes (#2033) * Delete deprecated files (#2038) * Add missing nanopb flag (#2042) * Fix auth multi app support (#2043) * Isolate Firestore nanopb messages in C++ namespaces (#2046) * Add C++ namespaces and use C++ linkage for nanopb-generated sources. * Regenerate nanopb sources as C++ * Add generated C++ nanopb sources to the podspec * Fix analyze errors (#2047) * Release 5.12.0 (#2051) * Update versions for Release 5.12.0 * Add missing nanopb flag * Isolate Firestore nanopb messages in C++ namespaces (#2046) * Add C++ namespaces and use C++ linkage for nanopb-generated sources. * Regenerate nanopb sources as C++ * Add generated C++ nanopb sources to the podspec * Remove Mutation tombstones (#2052) * Remove Mutation tombstones * Review comments * Porting Multi-Tab Structural Changes (#2049) * Delete Firestore public C++ API (#2050) * Add firebase_cpp_sdk 5.4.0 ... to the Firestore CMake build. * Move C++ public API headers to cpp/include * Add Firebase C++ API tests. * Add support for building on Linux * Add clang-format configuration for Firestore/cpp * Add windows build support * Review feedback * Revert build changes to support Firebase C++ integration. It turns out the public Firebase C++ SDK doesn't include enough to actually build another component of that SDK externally so these changes don't really help. Eventually, once Firebase C++ is open source we'll integrate with that to actually test Firestore's public C++ API. * Delete Firestore/cpp and public C++ artifacts It's not yet feasible to build these components externally so there's no use in keeping them here. * Add clang-format installation instructions (#2057) * Update Auth samples to sync with internal changes (#2056) * Add a nanopb string (#1839) * Add Equatable and Comparable * Add nanopb String * FIRApp is already configured. Remove duplicate configure call. This Fixes unit test failure. * Invalidate non-background url sessions * Run style * Update abseil to master@{2018-11-06} (#2058) * Update abseil-cpp to a new upstream Update to 7990fd459e9339467814ddb95000c87cb1e4d945 master@{2018-11-06} * Re-apply -Wcomma fix * Update add_subdirectory for Abseil * Remove references to Firestore/Port (which longer exists) * Fix ABSL_HAVE_THREAD_LOCAL when targeting iOS 8 in Xcode 10 * Clean up abseil warnings * Clean up a Firestore format string warning. * Exclude third_party/abseil-cpp from whitespace checks * Port code review changes from google3 * Amend changelog * Minor edits: change domain names in test app plist, fix warnings. * Fix warning. * Fix style. * Adding Numeric Add Proto message (#2064) * Adding Numeric Add Proto message * Remove trailing whitespace * Adding base_writes proto field (#2066) * Update the GULObjectSwizzler to handle NSProxy objects (#2053) * GoogleUtilities 5.3.5 (#2067) * gRPC: replace Objective-C implementation with the new C++ implementation (#2068) * Revert "Revert "gRPC: replace Objective-C implementation with the new C++ implementation (#1968)" (#2030)" This reverts commit ea567dc. * gRPC: fix bugs found during testing (#2039) All in `GrpcStream`: * make sure there are no pending completions when "finish" operation is enqueued; * always finish gRPC calls; * when connectivity changes, reset not just the calls, but the underlying channel as well. * Revert "Partially revert "Update CHANGELOG for Firestore v0.14.0 (#2025)" (#2031)" This reverts commit b2437b8. * Update changelog for v0.15.0. * gRPC: add gRPC wrapper classes to CMake build (#2015) * add a C++ equivalent of `FIRFirestoreVersionString`. This eliminates the only Objective-C dependency of `grpc_connection.mm` and allows making it a pure C++ file; * open-source `binary_to_array.py` script and use it in the build to embed `roots.pem` certificate file from gRPC into the Firestore binary. The embedded char array is then used to load certificate at runtime. * Revert local change -- do not enable sanitizers by default * Fix `string_view` referring to an out-of-scope string (#2074) * Allow setting the domainURIPrefix for custom domain names/paths when creating dynamic links (#2071) * Add support for creating DL with custom domain names/paths. The new domainURIPrefix parameter requires either a. a valid FDL domain name created in the Firebase console or b. a custom domain name or c. a custom domain name with path registered for DL. All domainURIPrefixes need to start with a valid (https) scheme. * Fix style. * style * Fix typo in DEPRECATED_MSG_ATTRIBUTE, other nits. * Fix styling. * Check incoming domainURIPrefix for validity using NSURL and check for an https scheme. * Release manifest for 5.13.0 (#2076) * Renaming manifest (#2077) * Release manifest for 5.13.0 * Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https (#2078) * Add support for creating DL with custom domain names/paths. The new domainURIPrefix parameter requires either a. a valid FDL domain name created in the Firebase console or b. a custom domain name or c. a custom domain name with path registered for DL. All domainURIPrefixes need to start with a valid (https) scheme. * Fix style. * style * Fix typo in DEPRECATED_MSG_ATTRIBUTE, other nits. * Fix styling. * Check incoming domainURIPrefix for validity using NSURL and check for an https scheme. * Add extra checks for deprecated domain parameter being incorrectly called with a scheme. Also fix some nits. * Log a warning for the deprecated API stating that the scheme for the supplied domain will be deduced as https. * Update CHANGELOG for M38. * Update changelog for M38 * Update CHANGELOG for M38 release. * Capitalize HTTPS. * Update CHANGELOG to include PR for removal of deprecated files. * Capitalize HTTPS. * Fix GoogleUtilities nullability regressions (#2079) * Remove `adjustsFontForContentSizeCategory` (unsupported in iOS 10.0) from labels in card layout Storyboard (#2083) * Add pod spec lint testing for Xcode 9 (#2084) * FirebaseAnalyticsInterop is cross-platform (#2088) * C++: eliminate `FSTDispatchQueue` and replace it with `AsyncQueue` (#2062) * replace all references to `FSTDispatchQueue` and `FSTTimerID` with their C++ equivalents; * remove `FSTDispatchQueue` class and related tests; * in method argument names, replace `workerDispatchQueue` with just `workerQueue`, more similar to other platforms; * move `Executor` and derived classes out of `internal` namespace. * Database Interop (#1865) * Register Database with Interop + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports * Use Interop for Auth token fetching + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports * Implement necessary protocols + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase * Squash of my previous local commits for Database Interop Register Database with Interop: + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports Use Interop for Auth token fetching: + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports Implement necessary protocols: + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase Clean up Database tests: - Removed all unnecessary header files ~ Ran style.sh across all the tests Cleaned Up project file: Some header removals were missed in the last commit. Sorted some test files Fix Database Fake App Tests: + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * Revert "Squash of my previous local commits for Database Interop" This reverts commit c0d0421. * Cleaned Up project file Some header removals were missed in the last commit. * Sorted some test files * Fix Database Fake App Tests + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * PR Feedback Changes + Created new FIRDatabaseComponent class to encapsulate instance creation + Updated FAuthTokenProvider to only use an auth instance rather than an app. * PR Feedback Follow-Up - Removed FIRDatabase registration code * pod deintegrate * Move instance management Somes tests may still be out of date. * Fix Auth integration test * pod deintegrate -- again * PR Feedback * PR Feedback Added the FIRComponentLifecycleMaintainer protocol to FIRDatabaseComponent * Update Firebase/Database/Api/FIRDatabaseComponent.m Missed some small changes * Get integration tests compiling * Fix some tests * Fixed more tests Component needs to be cacheable in order to get the appWIllBeDeleted callback. * Update target memberships * Revert project file changes * Add FIRAuthInteropFake for broken targets * PR feedback * Spacing and Style * Moved `instances` to ivar * Simplify FIRDatabaseDictionary It's now keyed on the URL with the app being implied since each app will get its own `FIRDatabaseComponent` * Revert "Database Interop (#1865)" (#2093) This reverts commit 4090195. * Revert premature api changes (#2097) * Revert "Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https (#2078)" This reverts commit ceb8392. * Revert "Allow setting the domainURIPrefix for custom domain names/paths when creating dynamic links (#2071)" This reverts commit d917bac. * Revert "Minor edits: change domain names in test app plist, fix warnings." This reverts commit 15f5d46. * Revert "Fix style. Run ./scripts/style.sh" This reverts commit 0e16e6c. * Revert "Allow for custom domains in the FDL iOS SDK" This reverts commit 5e33153. * Version is still 3.2.0 * Add test for verify iOS client (#2096) * Release 5.13.0 (#2101) * Update versions for Release 5.13.0 * Revert premature api changes (#2097) * Revert "Add warning for deprecated API to indicate that the passed in domain name's scheme will deduced as https (#2078)" This reverts commit ceb8392. * Revert "Allow setting the domainURIPrefix for custom domain names/paths when creating dynamic links (#2071)" This reverts commit d917bac. * Revert "Minor edits: change domain names in test app plist, fix warnings." This reverts commit 15f5d46. * Revert "Fix style. Run ./scripts/style.sh" This reverts commit 0e16e6c. * Revert "Allow for custom domains in the FDL iOS SDK" This reverts commit 5e33153. * Version is still 3.2.0 * Pin gRPC-C++ version to exactly 0.0.5 (#2105) While gRPC-C++ is in its 0.* versions, any new version could potentially contain breaking changes. Make sure we only upgrade at our own pace. * Database Interop Rollforward (#2095) * Register Database with Interop + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports * Use Interop for Auth token fetching + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports * Implement necessary protocols + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase * Squash of my previous local commits for Database Interop Register Database with Interop: + Add AuthInterop dependency + Have Database register with Interop component container + Add weak dependency on Auth ~ Cleaned up imports Use Interop for Auth token fetching: + Use macro to get auth component ~ Change `getTokenForcingRefresh:withCallback:` call to use Interop component version of Auth ~ Clean up imports Implement necessary protocols: + Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase Clean up Database tests: - Removed all unnecessary header files ~ Ran style.sh across all the tests Cleaned Up project file: Some header removals were missed in the last commit. Sorted some test files Fix Database Fake App Tests: + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * Revert "Squash of my previous local commits for Database Interop" This reverts commit c0d0421. * Cleaned Up project file Some header removals were missed in the last commit. * Sorted some test files * Fix Database Fake App Tests + Added container property + Added an Auth fake in the container + Added the Shared utils files to the necessary targets + Added a missing XCTest reference in a test that didn't compile for me * PR Feedback Changes + Created new FIRDatabaseComponent class to encapsulate instance creation + Updated FAuthTokenProvider to only use an auth instance rather than an app. * PR Feedback Follow-Up - Removed FIRDatabase registration code * pod deintegrate * Move instance management Somes tests may still be out of date. * Fix Auth integration test * pod deintegrate -- again * PR Feedback * PR Feedback Added the FIRComponentLifecycleMaintainer protocol to FIRDatabaseComponent * Update Firebase/Database/Api/FIRDatabaseComponent.m Missed some small changes * Get integration tests compiling * Fix some tests * Fixed more tests Component needs to be cacheable in order to get the appWIllBeDeleted callback. * Update target memberships * Revert project file changes * Add FIRAuthInteropFake for broken targets * PR feedback * Spacing and Style * Moved `instances` to ivar * Simplify FIRDatabaseDictionary It's now keyed on the URL with the app being implied since each app will get its own `FIRDatabaseComponent` * Fix Database Integration Tests Have the FakeApp cache DB instances Use the Full host/URL path to cache DB instances Simplified shared scheme ``` Test Suite 'Database_IntegrationTests_iOS.xctest' passed at 2018-11-20 07:09:30.520. Executed 326 tests, with 0 failures (0 unexpected) in 66.251 (66.528) seconds Test Suite 'All tests' passed at 2018-11-20 07:09:30.522. Executed 326 tests, with 0 failures (0 unexpected) in 66.251 (66.530) seconds ``` * Clarify defaultApp use * Prefer roots.pem from gRPC-C++, but fall back to Firestore bundled ones if necessary (#2106) gRPC-C++ versions up to and including 0.0.3, and also 0.0.5, don't bundle `roots.pem` in the podspec. gRPC-C++ 0.0.4 and, presumably, the currently not-yet-released 0.0.6 do. Firestore currently also bundles this file under the same bundle name, which leads to build errors when both Firestore and gRPC-C++ try to add the file into the build (only shows during archiving). For transition, this PR: * renames the Firestore bundle to avoid naming clash; * changes the loading code so that it first tries to load certificates bundled with gRPC-C++ (versions 0.0.4 and 0.0.6+), but falls back to those bundled with Firestore if necessary. At a later point, Firestore should be changed to not bundle the certificates altogether. * Add Firebase Source to Header Search Path (#2114) This resolves the annoying Xcode errors that claim `FIRAppInternal.h` can't be found. It also makes it *much* easier to "Jump to definition" now. * Implement PatchMutation::ApplyToLocalView (#1973) * Test namespacing fixup Since the nanopb protos are now namespaced, we need to account for that in our serializer_test.cc file.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ModalViewControllerstoryboard scene. This will help for future Auto Layout debugging.Before fix:
After fix: