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

Commit b183d10e authored by Moez Bhatti's avatar Moez Bhatti
Browse files

Reimplemented custom launcher icons

parent 5ebe6cae

QKSMS/src/main/AndroidManifest.xml

+19 −19
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Teal"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_teal"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -149,7 +149,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Red"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_red"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -161,7 +161,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Pink"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_pink"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -173,7 +173,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Purple"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_purple"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -185,7 +185,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-DeepPurple"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_deep_purple"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -197,7 +197,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Indigo"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_indigo"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -209,7 +209,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Blue"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_blue"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -221,7 +221,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-LightBlue"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_light_blue"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -233,7 +233,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Cyan"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_cyan"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -245,7 +245,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Green"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_green"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -257,7 +257,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-LightGreen"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_light_green"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -269,7 +269,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Lime"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_lime"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -281,7 +281,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Yellow"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_yellow"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -293,7 +293,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Amber"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_amber"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -305,7 +305,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Orange"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_orange"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -317,7 +317,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-DeepOrange"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_deep_orange"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -329,7 +329,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Brown"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_brown"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -341,7 +341,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-Grey"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_grey"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>
@@ -353,7 +353,7 @@ 
        <activity-alias

            android:name=".ui.MainActivity-BlueGrey"

            android:enabled="false"

            android:icon="@mipmap/ic_launcher"

            android:icon="@mipmap/ic_launcher_blue_grey"

            android:label="@string/app_name"

            android:targetActivity=".ui.MainActivity">

            <intent-filter>

QKSMS/src/main/java/com/moez/QKSMS/QKSMSAppBase.java

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ public class QKSMSAppBase extends MultiDexApplication { 
        registerActivityLifecycleCallbacks(new LifecycleHandler());



        ThemeManager.init(this);

        ThemeManager.migrateIcon(this); // TODO a few versions after 2.7, we can phase this out along with the old alias

        MmsConfig.init(this);

        Contact.init(this);

        DraftCache.init(this);

QKSMS/src/main/java/com/moez/QKSMS/enums/QKPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ public enum QKPreference { 


    // Storage

    COMPOSE_DRAFT("compose_draft", ""),

    LAST_AUTO_DELETE_CHECK("last_auto_delete_check", 0),

    MIGRATED_ICON("migrated_icon", false);

    LAST_AUTO_DELETE_CHECK("last_auto_delete_check", 0);



    private String mKey;

    private Object mDefaultValue;

QKSMS/src/main/java/com/moez/QKSMS/theme/IconAdapter.java

0 → 100644
+50 −0
Original line number Diff line number Diff line 
package com.moez.QKSMS.theme;



import android.content.Context;

import android.support.v7.internal.widget.AdapterViewCompat;

import android.support.v7.widget.RecyclerView;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import com.moez.QKSMS.R;



public class IconAdapter extends RecyclerView.Adapter<IconViewHolder> {



    private Context mContext;

    private AdapterViewCompat.OnItemClickListener mOnItemClickListener;

    private int[] mIconIds = new int[]{

            R.mipmap.ic_launcher, R.mipmap.ic_launcher_dark, R.mipmap.ic_launcher_red, R.mipmap.ic_launcher_pink,

            R.mipmap.ic_launcher_purple, R.mipmap.ic_launcher_deep_purple, R.mipmap.ic_launcher_indigo,

            R.mipmap.ic_launcher_blue, R.mipmap.ic_launcher_light_blue, R.mipmap.ic_launcher_cyan,

            R.mipmap.ic_launcher_teal, R.mipmap.ic_launcher_green, R.mipmap.ic_launcher_light_green,

            R.mipmap.ic_launcher_lime, R.mipmap.ic_launcher_yellow, R.mipmap.ic_launcher_amber,

            R.mipmap.ic_launcher_orange, R.mipmap.ic_launcher_deep_orange, R.mipmap.ic_launcher_brown,

            R.mipmap.ic_launcher_grey, R.mipmap.ic_launcher_blue_grey

    };



    public IconAdapter(Context context, AdapterViewCompat.OnItemClickListener onItemClickListener) {

        mContext = context;

        mOnItemClickListener = onItemClickListener;

    }



    @Override

    public IconViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {

        View view = LayoutInflater.from(mContext).inflate(R.layout.list_item_icon, parent, false);

        return new IconViewHolder(this, view);

    }



    @Override

    public void onBindViewHolder(IconViewHolder holder, int position) {

        holder.bind(position);

        holder.itemView.setOnClickListener(v -> mOnItemClickListener.onItemClick(null, holder.itemView, position, 0));

    }



    public Integer getItem(int position) {

        return mIconIds[position];

    }



    @Override

    public int getItemCount() {

        return mIconIds.length;

    }

}

QKSMS/src/main/java/com/moez/QKSMS/theme/IconViewHolder.java

0 → 100644
+27 −0
Original line number Diff line number Diff line 
package com.moez.QKSMS.theme;



import android.support.v7.widget.RecyclerView;

import android.view.View;

import android.widget.ImageView;

import butterknife.Bind;

import butterknife.ButterKnife;

import com.moez.QKSMS.R;



public class IconViewHolder extends RecyclerView.ViewHolder {



    @Bind(R.id.icon) protected ImageView mIcon;



    protected IconAdapter mIconAdapter;



    public IconViewHolder(IconAdapter iconAdapter, View view) {

        super(view);

        mIconAdapter = iconAdapter;

        ButterKnife.bind(this, view);

    }



    public void bind(int position) {

        int iconRes = mIconAdapter.getItem(position);

        mIcon.setImageResource(iconRes);

    }



}