Skip to content

Commit 11a1efb

Browse files
committed
remove additional snackbar padding
1 parent 294fe9f commit 11a1efb

File tree

4 files changed

+37
-14
lines changed

4 files changed

+37
-14
lines changed

ui/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@ dependencies {
4848
implementation project(':utils')
4949
implementation project(':core')
5050

51-
implementation 'androidx.core:core-ktx:1.5.0'
51+
implementation 'androidx.core:core-ktx:1.6.0'
5252
implementation 'androidx.appcompat:appcompat:1.3.0'
5353
implementation 'androidx.recyclerview:recyclerview:1.2.1'
5454
implementation 'androidx.cardview:cardview:1.0.0'
5555
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
5656
implementation 'androidx.webkit:webkit:1.4.0'
5757
implementation "androidx.viewpager2:viewpager2:1.0.0"
58-
implementation 'com.google.android.material:material:1.3.0'
58+
implementation 'com.google.android.material:material:1.4.0'
5959
implementation 'com.github.google:flexbox-layout:2.0.1'
6060
implementation 'me.relex:circleindicator:2.1.6'
6161
implementation 'ch.datatrans:android-sdk:1.4.1'
62-
implementation 'com.google.android.gms:play-services-wallet:18.1.2'
62+
implementation 'com.google.android.gms:play-services-wallet:18.1.3'
6363

6464
def camerax_version = "1.0.0"
6565
implementation "androidx.camera:camera-core:${camerax_version}"
6666
implementation "androidx.camera:camera-camera2:${camerax_version}"
6767
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
68-
implementation "androidx.camera:camera-view:1.0.0-alpha25"
69-
implementation "androidx.camera:camera-extensions:1.0.0-alpha25"
68+
implementation "androidx.camera:camera-view:1.0.0-alpha26"
69+
implementation "androidx.camera:camera-extensions:1.0.0-alpha26"
7070

7171
//noinspection GradleDependency
7272
implementation 'commons-io:commons-io:2.5'

ui/src/main/java/io/snabble/sdk/ui/cart/CheckoutBar.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.fragment.app.FragmentActivity
2020
import androidx.lifecycle.Lifecycle
2121
import androidx.lifecycle.LifecycleObserver
2222
import androidx.lifecycle.OnLifecycleEvent
23-
import com.google.android.material.snackbar.Snackbar
2423
import io.snabble.sdk.*
2524
import io.snabble.sdk.ui.Keyguard
2625
import io.snabble.sdk.ui.R
@@ -196,7 +195,7 @@ class CheckoutBar @JvmOverloads constructor(
196195
if (cart.hasReachedMaxCheckoutLimit()) {
197196
val message = resources.getString(R.string.Snabble_limitsAlert_checkoutNotAvailable,
198197
project.priceFormatter.format(project.maxCheckoutLimit))
199-
Snackbar.make(this, message, UIUtils.SNACKBAR_LENGTH_VERY_LONG).show()
198+
SnackbarUtils.make(this, message, UIUtils.SNACKBAR_LENGTH_VERY_LONG).show()
200199
} else {
201200
val entry = paymentSelectionHelper.selectedEntry.value
202201
if (entry != null) {
@@ -334,13 +333,13 @@ class CheckoutBar @JvmOverloads constructor(
334333
.setPositiveButton(R.string.Snabble_OK, null)
335334
.show()
336335
} else {
337-
Snackbar.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG).show()
336+
SnackbarUtils.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG).show()
338337
}
339338
progressDialog.dismiss()
340339
} else if (state == Checkout.State.CONNECTION_ERROR
341340
|| state == Checkout.State.NO_SHOP
342341
|| state == Checkout.State.PAYMENT_PROCESSING_ERROR) {
343-
Snackbar.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG).show()
342+
SnackbarUtils.make(this, R.string.Snabble_Payment_errorStarting, UIUtils.SNACKBAR_LENGTH_VERY_LONG).show()
344343
progressDialog.dismiss()
345344
} else if (state == Checkout.State.PAYMENT_ABORTED) {
346345
progressDialog.dismiss()

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartView.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
import android.content.res.ColorStateList;
88
import android.content.res.Resources;
99
import android.graphics.Color;
10-
import android.graphics.ColorMatrix;
11-
import android.graphics.ColorMatrixColorFilter;
1210
import android.text.Editable;
1311
import android.text.InputFilter;
1412
import android.text.TextWatcher;
@@ -26,7 +24,7 @@
2624
import androidx.annotation.DrawableRes;
2725
import androidx.annotation.NonNull;
2826
import androidx.appcompat.app.AlertDialog;
29-
import androidx.core.widget.TextViewCompat;
27+
import androidx.core.view.ViewCompat;
3028
import androidx.fragment.app.FragmentActivity;
3129
import androidx.recyclerview.widget.DefaultItemAnimator;
3230
import androidx.recyclerview.widget.DiffUtil;
@@ -56,6 +54,7 @@
5654
import io.snabble.sdk.ui.utils.I18nUtils;
5755
import io.snabble.sdk.ui.utils.InputFilterMinMax;
5856
import io.snabble.sdk.ui.utils.OneShotClickListener;
57+
import io.snabble.sdk.ui.utils.SnackbarUtils;
5958
import io.snabble.sdk.ui.utils.UIUtils;
6059
import io.snabble.sdk.utils.Logger;
6160
import io.snabble.sdk.utils.SimpleActivityLifecycleCallbacks;
@@ -887,13 +886,12 @@ public void removeAndShowUndoSnackbar(int adapterPosition, ShoppingCart.Item ite
887886
cart.remove(adapterPosition);
888887
Telemetry.event(Telemetry.Event.DeletedFromCart, item.getProduct());
889888

890-
Snackbar snackbar = Snackbar.make(parentView,
889+
Snackbar snackbar = SnackbarUtils.make(parentView,
891890
R.string.Snabble_Shoppingcart_articleRemoved, UIUtils.SNACKBAR_LENGTH_VERY_LONG);
892891
snackbar.setAction(R.string.Snabble_undo, v -> {
893892
cart.insert(item, adapterPosition);
894893
Telemetry.event(Telemetry.Event.UndoDeleteFromCart, item.getProduct());
895894
});
896-
897895
snackbar.show();
898896
}
899897
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package io.snabble.sdk.ui.utils
2+
3+
import android.view.View
4+
import androidx.annotation.StringRes
5+
import androidx.core.view.ViewCompat
6+
import com.google.android.material.snackbar.Snackbar
7+
8+
class SnackbarUtils {
9+
companion object {
10+
@JvmStatic
11+
fun make(parentView: View, string: String, duration: Int): Snackbar {
12+
val snackbar: Snackbar = Snackbar.make(parentView, string, duration)
13+
ViewCompat.setFitsSystemWindows(snackbar.view, false)
14+
ViewCompat.setOnApplyWindowInsetsListener(snackbar.view, null)
15+
return snackbar;
16+
}
17+
18+
@JvmStatic
19+
fun make(parentView: View, @StringRes resId: Int, duration: Int): Snackbar {
20+
val snackbar: Snackbar = Snackbar.make(parentView, resId, duration)
21+
ViewCompat.setFitsSystemWindows(snackbar.view, false)
22+
ViewCompat.setOnApplyWindowInsetsListener(snackbar.view, null)
23+
return snackbar;
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)