version:1.0.1

update:优化屏幕适配,更换图标
bugfixes:
This commit is contained in:
2024-07-13 15:22:39 +08:00
parent 6142c737e1
commit 4657e3ad2b
251 changed files with 3007 additions and 26518 deletions

View File

@@ -216,6 +216,7 @@
<activity
android:name=".activity.dialer.DialerActivity"
android:configChanges="keyboardHidden"
android:screenOrientation="portrait"
android:launchMode="singleTask" />
<activity
android:name=".activity.phone.PhoneActivity"
@@ -224,9 +225,11 @@
android:screenOrientation="portrait" />
<activity
android:name=".activity.dailyapp.DailyAppActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask" />
<activity
android:name=".activity.contact.ContactActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask" />
<activity
android:name=".activity.code.FamilySpaceActivity"
@@ -243,6 +246,7 @@
android:theme="@style/activity_styles" />
<activity
android:name=".activity.emergency.EmergencyActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask" />
<activity
android:name=".activity.noti.NoticeActivity"
@@ -283,9 +287,11 @@
android:screenOrientation="portrait" />
<activity
android:name=".activity.selectnumber.SelectNumberActivity"
android:screenOrientation="portrait"
android:launchMode="singleTask" />
<activity
android:name=".activity.screenlock.ScreenLockActivity"
android:screenOrientation="portrait"
android:configChanges="keyboardHidden"
android:launchMode="singleTask" />
<activity
@@ -336,6 +342,7 @@
android:theme="@style/activity_styles" />
<activity
android:name=".activity.tts.TtsActivity"
android:screenOrientation="portrait"
android:theme="@style/activity_styles" />

View File

@@ -1,14 +0,0 @@
// IAlarmAidlInterface.aidl
package com.alarmclock.uiui;
// Declare any non-default types here with import statements
interface IAlarmAidlInterface {
/**
* Demonstrates some basic types that you can use as parameters
* and return values in AIDL.
*/
void basicTypes(int anInt, long aLong, boolean aBoolean, float aFloat,
double aDouble, String aString);
String getAlarm();
}

View File

@@ -31,7 +31,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Observer;
import com.alarmclock.uiui.IAlarmAidlInterface;
import com.blankj.utilcode.util.NetworkUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -256,22 +255,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
// mViewModel.getAppList();
registReceiver();
mAlarmServiceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
Log.e(TAG, "onServiceConnected: ");
mIAlarmAidlInterface = IAlarmAidlInterface.Stub.asInterface(service);
getAlarmData();
}
@Override
public void onServiceDisconnected(ComponentName name) {
Log.e(TAG, "onServiceDisconnected: ");
mIAlarmAidlInterface = null;
}
};
bindAlarmService();
RemoteManager.setListener(this);
initAmap();
}
@@ -298,20 +281,7 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
}
private ServiceConnection mAlarmServiceConnection;
private IAlarmAidlInterface mIAlarmAidlInterface;
private void bindAlarmService() {
if (mIAlarmAidlInterface == null) {
//这是连接aidl服务的代码
Intent intent = new Intent();
intent.setAction("com.alarmclock.uiui.IAlarmAidlInterface");
intent.setPackage("com.alarmclock.uiui");
intent.setComponent(new ComponentName("com.alarmclock.uiui", "com.alarmclock.uiui.AIDLAlarmService"));
bindService(intent, mAlarmServiceConnection, Context.BIND_AUTO_CREATE);
} else {
}
}
public static void toggleNotificationListenerService(Context context) {
Log.e(TAG, "toggleNotificationListenerService");
@@ -323,28 +293,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
}
private void getAlarmData() {
if (mIAlarmAidlInterface == null) {
bindAlarmService();
return;
}
try {
String json = mIAlarmAidlInterface.getAlarm();
Log.e(TAG, "onServiceConnected: " + json);
if ("暂无闹钟".equalsIgnoreCase(json) || TextUtils.isEmpty(json)) {
// mCustomFragment.setAlarmItem(null);
return;
}
Type type = new TypeToken<List<AlarmItem>>() {
}.getType();
List<AlarmItem> alarmItem = new Gson().fromJson(json, type);
// mCustomFragment.setAlarmItem(alarmItem);
} catch (RemoteException e) {
e.printStackTrace();
}
}
private void addData() {
Log.e(TAG, "addData: ");
List<Fragment> fragmentList = new ArrayList<>();
@@ -425,7 +373,6 @@ public class MainActivity extends BaseMvvmActivity<MainViewModel, PhoneActivityM
super.onStart();
AppUsedTimeUtils.getInstance().setAppPackageName(BuildConfig.APPLICATION_ID);
AppUsedTimeUtils.getInstance().setStartTime(System.currentTimeMillis());
getAlarmData();
}
@Override

