From 10f1407e843b7dc53d466c30ba0cb56a72b7270f Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Fri, 21 Oct 2022 22:08:12 +0200 Subject: [PATCH 1/4] [github][ios] Fixed Fastlane upload Signed-off-by: Alexander Borsuk --- xcode/fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/fastlane/Fastfile b/xcode/fastlane/Fastfile index 07447bac6b..48fed0a209 100644 --- a/xcode/fastlane/Fastfile +++ b/xcode/fastlane/Fastfile @@ -4,7 +4,7 @@ default_platform(:ios) platform :ios do private_lane :prepare do if is_ci - xcversion(version: "~> 13.4.1") + xcversion(version: "~> 14.0.1") setup_ci # creates MATCH_KEYCHAIN_NAME on CI ensure_env_vars( env_vars: ['APPSTORE_CERTIFICATE_PASSWORD'] -- 2.45.3 From b5919fccc6124132bbd73a860a96ed75bc0b451d Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 22 Oct 2022 08:47:01 +0200 Subject: [PATCH 2/4] [github][ios] Fix bitcode testflight error Signed-off-by: Alexander Borsuk --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index d12db25a2e..8ab3f13f10 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4533,6 +4533,7 @@ BUNDLE_IDENTIFIER = app.organicmaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; + ENABLE_TESTABILITY = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = Maps_Prefix.pch; HEADER_SEARCH_PATHS = ( @@ -4576,6 +4577,7 @@ BUNDLE_IDENTIFIER = app.organicmaps; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; + ENABLE_TESTABILITY = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = Maps_Prefix.pch; HEADER_SEARCH_PATHS = ( -- 2.45.3 From 94b3c0013f98d34725987767955546d9ed7d7aff Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 22 Oct 2022 14:06:36 +0200 Subject: [PATCH 3/4] Revert "[github][ios] Fix bitcode testflight error" and disable bitcode in Fastlane This reverts commit b5919fccc6124132bbd73a860a96ed75bc0b451d. Bitcode is not used anyway in Organic Maps. --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 2 -- xcode/fastlane/Fastfile | 1 - 2 files changed, 3 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 8ab3f13f10..d12db25a2e 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4533,7 +4533,6 @@ BUNDLE_IDENTIFIER = app.organicmaps.debug; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; - ENABLE_TESTABILITY = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = Maps_Prefix.pch; HEADER_SEARCH_PATHS = ( @@ -4577,7 +4576,6 @@ BUNDLE_IDENTIFIER = app.organicmaps; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO; - ENABLE_TESTABILITY = NO; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = Maps_Prefix.pch; HEADER_SEARCH_PATHS = ( diff --git a/xcode/fastlane/Fastfile b/xcode/fastlane/Fastfile index 48fed0a209..7d8be8fe4e 100644 --- a/xcode/fastlane/Fastfile +++ b/xcode/fastlane/Fastfile @@ -66,7 +66,6 @@ platform :ios do silent: false, clean: false, include_symbols: true, - include_bitcode: true, export_method: 'app-store', export_options: { provisioningProfiles: { -- 2.45.3 From ee8ac09e8e01f245cec9924bc8da44782eceb407 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Sat, 22 Oct 2022 22:25:18 +0200 Subject: [PATCH 4/4] [android] call onSlideFinish only when bottomsheet is settled Signed-off-by: Arnaud Vergnet --- .../widget/placepage/BottomSheetChangedListener.java | 1 - .../widget/placepage/DefaultBottomSheetCallback.java | 11 ++--------- .../widget/placepage/RichPlacePageController.java | 7 ------- .../widget/placepage/SimplePlacePageController.java | 6 ------ 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java index fdb8cdf78f..edc8ea6a8c 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetChangedListener.java @@ -3,7 +3,6 @@ package com.mapswithme.maps.widget.placepage; public interface BottomSheetChangedListener { void onSheetHidden(); - void onSheetDirectionIconChange(); void onSheetDetailsOpened(); void onSheetCollapsed(); void onSheetSliding(int top); diff --git a/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java b/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java index 7050544f7b..312569010f 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java +++ b/android/src/com/mapswithme/maps/widget/placepage/DefaultBottomSheetCallback.java @@ -24,9 +24,9 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC { Logger.d(TAG, "State change, new = " + PlacePageUtils.toString(newState)); if (PlacePageUtils.isSettlingState(newState) || PlacePageUtils.isDraggingState(newState)) - { return; - } + + mSheetChangedListener.onSheetSlideFinish(); if (PlacePageUtils.isHiddenState(newState)) { @@ -34,8 +34,6 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC return; } - mSheetChangedListener.onSheetDirectionIconChange(); - if (isExpandedState(newState)) { mSheetChangedListener.onSheetDetailsOpened(); @@ -49,10 +47,5 @@ public class DefaultBottomSheetCallback extends BottomSheetBehavior.BottomSheetC public void onSlide(@NonNull View bottomSheet, float slideOffset) { mSheetChangedListener.onSheetSliding(bottomSheet.getTop()); - - if (slideOffset < 0) - return; - - mSheetChangedListener.onSheetSlideFinish(); } } diff --git a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java index 103e1aaca8..a267de559a 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java @@ -7,7 +7,6 @@ import android.location.Location; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import android.view.WindowInsets; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -53,12 +52,6 @@ public class RichPlacePageController implements PlacePageController, LocationLis onHiddenInternal(); } - @Override - public void onSheetDirectionIconChange() - { - // No op. - } - @Override public void onSheetDetailsOpened() { diff --git a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java index 163c19e024..5a5ba72436 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java @@ -52,12 +52,6 @@ public class SimplePlacePageController implements PlacePageController mStateListener.onPlacePageClosed(); } - @Override - public void onSheetDirectionIconChange() - { - // No op. - } - @Override public void onSheetDetailsOpened() { -- 2.45.3