Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Compose and set sheetGesturesEnabled to false #7142

Closed

Conversation

tillh-stripe
Copy link
Collaborator

@tillh-stripe tillh-stripe commented Aug 10, 2023

Summary

Motivation

Testing

  • Added tests
  • Modified tests
  • Manually verified

Screen recordings

Before

bottomsheet-compose-140.mp4

After

bottomsheet-compose-150.mp4

Changelog

@github-actions
Copy link
Contributor

github-actions bot commented Aug 10, 2023

Diffuse output:

OLD: paymentsheet-example-release-master.apk (signature: V1, V2)
NEW: paymentsheet-example-release-pr.apk (signature: V1, V2)

          │            compressed             │           uncompressed            
          ├───────────┬───────────┬───────────┼───────────┬───────────┬───────────
 APK      │ old       │ new       │ diff      │ old       │ new       │ diff      
──────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────
      dex │   3.5 MiB │   3.6 MiB │ +17.7 KiB │   7.8 MiB │   7.8 MiB │    -540 B 
     arsc │   2.2 MiB │   2.2 MiB │ +34.8 KiB │   2.2 MiB │   2.2 MiB │ +34.8 KiB 
 manifest │   4.9 KiB │   4.9 KiB │     +14 B │  24.1 KiB │  24.2 KiB │     +64 B 
      res │ 881.2 KiB │ 887.8 KiB │  +6.6 KiB │   1.4 MiB │   1.4 MiB │    +3 KiB 
   native │   2.6 MiB │   2.6 MiB │       0 B │     6 MiB │     6 MiB │       0 B 
    asset │     3 MiB │     3 MiB │      +5 B │     3 MiB │     3 MiB │      +5 B 
    other │ 200.2 KiB │ 201.9 KiB │  +1.7 KiB │ 447.9 KiB │ 454.7 KiB │  +6.7 KiB 
──────────┼───────────┼───────────┼───────────┼───────────┼───────────┼───────────
    total │  12.3 MiB │  12.4 MiB │ +60.8 KiB │  20.8 MiB │  20.8 MiB │ +44.1 KiB 

 DEX     │ old   │ new   │ diff                 
─────────┼───────┼───────┼──────────────────────
   files │     1 │     1 │    0                 
 strings │ 38336 │ 38552 │ +216 (+5336 -5120)   
   types │ 12691 │ 12736 │  +45 (+5016 -4971)   
 classes │ 10715 │ 10742 │  +27 (+4361 -4334)   
 methods │ 56223 │ 56210 │  -13 (+36257 -36270) 
  fields │ 35249 │ 35383 │ +134 (+25905 -25771) 

 ARSC    │ old  │ new  │ diff         
─────────┼──────┼──────┼──────────────
 configs │  290 │  292 │  +2 (+2 -0)  
 entries │ 6945 │ 6961 │ +16 (+16 -0)
APK
      compressed      │      uncompressed      │                                                                
──────────┬───────────┼───────────┬────────────┤                                                                
 size     │ diff      │ size      │ diff       │ path                                                           
