diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cac2b86..2626cb31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 1.0.15 - 2020-04-06 +- Fix [issue 99](https://github.com/stripe/stripe-terminal-android/issues/99) +- Fix [issue 103](https://github.com/stripe/stripe-terminal-android/issues/103) +- Fix EventFragment in Java example app showing empty screen +- Fix UpdateReaderFragment in Java example app showing empty screen + ## 1.0.14 - 2020-03-27 - Fix [bug](https://github.com/stripe/stripe-terminal-android/issues/73) where Android Studio cannot find `stripeterminal` classes diff --git a/Example/javaapp/build.gradle b/Example/javaapp/build.gradle index 661ed3f0..f939328a 100644 --- a/Example/javaapp/build.gradle +++ b/Example/javaapp/build.gradle @@ -43,7 +43,7 @@ ext { okhttp_version = '4.4.1' retrofit_version = '2.7.2' stetho_version = '1.5.1' - stripeTerminalVersion = '1.0.14' + stripeTerminalVersion = '1.0.15' } dependencies { diff --git a/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/UpdateReaderFragment.java b/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/UpdateReaderFragment.java index f488eceb..8365a87a 100644 --- a/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/UpdateReaderFragment.java +++ b/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/UpdateReaderFragment.java @@ -1,7 +1,9 @@ package com.stripe.example.javaapp.fragment; import android.os.Bundle; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import androidx.core.content.ContextCompat; @@ -45,6 +47,16 @@ public void onCreate(@Nullable Bundle bundle) { } } + @Override + @Nullable + public View onCreateView( + @NotNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState + ) { + return inflater.inflate(R.layout.fragment_update_reader, container, false); + } + @Override public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { // Cancel update on button click diff --git a/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventAdapter.java b/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventAdapter.java index 6c3ca084..0cf99c1a 100644 --- a/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventAdapter.java +++ b/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventAdapter.java @@ -44,6 +44,6 @@ public void onBindViewHolder(@NotNull EventHolder holder, int position) { @Override public EventHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) { return new EventHolder( - LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_event, parent)); + LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_event, parent, false)); } } diff --git a/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventFragment.java b/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventFragment.java index 44f9c7a8..4a37d9a2 100644 --- a/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventFragment.java +++ b/Example/javaapp/src/main/java/com/stripe/example/javaapp/fragment/event/EventFragment.java @@ -2,7 +2,9 @@ import android.os.Bundle; import android.util.Log; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import androidx.core.content.ContextCompat; @@ -183,6 +185,15 @@ public void onCreate(@Nullable Bundle savedInstanceState) { } } + @Nullable + public View onCreateView( + @NotNull LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState + ) { + return inflater.inflate(R.layout.fragment_event, container, false); + } + @Override public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { eventRecyclerView = view.findViewById(R.id.event_recycler_view); diff --git a/Example/kotlinapp/build.gradle b/Example/kotlinapp/build.gradle index 30283059..dd807c88 100644 --- a/Example/kotlinapp/build.gradle +++ b/Example/kotlinapp/build.gradle @@ -42,7 +42,7 @@ ext { okhttp_version = '4.4.1' retrofit_version = '2.7.2' stetho_version = '1.5.1' - stripeTerminalVersion = '1.0.14' + stripeTerminalVersion = '1.0.15' } dependencies {