diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java index ef115d4a..0ec12dd2 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/LiveViewManager.java @@ -3,7 +3,7 @@ package com.moez.QKSMS.common; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.interfaces.LiveView; import java.util.Arrays; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java index 543e3017..3858a112 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/MessageUtils.java @@ -1070,92 +1070,6 @@ public class MessageUtils { return null; } - public static CharSequence styleText(CharSequence text) { - if (text == null || text.toString().isEmpty() || (!text.toString().contains("*") && !text.toString().contains("_"))) - return text; // Do nothing if there's nothing to be styled - - boolean bool; - - text = Html.toHtml(new SpannedString(text)); - - // bold text - if (text.toString().contains("*")) { - int doubleStars = 0; - bool = true; - for (int i = 0; i < text.length() - 1; i++) { - if (text.subSequence(i, i + 2).equals("**")) { - doubleStars++; - } - } - if (doubleStars >= 2) { - if (doubleStars % 2 != 0) { - doubleStars--; - } - for (int i = 0; i < doubleStars; i++) { - text = text.toString().replaceFirst(Pattern.quote("**"), bool ? "" : ""); - bool = !bool; - } - } - } - - // italic text - if (text.toString().contains("*")) { - int singleStars = 0; - bool = true; - for (int i = 0; i < text.length(); i++) { - if (text.subSequence(i, i + 1).equals("*")) { - singleStars++; - } - } - if (singleStars >= 2) { - if (singleStars % 2 != 0) { - singleStars--; - } - for (int i = 0; i < singleStars; i++) { - text = text.toString().replaceFirst(Pattern.quote("*"), bool ? "" : ""); - bool = !bool; - } - } - } - - // underlined text - if (text.toString().contains("_")) { - int underscores = 0; - bool = true; - for (int i = 0; i < text.length(); i++) { - if (text.subSequence(i, i + 1).equals("_")) { - underscores++; - } - } - if (underscores >= 2) { - if (underscores % 2 != 0) { - underscores--; - } - for (int i = 0; i < underscores; i++) { - text = text.toString().replaceFirst(Pattern.quote("_"), bool ? "" : ""); - bool = !bool; - } - } - } - - text = text.toString().replaceAll(Pattern.quote("

"), "").replaceAll(Pattern.quote("

"), ""); - - return Html.fromHtml(text.toString()); - } - - public static String getInitial(String name) { - char initial; - if (name.length() == 1) { - initial = name.toUpperCase().charAt(0); - } else if (android.text.TextUtils.isEmpty(name) || PhoneNumberUtils.isReallyWellFormedSmsAddress(PhoneNumberUtils.stripSeparators(name))) { - initial = '#'; - } else { - initial = name.toUpperCase().charAt(0); - } - - return Character.toString(initial); - } - private static void log(String msg) { Log.d(TAG, "[MsgUtils] " + msg); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/TextUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/TextUtils.java new file mode 100644 index 00000000..55e50e1c --- /dev/null +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/TextUtils.java @@ -0,0 +1,81 @@ +package com.moez.QKSMS.common.utils; + +import android.text.Html; +import android.text.SpannedString; + +import java.util.regex.Pattern; + +public class TextUtils { + public static CharSequence styleText(CharSequence text) { + if (text == null || text.toString().isEmpty() || (!text.toString().contains("*") && !text.toString().contains("_"))) + return text; // Do nothing if there's nothing to be styled + + boolean bool; + + text = Html.toHtml(new SpannedString(text)); + + // bold text + if (text.toString().contains("*")) { + int doubleStars = 0; + bool = true; + for (int i = 0; i < text.length() - 1; i++) { + if (text.subSequence(i, i + 2).equals("**")) { + doubleStars++; + } + } + if (doubleStars >= 2) { + if (doubleStars % 2 != 0) { + doubleStars--; + } + for (int i = 0; i < doubleStars; i++) { + text = text.toString().replaceFirst(Pattern.quote("**"), bool ? "" : ""); + bool = !bool; + } + } + } + + // italic text + if (text.toString().contains("*")) { + int singleStars = 0; + bool = true; + for (int i = 0; i < text.length(); i++) { + if (text.subSequence(i, i + 1).equals("*")) { + singleStars++; + } + } + if (singleStars >= 2) { + if (singleStars % 2 != 0) { + singleStars--; + } + for (int i = 0; i < singleStars; i++) { + text = text.toString().replaceFirst(Pattern.quote("*"), bool ? "" : ""); + bool = !bool; + } + } + } + + // underlined text + if (text.toString().contains("_")) { + int underscores = 0; + bool = true; + for (int i = 0; i < text.length(); i++) { + if (text.subSequence(i, i + 1).equals("_")) { + underscores++; + } + } + if (underscores >= 2) { + if (underscores % 2 != 0) { + underscores--; + } + for (int i = 0; i < underscores; i++) { + text = text.toString().replaceFirst(Pattern.quote("_"), bool ? "" : ""); + bool = !bool; + } + } + } + + text = text.toString().replaceAll(Pattern.quote("

"), "").replaceAll(Pattern.quote("

"), ""); + + return Html.fromHtml(text.toString()); + } +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java similarity index 98% rename from QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java rename to QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java index d0978392..95b035f9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java @@ -1,4 +1,4 @@ -package com.moez.QKSMS.common.preferences; +package com.moez.QKSMS.enums; import com.moez.QKSMS.ui.ThemeManager; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetails.java b/QKSMS/src/main/java/com/moez/QKSMS/interfaces/ConversationDetails.java similarity index 70% rename from QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetails.java rename to QKSMS/src/main/java/com/moez/QKSMS/interfaces/ConversationDetails.java index 502ede08..77aeddb1 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetails.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/interfaces/ConversationDetails.java @@ -1,4 +1,4 @@ -package com.moez.QKSMS.common.conversationdetails; +package com.moez.QKSMS.interfaces; import com.moez.QKSMS.data.Conversation; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java index 50edaf36..2b34927d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/MainActivity.java @@ -32,7 +32,7 @@ import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.QKRateSnack; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.google.DraftCache; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.common.utils.Units; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index 788a29c4..f9778643 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -23,7 +23,7 @@ import com.moez.QKSMS.common.AnalyticsManager; import com.moez.QKSMS.common.CIELChEvaluator; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; import com.moez.QKSMS.receiver.IconColorReceiver; import com.moez.QKSMS.ui.base.QKActivity; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java index 9d7680b7..023237cd 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java @@ -24,7 +24,7 @@ import com.android.volley.RequestQueue; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.view.QKTextView; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java index cf8a2456..382c51c0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKFragment.java @@ -6,7 +6,7 @@ import android.os.Bundle; import android.view.View; import com.moez.QKSMS.QKSMSApp; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; import com.squareup.leakcanary.RefWatcher; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 27eb81ee..fff6dcee 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -8,7 +8,7 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.emoji.EmojiRegistry; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.data.Conversation; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index 04327aa6..93be149b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -26,8 +26,8 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.BlockedConversationHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.conversationdetails.ConversationDetailsDialog; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ColorUtils; import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.ConversationLegacy; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsContactListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/conversationdetails/ConversationDetailsContactListAdapter.java similarity index 97% rename from QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsContactListAdapter.java rename to QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/conversationdetails/ConversationDetailsContactListAdapter.java index cb69281b..cf2c3d6f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsContactListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/conversationdetails/ConversationDetailsContactListAdapter.java @@ -1,4 +1,4 @@ -package com.moez.QKSMS.common.conversationdetails; +package com.moez.QKSMS.ui.dialog.conversationdetails; import android.content.Context; import android.view.View; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/conversationdetails/ConversationDetailsDialog.java similarity index 95% rename from QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java rename to QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/conversationdetails/ConversationDetailsDialog.java index 67a7d632..17262887 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/conversationdetails/ConversationDetailsDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/conversationdetails/ConversationDetailsDialog.java @@ -1,4 +1,4 @@ -package com.moez.QKSMS.common.conversationdetails; +package com.moez.QKSMS.ui.dialog.conversationdetails; import android.app.FragmentManager; import android.view.View; @@ -8,6 +8,7 @@ import android.widget.ListView; import com.moez.QKSMS.R; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.data.Conversation; +import com.moez.QKSMS.interfaces.ConversationDetails; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.dialog.QKDialog; import com.moez.QKSMS.ui.view.QKTextView; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 58e4283f..0419b99e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -55,8 +55,8 @@ import com.moez.QKSMS.common.CIELChEvaluator; import com.moez.QKSMS.common.ConversationPrefsHelper; import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.conversationdetails.ConversationDetailsDialog; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.ui.dialog.conversationdetails.ConversationDetailsDialog; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.DrmUtils; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.MessageUtils; @@ -67,7 +67,6 @@ import com.moez.QKSMS.data.Conversation; import com.moez.QKSMS.data.ConversationLegacy; import com.moez.QKSMS.data.Message; import com.moez.QKSMS.interfaces.ActivityLauncher; -import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.model.SlideshowModel; import com.moez.QKSMS.transaction.NotificationManager; import com.moez.QKSMS.transaction.SmsHelper; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java index 0b76429c..dd3ca4a9 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java @@ -12,7 +12,7 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.google.ItemLoadedCallback; import com.moez.QKSMS.common.google.ThumbnailManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.interfaces.SlideViewInterface; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.ui.base.ClickyViewHolder; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java index 3e7c4eb3..8fb80d3f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/SettingsFragment.java @@ -35,7 +35,7 @@ import com.moez.QKSMS.common.DialogHelper; import com.moez.QKSMS.common.DonationManager; import com.moez.QKSMS.common.ListviewHelper; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.DateFormatter; import com.moez.QKSMS.common.utils.KeyboardUtils; import com.moez.QKSMS.common.utils.PackageUtils; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java index 730f53cf..b80a4203 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java @@ -10,7 +10,7 @@ import com.android.ex.chips.RecipientEditTextView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java index c25e0e78..4f03cc8a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java @@ -25,7 +25,7 @@ import android.widget.ImageView; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.ui.ThemeManager; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index 83283a7a..aec79843 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -37,7 +37,7 @@ import android.widget.LinearLayout; import android.widget.Toast; import com.github.lzyzsd.circleprogress.DonutProgress; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.mmssms.Transaction; import com.moez.QKSMS.mmssms.Utils; import com.moez.QKSMS.R; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java index cce50c5b..e8191566 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java @@ -11,7 +11,7 @@ import android.util.TypedValue; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; public class QKEditText extends android.widget.EditText { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java index bc1da43e..18854e9a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKImageView.java @@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.widget.ImageView; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; public class QKImageView extends ImageView { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java index c4ca616f..7249333a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKSwitch.java @@ -9,7 +9,7 @@ import android.support.v7.widget.SwitchCompat; import android.util.AttributeSet; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; public class QKSwitch extends SwitchCompat { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java index e41f0a72..07f9190b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java @@ -14,8 +14,8 @@ import com.moez.QKSMS.R; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.TypefaceManager; -import com.moez.QKSMS.common.preferences.QKPreference; -import com.moez.QKSMS.common.utils.MessageUtils; +import com.moez.QKSMS.enums.QKPreference; +import com.moez.QKSMS.common.utils.TextUtils; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -145,7 +145,7 @@ public class QKTextView extends TextView { } if (prefs.getBoolean(SettingsFragment.MARKDOWN_ENABLED, false)) { - text = MessageUtils.styleText(text); + text = TextUtils.styleText(text); if (text == null || text.length() <= 0 || Build.VERSION.SDK_INT >= 19) { super.setText(text, BufferType.EDITABLE); return; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java index 91a11ee8..d615a411 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/StarredContactsView.java @@ -16,7 +16,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.data.Contact; import com.moez.QKSMS.data.ContactHelper; import com.moez.QKSMS.ui.ThemeManager; diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeActivity.java index 62b838cb..3fbbe30f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/welcome/WelcomeActivity.java @@ -10,7 +10,7 @@ import android.view.View; import android.widget.ImageView; import com.moez.QKSMS.R; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.enums.QKPreference; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.base.QKActivity; import com.moez.QKSMS.ui.settings.SettingsFragment;