──────────┼───────────┼───────────┼────────────┼────────────────────────────────────────────────────────────────
   76 KiB │   +76 KiB │ 126.3 KiB │ +126.3 KiB │ + res/pE.ttf                                                   
          │   -76 KiB │           │ -126.3 KiB │ - res/Jk.ttf                                                   
   35 KiB │   +35 KiB │  62.3 KiB │  +62.3 KiB │ + res/1U.ttf                                                   
          │   -35 KiB │           │  -62.3 KiB │ - res/rt.ttf                                                   
  2.2 MiB │ +34.8 KiB │   2.2 MiB │  +34.8 KiB │ ∆ resources.arsc                                               
 24.5 KiB │ +24.5 KiB │  24.4 KiB │  +24.4 KiB │ + res/4Y.png                                                   
          │ -24.5 KiB │           │  -24.4 KiB │ - res/H5.png                                                   
  3.6 MiB │ +17.7 KiB │   7.8 MiB │     -540 B │ ∆ classes.dex                                                  
 16.3 KiB │ +16.3 KiB │  16.2 KiB │  +16.2 KiB │ + res/Gc.png                                                   
          │ -16.3 KiB │           │  -16.2 KiB │ - res/C9.png                                                   
   16 KiB │   +16 KiB │  15.9 KiB │  +15.9 KiB │ + res/Nl.png                                                   
    849 B │ -15.2 KiB │     753 B │  -15.2 KiB │ ∆ res/jW.png                                                   
 11.7 KiB │ +11.7 KiB │  11.6 KiB │  +11.6 KiB │ + res/fO.png                                                   
          │ -11.7 KiB │           │  -11.6 KiB │ - res/5Q.png                                                   
  9.5 KiB │  +9.5 KiB │   9.4 KiB │   +9.4 KiB │ + res/o-.png                                                   
          │  -9.5 KiB │           │   -9.4 KiB │ - res/CG.png                                                   
  7.4 KiB │  +7.4 KiB │   7.3 KiB │   +7.3 KiB │ + res/wb.png                                                   
          │  -7.4 KiB │           │   -7.3 KiB │ - res/1S.png                                                   
  7.3 KiB │  +7.3 KiB │   7.2 KiB │   +7.2 KiB │ + res/xg.png                                                   
          │  -7.3 KiB │           │   -7.2 KiB │ - res/EX.png                                                   
  7.2 KiB │  +7.2 KiB │   7.1 KiB │   +7.1 KiB │ + res/RJ.png                                                   
          │  -7.2 KiB │           │   -7.1 KiB │ - res/D2.png                                                   
  5.9 KiB │  +5.9 KiB │  13.2 KiB │  +13.2 KiB │ + res/3a.xml                                                   
  5.8 KiB │  +5.8 KiB │  12.8 KiB │  +12.8 KiB │ + res/vb.xml                                                   
          │  -5.8 KiB │           │  -12.8 KiB │ - res/8C.xml                                                   
  5.5 KiB │  +5.5 KiB │   5.4 KiB │   +5.4 KiB │ + res/4k.png                                                   
          │  -5.5 KiB │           │   -5.4 KiB │ - res/SK.png                                                   
    440 B │  -5.5 KiB │     708 B │  -12.5 KiB │ ∆ res/CP.xml                                                   
  5.3 KiB │  +5.3 KiB │   5.2 KiB │   +5.2 KiB │ + res/8c.png                                                   
          │  -5.3 KiB │           │   -5.2 KiB │ - res/tf.png                                                   
  5.2 KiB │  +5.2 KiB │  11.8 KiB │  +11.8 KiB │ + res/9B.xml                                                   
          │  -5.2 KiB │           │  -11.8 KiB │ - res/hj.xml                                                   
  5.1 KiB │  +5.1 KiB │     5 KiB │     +5 KiB │ + res/RT.png                                                   
          │  -5.1 KiB │           │     -5 KiB │ - res/hk.png                                                   
    5 KiB │    +5 KiB │  10.8 KiB │  +10.8 KiB │ + res/ry.xml                                                   
          │    -5 KiB │           │  -10.8 KiB │ - res/CV.xml                                
...✂
MANIFEST
@@ -1,4 +1,4 @@
 <manifest
-    android:compileSdkVersion=33
-    android:compileSdkVersionCodename=13
+    android:compileSdkVersion=34
+    android:compileSdkVersionCodename=14
     android:versionCode=11
@@ -6,4 +6,4 @@
     package=com.stripe.android.paymentsheet.example
-    platformBuildVersionCode=33
-    platformBuildVersionName=13
+    platformBuildVersionCode=34
+    platformBuildVersionName=14
     xmlns:android=http://schemas.android.com/apk/res/android
@@ -12,3 +12,3 @@
       android:minSdkVersion=21
-      android:targetSdkVersion=33
+      android:targetSdkVersion=34
       />
@@ -75,2 +75,3 @@
       android:appComponentFactory=androidx.core.app.CoreComponentFactory
+      android:extractNativeLibs=true
       android:icon=@mipmap/ic_launcher
@@ -372,2 +373,6 @@
         />
+    <activity
+        android:exported=true
+        android:name=androidx.compose.ui.tooling.PreviewActivity
+        />
     <service
@@ -412,6 +417,2 @@
         />
-    <activity
-        android:exported=true
-        android:name=androidx.compose.ui.tooling.PreviewActivity
-        />
     <receiver