View File

@@ -103,7 +103,7 @@ public class MainViewModel extends BaseViewModel<PhoneActivityMainBinding, Activ
if (Code.OK == weatherBean.getCode()) {
WeatherNowBean.NowBaseBean now = weatherBean.getNow();
LiveEventBus
.get("some_key1")
.get("getWeatherNowKey")
.post(now);
mNowBaseBeanData.postValue(now);
Log.d("getWeatherNow", "onSuccess: now " + new Gson().toJson(now));
@@ -138,7 +138,7 @@ public class MainViewModel extends BaseViewModel<PhoneActivityMainBinding, Activ
WeatherHourlyBean.HourlyBean now = hourly.get(0);
mHourlyBeanData.postValue(now);
LiveEventBus
.get("some_key2")
.get("getWeather24HourlyKey")
.post(now);
}
} else {
@@ -174,7 +174,7 @@ public class MainViewModel extends BaseViewModel<PhoneActivityMainBinding, Activ
WeatherDailyBean.DailyBean dailyBean = weatherDailyBean.getDaily().get(0);
DailyBeanData.postValue(dailyBean);
LiveEventBus
.get("some_key3")
.get("getWeather7DKey")
.post(dailyBean);
}
}

View File

@@ -210,7 +210,7 @@ public class WeatherViewModel extends BaseViewModel<ActivityWeatherBinding, Acti
mWeatherNowData.setValue(weatherBean);
WeatherNowBean.NowBaseBean now = weatherBean.getNow();
LiveEventBus
.get("some_key1")
.get("getWeatherNowKey")
.post(now);
}
});
@@ -238,7 +238,7 @@ public class WeatherViewModel extends BaseViewModel<ActivityWeatherBinding, Acti
mWeatherDailyData.setValue(weatherDailyBean);
WeatherDailyBean.DailyBean dailyBean = weatherDailyBean.getDaily().get(0);
LiveEventBus
.get("some_key3")
.get("getWeather7DKey")
.post(dailyBean);
}
});

View File

@@ -22,6 +22,7 @@ import com.tencent.mmkv.MMKV;
import com.xxpatx.os.R;
import com.xxpatx.os.activity.contact.AddWechatContactActivity;
import com.xxpatx.os.activity.contact.EditContactActivity;
import com.xxpatx.os.activity.weather.WeatherActivity;
import com.xxpatx.os.adapter.WechatContactAdapter;
import com.xxpatx.os.base.mvvm.fragment.BaseMvvmFragment;
import com.xxpatx.os.bean.BaseResponse;
@@ -31,6 +32,8 @@ import com.xxpatx.os.config.CommonConfig;
import com.xxpatx.os.databinding.FragmentContactHomeBinding;
import com.xxpatx.os.dialog.EditContactDialog;
import com.xxpatx.os.utils.DayUtils;
import com.xxpatx.os.utils.ScreenUtils;
import com.xxpatx.os.view.EquallyDividedItemDecoration;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -43,6 +46,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
private FragmentActivity mContext;
private WechatContactAdapter mContactAdapter;
private int SPAN_COUNT;
@Override
protected int getLayoutId() {
@@ -68,10 +72,13 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
}
});
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), 3));
SPAN_COUNT = 3;
} else {
mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), 2));
SPAN_COUNT = 2;
}
mViewDataBinding.rvContact.setLayoutManager(new GridLayoutManager(getContext(), SPAN_COUNT));
EquallyDividedItemDecoration equallyDividedItemDecoration = new EquallyDividedItemDecoration(SPAN_COUNT, ScreenUtils.dip2px(mContext, 6));
mViewDataBinding.rvContact.addItemDecoration(equallyDividedItemDecoration);
mViewDataBinding.rvContact.setAdapter(mContactAdapter);
setTime();
initAmap();
@@ -105,7 +112,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
@Override
protected void initData(Bundle savedInstanceState) {
LiveEventBus
.get("some_key1", WeatherNowBean.NowBaseBean.class)
.get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
.observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
@Override
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
@@ -132,7 +139,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
});
LiveEventBus
.get("some_key2", WeatherHourlyBean.HourlyBean.class)
.get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
.observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
@Override
public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
@@ -152,7 +159,7 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
});
LiveEventBus
.get("some_key3", WeatherDailyBean.DailyBean.class)
.get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
.observe(this, new Observer<WeatherDailyBean.DailyBean>() {
@Override
public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {
@@ -256,5 +263,9 @@ public class ContactFragment extends BaseMvvmFragment<ContactViewModel, Fragment
Intent intent = new Intent(getContext(), AddWechatContactActivity.class);
startActivity(intent);
}
public void toWeather(View view) {
startActivity(new Intent(mContext, WeatherActivity.class));
}
}
}

