[go: nahoru, domu]
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: google-pay/android-quickstart
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: google-pay/android-quickstart
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: base-pay-incomplete
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 13 files changed
  • 2 contributors

Commits on May 17, 2023

  1. Update base to latest libraries and Gradle 8

    @JlUgia
    JlUgia committed May 17, 2023
    Configuration menu
    Copy the full SHA
    61367df View commit details
    Browse the repository at this point in the history

  2. Remove Google Pay integration code and added guiding steps

    @JlUgia
    JlUgia committed May 17, 2023
    Configuration menu
    Copy the full SHA
    8c9daf0 View commit details
    Browse the repository at this point in the history

  3. specifying type of allowedPaymentMethods

    @dmengelt
    dmengelt committed May 17, 2023
    Configuration menu
    Copy the full SHA
    8d3d309 View commit details
    Browse the repository at this point in the history

  4. added requestPayment

    @dmengelt
    dmengelt committed May 17, 2023
    Configuration menu
    Copy the full SHA
    eee1c4a View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge branch 'master' of github.com:google-pay/android-quickstart int… 

    …o base-pay-incomplete

# Conflicts:
#	kotlin/app/build.gradle
#	kotlin/app/src/androidTest/java/com/google/android/gms/samples/wallet/GooglePayCheckoutTest/SampleGooglePayCheckoutTest.kt
#	kotlin/app/src/main/AndroidManifest.xml
#	kotlin/app/src/main/java/com/google/android/gms/samples/wallet/activity/CheckoutActivity.kt
#	kotlin/app/src/main/java/com/google/android/gms/samples/wallet/activity/CheckoutSuccessActivity.kt
#	kotlin/app/src/main/java/com/google/android/gms/samples/wallet/viewmodel/CheckoutViewModel.kt
#	kotlin/app/src/main/res/layout/activity_checkout.xml
#	kotlin/app/src/main/res/layout/activity_checkout_success.xml
#	kotlin/app/src/main/res/values/googlepay_strings.xml
#	kotlin/build.gradle
#	kotlin/settings.gradle.kts
    @JlUgia
    JlUgia committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    e5605d8 View commit details
    Browse the repository at this point in the history

  2. Hardcode string for now

    @JlUgia
    JlUgia committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    b2dd126 View commit details
    Browse the repository at this point in the history

  3. Update the pay incomplete branch with new architecture patterns

    @JlUgia
    JlUgia committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    dd1c149 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. no message

    @JlUgia
    JlUgia committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    6cd61f4 View commit details
    Browse the repository at this point in the history

  2. Conflict resolution

    @JlUgia
    JlUgia committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    280004c View commit details
    Browse the repository at this point in the history

  3. Last conflict resolution

    @JlUgia
    JlUgia committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    8e8290e View commit details
    Browse the repository at this point in the history

  4. Update steps

    @JlUgia
    JlUgia committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    85f00fb View commit details
    Browse the repository at this point in the history
Loading