DEX
STRINGS:

   old   │ new   │ diff               
  ───────┼───────┼────────────────────
   38336 │ 38552 │ +216 (+5336 -5120) 
  + 
  Delegate Node: 
  + _this_CacheDrawModifierNode
  + _this_fastMerge
  + _this_inspectable
  + _this_performCustomClearFocus
  + _this_performCustomRequestFocus
  + _this_composeColorSpace
  + ) was not set. Did you use DrawerState with the Drawer composable?
  + ) was not set. Did you use ModalBottomSheetState with the ModalBottomSheetLayout composable?
  + , onPreKeyEvent=
  + , onPreRotaryScrollEvent=null)
  + , progress=
  + , properties=
  + , swipeEdge=
  + , touchY=
  + A ModifierNodeElement cannot return an already attached node from create() 
  + A2
  + AccessibilityActionCompat: 
  + AndroidPointerIcon(type=
  + AppendedSemanticsElement(mergeDescendants=
  + B2
  + BackEventCompat{touchX=
  + BanUncheckedReflection
  + BorderModifierNodeElement(width=
  + C2
  + Cannot delegate to an already attached node
  + Cannot delegate to an already delegated node
  + Cannot detach a node that is not attached
  + Cannot obtain node coordinator. Is the Modifier.Node attached?
  + Cannot read CompositionLocal because the Modifier node is not currently attached.
  + ChallengeAdditionalAuth
  + ChallengeDecoupledAuth
  + Crossfade
  + D2
  + DLD
  + Delegating to multiple LayoutModifierNodes without the delegating node implementing LayoutModifierNode itself is not allowed.
  Delegating Node: 
  + DpAnimation
  + DrawWithCacheElement(onBuildDrawCache=
  + E2
  + F2
  + FFFFI
  + G2
  + GraphicsLayerElement(scaleX=
  + H2
  + I2
  + IIIIIIFJFL
  + IIIIZ
  + IIZIIIIJFL
  + InformationOnly
  + InsertTextAtCursor
  + Invalid content capture ID
  + IsTraversalGroup
  + J2
  + JJIII
  + JJZIF
  + K2
  + KeyInputElement(onKeyEvent=
  + KeyScheme set after setting a KeyGenParamSpec
  + Kotlin reflection is not yet supported for synthetic Java properties
  + L2
  + LDDDDDDD
  + LFFFI
  + LFLLLII
  + LIJJJLLLLLL
  + LJJJLLLLLL
  + LJLLII
  + LJLZ
  + LLILZZZ
  + LLJLFJLLLLLJLLLJLLLL
  + LLLJLLLII
  + LLLLJLLLLLL
  + LLLLLIZIILLLL
  + LLLLLLFF
  + LLLLLLLLI
  + LLLLZZL
  + La2/d;
  + La2/e;
  + La2/f;
  + La2/g;
  + La2/h;
  + La2/i;
  + La2/j;
  + La6/d;
  + La6/e;
  + La6/f;
  + La6/g;
  + La6/h;
  + La6/i;
  + La6/j;
  + La6/k;
  + La6/l;
  + La6/m;
  + La6/n;
  + La6/o;
  + La9/b;
  + La9/c;
  + La9/d;
  + La9/e;
  + La9/f;
  + Lab/d;
  + Lab/e;
  + Lab/f;
  + Lab/g;
  + Lab/h;
  + Lab/i;
  + Lab/j;
  + Laj/c;
  + Laj/d;
  + Laj/e;
  + Laj/f;
  + Laj/g;
  + Laj/h;
  + Laj/i;
  + Laj/j;
  + Laj/k;
  + Laj/l;
  + Laj/m;
  + Laj/n;
  + Laj/o;
  + Laj/p;
  + Laj/q;
  + Laj/r;
  + Laj/s;
  + Laj/t;
  + Laj/u;
  + Laj/v;
  + Laj/w;
  + Laj/x;
  + Laj/y;
  + Landroid/app/Person;
  + Landroid/app/RemoteInput;
  + Landroid/content/LocusId;
  + Landroid/graphics/ColorSpace_Rgb_TransferParameters;
  + Landroid/graphics/ColorSpace_Rgb;
  + Landroid/os/ext/SdkExtensions;
  + Landroid/view/WindowInsetsController_OnControllableInsetsChangedListener;
  + Landroid/view/contentcapture/ContentCaptureSession;
  + Landroid/window/BackEvent;
  + Landroid/window/OnBackAnimationCallback;
  + Landroidx/activity/a0;
  + Landroidx/activity/b0;
  + Landroidx/activity/c0;
  + Landroidx/activity/d0;
  + Landroidx/activity/e0;
  + Landroidx/activity/f0;
  + Landroidx/activity/g0;
  + Landroidx/activity/h0;
  + Landroidx/activity/i0;
  + Landroidx/activity/j0;
  + Landroidx/activity/k0;
  + Landroidx/activity/l0;
  + Landroidx/activity/m0;
  + Landroidx/activity/z;
  + Landroidx/compose/foundation/BackgroundElement;
  + Landroidx/compose/foundation/BorderModifierNodeElement;
  + Landroidx/compose/foundation/ClickableElement;
  + Landroidx/compose/foundation/FocusableElement;
  + Landroidx/compose/foundation/FocusableKt_FocusableInNonTouchModeElement_1;
  + Landroidx/compose/foundation/FocusedBoundsObserverElement;
  + Landroidx/compose/foundation/HoverableElement;
  + Landroidx/compose/foundation/ScrollingLayoutElement;
  + Landroidx/compose/foundation/a;
  + Landroidx/compose/foundation/b;
  + Landroidx/compose/foundation/c;
  + Landroidx/compose/foundation/d;
  + Landroidx/compose/foundation/gestures/DraggableElement;
  + Landroidx/compose/foundation/gestures/MouseWheelScrollElement;
  + Landroidx/compose/foundation/gestures/a;
  + Landroidx/compose/foundation/layout/AlignmentLineOffsetDpElement;
  + Landroidx/compose/foundation/layout/AspectRatioElement;
  + Landroidx/compose/foundation/layout/BoxChildDataElement;
  + Landroidx
...✂
ARSC
CONFIGS:

   old │ new │ diff       
  ─────┼─────┼────────────
   290 │ 292 │ +2 (+2 -0) 
  + drawable-anydpi
  + drawable-ldpi
  

ENTRIES:

   old  │ new  │ diff         
  ──────┼──────┼──────────────
   6945 │ 6961 │ +16 (+16 -0) 
  + color/call_notification_answer_color
  + color/call_notification_decline_color
  + drawable/ic_call_answer
  + drawable/ic_call_answer_low
  + drawable/ic_call_answer_video
  + drawable/ic_call_answer_video_low
  + drawable/ic_call_decline
  + drawable/ic_call_decline_low
  + id/binding_reference
  + string/call_notification_answer_action
  + string/call_notification_answer_video_action
  + string/call_notification_decline_action
  + string/call_notification_hang_up_action
  + string/call_notification_incoming_text
  + string/call_notification_ongoing_text
  + string/call_notification_screening_text

@tillh-stripe tillh-stripe force-pushed the tillh/use-bottomsheet-for-ps branch from 454a64a to a0c954b Compare August 10, 2023 18:20
@tillh-stripe tillh-stripe force-pushed the tillh/compose-1.5.0-for-better-bottomsheet branch from ff5b15f to 51e3d92 Compare August 10, 2023 18:48
@tillh-stripe tillh-stripe force-pushed the tillh/use-bottomsheet-for-ps branch 9 times, most recently from 4b1032f to 45946ae Compare August 11, 2023 17:10
@tillh-stripe tillh-stripe force-pushed the tillh/compose-1.5.0-for-better-bottomsheet branch from 1ad9c49 to 867310d Compare August 14, 2023 14:19
@tillh-stripe tillh-stripe force-pushed the tillh/use-bottomsheet-for-ps branch 3 times, most recently from 4510480 to c85c75b Compare August 14, 2023 23:09
@tillh-stripe tillh-stripe force-pushed the tillh/compose-1.5.0-for-better-bottomsheet branch 2 times, most recently from a124f89 to 9ea6277 Compare August 16, 2023 02:24
Base automatically changed from tillh/use-bottomsheet-for-ps to master August 21, 2023 21:33
@tillh-stripe tillh-stripe force-pushed the tillh/compose-1.5.0-for-better-bottomsheet branch 2 times, most recently from 3616f68 to 16b59fe Compare August 24, 2023 00:49
@tillh-stripe tillh-stripe force-pushed the tillh/compose-1.5.0-for-better-bottomsheet branch from 16b59fe to 2c9884f Compare September 12, 2023 17:37
@@ -1,17 +1,17 @@
ext.versions = [
accompanist : '0.30.1',
alipay : '15.8.12',
androidGradlePlugin : '8.0.2',
androidGradlePlugin : '8.1.0',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can/should do this independently. (8.1.1 is the latest stable)

androidTest : '1.5.0',
androidTestJunit : '1.1.5',
androidTestOrchestrator : '1.4.2',
androidTestRunner : '1.5.2',
androidxActivity : '1.7.2',
androidxActivity : '1.8.0-alpha06',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't the latest. But do we need this? Can we do without it?

@tillh-stripe
Copy link
Collaborator Author

Closed in favor of #7297.

@tillh-stripe tillh-stripe deleted the tillh/compose-1.5.0-for-better-bottomsheet branch October 26, 2023 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants