update:2020.05.22

fix:图标更新
add:

app/src/main/java/com/appstore/uiui/MyApplication.java

@@ -36,7 +36,6 @@ import java.io.File;
 
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.JPushInterface;
-import uk.co.chrisjenx.calligraphy.CalligraphyConfig;
 
 /**
  * Created by asus on 2017/10/27.
@@ -59,7 +58,7 @@ public class MyApplication extends Application {
             @NonNull
             @Override
             public RefreshHeader createRefreshHeader(@NonNull Context context, @NonNull RefreshLayout layout) {
-                layout.setPrimaryColorsId(R.color.download, R.color.green);//全局设置主题颜色
+                layout.setPrimaryColorsId(R.color.download, R.color.red);//全局设置主题颜色
                 return new ClassicsHeader(context);//.setTimeFormat(new DynamicTimeFormat("更新于 %s"));//指定为经典Header，默认是 贝塞尔雷达Header
             }
         });

app/src/main/java/com/appstore/uiui/activity/DetailsActivity.java

@@ -17,6 +17,7 @@ import com.appstore.uiui.R;
 import com.appstore.uiui.adapter.ImageAdapter;
 import com.appstore.uiui.base.BaseActivity;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.helper.CustomSnapHelper;
 import com.appstore.uiui.utils.ApkUtils;
 import com.appstore.uiui.utils.ToastUtil;
@@ -80,12 +81,13 @@ public class DetailsActivity extends BaseActivity {
         tv_name.setText(appInfo.getApp_name());
         tv_company.setText(appInfo.getApp_developer());
         detali_tv_size.setText("大小\t" + "(" + appInfo.getApp_size() + "MB" + ")");
-        detail_tv_Developers.setText("供应商\t" + appInfo.getApp_developer());
+        detail_tv_Developers.setText("开发者\t" + appInfo.getApp_developer());
         tv_update_time.setText("时间\t" + appInfo.getCreatetime());
         tv_version.setText("版本\t" + appInfo.getApp_version_name());
         tv_content.setText(appInfo.getApp_desc());
         rating_bar.setRating((float) appInfo.getApp_score());
-        Glide.with(this).asBitmap().load(appInfo.getApp_img()).into(iv_icon);
+        Glide.with(this).asBitmap().load(appInfo.getApp_img())                    .transform(new GlideCircleWithBorder(this))
+                .into(iv_icon);
         List<String> list = new ArrayList<String>() {{
             this.add(appInfo.getApp_preview1());
             this.add(appInfo.getApp_preview2());

app/src/main/java/com/appstore/uiui/activity/MainActivity.java

@@ -130,7 +130,7 @@ public class MainActivity extends BaseActivity {
 
     private void initTabLayout() {
         final List<Fragment> fragmentList = new ArrayList<>();
-        fragmentList.add(new FeaturedFragment());
+        fragmentList.add(new FeaturedFragment(this));
         fragmentList.add(new RankFragment());
         fragmentList.add(new KindFragment());
         fragmentList.add(new ManageFragment());

app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java

@@ -1,8 +1,10 @@
 package com.appstore.uiui.activity;
 
+import android.graphics.Color;
 import android.os.Handler;
 import android.os.Message;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SearchView;
@@ -36,6 +38,10 @@ public class SearcherActivity extends BaseActivity {
     @Override
     protected void initView() {
         search = findViewById(R.id.search);
+//        int id = search.getContext().getResources().getIdentifier("android:id/search_src_text", null, null);
+        TextView textView = search.findViewById(androidx.appcompat.R.id.search_src_text);
+        textView.setTextColor(Color.WHITE);
+        textView.setHintTextColor(Color.WHITE);//提示字体颜色**
         recyclerView = findViewById(R.id.recyclerView);
     }
 

app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java

@@ -2,6 +2,8 @@ package com.appstore.uiui.adapter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.appstore.uiui.R;
 import com.appstore.uiui.activity.DetailsActivity;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.listener.LogDownloadListener;
 import com.appstore.uiui.utils.ApkUtils;
 import com.appstore.uiui.utils.ToastUtil;
@@ -70,11 +73,22 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.Holder> {
             holder.refresh(downloadTask.progress);
         }
 
+
+
         if (!isNotLoadBitmap) {
-            Glide.with(mContext).asBitmap().load(appInfo.getApp_img()).placeholder(R.drawable.ic_place_holder).into(holder.ivIcon);
+            Glide.with(mContext)
+                    .asBitmap()
+                    .load(appInfo.getApp_img())
+                    .placeholder(R.drawable.ic_place_holder)
+                    .transform(new GlideCircleWithBorder(mContext))
+                    .into(holder.ivIcon);
         } else {
-            Glide.with(mContext).load(R.drawable.ic_place_holder).into(holder.ivIcon);
+            Glide.with(mContext)
+                    .load(R.drawable.ic_place_holder)
+                    .transform(new GlideCircleWithBorder(mContext))
+                    .into(holder.ivIcon);
         }
+
         holder.tvCompany.setText(appInfo.getApp_developer());
         if (isShowOrder) {
             holder.tvName.setText((position + 1) + "." + appInfo.getApp_name());

app/src/main/java/com/appstore/uiui/adapter/DownloadManagerAdapter.java

@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.listener.LogDownloadListener;
 import com.appstore.uiui.view.NumberProgressBar;
 import com.bumptech.glide.Glide;
@@ -125,7 +126,11 @@ public class DownloadManagerAdapter extends RecyclerView.Adapter<DownloadManager
             Progress progress = task.progress;
             AppInfo apk = (AppInfo) progress.extra1;
             if (apk != null) {
-                Glide.with(mContext).load(apk.getApp_img()).error(R.mipmap.ic_launcher).into(icon);
+                Glide.with(mContext)
+                        .load(apk.getApp_img())
+                        .error(R.mipmap.ic_launcher)
+                        .transform(new GlideCircleWithBorder(mContext))
+                        .into(icon);
                 name.setText(apk.getApp_name());
             } else {
                 name.setText(progress.fileName);

app/src/main/java/com/appstore/uiui/adapter/KindAdapter.java

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
 import com.appstore.uiui.activity.KindDetailActivity;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.bean.Kind;
 import com.bumptech.glide.Glide;
 
@@ -41,7 +42,9 @@ public class KindAdapter extends RecyclerView.Adapter<KindAdapter.KindViewHolder
     public void onBindViewHolder(KindViewHolder holder, int position) {
         final Kind kind = mKindList.get(position);
         holder.tvName.setText(kind.getName());
-        Glide.with(mContext).load(kind.getIcon()).into(holder.ivIcon);
+        Glide.with(mContext).load(kind.getIcon())
+//                .transform(new GlideCircleWithBorder(mContext))
+                .into(holder.ivIcon);
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/com/appstore/uiui/adapter/LocalAppAdapter.java

@@ -3,6 +3,8 @@ package com.appstore.uiui.adapter;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.text.format.Formatter;
 import android.view.LayoutInflater;
@@ -17,8 +19,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
 import com.appstore.uiui.bean.AppInfo;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.appstore.uiui.bean.LocalApp;
 import com.appstore.uiui.utils.ApkUtils;
+import com.appstore.uiui.utils.Utils;
+import com.bumptech.glide.Glide;
 
 import java.util.List;
 
@@ -49,8 +54,11 @@ public class LocalAppAdapter extends RecyclerView.Adapter<LocalAppAdapter.LocalA
     @Override
     public void onBindViewHolder(LocalAppViewHolder holder, int position) {
         final LocalApp localApp = localAppList.get(position);
-
-        holder.ivIcon.setImageDrawable(localApp.getIcon());
+        Bitmap bitmap = Utils.getRoundedBitmap(Utils.DrawableToBitmap(localApp.getIcon()), context);
+        Glide.with(context).load(bitmap)
+                .transform(new GlideCircleWithBorder(context))
+                .into(holder.ivIcon);
+        holder.ivIcon.setImageDrawable(new BitmapDrawable(context.getResources(), bitmap));
         holder.tvCompany.setText(localApp.getCompany());
         holder.tvName.setText(localApp.getAppName());
         holder.tvVersion.setText(localApp.getVersion());

app/src/main/java/com/appstore/uiui/adapter/ShowImageAdapter.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
+import com.appstore.uiui.bean.GlideCircleWithBorder;
 import com.bumptech.glide.Glide;
 
 import java.util.List;
@@ -36,7 +37,12 @@ public class ShowImageAdapter extends RecyclerView.Adapter<ShowImageAdapter.Imag
     @Override
     public void onBindViewHolder(ImageViewHolder holder, int position) {
         String src = mSrcList.get(position);
-        Glide.with(mContext).asBitmap().load(src).placeholder(R.drawable.ic_place_holder).into(holder.imageView);
+        Glide.with(mContext)
+                .asBitmap()
+                .load(src)
+                .placeholder(R.drawable.ic_place_holder)
+                .transform(new GlideCircleWithBorder(mContext))
+                .into(holder.imageView);
     }
 
     @Override

app/src/main/java/com/appstore/uiui/adapter/UpdateAppAdapter.java

@@ -8,7 +8,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.appstore.uiui.R;
@@ -59,7 +58,7 @@ public class UpdateAppAdapter extends RecyclerView.Adapter<UpdateAppAdapter.Upda
         holder.tvName.setText(appInfo.getAppName());
         holder.tvVersion.setText(appInfo.getVersionName() + "->" + appInfo.getNewVersionName());
         holder.btnDownLoad.setText("更新");
-        holder.btnDownLoad.setTextColor(context.getColor(R.color.green));
+        holder.btnDownLoad.setTextColor(context.getColor(R.color.red));
         holder.btnDownLoad.setBackground(context.getDrawable(R.drawable.btn_style_none));
         holder.btnDownLoad.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/appstore/uiui/bean/GlideCircleWithBorder.java

@@ -0,0 +1,112 @@
+package com.appstore.uiui.bean;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.RectF;
+
+import com.appstore.uiui.R;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+
+import java.security.MessageDigest;
+
+/**
+ * 加载圆形头像带白色边框
+ */
+public class GlideCircleWithBorder extends BitmapTransformation {
+    private Paint mBorderPaint;
+    private float mBorderWidth;
+    private Context mContext;
+
+    public GlideCircleWithBorder(Context context) {
+        this.mContext = context;
+    }
+
+//    public GlideCircleWithBorder(Context context, int borderWidth, int borderColor) {
+//        this.mContext = context;
+//        mBorderWidth = Resources.getSystem().getDisplayMetrics().density * borderWidth;
+//        mBorderPaint = new Paint();
+//        mBorderPaint.setDither(true);
+//        mBorderPaint.setAntiAlias(true);
+//        mBorderPaint.setColor(borderColor);
+//        mBorderPaint.setStyle(Paint.Style.STROKE);
+//        mBorderPaint.setStrokeWidth(mBorderWidth);
+//    }
+
+    protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+        return circleCrop(pool, toTransform);
+    }
+
+    private Bitmap circleCrop(BitmapPool pool, Bitmap source) {
+        if (source == null) {
+            return null;
+        }
+//        int size = (int) (Math.min(source.getWidth(), source.getHeight()) - (mBorderWidth / 2));
+//        int x = (source.getWidth() - size) / 2;
+//        int y = (source.getHeight() - size) / 2;
+//        Bitmap squared = Bitmap.createBitmap(source, x, y, size, size);
+//        Bitmap result = pool.get(size, size, Bitmap.Config.ARGB_8888);
+//        if (result == null) {
+//            result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+//        }
+        //创建画笔 画布 手动描绘边框
+//        Canvas canvas = new Canvas(result);
+//        Paint paint = new Paint();
+//        paint.setShader(new BitmapShader(squared, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+//        paint.setAntiAlias(true);
+//        float r = size / 2f;
+//        canvas.drawCircle(r, r, r, paint);
+//        if (mBorderPaint != null) {
+//            float borderRadius = r - mBorderWidth / 2;
+//            canvas.drawCircle(r, r, borderRadius, mBorderPaint);
+//        }
+//        Bitmap bgBitmap = Bitmap.createBitmap(mBitmap.getWidth(), mBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+
+        Bitmap mask = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.mask);
+        //获取背景
+        int width = mask.getWidth();
+        int height = mask.getHeight();
+        Bitmap result = pool.get(width, height, Bitmap.Config.ARGB_8888);
+        if (result == null) {
+            result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        }
+
+        Bitmap bitmapScale = Bitmap.createScaledBitmap(source, width, height, true);
+        Canvas canvas = new Canvas();
+        Paint paint = new Paint();
+        canvas.setBitmap(result);
+        canvas.drawBitmap(mask, 0, 0, paint);
+        canvas.drawBitmap(bitmapScale, 0, 0, paint);
+        Bitmap result2 = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+
+        Canvas canvas2 = new Canvas();
+        Paint paint2 = new Paint();
+        canvas2.setBitmap(result2);
+        canvas2.drawBitmap(mask, 0, 0, paint2);
+        paint2.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas2.drawBitmap(result, 0, 0, paint2);
+
+        Bitmap bitmapshadow =BitmapFactory.decodeResource(mContext.getResources(), R.drawable.mask_shadow);
+        Bitmap bitmap=Bitmap.createScaledBitmap(bitmapshadow,width+2,height+2,true);
+        Canvas canvas3=new Canvas();
+        Paint paint3=new Paint();
+        canvas3.setBitmap(bitmap);
+        canvas3.drawBitmap(bitmapshadow,0,0,paint3);
+        canvas3.drawBitmap(result2,1,1,paint3);
+
+        return bitmap;
+    }
+
+    @Override
+    public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+    }
+}

app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java

@@ -53,6 +53,12 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
     private boolean isNotLoadBitmap;
 
     private installReceiver myReceiver;
+    private Context mContext;
+
+    public FeaturedFragment(Context context) {
+        this.mContext = context;
+    }
+
 
     @Override
     public int getLayoutId() {
@@ -83,7 +89,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
             filter.addAction("com.appstore.uiui.PACKAGE_REPLACED");
             filter.addAction("com.appstore.uiui.PACKAGE_REMOVED");
             filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
-            getActivity().getApplication().registerReceiver(myReceiver, filter);
+            mContext.registerReceiver(myReceiver, filter);
         }
     }
 
@@ -108,7 +114,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
                         return new BannerViewHolder();
                     }
                 })
-                .setIndicatorColor(getResources().getColor(R.color.colorAccent), getResources().getColor(R.color.colorAccent))
+                .setIndicatorColor(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent))
                 .setOnPageClickListener(new BannerViewPager.OnPageClickListener() {
                     @Override
                     public void onPageClick(int position) {
@@ -180,7 +186,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
                                     return new BannerViewHolder();
                                 }
                             })
-                            .setIndicatorColor(getResources().getColor(R.color.colorAccent), getResources().getColor(R.color.colorAccent))
+                            .setIndicatorColor(getResources().getColor(R.color.white), getResources().getColor(R.color.colorAccent))
                             .setOnPageClickListener(new BannerViewPager.OnPageClickListener() {
                                 @Override
                                 public void onPageClick(int position) {

app/src/main/java/com/appstore/uiui/fragment/KindFragment.java

@@ -14,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.appstore.uiui.R;
 import com.appstore.uiui.adapter.KindAdapter;
 import com.appstore.uiui.base.BaseFragment;
-import com.appstore.uiui.base.RefreshManager;
 import com.appstore.uiui.bean.Kind;
 
 import java.util.ArrayList;
@@ -44,17 +43,17 @@ public class KindFragment extends BaseFragment {
 
     private void initView() {
         kindList = new ArrayList<>();
-        kindList.add(new Kind("语文", 1, R.drawable.icon_language));
-        kindList.add(new Kind("数学", 2, R.drawable.icon_math));
-        kindList.add(new Kind("英语", 3, R.drawable.icon_english));
-        kindList.add(new Kind("物理", 4, R.drawable.icon_physics));
-        kindList.add(new Kind("化学", 5, R.drawable.icon_chemistry));
-        kindList.add(new Kind("生物", 6, R.drawable.icon_biology));
-        kindList.add(new Kind("政治", 7, R.drawable.icon_politics));
-        kindList.add(new Kind("历史", 8, R.drawable.icon_history));
-        kindList.add(new Kind("地理", 9, R.drawable.icon_geography));
+        kindList.add(new Kind("语文", 1, R.drawable.icon_language1));
+        kindList.add(new Kind("数学", 2, R.drawable.icon_math1));
+        kindList.add(new Kind("英语", 3, R.drawable.icon_english1));
+        kindList.add(new Kind("物理", 4, R.drawable.icon_physics1));
+        kindList.add(new Kind("化学", 5, R.drawable.icon_chemistry1));
+        kindList.add(new Kind("生物", 6, R.drawable.icon_biology1));
+        kindList.add(new Kind("政治", 7, R.drawable.icon_politics1));
+        kindList.add(new Kind("历史", 8, R.drawable.icon_history1));
+        kindList.add(new Kind("地理", 9, R.drawable.icon_geography1));
 
-        kindList.add(new Kind("娱乐", 0, R.drawable.icon_game));
+        kindList.add(new Kind("娱乐", 0, R.drawable.icon_game1));
 
         adapter = new KindAdapter(kindList, getContext());
         mRvKind.setAdapter(adapter);

app/src/main/java/com/appstore/uiui/utils/Utils.java

@@ -12,6 +12,14 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
@@ -24,6 +32,8 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.appstore.uiui.R;
+
 import java.io.FileReader;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
@@ -704,4 +714,72 @@ public class Utils {
 
     }
 
+    public static Bitmap getRoundedBitmap(Bitmap mBitmap, Context context) {
+        Bitmap bgBitmap = Bitmap.createBitmap(mBitmap.getWidth(), mBitmap.getHeight(), Bitmap.Config.ARGB_8888);
+
+        Bitmap mask = BitmapFactory.decodeResource(context.getResources(), R.drawable.mask);
+        int width = mask.getWidth();
+        int height = mask.getHeight();
+        Bitmap bitmapScale = Bitmap.createScaledBitmap(mBitmap, width, height, true);
+
+//        Palette p = Palette.from(mBitmap).generate();
+//        Palette.Swatch vibrant = p.getVibrantSwatch();//有活力的
+//        int color = vibrant.getRgb(); //样本中的像素数量
+
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas();
+        Paint paint = new Paint();
+
+        canvas.setBitmap(result);
+//        canvas.drawColor(color);
+        canvas.drawBitmap(mask, 0, 0, paint);
+//        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas.drawBitmap(bitmapScale, 0, 0, paint);
+//        return result;
+
+        Bitmap result2 = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas2 = new Canvas();
+        Paint paint2 = new Paint();
+        canvas2.setBitmap(result2);
+        canvas2.drawBitmap(mask, 0, 0, paint2);
+        paint2.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas2.drawBitmap(result, 0, 0, paint2);
+        return result2;
+
+
+//        Canvas mCanvas = new Canvas();
+//        mCanvas.setBitmap(bgBitmap);
+//        Paint mPaint = new Paint();
+//        RectF mRectM = new RectF(scaleM, scaleM, mBitmap.getWidth() - scaleM, mBitmap.getHeight() - scaleM); //设置剪裁圆角的区域
+//        Rect mRect = new Rect(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
+//        RectF mRectF = mRectM;
+//
+//        float roundPx = 15;    //圆角半径
+//        mPaint.setAntiAlias(true);
+//        //Log.d("wy"+TAG,"mBitmap.getWidth()="+mBitmap.getWidth()+", mBitmap.getHeight()="+mBitmap.getHeight());
+//        mCanvas.drawRoundRect(mRectF, roundPx, roundPx, mPaint);
+//        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+//        mCanvas.drawBitmap(mBitmap, mRect, mRect, mPaint);
+//        return bgBitmap;
+    }
+    public static Bitmap DrawableToBitmap(Drawable drawable) {
+
+        // 获取 drawable 长宽
+        int width = drawable.getIntrinsicWidth();
+        int heigh = drawable.getIntrinsicHeight();
+
+        drawable.setBounds(0, 0, width, heigh);
+
+        // 获取drawable的颜色格式
+        Bitmap.Config config = drawable.getOpacity() != PixelFormat.OPAQUE ? Bitmap.Config.ARGB_8888
+                : Bitmap.Config.RGB_565;
+        // 创建bitmap
+        Bitmap bitmap = Bitmap.createBitmap(width, heigh, config);
+        // 创建bitmap画布
+        Canvas canvas = new Canvas(bitmap);
+        // 将drawable 内容画到画布中
+        drawable.draw(canvas);
+        return bitmap;
+    }
+
 }

app/src/main/res/drawable/background_title.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <!--
+    android:startColor="#aa000000"  渐变起始色值
+    android:centerColor=""      渐变中间色值
+    android:endColor="#ffffffff"    渐变结束颜色
+    android:angle="45"      渐变的方向 默认为0 从做向右 ，90时从下向上 必须为45的整数倍
+    android:type="radial"       渐变类型 有三种 线性linear 放射渐变radial 扫描线性渐变sweep
+    android:centerX="0.5"       渐变中心相对X坐标只有渐变类型为放射渐变时有效
+    android:centerY="0.5"       渐变中心相对Y坐标只有渐变类型为放射渐变时有效
+    android:gradientRadius="100"    渐变半径 非线性放射有效
+     -->
+    <gradient
+        android:startColor="#dd5035"
+        android:endColor="#c12b6a"
+        android:angle="90"
+        />
+
+</shape>

app/src/main/res/drawable/btn_style_delete.xml

@@ -1,36 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 连框颜色值 -->
+
+    <!--边-->
     <item>
-        <shape>
-            <solid android:color="#f9493c" />
-            <corners android:radius="@dimen/dp_25" />
-
-        </shape>
-    </item>
-    <!-- 主体背景颜色值 -->
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape>
-<!--            <gradient-->
-<!--                android:angle="90"-->
-<!--                android:centerColor="#FFFFFF"-->
-<!--                android:centerX="0.5"-->
-<!--                android:centerY="0.5"-->
-<!--                android:endColor="#FFFFFF"-->
-<!--                android:startColor="#FFFFFF"-->
-<!--                android:type="linear" />-->
-
+        <shape android:shape="rectangle">
             <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <!-- 应该是圆角 -->
-            <corners android:radius="@dimen/dp_25" />
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#00CCCCCC" />
+
+            <corners android:radius="25dp" />
         </shape>
     </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#10CCCCCC" />
+
+            <corners android:radius="225dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#20CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#30CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/red" />
+            <corners android:radius="25dp" />
+            <size android:width="32dp"
+                android:height="32dp"/>
+
+        </shape>
+    </item>
+
 </layer-list>

app/src/main/res/drawable/btn_style_none.xml

@@ -1,36 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 连框颜色值 -->
+
+    <!--边-->
     <item>
-        <shape>
-            <solid android:color="@color/download" />
-            <corners android:radius="@dimen/dp_25" />
-
-        </shape>
-    </item>
-    <!-- 主体背景颜色值 -->
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape>
-<!--            <gradient-->
-<!--                android:angle="90"-->
-<!--                android:centerColor="#FFFFFF"-->
-<!--                android:centerX="0.5"-->
-<!--                android:centerY="0.5"-->
-<!--                android:endColor="#FFFFFF"-->
-<!--                android:startColor="#FFFFFF"-->
-<!--                android:type="linear" />-->
-
+        <shape android:shape="rectangle">
             <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <!-- 应该是圆角 -->
-            <corners android:radius="@dimen/dp_25" />
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#00CCCCCC" />
+
+            <corners android:radius="25dp" />
         </shape>
     </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#10CCCCCC" />
+
+            <corners android:radius="225dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#20CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#30CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/white" />
+            <corners android:radius="25dp" />
+            <size android:width="32dp"
+                android:height="32dp"/>
+
+        </shape>
+    </item>
+
 </layer-list>

app/src/main/res/drawable/btn_style_open.xml

@@ -1,36 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- 连框颜色值 -->
+
+    <!--边-->
     <item>
-        <shape>
-            <solid android:color="@color/green" />
-            <corners android:radius="@dimen/dp_25" />
-
-        </shape>
-    </item>
-    <!-- 主体背景颜色值 -->
-    <item
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp">
-        <shape>
-<!--            <gradient-->
-<!--                android:angle="90"-->
-<!--                android:centerColor="#FFFFFF"-->
-<!--                android:centerX="0.5"-->
-<!--                android:centerY="0.5"-->
-<!--                android:endColor="#FFFFFF"-->
-<!--                android:startColor="#FFFFFF"-->
-<!--                android:type="linear" />-->
-
+        <shape android:shape="rectangle">
             <padding
-                android:bottom="2dp"
-                android:left="2dp"
-                android:right="2dp"
-                android:top="2dp" />
-            <!-- 应该是圆角 -->
-            <corners android:radius="@dimen/dp_25" />
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#00CCCCCC" />
+
+            <corners android:radius="25dp" />
         </shape>
     </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#10CCCCCC" />
+
+            <corners android:radius="225dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#20CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#30CCCCCC" />
+
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1px"
+                android:left="1px"
+                android:right="1px"
+                android:top="1px" />
+
+            <solid android:color="#50CCCCCC" />
+            <corners android:radius="25dp" />
+        </shape>
+    </item>
+
+    <!--中心背景 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+            <!--实心 -->
+            <solid android:color="@color/red" />
+            <corners android:radius="25dp" />
+            <size android:width="32dp"
+                android:height="32dp"/>
+
+        </shape>
+    </item>
+
 </layer-list>

app/src/main/res/drawable/btn_style_shadow.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 连框颜色值 -->
+    <item>
+        <shape>
+            <solid android:color="@color/download" />
+            <corners android:radius="@dimen/dp_25" />
+
+        </shape>
+    </item>
+    <!-- 主体背景颜色值 -->
+    <item
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+        <shape>
+            <!--            <gradient-->
+            <!--                android:angle="90"-->
+            <!--                android:centerColor="#FFFFFF"-->
+            <!--                android:centerX="0.5"-->
+            <!--                android:centerY="0.5"-->
+            <!--                android:endColor="#FFFFFF"-->
+            <!--                android:startColor="#FFFFFF"-->
+            <!--                android:type="linear" />-->
+
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <!-- 应该是圆角 -->
+            <corners android:radius="@dimen/dp_25" />
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/drawable/ll_customer_selected.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/green" />
+    <solid android:color="@color/gray" />
 
 </shape>

app/src/main/res/drawable/shap_search_left.xml

@@ -4,6 +4,9 @@
     <solid android:color="@color/backgroundcolor" />
     <!-- 圆角的幅度 -->
     <corners
-        android:bottomLeftRadius="@dimen/dp_25"
-        android:topLeftRadius="@dimen/dp_25" />
+        android:bottomLeftRadius="@dimen/dp_20"
+        android:topLeftRadius="@dimen/dp_20" />
+    <size
+        android:width="@dimen/dp_20"
+        android:height="@dimen/dp_40" />
 </shape>

app/src/main/res/drawable/shap_search_right.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 内部颜色 -->
-    <solid
-        android:color="@color/backgroundcolor" />
+    <solid android:color="@color/backgroundcolor" />
     <!-- 圆角的幅度 -->
     <corners
-        android:topRightRadius="@dimen/dp_25"
-        android:bottomRightRadius="@dimen/dp_25" />
+        android:bottomRightRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20" />
+    <size
+        android:width="@dimen/dp_20"
+        android:height="@dimen/dp_20" />
 </shape>

app/src/main/res/layout/activity_about.xml

@@ -9,7 +9,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_30"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -17,12 +18,12 @@
 
         <ImageView
             android:id="@+id/iv_exit"
-            android:layout_width="@dimen/dp_15"
-            android:layout_height="@dimen/dp_15"
-            android:layout_marginLeft="@dimen/dp_5"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="20dp"
             android:adjustViewBounds="true"
             android:scaleType="centerCrop"
-            android:src="@drawable/bt_return"
+            android:src="@drawable/ic_back"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -33,8 +34,8 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:text="关于"
-            android:textColor="#4b4b4b"
-            android:textSize="@dimen/sp_14"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/activity_font_size"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -44,8 +45,8 @@
 
     <ImageView
         android:id="@+id/imageView3"
-        android:layout_width="@dimen/dp_100"
-        android:layout_height="@dimen/dp_100"
+        android:layout_width="@dimen/dp_200"
+        android:layout_height="@dimen/dp_200"
         android:layout_marginTop="64dp"
         android:adjustViewBounds="true"
         android:scaleType="fitCenter"

app/src/main/res/layout/activity_details.xml

@@ -7,14 +7,15 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/search_iv_back"
             android:layout_width="20dp"
             android:layout_height="20dp"
+            android:layout_marginStart="20dp"
             android:layout_gravity="center_vertical"
             android:adjustViewBounds="true"
             android:onClick="finish"
@@ -29,8 +30,8 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="应用详情"
-            android:textColor="#8c8b8b"
-            android:textSize="@dimen/sp_15"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/activity_font_size"
             android:textStyle="bold" />
 
     </LinearLayout>
@@ -39,11 +40,13 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:background="@color/white"
         android:layout_weight="1">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/white"
             android:orientation="vertical">
 
             <LinearLayout
@@ -79,7 +82,7 @@
                         android:singleLine="true"
                         android:text="今日头条"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_11" />
+                        android:textSize="@dimen/sp_16" />
 
 
                     <RatingBar
@@ -106,6 +109,8 @@
                 android:id="@+id/detail_rv_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/white"
+
                 android:layout_marginTop="15dp"
                 android:layout_marginBottom="15dp" />
 
@@ -115,7 +120,7 @@
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="应用介绍"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/sp_16"
                 android:textStyle="bold">
 
             </TextView>
@@ -137,7 +142,7 @@
                 android:layout_marginTop="@dimen/dp_2"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="更新"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/sp_16"
                 android:textStyle="bold">
 
             </TextView>
@@ -160,7 +165,7 @@
                 android:layout_marginTop="@dimen/dp_2"
                 android:layout_marginRight="@dimen/dp_15"
                 android:text="信息"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/sp_16"
                 android:textStyle="bold">
 
             </TextView>
@@ -196,7 +201,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginRight="@dimen/dp_15"
-                android:text="供应商" />
+                android:text="开发者" />
 
 
         </LinearLayout>
@@ -207,13 +212,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_15"
+        android:background="@color/white"
         android:orientation="horizontal">
 
 
         <Button
             android:id="@+id/detail_tv_download"
-            android:layout_width="280dp"
-            android:layout_height="40dp"
+            android:layout_width="@dimen/dp_340"
+            android:layout_height="@dimen/dp_60"
             android:layout_centerInParent="true"
             android:background="@drawable/btn_style_open"
             android:clickable="true"
@@ -221,7 +227,7 @@
             android:stateListAnimator="@null"
             android:text="安装"
             android:textColor="#ffffff"
-            android:textSize="15sp" />
+            android:textSize="@dimen/sp_18" />
 
 
     </RelativeLayout>

app/src/main/res/layout/activity_download_manager.xml

@@ -9,8 +9,8 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal">
 
         <ImageView
@@ -20,6 +20,7 @@
             android:layout_gravity="center_vertical"
             android:adjustViewBounds="true"
             android:onClick="finish"
+            android:layout_marginStart="20dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_back" />
 
@@ -30,13 +31,14 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="下载管理"
-            android:textColor="#8c8b8b"
-            android:textSize="17sp"
+            android:textColor="#ffffff"
+            android:textSize="@dimen/activity_font_size"
             android:textStyle="bold" />
 
     </LinearLayout>
 
     <RelativeLayout
+        android:background="@color/white"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 

app/src/main/res/layout/activity_kind_detail.xml

@@ -4,19 +4,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal">
 
         <ImageView
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
             android:adjustViewBounds="true"
             android:onClick="finish"
             android:scaleType="centerInside"
@@ -29,7 +31,7 @@
             android:layout_marginLeft="10dp"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:textColor="#8c8b8b"
+            android:textColor="@color/white"
             android:textSize="17sp"
             android:textStyle="bold" />
 

app/src/main/res/layout/activity_local_manager.xml

@@ -9,8 +9,8 @@
     <LinearLayout
         android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="20dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -20,6 +20,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center_vertical"
+            android:layout_marginStart="20dp"
             android:adjustViewBounds="true"
             android:onClick="finish"
             android:scaleType="centerInside"
@@ -32,7 +33,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:text="本地管理"
-            android:textColor="#8c8b8b"
+            android:textColor="@color/white"
             android:textSize="17sp"
             android:textStyle="bold" />
 
@@ -46,6 +47,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/white"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
 
         <RelativeLayout

app/src/main/res/layout/activity_main.xml

@@ -9,14 +9,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="60dp"
-            android:layout_margin="10dp"
+            android:background="@drawable/background_title"
             android:orientation="horizontal">
 
 
@@ -24,8 +23,8 @@
                 android:id="@+id/iv_appicon"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_marginLeft="20dp"
                 android:layout_gravity="center_vertical"
+                android:layout_marginLeft="20dp"
                 android:adjustViewBounds="true"
                 android:background="@drawable/ic_place_holder"
                 android:scaleType="centerInside" />
@@ -41,31 +40,32 @@
 
 
 
+
                     <LinearLayout
                         android:id="@+id/search_ll"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_40"
                         android:layout_centerInParent="true"
                         android:gravity="center_vertical">
 
 
                         <ImageView
-                            android:layout_width="@dimen/dp_12"
-                            android:layout_height="@dimen/dp_24"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_40"
                             android:gravity="center_vertical"
                             android:src="@drawable/shap_search_left" />
 
                         <ImageView
-                            android:layout_width="@dimen/dp_15"
-                            android:layout_height="@dimen/dp_24"
+                            android:layout_width="@dimen/dp_20"
+                            android:layout_height="@dimen/dp_40"
                             android:adjustViewBounds="true"
                             android:background="@color/backgroundcolor"
                             android:scaleType="centerInside"
-                            android:src="@drawable/icon_serach"></ImageView>
+                            android:src="@drawable/icon_search" />
 
                         <TextView
                             android:layout_width="match_parent"
-                            android:layout_height="@dimen/dp_24"
+                            android:layout_height="@dimen/dp_40"
                             android:background="@drawable/shap_search_right"
                             android:gravity="center_vertical"
                             android:text="@string/search_edit"
@@ -74,7 +74,6 @@
                         </TextView>
                     </LinearLayout>
 
-
             </RelativeLayout>
 
             <ImageView
@@ -83,8 +82,8 @@
                 android:layout_height="30dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="20dp"
-                android:visibility="gone"
-                android:src="@drawable/ic_action_bar">
+                android:src="@drawable/ic_action_bar"
+                android:visibility="gone">
 
             </ImageView>
 
@@ -98,7 +97,8 @@
             app:tl_indicator_style="TRIANGLE"
             app:tl_tab_space_equal="true"
             app:tl_textBold="SELECT"
-            app:tl_textSelectColor="@color/green"
+            app:tl_textsize="@dimen/sp_15"
+            app:tl_textSelectColor="@color/red"
             app:tl_textUnselectColor="@color/install" />
 
         <androidx.viewpager.widget.ViewPager

app/src/main/res/layout/activity_searcher.xml

@@ -9,7 +9,8 @@
     <LinearLayout
         android:id="@+id/linearLayout3"
         android:layout_width="match_parent"
-        android:layout_height="50dp"
+        android:layout_height="@dimen/activity_title_height"
+        android:background="@drawable/background_title"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -30,8 +31,10 @@
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="@dimen/dp_40"
+            android:textColor="@color/white"
             app:iconifiedByDefault="false"
-            app:queryHint="@string/search_edit">
+            app:queryHint="@string/search_edit"
+            app:searchIcon="@drawable/ic_menu_search">
 
         </androidx.appcompat.widget.SearchView>
 
@@ -44,6 +47,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:background="@color/white"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout3">
 
         <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/fragment_featured.xml

@@ -15,13 +15,13 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <com.zhpan.bannerview.BannerViewPager
                     android:id="@+id/banner_view"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_150"
+                    android:layout_height="@dimen/dp_230"
                     android:layout_margin="10dp" />
 
                 <RelativeLayout

app/src/main/res/layout/fragment_kind.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/fragment_manage.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -158,6 +159,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/manage_rv_local"
             android:layout_width="match_parent"
+            android:background="@color/white"
             android:layout_height="match_parent" />
 
         <ImageView

app/src/main/res/layout/fragment_rank.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.scwang.smartrefresh.layout.SmartRefreshLayout

app/src/main/res/layout/item_app.xml

@@ -5,7 +5,6 @@
     android:layout_height="80dp"
     android:background="@drawable/ll_selector"
     android:clickable="true"
-
     android:orientation="vertical">
 
     <LinearLayout
@@ -23,7 +22,7 @@
             android:layout_height="55dp"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="10dp"
-            android:background="@mipmap/ic_launcher" />
+            />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -73,15 +72,15 @@
 
             <Button
                 android:id="@+id/app_btn_download"
-                android:layout_width="@dimen/dp_40"
-                android:layout_height="@dimen/dp_20"
+                android:layout_width="@dimen/dp_80"
+                android:layout_height="@dimen/dp_40"
                 android:textColor="#000000"
                 android:stateListAnimator="@null"
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="10dp"
                 android:background="@drawable/btn_style_none"
                 android:text="下载中"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/sp_16"
                 android:visibility="visible" />
 
 

app/src/main/res/layout/item_donwloadfinish.xml

@@ -41,8 +41,8 @@
 
     <Button
         android:id="@+id/item_finish_btn_install"
-        android:layout_width="40dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_40"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="20dp"

app/src/main/res/layout/item_donwloading.xml

@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginRight="10dp" />
+            android:layout_marginEnd="10dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -52,7 +52,7 @@
                 android:id="@+id/item_downloading_tv_state"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
                 />
         </LinearLayout>
 
@@ -60,11 +60,11 @@
 
     <Button
         android:id="@+id/item_downloading_btn_donwload"
-        android:layout_width="40dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_40"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="20dp"
         android:background="@drawable/btn_selector"
         android:text="开始" />
 </LinearLayout>

app/src/main/res/layout/item_download_manager.xml

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_60">
+    android:layout_height="@dimen/dp_80">
 
     <LinearLayout
         android:id="@+id/linearLayout"
@@ -16,9 +16,10 @@
 
         <ImageView
             android:id="@+id/icon"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_40"
+            android:layout_width="@dimen/dp_45"
+            android:layout_height="@dimen/dp_45"
             android:layout_margin="@dimen/dp_5"
+            android:layout_gravity="center"
             android:adjustViewBounds="true"
             android:scaleType="centerInside"
             android:src="@mipmap/ic_launcher">
@@ -28,6 +29,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/dp_20"
             android:layout_weight="2"
             android:orientation="vertical">
 
@@ -92,6 +94,7 @@
                 android:layout_width="@dimen/dp_15"
                 android:layout_height="@dimen/dp_15"
                 android:layout_gravity="center"
+                android:layout_margin="@dimen/dp_20"
                 android:adjustViewBounds="true"
                 android:scaleType="centerInside"
                 android:src="@drawable/bt_delete">
@@ -100,7 +103,7 @@
 
             <Button
                 android:id="@+id/start"
-                android:layout_width="60dp"
+                android:layout_width="@dimen/dp_80"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="暂停"
@@ -112,12 +115,14 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="@dimen/dp_340"
+        android:layout_width="match_parent"
         android:layout_height="1dp"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
         android:src="#9B9B9B"
         app:layout_constraintBottom_toBottomOf="@+id/linearLayout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintEnd_toEndOf="@+id/linearLayout"
+        app:layout_constraintStart_toStartOf="@+id/linearLayout">
 
     </ImageView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/item_local_app.xml

@@ -18,7 +18,7 @@
             android:layout_height="60dp"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="20dp"
-            android:background="@mipmap/ic_launcher" />
+            />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -37,7 +37,6 @@
                 android:layout_weight="1"
                 android:gravity="center_vertical"
                 android:singleLine="true"
-                android:text="王者荣耀"
                 android:textColor="@color/black"
                 android:textSize="17sp" />
 
@@ -62,8 +61,8 @@
 
         <Button
             android:id="@+id/local_app_btn_download"
-            android:layout_width="@dimen/dp_40"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_40"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="10dp"
             android:background="@drawable/btn_style_delete"

app/src/main/res/values-sw1024dp/dimens.xml

@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-170.6667dp</dimen>
-	<dimen name="dp_m_30">-85.3333dp</dimen>
-	<dimen name="dp_m_20">-56.8889dp</dimen>
-	<dimen name="dp_m_12">-34.1333dp</dimen>
-	<dimen name="dp_m_10">-28.4444dp</dimen>
-	<dimen name="dp_m_8">-22.7556dp</dimen>
-	<dimen name="dp_m_5">-14.2222dp</dimen>
-	<dimen name="dp_m_2">-5.6889dp</dimen>
-	<dimen name="dp_m_1">-2.8444dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.2844dp</dimen>
-	<dimen name="dp_0_5">1.4222dp</dimen>
-	<dimen name="dp_1">2.8444dp</dimen>
-	<dimen name="dp_1_5">4.2667dp</dimen>
-	<dimen name="dp_2">5.6889dp</dimen>
-	<dimen name="dp_2_5">7.1111dp</dimen>
-	<dimen name="dp_3">8.5333dp</dimen>
-	<dimen name="dp_3_5">9.9556dp</dimen>
-	<dimen name="dp_4">11.3778dp</dimen>
-	<dimen name="dp_4_5">12.8000dp</dimen>
-	<dimen name="dp_5">14.2222dp</dimen>
-	<dimen name="dp_6">17.0667dp</dimen>
-	<dimen name="dp_7">19.9111dp</dimen>
-	<dimen name="dp_8">22.7556dp</dimen>
-	<dimen name="dp_9">25.6000dp</dimen>
-	<dimen name="dp_10">28.4444dp</dimen>
-	<dimen name="dp_11">31.2889dp</dimen>
-	<dimen name="dp_12">34.1333dp</dimen>
-	<dimen name="dp_13">36.9778dp</dimen>
-	<dimen name="dp_14">39.8222dp</dimen>
-	<dimen name="dp_15">42.6667dp</dimen>
-	<dimen name="dp_16">45.5111dp</dimen>
-	<dimen name="dp_17">48.3556dp</dimen>
-	<dimen name="dp_18">51.2000dp</dimen>
-	<dimen name="dp_19">54.0444dp</dimen>
-	<dimen name="dp_20">56.8889dp</dimen>
-	<dimen name="dp_21">59.7333dp</dimen>
-	<dimen name="dp_22">62.5778dp</dimen>
-	<dimen name="dp_23">65.4222dp</dimen>
-	<dimen name="dp_24">68.2667dp</dimen>
-	<dimen name="dp_25">71.1111dp</dimen>
-	<dimen name="dp_26">73.9556dp</dimen>
-	<dimen name="dp_27">76.8000dp</dimen>
-	<dimen name="dp_28">79.6444dp</dimen>
-	<dimen name="dp_29">82.4889dp</dimen>
-	<dimen name="dp_30">85.3333dp</dimen>
-	<dimen name="dp_31">88.1778dp</dimen>
-	<dimen name="dp_32">91.0222dp</dimen>
-	<dimen name="dp_33">93.8667dp</dimen>
-	<dimen name="dp_34">96.7111dp</dimen>
-	<dimen name="dp_35">99.5556dp</dimen>
-	<dimen name="dp_36">102.4000dp</dimen>
-	<dimen name="dp_37">105.2444dp</dimen>
-	<dimen name="dp_38">108.0889dp</dimen>
-	<dimen name="dp_39">110.9333dp</dimen>
-	<dimen name="dp_40">113.7778dp</dimen>
-	<dimen name="dp_41">116.6222dp</dimen>
-	<dimen name="dp_42">119.4667dp</dimen>
-	<dimen name="dp_43">122.3111dp</dimen>
-	<dimen name="dp_44">125.1556dp</dimen>
-	<dimen name="dp_45">128.0000dp</dimen>
-	<dimen name="dp_46">130.8444dp</dimen>
-	<dimen name="dp_47">133.6889dp</dimen>
-	<dimen name="dp_48">136.5333dp</dimen>
-	<dimen name="dp_49">139.3778dp</dimen>
-	<dimen name="dp_50">142.2222dp</dimen>
-	<dimen name="dp_51">145.0667dp</dimen>
-	<dimen name="dp_52">147.9111dp</dimen>
-	<dimen name="dp_53">150.7556dp</dimen>
-	<dimen name="dp_54">153.6000dp</dimen>
-	<dimen name="dp_55">156.4444dp</dimen>
-	<dimen name="dp_56">159.2889dp</dimen>
-	<dimen name="dp_57">162.1333dp</dimen>
-	<dimen name="dp_58">164.9778dp</dimen>
-	<dimen name="dp_59">167.8222dp</dimen>
-	<dimen name="dp_60">170.6667dp</dimen>
-	<dimen name="dp_61">173.5111dp</dimen>
-	<dimen name="dp_62">176.3556dp</dimen>
-	<dimen name="dp_63">179.2000dp</dimen>
-	<dimen name="dp_64">182.0444dp</dimen>
-	<dimen name="dp_65">184.8889dp</dimen>
-	<dimen name="dp_66">187.7333dp</dimen>
-	<dimen name="dp_67">190.5778dp</dimen>
-	<dimen name="dp_68">193.4222dp</dimen>
-	<dimen name="dp_69">196.2667dp</dimen>
-	<dimen name="dp_70">199.1111dp</dimen>
-	<dimen name="dp_71">201.9556dp</dimen>
-	<dimen name="dp_72">204.8000dp</dimen>
-	<dimen name="dp_73">207.6444dp</dimen>
-	<dimen name="dp_74">210.4889dp</dimen>
-	<dimen name="dp_75">213.3333dp</dimen>
-	<dimen name="dp_76">216.1778dp</dimen>
-	<dimen name="dp_77">219.0222dp</dimen>
-	<dimen name="dp_78">221.8667dp</dimen>
-	<dimen name="dp_79">224.7111dp</dimen>
-	<dimen name="dp_80">227.5556dp</dimen>
-	<dimen name="dp_81">230.4000dp</dimen>
-	<dimen name="dp_82">233.2444dp</dimen>
-	<dimen name="dp_83">236.0889dp</dimen>
-	<dimen name="dp_84">238.9333dp</dimen>
-	<dimen name="dp_85">241.7778dp</dimen>
-	<dimen name="dp_86">244.6222dp</dimen>
-	<dimen name="dp_87">247.4667dp</dimen>
-	<dimen name="dp_88">250.3111dp</dimen>
-	<dimen name="dp_89">253.1556dp</dimen>
-	<dimen name="dp_90">256.0000dp</dimen>
-	<dimen name="dp_91">258.8444dp</dimen>
-	<dimen name="dp_92">261.6889dp</dimen>
-	<dimen name="dp_93">264.5333dp</dimen>
-	<dimen name="dp_94">267.3778dp</dimen>
-	<dimen name="dp_95">270.2222dp</dimen>
-	<dimen name="dp_96">273.0667dp</dimen>
-	<dimen name="dp_97">275.9111dp</dimen>
-	<dimen name="dp_98">278.7556dp</dimen>
-	<dimen name="dp_99">281.6000dp</dimen>
-	<dimen name="dp_100">284.4444dp</dimen>
-	<dimen name="dp_101">287.2889dp</dimen>
-	<dimen name="dp_102">290.1333dp</dimen>
-	<dimen name="dp_103">292.9778dp</dimen>
-	<dimen name="dp_104">295.8222dp</dimen>
-	<dimen name="dp_105">298.6667dp</dimen>
-	<dimen name="dp_106">301.5111dp</dimen>
-	<dimen name="dp_107">304.3556dp</dimen>
-	<dimen name="dp_108">307.2000dp</dimen>
-	<dimen name="dp_109">310.0444dp</dimen>
-	<dimen name="dp_110">312.8889dp</dimen>
-	<dimen name="dp_111">315.7333dp</dimen>
-	<dimen name="dp_112">318.5778dp</dimen>
-	<dimen name="dp_113">321.4222dp</dimen>
-	<dimen name="dp_114">324.2667dp</dimen>
-	<dimen name="dp_115">327.1111dp</dimen>
-	<dimen name="dp_116">329.9556dp</dimen>
-	<dimen name="dp_117">332.8000dp</dimen>
-	<dimen name="dp_118">335.6444dp</dimen>
-	<dimen name="dp_119">338.4889dp</dimen>
-	<dimen name="dp_120">341.3333dp</dimen>
-	<dimen name="dp_121">344.1778dp</dimen>
-	<dimen name="dp_122">347.0222dp</dimen>
-	<dimen name="dp_123">349.8667dp</dimen>
-	<dimen name="dp_124">352.7111dp</dimen>
-	<dimen name="dp_125">355.5556dp</dimen>
-	<dimen name="dp_126">358.4000dp</dimen>
-	<dimen name="dp_127">361.2444dp</dimen>
-	<dimen name="dp_128">364.0889dp</dimen>
-	<dimen name="dp_129">366.9333dp</dimen>
-	<dimen name="dp_130">369.7778dp</dimen>
-	<dimen name="dp_131">372.6222dp</dimen>
-	<dimen name="dp_132">375.4667dp</dimen>
-	<dimen name="dp_133">378.3111dp</dimen>
-	<dimen name="dp_134">381.1556dp</dimen>
-	<dimen name="dp_135">384.0000dp</dimen>
-	<dimen name="dp_136">386.8444dp</dimen>
-	<dimen name="dp_137">389.6889dp</dimen>
-	<dimen name="dp_138">392.5333dp</dimen>
-	<dimen name="dp_139">395.3778dp</dimen>
-	<dimen name="dp_140">398.2222dp</dimen>
-	<dimen name="dp_141">401.0667dp</dimen>
-	<dimen name="dp_142">403.9111dp</dimen>
-	<dimen name="dp_143">406.7556dp</dimen>
-	<dimen name="dp_144">409.6000dp</dimen>
-	<dimen name="dp_145">412.4444dp</dimen>
-	<dimen name="dp_146">415.2889dp</dimen>
-	<dimen name="dp_147">418.1333dp</dimen>
-	<dimen name="dp_148">420.9778dp</dimen>
-	<dimen name="dp_149">423.8222dp</dimen>
-	<dimen name="dp_150">426.6667dp</dimen>
-	<dimen name="dp_151">429.5111dp</dimen>
-	<dimen name="dp_152">432.3556dp</dimen>
-	<dimen name="dp_153">435.2000dp</dimen>
-	<dimen name="dp_154">438.0444dp</dimen>
-	<dimen name="dp_155">440.8889dp</dimen>
-	<dimen name="dp_156">443.7333dp</dimen>
-	<dimen name="dp_157">446.5778dp</dimen>
-	<dimen name="dp_158">449.4222dp</dimen>
-	<dimen name="dp_159">452.2667dp</dimen>
-	<dimen name="dp_160">455.1111dp</dimen>
-	<dimen name="dp_161">457.9556dp</dimen>
-	<dimen name="dp_162">460.8000dp</dimen>
-	<dimen name="dp_163">463.6444dp</dimen>
-	<dimen name="dp_164">466.4889dp</dimen>
-	<dimen name="dp_165">469.3333dp</dimen>
-	<dimen name="dp_166">472.1778dp</dimen>
-	<dimen name="dp_167">475.0222dp</dimen>
-	<dimen name="dp_168">477.8667dp</dimen>
-	<dimen name="dp_169">480.7111dp</dimen>
-	<dimen name="dp_170">483.5556dp</dimen>
-	<dimen name="dp_171">486.4000dp</dimen>
-	<dimen name="dp_172">489.2444dp</dimen>
-	<dimen name="dp_173">492.0889dp</dimen>
-	<dimen name="dp_174">494.9333dp</dimen>
-	<dimen name="dp_175">497.7778dp</dimen>
-	<dimen name="dp_176">500.6222dp</dimen>
-	<dimen name="dp_177">503.4667dp</dimen>
-	<dimen name="dp_178">506.3111dp</dimen>
-	<dimen name="dp_179">509.1556dp</dimen>
-	<dimen name="dp_180">512.0000dp</dimen>
-	<dimen name="dp_181">514.8444dp</dimen>
-	<dimen name="dp_182">517.6889dp</dimen>
-	<dimen name="dp_183">520.5333dp</dimen>
-	<dimen name="dp_184">523.3778dp</dimen>
-	<dimen name="dp_185">526.2222dp</dimen>
-	<dimen name="dp_186">529.0667dp</dimen>
-	<dimen name="dp_187">531.9111dp</dimen>
-	<dimen name="dp_188">534.7556dp</dimen>
-	<dimen name="dp_189">537.6000dp</dimen>
-	<dimen name="dp_190">540.4444dp</dimen>
-	<dimen name="dp_191">543.2889dp</dimen>
-	<dimen name="dp_192">546.1333dp</dimen>
-	<dimen name="dp_193">548.9778dp</dimen>
-	<dimen name="dp_194">551.8222dp</dimen>
-	<dimen name="dp_195">554.6667dp</dimen>
-	<dimen name="dp_196">557.5111dp</dimen>
-	<dimen name="dp_197">560.3556dp</dimen>
-	<dimen name="dp_198">563.2000dp</dimen>
-	<dimen name="dp_199">566.0444dp</dimen>
-	<dimen name="dp_200">568.8889dp</dimen>
-	<dimen name="dp_201">571.7333dp</dimen>
-	<dimen name="dp_202">574.5778dp</dimen>
-	<dimen name="dp_203">577.4222dp</dimen>
-	<dimen name="dp_204">580.2667dp</dimen>
-	<dimen name="dp_205">583.1111dp</dimen>
-	<dimen name="dp_206">585.9556dp</dimen>
-	<dimen name="dp_207">588.8000dp</dimen>
-	<dimen name="dp_208">591.6444dp</dimen>
-	<dimen name="dp_209">594.4889dp</dimen>
-	<dimen name="dp_210">597.3333dp</dimen>
-	<dimen name="dp_211">600.1778dp</dimen>
-	<dimen name="dp_212">603.0222dp</dimen>
-	<dimen name="dp_213">605.8667dp</dimen>
-	<dimen name="dp_214">608.7111dp</dimen>
-	<dimen name="dp_215">611.5556dp</dimen>
-	<dimen name="dp_216">614.4000dp</dimen>
-	<dimen name="dp_217">617.2444dp</dimen>
-	<dimen name="dp_218">620.0889dp</dimen>
-	<dimen name="dp_219">622.9333dp</dimen>
-	<dimen name="dp_220">625.7778dp</dimen>
-	<dimen name="dp_221">628.6222dp</dimen>
-	<dimen name="dp_222">631.4667dp</dimen>
-	<dimen name="dp_223">634.3111dp</dimen>
-	<dimen name="dp_224">637.1556dp</dimen>
-	<dimen name="dp_225">640.0000dp</dimen>
-	<dimen name="dp_226">642.8444dp</dimen>
-	<dimen name="dp_227">645.6889dp</dimen>
-	<dimen name="dp_228">648.5333dp</dimen>
-	<dimen name="dp_229">651.3778dp</dimen>
-	<dimen name="dp_230">654.2222dp</dimen>
-	<dimen name="dp_231">657.0667dp</dimen>
-	<dimen name="dp_232">659.9111dp</dimen>
-	<dimen name="dp_233">662.7556dp</dimen>
-	<dimen name="dp_234">665.6000dp</dimen>
-	<dimen name="dp_235">668.4444dp</dimen>
-	<dimen name="dp_236">671.2889dp</dimen>
-	<dimen name="dp_237">674.1333dp</dimen>
-	<dimen name="dp_238">676.9778dp</dimen>
-	<dimen name="dp_239">679.8222dp</dimen>
-	<dimen name="dp_240">682.6667dp</dimen>
-	<dimen name="dp_241">685.5111dp</dimen>
-	<dimen name="dp_242">688.3556dp</dimen>
-	<dimen name="dp_243">691.2000dp</dimen>
-	<dimen name="dp_244">694.0444dp</dimen>
-	<dimen name="dp_245">696.8889dp</dimen>
-	<dimen name="dp_246">699.7333dp</dimen>
-	<dimen name="dp_247">702.5778dp</dimen>
-	<dimen name="dp_248">705.4222dp</dimen>
-	<dimen name="dp_249">708.2667dp</dimen>
-	<dimen name="dp_250">711.1111dp</dimen>
-	<dimen name="dp_251">713.9556dp</dimen>
-	<dimen name="dp_252">716.8000dp</dimen>
-	<dimen name="dp_253">719.6444dp</dimen>
-	<dimen name="dp_254">722.4889dp</dimen>
-	<dimen name="dp_255">725.3333dp</dimen>
-	<dimen name="dp_256">728.1778dp</dimen>
-	<dimen name="dp_257">731.0222dp</dimen>
-	<dimen name="dp_258">733.8667dp</dimen>
-	<dimen name="dp_259">736.7111dp</dimen>
-	<dimen name="dp_260">739.5556dp</dimen>
-	<dimen name="dp_261">742.4000dp</dimen>
-	<dimen name="dp_262">745.2444dp</dimen>
-	<dimen name="dp_263">748.0889dp</dimen>
-	<dimen name="dp_264">750.9333dp</dimen>
-	<dimen name="dp_265">753.7778dp</dimen>
-	<dimen name="dp_266">756.6222dp</dimen>
-	<dimen name="dp_267">759.4667dp</dimen>
-	<dimen name="dp_268">762.3111dp</dimen>
-	<dimen name="dp_269">765.1556dp</dimen>
-	<dimen name="dp_270">768.0000dp</dimen>
-	<dimen name="dp_271">770.8444dp</dimen>
-	<dimen name="dp_272">773.6889dp</dimen>
-	<dimen name="dp_273">776.5333dp</dimen>
-	<dimen name="dp_274">779.3778dp</dimen>
-	<dimen name="dp_275">782.2222dp</dimen>
-	<dimen name="dp_276">785.0667dp</dimen>
-	<dimen name="dp_277">787.9111dp</dimen>
-	<dimen name="dp_278">790.7556dp</dimen>
-	<dimen name="dp_279">793.6000dp</dimen>
-	<dimen name="dp_280">796.4444dp</dimen>
-	<dimen name="dp_281">799.2889dp</dimen>
-	<dimen name="dp_282">802.1333dp</dimen>
-	<dimen name="dp_283">804.9778dp</dimen>
-	<dimen name="dp_284">807.8222dp</dimen>
-	<dimen name="dp_285">810.6667dp</dimen>
-	<dimen name="dp_286">813.5111dp</dimen>
-	<dimen name="dp_287">816.3556dp</dimen>
-	<dimen name="dp_288">819.2000dp</dimen>
-	<dimen name="dp_289">822.0444dp</dimen>
-	<dimen name="dp_290">824.8889dp</dimen>
-	<dimen name="dp_291">827.7333dp</dimen>
-	<dimen name="dp_292">830.5778dp</dimen>
-	<dimen name="dp_293">833.4222dp</dimen>
-	<dimen name="dp_294">836.2667dp</dimen>
-	<dimen name="dp_295">839.1111dp</dimen>
-	<dimen name="dp_296">841.9556dp</dimen>
-	<dimen name="dp_297">844.8000dp</dimen>
-	<dimen name="dp_298">847.6444dp</dimen>
-	<dimen name="dp_299">850.4889dp</dimen>
-	<dimen name="dp_300">853.3333dp</dimen>
-	<dimen name="dp_301">856.1778dp</dimen>
-	<dimen name="dp_302">859.0222dp</dimen>
-	<dimen name="dp_303">861.8667dp</dimen>
-	<dimen name="dp_304">864.7111dp</dimen>
-	<dimen name="dp_305">867.5556dp</dimen>
-	<dimen name="dp_306">870.4000dp</dimen>
-	<dimen name="dp_307">873.2444dp</dimen>
-	<dimen name="dp_308">876.0889dp</dimen>
-	<dimen name="dp_309">878.9333dp</dimen>
-	<dimen name="dp_310">881.7778dp</dimen>
-	<dimen name="dp_311">884.6222dp</dimen>
-	<dimen name="dp_312">887.4667dp</dimen>
-	<dimen name="dp_313">890.3111dp</dimen>
-	<dimen name="dp_314">893.1556dp</dimen>
-	<dimen name="dp_315">896.0000dp</dimen>
-	<dimen name="dp_316">898.8444dp</dimen>
-	<dimen name="dp_317">901.6889dp</dimen>
-	<dimen name="dp_318">904.5333dp</dimen>
-	<dimen name="dp_319">907.3778dp</dimen>
-	<dimen name="dp_320">910.2222dp</dimen>
-	<dimen name="dp_321">913.0667dp</dimen>
-	<dimen name="dp_322">915.9111dp</dimen>
-	<dimen name="dp_323">918.7556dp</dimen>
-	<dimen name="dp_324">921.6000dp</dimen>
-	<dimen name="dp_325">924.4444dp</dimen>
-	<dimen name="dp_326">927.2889dp</dimen>
-	<dimen name="dp_327">930.1333dp</dimen>
-	<dimen name="dp_328">932.9778dp</dimen>
-	<dimen name="dp_329">935.8222dp</dimen>
-	<dimen name="dp_330">938.6667dp</dimen>
-	<dimen name="dp_331">941.5111dp</dimen>
-	<dimen name="dp_332">944.3556dp</dimen>
-	<dimen name="dp_333">947.2000dp</dimen>
-	<dimen name="dp_334">950.0444dp</dimen>
-	<dimen name="dp_335">952.8889dp</dimen>
-	<dimen name="dp_336">955.7333dp</dimen>
-	<dimen name="dp_337">958.5778dp</dimen>
-	<dimen name="dp_338">961.4222dp</dimen>
-	<dimen name="dp_339">964.2667dp</dimen>
-	<dimen name="dp_340">967.1111dp</dimen>
-	<dimen name="dp_341">969.9556dp</dimen>
-	<dimen name="dp_342">972.8000dp</dimen>
-	<dimen name="dp_343">975.6444dp</dimen>
-	<dimen name="dp_344">978.4889dp</dimen>
-	<dimen name="dp_345">981.3333dp</dimen>
-	<dimen name="dp_346">984.1778dp</dimen>
-	<dimen name="dp_347">987.0222dp</dimen>
-	<dimen name="dp_348">989.8667dp</dimen>
-	<dimen name="dp_349">992.7111dp</dimen>
-	<dimen name="dp_350">995.5556dp</dimen>
-	<dimen name="dp_351">998.4000dp</dimen>
-	<dimen name="dp_352">1001.2444dp</dimen>
-	<dimen name="dp_353">1004.0889dp</dimen>
-	<dimen name="dp_354">1006.9333dp</dimen>
-	<dimen name="dp_355">1009.7778dp</dimen>
-	<dimen name="dp_356">1012.6222dp</dimen>
-	<dimen name="dp_357">1015.4667dp</dimen>
-	<dimen name="dp_358">1018.3111dp</dimen>
-	<dimen name="dp_359">1021.1556dp</dimen>
-	<dimen name="dp_360">1024.0000dp</dimen>
-	<dimen name="dp_365">1038.2222dp</dimen>
-	<dimen name="dp_370">1052.4444dp</dimen>
-	<dimen name="dp_400">1137.7778dp</dimen>
-	<dimen name="dp_410">1166.2222dp</dimen>
-	<dimen name="dp_422">1200.3556dp</dimen>
-	<dimen name="dp_472">1342.5778dp</dimen>
-	<dimen name="dp_500">1422.2222dp</dimen>
-	<dimen name="dp_600">1706.6667dp</dimen>
-	<dimen name="dp_640">1820.4444dp</dimen>
-	<dimen name="dp_720">2048.0000dp</dimen>
-	<dimen name="sp_6">17.0667sp</dimen>
-	<dimen name="sp_7">19.9111sp</dimen>
-	<dimen name="sp_8">22.7556sp</dimen>
-	<dimen name="sp_9">25.6000sp</dimen>
-	<dimen name="sp_10">28.4444sp</dimen>
-	<dimen name="sp_11">31.2889sp</dimen>
-	<dimen name="sp_12">34.1333sp</dimen>
-	<dimen name="sp_13">36.9778sp</dimen>
-	<dimen name="sp_14">39.8222sp</dimen>
-	<dimen name="sp_15">42.6667sp</dimen>
-	<dimen name="sp_16">45.5111sp</dimen>
-	<dimen name="sp_17">48.3556sp</dimen>
-	<dimen name="sp_18">51.2000sp</dimen>
-	<dimen name="sp_19">54.0444sp</dimen>
-	<dimen name="sp_20">56.8889sp</dimen>
-	<dimen name="sp_21">59.7333sp</dimen>
-	<dimen name="sp_22">62.5778sp</dimen>
-	<dimen name="sp_23">65.4222sp</dimen>
-	<dimen name="sp_24">68.2667sp</dimen>
-	<dimen name="sp_25">71.1111sp</dimen>
-	<dimen name="sp_28">79.6444sp</dimen>
-	<dimen name="sp_30">85.3333sp</dimen>
-	<dimen name="sp_32">91.0222sp</dimen>
-	<dimen name="sp_34">96.7111sp</dimen>
-	<dimen name="sp_36">102.4000sp</dimen>
-	<dimen name="sp_38">108.0889sp</dimen>
-	<dimen name="sp_40">113.7778sp</dimen>
-	<dimen name="sp_42">119.4667sp</dimen>
-	<dimen name="sp_48">136.5333sp</dimen>
-</resources>

app/src/main/res/values-sw1280dp/dimens.xml

@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-	<dimen name="common_margin">@dimen/dp_15</dimen>
-	<dimen name="dp_m_60">-213.3333dp</dimen>
-	<dimen name="dp_m_30">-106.6667dp</dimen>
-	<dimen name="dp_m_20">-71.1111dp</dimen>
-	<dimen name="dp_m_12">-42.6667dp</dimen>
-	<dimen name="dp_m_10">-35.5556dp</dimen>
-	<dimen name="dp_m_8">-28.4444dp</dimen>
-	<dimen name="dp_m_5">-17.7778dp</dimen>
-	<dimen name="dp_m_2">-7.1111dp</dimen>
-	<dimen name="dp_m_1">-3.5556dp</dimen>
-	<dimen name="dp_0">0.0000dp</dimen>
-	<dimen name="dp_0_1">0.3556dp</dimen>
-	<dimen name="dp_0_5">1.7778dp</dimen>
-	<dimen name="dp_1">3.5556dp</dimen>
-	<dimen name="dp_1_5">5.3333dp</dimen>
-	<dimen name="dp_2">7.1111dp</dimen>
-	<dimen name="dp_2_5">8.8889dp</dimen>
-	<dimen name="dp_3">10.6667dp</dimen>
-	<dimen name="dp_3_5">12.4444dp</dimen>
-	<dimen name="dp_4">14.2222dp</dimen>
-	<dimen name="dp_4_5">16.0000dp</dimen>
-	<dimen name="dp_5">17.7778dp</dimen>
-	<dimen name="dp_6">21.3333dp</dimen>
-	<dimen name="dp_7">24.8889dp</dimen>
-	<dimen name="dp_8">28.4444dp</dimen>
-	<dimen name="dp_9">32.0000dp</dimen>
-	<dimen name="dp_10">35.5556dp</dimen>
-	<dimen name="dp_11">39.1111dp</dimen>
-	<dimen name="dp_12">42.6667dp</dimen>
-	<dimen name="dp_13">46.2222dp</dimen>
-	<dimen name="dp_14">49.7778dp</dimen>
-	<dimen name="dp_15">53.3333dp</dimen>
-	<dimen name="dp_16">56.8889dp</dimen>
-	<dimen name="dp_17">60.4444dp</dimen>
-	<dimen name="dp_18">64.0000dp</dimen>
-	<dimen name="dp_19">67.5556dp</dimen>
-	<dimen name="dp_20">71.1111dp</dimen>
-	<dimen name="dp_21">74.6667dp</dimen>
-	<dimen name="dp_22">78.2222dp</dimen>
-	<dimen name="dp_23">81.7778dp</dimen>
-	<dimen name="dp_24">85.3333dp</dimen>
-	<dimen name="dp_25">88.8889dp</dimen>
-	<dimen name="dp_26">92.4444dp</dimen>
-	<dimen name="dp_27">96.0000dp</dimen>
-	<dimen name="dp_28">99.5556dp</dimen>
-	<dimen name="dp_29">103.1111dp</dimen>
-	<dimen name="dp_30">106.6667dp</dimen>
-	<dimen name="dp_31">110.2222dp</dimen>
-	<dimen name="dp_32">113.7778dp</dimen>
-	<dimen name="dp_33">117.3333dp</dimen>
-	<dimen name="dp_34">120.8889dp</dimen>
-	<dimen name="dp_35">124.4444dp</dimen>
-	<dimen name="dp_36">128.0000dp</dimen>
-	<dimen name="dp_37">131.5556dp</dimen>
-	<dimen name="dp_38">135.1111dp</dimen>
-	<dimen name="dp_39">138.6667dp</dimen>
-	<dimen name="dp_40">142.2222dp</dimen>
-	<dimen name="dp_41">145.7778dp</dimen>
-	<dimen name="dp_42">149.3333dp</dimen>
-	<dimen name="dp_43">152.8889dp</dimen>
-	<dimen name="dp_44">156.4444dp</dimen>
-	<dimen name="dp_45">160.0000dp</dimen>
-	<dimen name="dp_46">163.5556dp</dimen>
-	<dimen name="dp_47">167.1111dp</dimen>
-	<dimen name="dp_48">170.6667dp</dimen>
-	<dimen name="dp_49">174.2222dp</dimen>
-	<dimen name="dp_50">177.7778dp</dimen>
-	<dimen name="dp_51">181.3333dp</dimen>
-	<dimen name="dp_52">184.8889dp</dimen>
-	<dimen name="dp_53">188.4444dp</dimen>
-	<dimen name="dp_54">192.0000dp</dimen>
-	<dimen name="dp_55">195.5556dp</dimen>
-	<dimen name="dp_56">199.1111dp</dimen>
-	<dimen name="dp_57">202.6667dp</dimen>
-	<dimen name="dp_58">206.2222dp</dimen>
-	<dimen name="dp_59">209.7778dp</dimen>
-	<dimen name="dp_60">213.3333dp</dimen>
-	<dimen name="dp_61">216.8889dp</dimen>
-	<dimen name="dp_62">220.4444dp</dimen>
-	<dimen name="dp_63">224.0000dp</dimen>
-	<dimen name="dp_64">227.5556dp</dimen>
-	<dimen name="dp_65">231.1111dp</dimen>
-	<dimen name="dp_66">234.6667dp</dimen>
-	<dimen name="dp_67">238.2222dp</dimen>
-	<dimen name="dp_68">241.7778dp</dimen>
-	<dimen name="dp_69">245.3333dp</dimen>
-	<dimen name="dp_70">248.8889dp</dimen>
-	<dimen name="dp_71">252.4444dp</dimen>
-	<dimen name="dp_72">256.0000dp</dimen>
-	<dimen name="dp_73">259.5556dp</dimen>
-	<dimen name="dp_74">263.1111dp</dimen>
-	<dimen name="dp_75">266.6667dp</dimen>
-	<dimen name="dp_76">270.2222dp</dimen>
-	<dimen name="dp_77">273.7778dp</dimen>
-	<dimen name="dp_78">277.3333dp</dimen>
-	<dimen name="dp_79">280.8889dp</dimen>
-	<dimen name="dp_80">284.4444dp</dimen>
-	<dimen name="dp_81">288.0000dp</dimen>
-	<dimen name="dp_82">291.5556dp</dimen>
-	<dimen name="dp_83">295.1111dp</dimen>
-	<dimen name="dp_84">298.6667dp</dimen>
-	<dimen name="dp_85">302.2222dp</dimen>
-	<dimen name="dp_86">305.7778dp</dimen>
-	<dimen name="dp_87">309.3333dp</dimen>
-	<dimen name="dp_88">312.8889dp</dimen>
-	<dimen name="dp_89">316.4444dp</dimen>
-	<dimen name="dp_90">320.0000dp</dimen>
-	<dimen name="dp_91">323.5556dp</dimen>
-	<dimen name="dp_92">327.1111dp</dimen>
-	<dimen name="dp_93">330.6667dp</dimen>
-	<dimen name="dp_94">334.2222dp</dimen>
-	<dimen name="dp_95">337.7778dp</dimen>
-	<dimen name="dp_96">341.3333dp</dimen>
-	<dimen name="dp_97">344.8889dp</dimen>
-	<dimen name="dp_98">348.4444dp</dimen>
-	<dimen name="dp_99">352.0000dp</dimen>
-	<dimen name="dp_100">355.5556dp</dimen>
-	<dimen name="dp_101">359.1111dp</dimen>
-	<dimen name="dp_102">362.6667dp</dimen>
-	<dimen name="dp_103">366.2222dp</dimen>
-	<dimen name="dp_104">369.7778dp</dimen>
-	<dimen name="dp_105">373.3333dp</dimen>
-	<dimen name="dp_106">376.8889dp</dimen>
-	<dimen name="dp_107">380.4444dp</dimen>
-	<dimen name="dp_108">384.0000dp</dimen>
-	<dimen name="dp_109">387.5556dp</dimen>
-	<dimen name="dp_110">391.1111dp</dimen>
-	<dimen name="dp_111">394.6667dp</dimen>
-	<dimen name="dp_112">398.2222dp</dimen>
-	<dimen name="dp_113">401.7778dp</dimen>
-	<dimen name="dp_114">405.3333dp</dimen>
-	<dimen name="dp_115">408.8889dp</dimen>
-	<dimen name="dp_116">412.4444dp</dimen>
-	<dimen name="dp_117">416.0000dp</dimen>
-	<dimen name="dp_118">419.5556dp</dimen>
-	<dimen name="dp_119">423.1111dp</dimen>
-	<dimen name="dp_120">426.6667dp</dimen>
-	<dimen name="dp_121">430.2222dp</dimen>
-	<dimen name="dp_122">433.7778dp</dimen>
-	<dimen name="dp_123">437.3333dp</dimen>
-	<dimen name="dp_124">440.8889dp</dimen>
-	<dimen name="dp_125">444.4444dp</dimen>
-	<dimen name="dp_126">448.0000dp</dimen>
-	<dimen name="dp_127">451.5556dp</dimen>
-	<dimen name="dp_128">455.1111dp</dimen>
-	<dimen name="dp_129">458.6667dp</dimen>
-	<dimen name="dp_130">462.2222dp</dimen>
-	<dimen name="dp_131">465.7778dp</dimen>
-	<dimen name="dp_132">469.3333dp</dimen>
-	<dimen name="dp_133">472.8889dp</dimen>
-	<dimen name="dp_134">476.4444dp</dimen>
-	<dimen name="dp_135">480.0000dp</dimen>
-	<dimen name="dp_136">483.5556dp</dimen>
-	<dimen name="dp_137">487.1111dp</dimen>
-	<dimen name="dp_138">490.6667dp</dimen>
-	<dimen name="dp_139">494.2222dp</dimen>
-	<dimen name="dp_140">497.7778dp</dimen>
-	<dimen name="dp_141">501.3333dp</dimen>
-	<dimen name="dp_142">504.8889dp</dimen>
-	<dimen name="dp_143">508.4444dp</dimen>
-	<dimen name="dp_144">512.0000dp</dimen>
-	<dimen name="dp_145">515.5556dp</dimen>
-	<dimen name="dp_146">519.1111dp</dimen>
-	<dimen name="dp_147">522.6667dp</dimen>
-	<dimen name="dp_148">526.2222dp</dimen>
-	<dimen name="dp_149">529.7778dp</dimen>
-	<dimen name="dp_150">533.3333dp</dimen>
-	<dimen name="dp_151">536.8889dp</dimen>
-	<dimen name="dp_152">540.4444dp</dimen>
-	<dimen name="dp_153">544.0000dp</dimen>
-	<dimen name="dp_154">547.5556dp</dimen>
-	<dimen name="dp_155">551.1111dp</dimen>
-	<dimen name="dp_156">554.6667dp</dimen>
-	<dimen name="dp_157">558.2222dp</dimen>
-	<dimen name="dp_158">561.7778dp</dimen>
-	<dimen name="dp_159">565.3333dp</dimen>
-	<dimen name="dp_160">568.8889dp</dimen>
-	<dimen name="dp_161">572.4444dp</dimen>
-	<dimen name="dp_162">576.0000dp</dimen>
-	<dimen name="dp_163">579.5556dp</dimen>
-	<dimen name="dp_164">583.1111dp</dimen>
-	<dimen name="dp_165">586.6667dp</dimen>
-	<dimen name="dp_166">590.2222dp</dimen>
-	<dimen name="dp_167">593.7778dp</dimen>
-	<dimen name="dp_168">597.3333dp</dimen>
-	<dimen name="dp_169">600.8889dp</dimen>
-	<dimen name="dp_170">604.4444dp</dimen>
-	<dimen name="dp_171">608.0000dp</dimen>
-	<dimen name="dp_172">611.5556dp</dimen>
-	<dimen name="dp_173">615.1111dp</dimen>
-	<dimen name="dp_174">618.6667dp</dimen>
-	<dimen name="dp_175">622.2222dp</dimen>
-	<dimen name="dp_176">625.7778dp</dimen>
-	<dimen name="dp_177">629.3333dp</dimen>
-	<dimen name="dp_178">632.8889dp</dimen>
-	<dimen name="dp_179">636.4444dp</dimen>
-	<dimen name="dp_180">640.0000dp</dimen>
-	<dimen name="dp_181">643.5556dp</dimen>
-	<dimen name="dp_182">647.1111dp</dimen>
-	<dimen name="dp_183">650.6667dp</dimen>
-	<dimen name="dp_184">654.2222dp</dimen>
-	<dimen name="dp_185">657.7778dp</dimen>
-	<dimen name="dp_186">661.3333dp</dimen>
-	<dimen name="dp_187">664.8889dp</dimen>
-	<dimen name="dp_188">668.4444dp</dimen>
-	<dimen name="dp_189">672.0000dp</dimen>
-	<dimen name="dp_190">675.5556dp</dimen>
-	<dimen name="dp_191">679.1111dp</dimen>
-	<dimen name="dp_192">682.6667dp</dimen>
-	<dimen name="dp_193">686.2222dp</dimen>
-	<dimen name="dp_194">689.7778dp</dimen>
-	<dimen name="dp_195">693.3333dp</dimen>
-	<dimen name="dp_196">696.8889dp</dimen>
-	<dimen name="dp_197">700.4444dp</dimen>
-	<dimen name="dp_198">704.0000dp</dimen>
-	<dimen name="dp_199">707.5556dp</dimen>
-	<dimen name="dp_200">711.1111dp</dimen>
-	<dimen name="dp_201">714.6667dp</dimen>
-	<dimen name="dp_202">718.2222dp</dimen>
-	<dimen name="dp_203">721.7778dp</dimen>
-	<dimen name="dp_204">725.3333dp</dimen>
-	<dimen name="dp_205">728.8889dp</dimen>
-	<dimen name="dp_206">732.4444dp</dimen>
-	<dimen name="dp_207">736.0000dp</dimen>
-	<dimen name="dp_208">739.5556dp</dimen>
-	<dimen name="dp_209">743.1111dp</dimen>
-	<dimen name="dp_210">746.6667dp</dimen>
-	<dimen name="dp_211">750.2222dp</dimen>
-	<dimen name="dp_212">753.7778dp</dimen>
-	<dimen name="dp_213">757.3333dp</dimen>
-	<dimen name="dp_214">760.8889dp</dimen>
-	<dimen name="dp_215">764.4444dp</dimen>
-	<dimen name="dp_216">768.0000dp</dimen>
-	<dimen name="dp_217">771.5556dp</dimen>
-	<dimen name="dp_218">775.1111dp</dimen>
-	<dimen name="dp_219">778.6667dp</dimen>
-	<dimen name="dp_220">782.2222dp</dimen>
-	<dimen name="dp_221">785.7778dp</dimen>
-	<dimen name="dp_222">789.3333dp</dimen>
-	<dimen name="dp_223">792.8889dp</dimen>
-	<dimen name="dp_224">796.4444dp</dimen>
-	<dimen name="dp_225">800.0000dp</dimen>
-	<dimen name="dp_226">803.5556dp</dimen>
-	<dimen name="dp_227">807.1111dp</dimen>
-	<dimen name="dp_228">810.6667dp</dimen>
-	<dimen name="dp_229">814.2222dp</dimen>
-	<dimen name="dp_230">817.7778dp</dimen>
-	<dimen name="dp_231">821.3333dp</dimen>
-	<dimen name="dp_232">824.8889dp</dimen>
-	<dimen name="dp_233">828.4444dp</dimen>
-	<dimen name="dp_234">832.0000dp</dimen>
-	<dimen name="dp_235">835.5556dp</dimen>
-	<dimen name="dp_236">839.1111dp</dimen>
-	<dimen name="dp_237">842.6667dp</dimen>
-	<dimen name="dp_238">846.2222dp</dimen>
-	<dimen name="dp_239">849.7778dp</dimen>
-	<dimen name="dp_240">853.3333dp</dimen>
-	<dimen name="dp_241">856.8889dp</dimen>
-	<dimen name="dp_242">860.4444dp</dimen>
-	<dimen name="dp_243">864.0000dp</dimen>
-	<dimen name="dp_244">867.5556dp</dimen>
-	<dimen name="dp_245">871.1111dp</dimen>
-	<dimen name="dp_246">874.6667dp</dimen>
-	<dimen name="dp_247">878.2222dp</dimen>
-	<dimen name="dp_248">881.7778dp</dimen>
-	<dimen name="dp_249">885.3333dp</dimen>
-	<dimen name="dp_250">888.8889dp</dimen>
-	<dimen name="dp_251">892.4444dp</dimen>
-	<dimen name="dp_252">896.0000dp</dimen>
-	<dimen name="dp_253">899.5556dp</dimen>
-	<dimen name="dp_254">903.1111dp</dimen>
-	<dimen name="dp_255">906.6667dp</dimen>
-	<dimen name="dp_256">910.2222dp</dimen>
-	<dimen name="dp_257">913.7778dp</dimen>
-	<dimen name="dp_258">917.3333dp</dimen>
-	<dimen name="dp_259">920.8889dp</dimen>
-	<dimen name="dp_260">924.4444dp</dimen>
-	<dimen name="dp_261">928.0000dp</dimen>
-	<dimen name="dp_262">931.5556dp</dimen>
-	<dimen name="dp_263">935.1111dp</dimen>
-	<dimen name="dp_264">938.6667dp</dimen>
-	<dimen name="dp_265">942.2222dp</dimen>
-	<dimen name="dp_266">945.7778dp</dimen>
-	<dimen name="dp_267">949.3333dp</dimen>
-	<dimen name="dp_268">952.8889dp</dimen>
-	<dimen name="dp_269">956.4444dp</dimen>
-	<dimen name="dp_270">960.0000dp</dimen>
-	<dimen name="dp_271">963.5556dp</dimen>
-	<dimen name="dp_272">967.1111dp</dimen>
-	<dimen name="dp_273">970.6667dp</dimen>
-	<dimen name="dp_274">974.2222dp</dimen>
-	<dimen name="dp_275">977.7778dp</dimen>
-	<dimen name="dp_276">981.3333dp</dimen>
-	<dimen name="dp_277">984.8889dp</dimen>
-	<dimen name="dp_278">988.4444dp</dimen>
-	<dimen name="dp_279">992.0000dp</dimen>
-	<dimen name="dp_280">995.5556dp</dimen>
-	<dimen name="dp_281">999.1111dp</dimen>
-	<dimen name="dp_282">1002.6667dp</dimen>
-	<dimen name="dp_283">1006.2222dp</dimen>
-	<dimen name="dp_284">1009.7778dp</dimen>
-	<dimen name="dp_285">1013.3333dp</dimen>
-	<dimen name="dp_286">1016.8889dp</dimen>
-	<dimen name="dp_287">1020.4444dp</dimen>
-	<dimen name="dp_288">1024.0000dp</dimen>
-	<dimen name="dp_289">1027.5556dp</dimen>
-	<dimen name="dp_290">1031.1111dp</dimen>
-	<dimen name="dp_291">1034.6667dp</dimen>
-	<dimen name="dp_292">1038.2222dp</dimen>
-	<dimen name="dp_293">1041.7778dp</dimen>
-	<dimen name="dp_294">1045.3333dp</dimen>
-	<dimen name="dp_295">1048.8889dp</dimen>
-	<dimen name="dp_296">1052.4444dp</dimen>
-	<dimen name="dp_297">1056.0000dp</dimen>
-	<dimen name="dp_298">1059.5556dp</dimen>
-	<dimen name="dp_299">1063.1111dp</dimen>
-	<dimen name="dp_300">1066.6667dp</dimen>
-	<dimen name="dp_301">1070.2222dp</dimen>
-	<dimen name="dp_302">1073.7778dp</dimen>
-	<dimen name="dp_303">1077.3333dp</dimen>
-	<dimen name="dp_304">1080.8889dp</dimen>
-	<dimen name="dp_305">1084.4444dp</dimen>
-	<dimen name="dp_306">1088.0000dp</dimen>
-	<dimen name="dp_307">1091.5556dp</dimen>
-	<dimen name="dp_308">1095.1111dp</dimen>
-	<dimen name="dp_309">1098.6667dp</dimen>
-	<dimen name="dp_310">1102.2222dp</dimen>
-	<dimen name="dp_311">1105.7778dp</dimen>
-	<dimen name="dp_312">1109.3333dp</dimen>
-	<dimen name="dp_313">1112.8889dp</dimen>
-	<dimen name="dp_314">1116.4444dp</dimen>
-	<dimen name="dp_315">1120.0000dp</dimen>
-	<dimen name="dp_316">1123.5556dp</dimen>
-	<dimen name="dp_317">1127.1111dp</dimen>
-	<dimen name="dp_318">1130.6667dp</dimen>
-	<dimen name="dp_319">1134.2222dp</dimen>
-	<dimen name="dp_320">1137.7778dp</dimen>
-	<dimen name="dp_321">1141.3333dp</dimen>
-	<dimen name="dp_322">1144.8889dp</dimen>
-	<dimen name="dp_323">1148.4444dp</dimen>
-	<dimen name="dp_324">1152.0000dp</dimen>
-	<dimen name="dp_325">1155.5556dp</dimen>
-	<dimen name="dp_326">1159.1111dp</dimen>
-	<dimen name="dp_327">1162.6667dp</dimen>
-	<dimen name="dp_328">1166.2222dp</dimen>
-	<dimen name="dp_329">1169.7778dp</dimen>
-	<dimen name="dp_330">1173.3333dp</dimen>
-	<dimen name="dp_331">1176.8889dp</dimen>
-	<dimen name="dp_332">1180.4444dp</dimen>
-	<dimen name="dp_333">1184.0000dp</dimen>
-	<dimen name="dp_334">1187.5556dp</dimen>
-	<dimen name="dp_335">1191.1111dp</dimen>
-	<dimen name="dp_336">1194.6667dp</dimen>
-	<dimen name="dp_337">1198.2222dp</dimen>
-	<dimen name="dp_338">1201.7778dp</dimen>
-	<dimen name="dp_339">1205.3333dp</dimen>
-	<dimen name="dp_340">1208.8889dp</dimen>
-	<dimen name="dp_341">1212.4444dp</dimen>
-	<dimen name="dp_342">1216.0000dp</dimen>
-	<dimen name="dp_343">1219.5556dp</dimen>
-	<dimen name="dp_344">1223.1111dp</dimen>
-	<dimen name="dp_345">1226.6667dp</dimen>
-	<dimen name="dp_346">1230.2222dp</dimen>
-	<dimen name="dp_347">1233.7778dp</dimen>
-	<dimen name="dp_348">1237.3333dp</dimen>
-	<dimen name="dp_349">1240.8889dp</dimen>
-	<dimen name="dp_350">1244.4444dp</dimen>
-	<dimen name="dp_351">1248.0000dp</dimen>
-	<dimen name="dp_352">1251.5556dp</dimen>
-	<dimen name="dp_353">1255.1111dp</dimen>
-	<dimen name="dp_354">1258.6667dp</dimen>
-	<dimen name="dp_355">1262.2222dp</dimen>
-	<dimen name="dp_356">1265.7778dp</dimen>
-	<dimen name="dp_357">1269.3333dp</dimen>
-	<dimen name="dp_358">1272.8889dp</dimen>
-	<dimen name="dp_359">1276.4444dp</dimen>
-	<dimen name="dp_360">1280.0000dp</dimen>
-	<dimen name="dp_365">1297.7778dp</dimen>
-	<dimen name="dp_370">1315.5556dp</dimen>
-	<dimen name="dp_400">1422.2222dp</dimen>
-	<dimen name="dp_410">1457.7778dp</dimen>
-	<dimen name="dp_422">1500.4444dp</dimen>
-	<dimen name="dp_472">1678.2222dp</dimen>
-	<dimen name="dp_500">1777.7778dp</dimen>
-	<dimen name="dp_600">2133.3333dp</dimen>
-	<dimen name="dp_640">2275.5556dp</dimen>
-	<dimen name="dp_720">2560.0000dp</dimen>
-	<dimen name="sp_6">21.3333sp</dimen>
-	<dimen name="sp_7">24.8889sp</dimen>
-	<dimen name="sp_8">28.4444sp</dimen>
-	<dimen name="sp_9">32.0000sp</dimen>
-	<dimen name="sp_10">35.5556sp</dimen>
-	<dimen name="sp_11">39.1111sp</dimen>
-	<dimen name="sp_12">42.6667sp</dimen>
-	<dimen name="sp_13">46.2222sp</dimen>
-	<dimen name="sp_14">49.7778sp</dimen>
-	<dimen name="sp_15">53.3333sp</dimen>
-	<dimen name="sp_16">56.8889sp</dimen>
-	<dimen name="sp_17">60.4444sp</dimen>
-	<dimen name="sp_18">64.0000sp</dimen>
-	<dimen name="sp_19">67.5556sp</dimen>
-	<dimen name="sp_20">71.1111sp</dimen>
-	<dimen name="sp_21">74.6667sp</dimen>
-	<dimen name="sp_22">78.2222sp</dimen>
-	<dimen name="sp_23">81.7778sp</dimen>
-	<dimen name="sp_24">85.3333sp</dimen>
-	<dimen name="sp_25">88.8889sp</dimen>
-	<dimen name="sp_28">99.5556sp</dimen>
-	<dimen name="sp_30">106.6667sp</dimen>
-	<dimen name="sp_32">113.7778sp</dimen>
-	<dimen name="sp_34">120.8889sp</dimen>
-	<dimen name="sp_36">128.0000sp</dimen>
-	<dimen name="sp_38">135.1111sp</dimen>
-	<dimen name="sp_40">142.2222sp</dimen>
-	<dimen name="sp_42">149.3333sp</dimen>
-	<dimen name="sp_48">170.6667sp</dimen>
-</resources>