From b26b5d01feef6feb06f2414e7034e6cb5e648406 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 20 Sep 2019 17:54:28 +0200 Subject: migrate to AndroidX --- src/main/java/de/pixart/messenger/utils/Compatibility.java | 4 ++-- src/main/java/de/pixart/messenger/utils/EmojiWrapper.java | 2 +- src/main/java/de/pixart/messenger/utils/ExceptionHelper.java | 2 +- .../de/pixart/messenger/utils/IrregularUnicodeDetector.java | 2 +- src/main/java/de/pixart/messenger/utils/Resolver.java | 2 +- src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java | 2 +- src/main/java/de/pixart/messenger/utils/StylingHelper.java | 4 ++-- src/main/java/de/pixart/messenger/utils/ThemeHelper.java | 10 +++++----- src/main/java/de/pixart/messenger/utils/TimeframeUtils.java | 2 +- src/main/java/de/pixart/messenger/utils/UIHelper.java | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/main/java/de/pixart/messenger/utils') diff --git a/src/main/java/de/pixart/messenger/utils/Compatibility.java b/src/main/java/de/pixart/messenger/utils/Compatibility.java index a57835101..38e331638 100644 --- a/src/main/java/de/pixart/messenger/utils/Compatibility.java +++ b/src/main/java/de/pixart/messenger/utils/Compatibility.java @@ -10,8 +10,8 @@ import android.preference.Preference; import android.preference.PreferenceCategory; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; -import android.support.annotation.BoolRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.BoolRes; +import androidx.core.content.ContextCompat; import android.util.Log; import java.util.Arrays; diff --git a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java b/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java index d30c68a97..e6725e744 100644 --- a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java +++ b/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java @@ -28,7 +28,7 @@ */ package de.pixart.messenger.utils; -import android.support.text.emoji.EmojiCompat; +import androidx.emoji.text.EmojiCompat; public class EmojiWrapper { diff --git a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java index 428aa616e..0cdf2a26d 100644 --- a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java +++ b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java @@ -7,7 +7,7 @@ import android.content.pm.PackageManager; import android.content.pm.Signature; import android.os.Build; import android.preference.PreferenceManager; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import java.io.BufferedReader; diff --git a/src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java b/src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java index 3775494e7..170b7e994 100644 --- a/src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java +++ b/src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java @@ -32,7 +32,7 @@ package de.pixart.messenger.utils; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java index 9d2d90838..30caa3a4a 100644 --- a/src/main/java/de/pixart/messenger/utils/Resolver.java +++ b/src/main/java/de/pixart/messenger/utils/Resolver.java @@ -2,7 +2,7 @@ package de.pixart.messenger.utils; import android.content.ContentValues; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.io.IOException; diff --git a/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java b/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java index ce8aa009f..0a1ea6801 100644 --- a/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java +++ b/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java @@ -1,7 +1,7 @@ package de.pixart.messenger.utils; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.Log; import org.conscrypt.Conscrypt; diff --git a/src/main/java/de/pixart/messenger/utils/StylingHelper.java b/src/main/java/de/pixart/messenger/utils/StylingHelper.java index be430e584..7901c0c94 100644 --- a/src/main/java/de/pixart/messenger/utils/StylingHelper.java +++ b/src/main/java/de/pixart/messenger/utils/StylingHelper.java @@ -32,8 +32,8 @@ package de.pixart.messenger.utils; import android.content.Context; import android.graphics.Color; import android.graphics.Typeface; -import android.support.annotation.ColorInt; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorInt; +import androidx.core.content.ContextCompat; import android.text.Editable; import android.text.ParcelableSpan; import android.text.Spannable; diff --git a/src/main/java/de/pixart/messenger/utils/ThemeHelper.java b/src/main/java/de/pixart/messenger/utils/ThemeHelper.java index b83631623..b73559529 100644 --- a/src/main/java/de/pixart/messenger/utils/ThemeHelper.java +++ b/src/main/java/de/pixart/messenger/utils/ThemeHelper.java @@ -35,9 +35,9 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.preference.PreferenceManager; -import android.support.annotation.StyleRes; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; +import androidx.annotation.StyleRes; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; import android.util.TypedValue; import android.widget.TextView; @@ -112,8 +112,8 @@ public class ThemeHelper { final float size = typedArray.getDimension(0, 0f); typedArray.recycle(); if (size != 0f) { - final TextView text = snackbar.getView().findViewById(android.support.design.R.id.snackbar_text); - final TextView action = snackbar.getView().findViewById(android.support.design.R.id.snackbar_action); + final TextView text = snackbar.getView().findViewById(com.google.android.material.R.id.snackbar_text); + final TextView action = snackbar.getView().findViewById(com.google.android.material.R.id.snackbar_action); if (text != null && action != null) { text.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); action.setTextSize(TypedValue.COMPLEX_UNIT_PX, size); diff --git a/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java b/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java index 316733b54..3301ddf70 100644 --- a/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java +++ b/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java @@ -29,7 +29,7 @@ package de.pixart.messenger.utils; import android.content.Context; -import android.support.annotation.PluralsRes; +import androidx.annotation.PluralsRes; import de.pixart.messenger.R; diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index 590085ff5..102848183 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -1,7 +1,7 @@ package de.pixart.messenger.utils; import android.content.Context; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; import android.text.SpannableStringBuilder; import android.text.format.DateFormat; import android.text.format.DateUtils; -- cgit v1.2.3