View File

@@ -224,7 +224,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
}
});
LiveEventBus
.get("some_key1", WeatherNowBean.NowBaseBean.class)
.get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
.observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
@Override
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
@@ -251,7 +251,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
});
LiveEventBus
.get("some_key2", WeatherHourlyBean.HourlyBean.class)
.get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
.observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
@Override
public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
@@ -271,7 +271,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
});
LiveEventBus
.get("some_key3", WeatherDailyBean.DailyBean.class)
.get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
.observe(this, new Observer<WeatherDailyBean.DailyBean>() {
@Override
public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {
@@ -509,7 +509,7 @@ public class HomeFragment extends BaseMvvmFragment<HomeViewModel, FragmentHomeBi
}
public void toVideoplayer(View view) {
ApkUtils.openPackage(mContext, "com.uiui.videoplayer", "com.uiui.videoplayer.activity.main.MainActivity");
ApkUtils.openPackage(mContext, "com.xxpatx.jtxc", "com.xxpatx.jtxc.activity.main.MainActivity");
}
public void openSettings(View view) {

View File

@@ -104,7 +104,7 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
}
});
LiveEventBus
.get("some_key1", WeatherNowBean.NowBaseBean.class)
.get("getWeatherNowKey", WeatherNowBean.NowBaseBean.class)
.observe(this, new Observer<WeatherNowBean.NowBaseBean>() {
@Override
public void onChanged(@Nullable WeatherNowBean.NowBaseBean nowBaseBean) {
@@ -131,7 +131,7 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
});
LiveEventBus
.get("some_key2", WeatherHourlyBean.HourlyBean.class)
.get("getWeather24HourlyKey", WeatherHourlyBean.HourlyBean.class)
.observe(this, new Observer<WeatherHourlyBean.HourlyBean>() {
@Override
public void onChanged(@Nullable WeatherHourlyBean.HourlyBean hourlyBean) {
@@ -151,7 +151,7 @@ public class SettingsFragment extends BaseMvvmFragment<SettingsViewModel, Fragme
});
LiveEventBus
.get("some_key3", WeatherDailyBean.DailyBean.class)
.get("getWeather7DKey", WeatherDailyBean.DailyBean.class)
.observe(this, new Observer<WeatherDailyBean.DailyBean>() {
@Override
public void onChanged(@Nullable WeatherDailyBean.DailyBean dailyBean) {

View File

@@ -0,0 +1,78 @@
package com.xxpatx.os.view;
import android.graphics.Rect;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
public class EquallyDividedItemDecoration extends RecyclerView.ItemDecoration {
private static final String TAG = "EquallyDividedItemDecoration";
private int mSpanCount;//横条目数量
private int mHalfRowSpacing;//行间距的一半
private int mHalfColumnSpacing;// 列间距的一半
public EquallyDividedItemDecoration(int spanCount, int halfRowSpacing) {
mSpanCount = spanCount;
mHalfRowSpacing = halfRowSpacing;
mHalfColumnSpacing = halfRowSpacing;
}
public EquallyDividedItemDecoration(int spanCount, int halfRowSpacing, int halfColumnSpacing) {
mSpanCount = spanCount;
mHalfRowSpacing = halfRowSpacing;
mHalfColumnSpacing = halfColumnSpacing;
}
@Override
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
super.getItemOffsets(outRect, view, parent, state);
int position = parent.getChildAdapterPosition(view); // 获取view 在adapter中的位置。
Log.d(TAG, "getItemOffsets: position = " + position);
int itemCount = parent.getAdapter().getItemCount();//item全部数量
Log.d(TAG, "getItemOffsets: itemCount = " + itemCount);
int column = position % mSpanCount; // view 所在的列
Log.d(TAG, "getItemOffsets: column = " + column);
if (column == 0) {
// outRect.left = 2 * mHalfRowSpacing;
outRect.left = 0;
outRect.right = mHalfRowSpacing;
} else if (column == mSpanCount - 1) {
outRect.left = mHalfRowSpacing;
// outRect.right = 2 * mHalfRowSpacing;
outRect.right = 0;
} else {
outRect.left = mHalfRowSpacing;
outRect.right = mHalfRowSpacing;
}
int row = (position / mSpanCount);//所在行
Log.d(TAG, "getItemOffsets: row = " + row);
int maxRow = (int) Math.ceil((double) itemCount / mSpanCount);//一共多少行
Log.d(TAG, "getItemOffsets: maxRow = " + maxRow);
if (row == 0) {
// outRect.top = 2 * mHalfColumnSpacing;
outRect.top = 0;
outRect.bottom = mHalfColumnSpacing;
} else if (row == maxRow - 1) {
outRect.top = mHalfColumnSpacing;
// outRect.bottom = 2 * mHalfColumnSpacing;
outRect.bottom = 0;
} else {
outRect.top = mHalfColumnSpacing;
outRect.bottom = mHalfColumnSpacing;
}
Log.d(TAG, "getItemOffsets: outRect.left = " + outRect.left);
Log.d(TAG, "getItemOffsets: outRect.right = " + outRect.right);
Log.d(TAG, "getItemOffsets: outRect.top = " + outRect.top);
Log.d(TAG, "getItemOffsets: outRect.bottom = " + outRect.bottom);
}
}

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_20" />
<corners android:radius="20dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_16" />
<corners android:radius="16dp" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_12"
android:right="@dimen/dp_12"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="12dp"
android:right="12dp"
android:top="4dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<padding
android:bottom="@dimen/dp_8"
android:left="@dimen/dp_8"
android:right="@dimen/dp_8"
android:top="@dimen/dp_8" />
android:bottom="8dp"
android:left="8dp"
android:right="8dp"
android:top="8dp" />
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="#5b5b5c" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,11 +3,11 @@
<stroke
android:width="1px"
android:color="@color/action_bar_red" />
<corners android:radius="@dimen/dp_2" />
<corners android:radius="2dp" />
<padding
android:bottom="@dimen/dp_1"
android:left="@dimen/dp_2"
android:right="@dimen/dp_2"
android:top="@dimen/dp_1" />
android:bottom="1dp"
android:left="2dp"
android:right="2dp"
android:top="1dp" />
</shape>

View File

@@ -3,8 +3,8 @@
<!-- 内部颜色 -->
<solid android:color="@color/alarm_background_color" />
<!-- 圆角的幅度 -->
<corners android:topLeftRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
<corners android:topLeftRadius="8dp"
android:bottomLeftRadius="8dp"
/>
<!-- <padding-->

View File

@@ -4,15 +4,15 @@
<solid android:color="#444444" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<padding
android:right="@dimen/dp_8"
android:left="@dimen/dp_8"
android:top="@dimen/dp_8"
android:bottom="@dimen/dp_8"
android:right="8dp"
android:left="8dp"
android:top="8dp"
android:bottom="8dp"
/>
</shape>

View File

@@ -9,18 +9,18 @@
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<!-- paddingButton里面的文字与Button边界的间隔 -->
<!-- <padding-->
<!-- android:bottom="@dimen/dp_10"-->
<!-- android:left="@dimen/dp_10"-->
<!-- android:right="@dimen/dp_10"-->
<!-- android:top="@dimen/dp_10" />-->
<!-- android:bottom="10dp"-->
<!-- android:left="10dp"-->
<!-- android:right="10dp"-->
<!-- android:top="10dp" />-->
</shape>

View File

@@ -11,14 +11,14 @@
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<!-- paddingButton里面的文字与Button边界的间隔 -->
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_8"
android:bottom="4dp"
android:left="8dp"
android:right="0dp"
android:top="@dimen/dp_4" />
android:top="4dp" />
</shape>

View File

@@ -9,18 +9,18 @@
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<!-- paddingButton里面的文字与Button边界的间隔 -->
<!-- <padding-->
<!-- android:bottom="@dimen/dp_10"-->
<!-- android:left="@dimen/dp_10"-->
<!-- android:right="@dimen/dp_10"-->
<!-- android:top="@dimen/dp_10" />-->
<!-- android:bottom="10dp"-->
<!-- android:left="10dp"-->
<!-- android:right="10dp"-->
<!-- android:top="10dp" />-->
</shape>

View File

@@ -9,18 +9,18 @@
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<!-- paddingButton里面的文字与Button边界的间隔 -->
<!-- <padding-->
<!-- android:bottom="@dimen/dp_10"-->
<!-- android:left="@dimen/dp_10"-->
<!-- android:right="@dimen/dp_10"-->
<!-- android:top="@dimen/dp_10" />-->
<!-- android:bottom="10dp"-->
<!-- android:left="10dp"-->
<!-- android:right="10dp"-->
<!-- android:top="10dp" />-->
</shape>

View File

@@ -6,8 +6,8 @@
android:color="@color/red" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_20"
android:topRightRadius="@dimen/dp_20"
android:bottomLeftRadius="@dimen/dp_20"
android:bottomRightRadius="@dimen/dp_20" />
android:topLeftRadius="20dp"
android:topRightRadius="20dp"
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp" />
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 设置背景色(黑色) -->
<item android:id="@android:id/background">
<shape>
<corners android:radius="@dimen/dp_6" />
<corners android:radius="6dp" />
<gradient
android:endColor="@color/progress_bg"
android:startColor="@color/progress_bg" />
@@ -14,7 +14,7 @@
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="@dimen/dp_6" />
<corners android:radius="6dp" />
<gradient
android:endColor="@color/red"
android:startColor="@color/red" />

View File

@@ -7,8 +7,8 @@
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
</shape>

View File

@@ -5,5 +5,5 @@
android:width="0.8dp"
android:color="#ffffff" />
<!-- 圆角 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
</shape>

View File

@@ -4,12 +4,12 @@
<solid android:color="@color/check_update_color" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_20"
android:bottomRightRadius="@dimen/dp_20"
android:topLeftRadius="@dimen/dp_20"
android:topRightRadius="@dimen/dp_20" />
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
<padding
android:left="@dimen/dp_10"
android:right="@dimen/dp_10" />
android:left="10dp"
android:right="10dp" />
</shape>

View File

@@ -4,12 +4,12 @@
<solid android:color="@color/check_update_color_pressed" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_20"
android:bottomRightRadius="@dimen/dp_20"
android:topLeftRadius="@dimen/dp_20"
android:topRightRadius="@dimen/dp_20" />
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
<padding
android:left="@dimen/dp_10"
android:right="@dimen/dp_10" />
android:left="10dp"
android:right="10dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<corners android:bottomLeftRadius="@dimen/dp_8" />
<corners android:bottomLeftRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="#E8E8E8" />
<corners android:bottomLeftRadius="@dimen/dp_8" />
<corners android:bottomLeftRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<corners android:bottomRightRadius="@dimen/dp_8" />
<corners android:bottomRightRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="#E8E8E8" />
<corners android:bottomRightRadius="@dimen/dp_8" />
<corners android:bottomRightRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<corners android:topLeftRadius="@dimen/dp_8" />
<corners android:topLeftRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="#E8E8E8" />
<corners android:topLeftRadius="@dimen/dp_8" />
<corners android:topLeftRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<corners android:topRightRadius="@dimen/dp_8" />
<corners android:topRightRadius="8dp" />
</shape>

View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 内部颜色 -->
<solid android:color="#E8E8E8" />
<corners android:topRightRadius="@dimen/dp_8" />
<corners android:topRightRadius="8dp" />
</shape>

View File

@@ -4,14 +4,14 @@
<solid android:color="#E99830" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_16"
android:bottomRightRadius="@dimen/dp_16"
android:topLeftRadius="@dimen/dp_16"
android:topRightRadius="@dimen/dp_16" />
android:bottomLeftRadius="16dp"
android:bottomRightRadius="16dp"
android:topLeftRadius="16dp"
android:topRightRadius="16dp" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_16"
android:right="@dimen/dp_16"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="16dp"
android:right="16dp"
android:top="4dp" />
</shape>

View File

@@ -6,15 +6,15 @@
android:color="@color/red" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_4"
android:topRightRadius="@dimen/dp_4"
android:bottomLeftRadius="@dimen/dp_4"
android:bottomRightRadius="@dimen/dp_4" />
android:topLeftRadius="4dp"
android:topRightRadius="4dp"
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp" />
<padding
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:top="@dimen/dp_2"
android:bottom="@dimen/dp_2"/>
android:left="4dp"
android:right="4dp"
android:top="2dp"
android:bottom="2dp"/>
</shape>

View File

@@ -7,10 +7,10 @@
android:width="1dp"
android:color="@color/colorPrimary" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_8"
android:right="@dimen/dp_8"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="8dp"
android:right="8dp"
android:top="4dp" />
<corners android:radius="@dimen/dp_4" />
<corners android:radius="4dp" />
</shape>

View File

@@ -4,14 +4,14 @@
<solid android:color="#232323" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_2"
android:bottomRightRadius="@dimen/dp_2"
android:topLeftRadius="@dimen/dp_2"
android:topRightRadius="@dimen/dp_2" />
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp"
android:topLeftRadius="2dp"
android:topRightRadius="2dp" />
<padding
android:bottom="@dimen/dp_1"
android:left="@dimen/dp_2"
android:right="@dimen/dp_2"
android:top="@dimen/dp_1" />
android:bottom="1dp"
android:left="2dp"
android:right="2dp"
android:top="1dp" />
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="#e0e0e0" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<!-- <corners android:radius="@dimen/dp_8" />-->
<!-- <corners android:radius="8dp" />-->
<gradient
android:angle="270"

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="#33FFFFFF" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -5,10 +5,10 @@
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<!-- <padding-->
<!-- android:bottom="4dp"-->

View File

@@ -5,10 +5,10 @@
<solid android:color="@color/control_bg_color" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8" />
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<!-- <padding-->
<!-- android:bottom="4dp"-->

View File

@@ -4,10 +4,10 @@
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
<gradient
android:angle="315"

View File

@@ -4,10 +4,10 @@
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
<gradient
android:angle="315"

View File

@@ -4,10 +4,10 @@
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
<gradient
android:angle="315"

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_32" />
<corners android:radius="32dp" />
<padding
android:bottom="0dp"
android:left="@dimen/dp_20"
android:right="@dimen/dp_20"
android:left="20dp"
android:right="20dp"
android:top="0dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/lightGray" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_32" />
<corners android:radius="32dp" />
<padding
android:bottom="0dp"
android:left="@dimen/dp_20"
android:right="@dimen/dp_20"
android:left="20dp"
android:right="20dp"
android:top="0dp" />
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<!-- <corners android:radius="@dimen/dp_8" />-->
<!-- <corners android:radius="8dp" />-->
<gradient
android:angle="270"

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="#33FFFFFF" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -4,15 +4,15 @@
<item>
<shape android:shape="rectangle">
<solid android:color="#efefef" />
<corners android:radius="@dimen/dp_4" />
<corners android:radius="4dp" />
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="#505050" />-->
<padding
android:bottom="@dimen/dp_2"
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:top="@dimen/dp_2" />
android:bottom="2dp"
android:left="4dp"
android:right="4dp"
android:top="2dp" />
</shape>
</item>
</layer-list>

View File

@@ -3,11 +3,11 @@
<stroke
android:width="1px"
android:color="@color/black" />
<corners android:radius="@dimen/dp_2" />
<corners android:radius="2dp" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="4dp"
android:right="4dp"
android:top="4dp" />
</shape>

View File

@@ -4,5 +4,5 @@
<stroke
android:width="2px"
android:color="@color/lightGray" />
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/alarm_background_color" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_4" />
<corners android:radius="4dp" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_8"
android:right="@dimen/dp_8"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="8dp"
android:right="8dp"
android:top="4dp" />
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="#494949" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_16" />
<corners android:radius="16dp" />
<gradient
android:angle="270"
@@ -11,8 +11,8 @@
android:startColor="#00C5FF" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_16"
android:right="@dimen/dp_16"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="16dp"
android:right="16dp"
android:top="4dp" />
</shape>

View File

@@ -4,12 +4,12 @@
<solid android:color="#0480FF" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_4"
android:bottomRightRadius="@dimen/dp_4"
android:topLeftRadius="@dimen/dp_4"
android:topRightRadius="@dimen/dp_4" />
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
<!-- <padding-->
<!-- android:left="@dimen/dp_10"-->
<!-- android:right="@dimen/dp_10" />-->
<!-- android:left="10dp"-->
<!-- android:right="10dp" />-->
</shape>

View File

@@ -4,12 +4,12 @@
<solid android:color="#00D56B" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_4"
android:bottomRightRadius="@dimen/dp_4"
android:topLeftRadius="@dimen/dp_4"
android:topRightRadius="@dimen/dp_4" />
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
<!-- <padding-->
<!-- android:left="@dimen/dp_10"-->
<!-- android:right="@dimen/dp_10" />-->
<!-- android:left="10dp"-->
<!-- android:right="10dp" />-->
</shape>

View File

@@ -4,12 +4,12 @@
<solid android:color="@color/red" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_4"
android:bottomRightRadius="@dimen/dp_4"
android:topLeftRadius="@dimen/dp_4"
android:topRightRadius="@dimen/dp_4" />
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp"
android:topLeftRadius="4dp"
android:topRightRadius="4dp" />
<!-- <padding-->
<!-- android:left="@dimen/dp_10"-->
<!-- android:right="@dimen/dp_10" />-->
<!-- android:left="10dp"-->
<!-- android:right="10dp" />-->
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<gradient
android:angle="270"

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="#F0F0F0" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_32" />
<corners android:radius="32dp" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_16"
android:right="@dimen/dp_16"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="16dp"
android:right="16dp"
android:top="4dp" />
</shape>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_4" />
<corners android:radius="4dp" />
<padding
android:bottom="0dp"

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/lightGray" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_4" />
<corners android:radius="4dp" />
<padding
android:bottom="0dp"

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<solid android:color="@color/white" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<!-- <padding-->
<!-- android:bottom="0dp"-->

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="#EDEDED" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<padding
android:bottom="@dimen/dp_4"
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:top="@dimen/dp_4" />
android:bottom="4dp"
android:left="4dp"
android:right="4dp"
android:top="4dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="#EDEDED" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_32" />
<corners android:radius="32dp" />
<padding
android:bottom="0dp"
android:left="@dimen/dp_16"
android:right="@dimen/dp_16"
android:left="16dp"
android:right="16dp"
android:top="0dp" />
</shape>

View File

@@ -4,15 +4,15 @@
<solid android:color="#EAE8E8" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:right="@dimen/dp_20"
android:left="@dimen/dp_20"
android:top="@dimen/dp_8"
android:bottom="@dimen/dp_8"
android:right="20dp"
android:left="20dp"
android:top="8dp"
android:bottom="8dp"
/>
</shape>

View File

@@ -3,6 +3,6 @@
<!-- 内部颜色 -->
<solid android:color="#F1F1F1" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_2" />
<corners android:radius="2dp" />
</shape>

View File

@@ -5,15 +5,15 @@
<!-- 圆角的幅度 -->
<!-- <corners-->
<!-- android:bottomLeftRadius="@dimen/dp_8"-->
<!-- android:bottomRightRadius="@dimen/dp_8"-->
<!-- android:topLeftRadius="@dimen/dp_8"-->
<!-- android:topRightRadius="@dimen/dp_8" />-->
<!-- android:bottomLeftRadius="8dp"-->
<!-- android:bottomRightRadius="8dp"-->
<!-- android:topLeftRadius="8dp"-->
<!-- android:topRightRadius="8dp" />-->
<!-- <padding-->
<!-- android:right="@dimen/dp_8"-->
<!-- android:left="@dimen/dp_8"-->
<!-- android:top="@dimen/dp_8"-->
<!-- android:bottom="@dimen/dp_8"-->
<!-- android:right="8dp"-->
<!-- android:left="8dp"-->
<!-- android:top="8dp"-->
<!-- android:bottom="8dp"-->
<!-- />-->
</shape>

View File

@@ -5,14 +5,14 @@
<solid android:color="@color/tv_add_color" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:bottom="@dimen/dp_6"
android:left="@dimen/dp_20"
android:right="@dimen/dp_20"
android:top="@dimen/dp_6" />
android:bottom="6dp"
android:left="20dp"
android:right="20dp"
android:top="6dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<padding
android:bottom="@dimen/dp_8"
android:left="@dimen/dp_32"
android:right="@dimen/dp_32"
android:top="@dimen/dp_8" />
android:bottom="8dp"
android:left="32dp"
android:right="32dp"
android:top="8dp" />
</shape>

View File

@@ -6,8 +6,8 @@
android:color="@color/default_blue" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_2"
android:topRightRadius="@dimen/dp_2"
android:bottomLeftRadius="@dimen/dp_2"
android:bottomRightRadius="@dimen/dp_2" />
android:topLeftRadius="2dp"
android:topRightRadius="2dp"
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp" />
</shape>

View File

@@ -4,5 +4,5 @@
<stroke
android:width="3px"
android:color="@color/action_bar_red" />
<corners android:radius="@dimen/dp_4" />
<corners android:radius="4dp" />
</shape>

View File

@@ -11,7 +11,7 @@
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="#fff" />-->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<solid android:color="@color/control_bg_color" />
</shape>
</item>
@@ -35,7 +35,7 @@
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="#fff" />-->
<corners android:radius="@dimen/dp_8" />
<corners android:radius="8dp" />
<solid android:color="@color/control_text_color" />
</shape>
</clip>

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -3,7 +3,7 @@
<!-- 内部颜色 -->
<!-- <solid android:color="@color/default_blue" />-->
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_12" />
<corners android:radius="12dp" />
<!-- <gradient-->
<!-- android:angle="270"-->

View File

@@ -6,14 +6,14 @@
android:color="@color/settings_color_bg" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
<!-- <padding-->
<!-- android:left="@dimen/dp_4"-->
<!-- android:right="@dimen/dp_4"-->
<!-- android:top="@dimen/dp_4"-->
<!-- android:bottom="@dimen/dp_4"/>-->
<!-- android:left="4dp"-->
<!-- android:right="4dp"-->
<!-- android:top="4dp"-->
<!-- android:bottom="4dp"/>-->
</shape>

View File

@@ -3,8 +3,8 @@
<item android:id="@android:id/background">
<shape>
<solid android:color="#FFFFFF" />
<size android:height="@dimen/dp_14" />
<corners android:radius="@dimen/dp_14" />
<size android:height="14dp" />
<corners android:radius="14dp" />
</shape>
</item>
@@ -15,8 +15,8 @@
android:centerColor="#FFFFFF"
android:endColor="#FFFFFF"
android:startColor="#FFFFFF" />
<size android:height="@dimen/dp_14" />
<corners android:radius="@dimen/dp_14" />
<size android:height="14dp" />
<corners android:radius="14dp" />
</shape>
</clip>
</item>

View File

@@ -3,10 +3,10 @@
android:shape="oval">
<size
android:width="@dimen/dp_14"
android:height="@dimen/dp_14" />
android:width="14dp"
android:height="14dp" />
<stroke
android:width="@dimen/dp_2"
android:width="2dp"
android:color="#ffe6d4" />
<solid android:color="@color/control_text_color" />
</shape>

View File

@@ -4,14 +4,14 @@
<solid android:color="#fdedbc" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_20"
android:bottomRightRadius="@dimen/dp_20"
android:topLeftRadius="@dimen/dp_20"
android:topRightRadius="@dimen/dp_20" />
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
<padding
android:top="@dimen/dp_4"
android:right="@dimen/dp_8"
android:left="@dimen/dp_8"
android:bottom="@dimen/dp_4" />
android:top="4dp"
android:right="8dp"
android:left="8dp"
android:bottom="4dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/black" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_2" />
<corners android:radius="2dp" />
<padding
android:bottom="0dp"
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:left="4dp"
android:right="4dp"
android:top="0dp" />
</shape>

View File

@@ -3,11 +3,11 @@
<!-- 内部颜色 -->
<solid android:color="@color/gray" />
<!-- 圆角的幅度 -->
<corners android:radius="@dimen/dp_2" />
<corners android:radius="2dp" />
<padding
android:bottom="0dp"
android:left="@dimen/dp_4"
android:right="@dimen/dp_4"
android:left="4dp"
android:right="4dp"
android:top="0dp" />
</shape>

View File

@@ -6,11 +6,11 @@
android:color="@color/tv_add_color" />
<!-- 圆角的幅度 -->
<corners
android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_8"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8" />
android:topLeftRadius="8dp"
android:topRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp" />
<padding android:top="@dimen/dp_8"
android:bottom="@dimen/dp_8"/>
<padding android:top="8dp"
android:bottom="8dp"/>
</shape>

View File

@@ -5,14 +5,14 @@
<solid android:color="#FFFFFF" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:bottom="@dimen/dp_8"
android:left="@dimen/dp_16"
android:right="@dimen/dp_16"
android:top="@dimen/dp_8" />
android:bottom="8dp"
android:left="16dp"
android:right="16dp"
android:top="8dp" />
</shape>

View File

@@ -4,13 +4,13 @@
<solid android:color="@color/default_gray" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:left="@dimen/dp_12"
android:right="@dimen/dp_12" />
android:left="12dp"
android:right="12dp" />
</shape>

View File

@@ -4,13 +4,13 @@
<solid android:color="#00d56b" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:left="@dimen/dp_12"
android:right="@dimen/dp_12" />
android:left="12dp"
android:right="12dp" />
</shape>

View File

@@ -4,13 +4,13 @@
<solid android:color="#e5004f" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:left="@dimen/dp_12"
android:right="@dimen/dp_12" />
android:left="12dp"
android:right="12dp" />
</shape>

View File

@@ -4,13 +4,13 @@
<solid android:color="@color/alarm_clock_blue" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:left="@dimen/dp_12"
android:right="@dimen/dp_12" />
android:left="12dp"
android:right="12dp" />
</shape>

View File

@@ -4,13 +4,13 @@
<solid android:color="#ffb70d" />
<!-- 圆角的幅度 -->
<corners
android:bottomLeftRadius="@dimen/dp_32"
android:bottomRightRadius="@dimen/dp_32"
android:topLeftRadius="@dimen/dp_32"
android:topRightRadius="@dimen/dp_32" />
android:bottomLeftRadius="32dp"
android:bottomRightRadius="32dp"
android:topLeftRadius="32dp"
android:topRightRadius="32dp" />
<padding
android:left="@dimen/dp_12"
android:right="@dimen/dp_12" />
android:left="12dp"
android:right="12dp" />
</shape>

Some files were not shown because too many files have changed in this diff Show More