Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 006c14db authored by Moez Bhatti's avatar Moez Bhatti
Browse files

Remove all usages of old ripple application

parent e5403bc5
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ import android.util.Log;
import android.view.View;
import android.widget.Toast;
import com.moez.QKSMS.R;
import com.moez.QKSMS.enums.QKPreference;
import com.moez.QKSMS.external.iab.IabHelper;
import com.moez.QKSMS.external.iab.IabResult;
import com.moez.QKSMS.external.iab.Purchase;
import com.moez.QKSMS.ui.ThemeManager;
import com.moez.QKSMS.ui.base.QKActivity;
import com.moez.QKSMS.ui.dialog.QKDialog;

@@ -197,6 +199,13 @@ public class DonationManager {
        view.findViewById(R.id.donate_10).setOnClickListener(clickListener);
        view.findViewById(R.id.donate_paypal).setOnClickListener(clickListener);

        LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
            view.findViewById(R.id.donate_1).setBackgroundDrawable(ThemeManager.getRippleBackground());
            view.findViewById(R.id.donate_5).setBackgroundDrawable(ThemeManager.getRippleBackground());
            view.findViewById(R.id.donate_10).setBackgroundDrawable(ThemeManager.getRippleBackground());
            view.findViewById(R.id.donate_paypal).setBackgroundDrawable(ThemeManager.getRippleBackground());
        });

        QKDialog dialog = new QKDialog()
                .setContext(mContext)
                .setCustomView(view);
+16 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.preference.PreferenceManager;
import android.support.annotation.ColorInt;
import android.support.annotation.DrawableRes;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
import android.util.Log;
@@ -373,46 +375,57 @@ public class ThemeManager {
                .show();
    }

    @ColorInt
    public static int getBackgroundColor() {
        return mBackgroundColor;
    }

    @ColorInt
    public static int getTextOnColorPrimary() {
        return mTextOnColorPrimary;
    }

    @ColorInt
    public static int getTextOnColorSecondary() {
        return mTextOnColorSecondary;
    }

    @ColorInt
    public static int getTextOnBackgroundPrimary() {
        return mTextOnBackgroundPrimary;
    }

    @ColorInt
    public static int getTextOnBackgroundSecondary() {
        return mtextOnBackgroundSecondary;
    }

    @DrawableRes
    public static int getSentBubbleRes() {
        return mSentBubbleRes;
    }

    @DrawableRes
    public static int getSentBubbleAltRes() {
        return mSentBubbleAltRes;
    }

    @ColorInt
    public static int getSentBubbleColor() {
        return mSentBubbleColored ? mActiveColor : getNeutralBubbleColor();
    }

    @DrawableRes
    public static int getReceivedBubbleRes() {
        return mReceivedBubbleRes;
    }

    @DrawableRes
    public static int getReceivedBubbleAltRes() {
        return mReceivedBubbleAltRes;
    }

    @ColorInt
    public static int getReceivedBubbleColor() {
        return mReceivedBubbleColored ? mActiveColor : getNeutralBubbleColor();
    }
@@ -432,6 +445,7 @@ public class ThemeManager {
        mReceivedBubbleColored = colored;
    }

    @ColorInt
    public static int getNeutralBubbleColor() {
        if (mTheme == null) {
            return 0xeeeeee;
@@ -453,10 +467,12 @@ public class ThemeManager {
        return mResources.getDrawable(mRippleBackgroundRes);
    }

    @ColorInt
    public static int getColor() {
        return mActiveColor;
    }

    @ColorInt
    public static int getThemeColor() {
        return mColor;
    }
@@ -495,7 +511,6 @@ public class ThemeManager {
        holder.mPager.setAdapter(adapter);
        holder.mPager.setOffscreenPageLimit(1);
        holder.mPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
            @SuppressWarnings("ResourceAsColor")
            @Override
            public void onPageSelected(int position) {
                super.onPageSelected(position);
+7 −5
Original line number Diff line number Diff line
@@ -13,14 +13,11 @@ import com.moez.QKSMS.common.utils.DateFormatter;
import com.moez.QKSMS.data.Contact;
import com.moez.QKSMS.data.Conversation;
import com.moez.QKSMS.enums.QKPreference;
import com.moez.QKSMS.interfaces.LiveView;
import com.moez.QKSMS.ui.ThemeManager;
import com.moez.QKSMS.ui.base.QKActivity;
import com.moez.QKSMS.ui.base.RecyclerCursorAdapter;
import com.moez.QKSMS.ui.settings.SettingsFragment;

import static com.moez.QKSMS.R.id.conversation;

public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationListViewHolder, Conversation> {


@@ -52,6 +49,10 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
            holder.errorIndicator.setColorFilter(ThemeManager.getColor());
        });

        LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
            holder.root.setBackgroundDrawable(ThemeManager.getRippleBackground());
        });

        return holder;
    }

@@ -104,8 +105,9 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
            holder.mSelected.setVisibility(View.GONE);
        }

        LiveViewManager.registerView(QKPreference.HIDE_AVATAR_CONVERSATIONS, this, key ->
                holder.mAvatarView.setVisibility(mContext.getBoolean(QKPreference.HIDE_AVATAR_CONVERSATIONS) ? View.GONE : View.VISIBLE));
        LiveViewManager.registerView(QKPreference.HIDE_AVATAR_CONVERSATIONS, this, key -> {
            holder.mAvatarView.setVisibility(mContext.getBoolean(QKPreference.HIDE_AVATAR_CONVERSATIONS) ? View.GONE : View.VISIBLE);
        });

        // Date
        holder.dateView.setText(DateFormatter.getConversationTimestamp(mContext, conversation.getDate()));
+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ import com.moez.QKSMS.R;
import com.moez.QKSMS.data.Contact;
import com.moez.QKSMS.data.Conversation;
import com.moez.QKSMS.data.ConversationLegacy;
import com.moez.QKSMS.ui.MainActivity;
import com.moez.QKSMS.ui.ThemeManager;
import com.moez.QKSMS.ui.base.ClickyViewHolder;
import com.moez.QKSMS.ui.base.QKActivity;
+2 −1
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter<MessageListViewHol
        }

        LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
            holder.mRoot.setBackgroundDrawable(ThemeManager.getRippleBackground());
            holder.mMmsView.getForeground().setColorFilter(ThemeManager.getBackgroundColor(), PorterDuff.Mode.SRC_ATOP);
        });

Loading