From 1f10ffe612e8353867b988ec44e0d40b1a8730a0 Mon Sep 17 00:00:00 2001 From: SiberiaDante <994537867@qq.com> Date: Thu, 21 Sep 2017 22:37:51 +0800 Subject: [PATCH] change project --- README.md | 138 ++++++++--------- .../siberiadante/custom/constant/AppInfo.java | 12 +- .../custom/http/RetrofitManager.java | 4 +- .../http/interceptor/RsqCheckInterceptor.java | 4 +- .../custom/http/manager/CacheInterceptor.java | 6 +- .../custom/ui/activity/BaseActivity.java | 6 +- .../custom/ui/activity/MainActivity.java | 12 +- .../custom/ui/fragment/OneFragment.java | 4 +- .../custom/ui/fragment/TwoFragment.java | 18 +-- .../custom/util/ImageLoadUtil.java | 3 - .../widget/GuideSlideImagePointView.java | 10 +- .../custom/widget/TitleLayout.java | 1 - .../src/main/res/layout/activity_main.xml | 8 +- doc/view/SDTitleBar.md | 64 ++++++++ sample/src/main/AndroidManifest.xml | 2 +- .../com/sample/adapter/CustomAdapter.java | 2 - .../java/com/sample/constants/AppInfo.java | 26 ++-- .../java/com/sample/ui/BaseFragmentN.java | 4 +- .../com/sample/ui/activity/BaseActivity.java | 29 ++-- .../com/sample/ui/activity/MainActivity.java | 6 +- .../sample/ui/activity/SecondActivity.java | 10 +- .../com/sample/ui/activity/WebActivity.java | 7 +- .../sample/ui/activity/WebViewActivity.java | 4 +- .../activity/util/ActivityUtilActivity.java | 10 +- .../sample/ui/activity/util/AppActivity.java | 62 ++++---- .../ui/activity/util/ClearActivity.java | 16 +- .../ui/activity/util/DateUtilActivity.java | 28 ++-- .../ui/activity/util/LogUtilActivity.java | 4 +- .../ui/activity/util/NetworkActivity.java | 10 +- .../ui/activity/util/NumberActivity.java | 4 +- .../ui/activity/util/SDCardUtilActivity.java | 44 +++--- .../ui/activity/util/ScreenActivity.java | 14 +- .../ui/activity/util/ToastActivity.java | 6 +- .../ui/activity/view/DialogActivity.java | 14 +- .../ui/activity/view/ImageSpanActivity.java | 9 +- .../com/sample/ui/fragment/MainFragment.java | 25 +--- .../com/sample/ui/fragment/OtherFragment.java | 7 +- .../com/sample/ui/fragment/UtilFragment.java | 13 +- .../com/sample/ui/fragment/ViewFragment.java | 16 +- .../main/java/com/sample/util/JumpUtils.java | 16 +- sample/src/main/res/layout/activity_app.xml | 2 +- sample/src/main/res/layout/activity_clear.xml | 4 - .../main/res/layout/activity_date_util.xml | 2 +- .../src/main/res/layout/activity_dialog.xml | 2 +- .../main/res/layout/activity_image_span.xml | 9 ++ .../main/res/layout/activity_key_board.xml | 15 +- sample/src/main/res/layout/activity_main.xml | 8 +- .../layout/activity_permission_manager.xml | 1 + .../layout/activity_qqexercise_pedometer.xml | 4 +- .../main/res/layout/activity_screen_test.xml | 28 ++-- .../main/res/layout/activity_sdcard_util.xml | 1 + .../main/res/layout/activity_shape_view.xml | 2 +- .../main/res/layout/activity_title_layout.xml | 36 +++-- sample/src/main/res/values/colors.xml | 1 + .../com/siberiadante/lib/SiberiaDanteLib.java | 4 +- .../siberiadante/lib/base/BaseActivity.java | 4 +- .../lib/bean/{AppInfo.java => SDAppInfo.java} | 6 +- .../siberiadante/lib/constants/AppInfo.java | 8 +- .../siberiadante/lib/util/CrashHandler.java | 8 +- .../siberiadante/lib/util/EncryptUtil.java | 2 +- ...{ActivityUtil.java => SDActivityUtil.java} | 4 +- .../lib/util/{AppUtil.java => SDAppUtil.java} | 64 ++++---- .../util/{ClearUtil.java => SDClearUtil.java} | 25 ++-- .../util/{CloseUtil.java => SDCloseUtil.java} | 15 +- .../util/{DateUtil.java => SDDateUtil.java} | 2 +- .../util/{FileUtil.java => SDFileUtil.java} | 26 ++-- .../{IntentUtil.java => SDIntentUtil.java} | 20 +-- ...{KeyBoardUtil.java => SDKeyBoardUtil.java} | 4 +- .../lib/util/{LogUtil.java => SDLogUtil.java} | 26 ++-- .../util/{MathUtil.java => SDMathUtil.java} | 2 +- .../{NetWorkUtil.java => SDNetWorkUtil.java} | 10 +- .../{NumberUtil.java => SDNumberUtil.java} | 2 +- .../lib/util/{SPUtil.java => SDSPUtil.java} | 6 +- .../{ScreenUtil.java => SDScreenUtil.java} | 10 +- .../{SDCardUtil.java => SDStorageUtil.java} | 6 +- .../{StringUtil.java => SDStringUtil.java} | 6 +- .../com/siberiadante/lib/util/SDToast.java | 4 +- ...sitionTools.java => SDTransitionUtil.java} | 2 +- .../com/siberiadante/lib/util/ShellUtil.java | 2 +- .../view/base/nicedialog/BaseNiceDialog.java | 10 +- .../SDBottomDialog.java} | 31 ++-- .../lib/view/dialog/SDEditDialog.java | 2 +- .../lib/view/dialog/SDEnsureDialog.java | 2 +- .../lib/view/titlebar/SDTitleBar.java | 16 +- .../lib/view/titlebar/SDTitleLayout.java | 73 ++++----- .../lib/widget/JustifyTextView.java | 6 +- .../lib/widget/LetterSpaceTextView.java | 77 ---------- ...eSpan.java => SDCenterAlignImageSpan.java} | 6 +- .../{HexagonView.java => SDHexagonView.java} | 26 ++-- ...TabRadioButton.java => SDRadioButton.java} | 22 +-- .../lib/widget/WrapRecyclerView.java | 141 ------------------ ...layout.xml => sd_bottom_dialog_layout.xml} | 0 ...lert_edit.xml => sd_dialog_alert_edit.xml} | 0 ...layout.xml => sd_dialog_ensure_layout.xml} | 0 .../{title_layout.xml => sd_title_layout.xml} | 0 .../{toast_layout.xml => sd_toast_layout.xml} | 0 siberiadante/src/main/res/values/attrs.xml | 4 +- siberiadante/src/main/res/values/colors.xml | 1 + 98 files changed, 648 insertions(+), 830 deletions(-) create mode 100644 doc/view/SDTitleBar.md rename siberiadante/src/main/java/com/siberiadante/lib/bean/{AppInfo.java => SDAppInfo.java} (92%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{ActivityUtil.java => SDActivityUtil.java} (99%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{AppUtil.java => SDAppUtil.java} (92%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{ClearUtil.java => SDClearUtil.java} (70%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{CloseUtil.java => SDCloseUtil.java} (72%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{DateUtil.java => SDDateUtil.java} (99%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{FileUtil.java => SDFileUtil.java} (98%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{IntentUtil.java => SDIntentUtil.java} (94%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{KeyBoardUtil.java => SDKeyBoardUtil.java} (98%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{LogUtil.java => SDLogUtil.java} (91%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{MathUtil.java => SDMathUtil.java} (95%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{NetWorkUtil.java => SDNetWorkUtil.java} (97%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{NumberUtil.java => SDNumberUtil.java} (96%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{SPUtil.java => SDSPUtil.java} (97%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{ScreenUtil.java => SDScreenUtil.java} (98%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{SDCardUtil.java => SDStorageUtil.java} (99%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{StringUtil.java => SDStringUtil.java} (94%) rename siberiadante/src/main/java/com/siberiadante/lib/util/{TransitionTools.java => SDTransitionUtil.java} (98%) rename siberiadante/src/main/java/com/siberiadante/lib/view/{BottomPopupWindow.java => dialog/SDBottomDialog.java} (89%) delete mode 100644 siberiadante/src/main/java/com/siberiadante/lib/widget/LetterSpaceTextView.java rename siberiadante/src/main/java/com/siberiadante/lib/widget/{CenterAlignImageSpan.java => SDCenterAlignImageSpan.java} (91%) rename siberiadante/src/main/java/com/siberiadante/lib/widget/{HexagonView.java => SDHexagonView.java} (86%) rename siberiadante/src/main/java/com/siberiadante/lib/widget/{TabRadioButton.java => SDRadioButton.java} (79%) delete mode 100644 siberiadante/src/main/java/com/siberiadante/lib/widget/WrapRecyclerView.java rename siberiadante/src/main/res/layout/{popup_window_bottom_layout.xml => sd_bottom_dialog_layout.xml} (100%) rename siberiadante/src/main/res/layout/{dialog_alert_edit.xml => sd_dialog_alert_edit.xml} (100%) rename siberiadante/src/main/res/layout/{dialog_ensure_layout.xml => sd_dialog_ensure_layout.xml} (100%) rename siberiadante/src/main/res/layout/{title_layout.xml => sd_title_layout.xml} (100%) rename siberiadante/src/main/res/layout/{toast_layout.xml => sd_toast_layout.xml} (100%) diff --git a/README.md b/README.md index fb314e4..99ab88a 100644 --- a/README.md +++ b/README.md @@ -24,99 +24,103 @@ dependencies { > [版本更新说明](https://github.com/SiberiaDante/SiberiaDanteLib/blob/5a8051c462060e62fc78b47eb05c9b35cb8adc99/VERSION_UPDATE.md) ## view -* [EditDialog] :仿IOS弹出可编辑dialog([使用:sample/activity/DialogActivity]) -* [BottomPopupWindow] :仿IOS底部弹出可拓展dialog([使用:sample/activity/DialogActivity]) -* [EnsureDialog] 常规提示确认dialog([使用:sample/activity/DialogActivity]) +### Dialog相关 +* [SDBottomDialog] :仿IOS底部弹出可拓展dialog +* [SDCustomDialog] :通用可自定义的dialog +* [SDEditDialog] :仿IOS弹出可编辑dialog +* [SDEnsureDialog] 常规提示确认dialog +* [SDEnsureSubDialog] 常规提示确认dialog,带标题，可设置log +* [NiceDialog] + * [PicassoCircleTransfer] :Picasso加载图片时将图片转换为圆形工具 -* [QQStepView] :自定义View实现仿QQ运动步数功能([使用:sample/activity/QQStepViewActivity]) -* [TitleBar] :常规的titleBar的封装，一般的titleBar均可([使用:TitleBar使用说明]) +* [QQStepView] :自定义View实现仿QQ运动步数功能 +### 标题栏相关 +* [SDTitleBar] :常规的titleBar的封装，一般的titleBar均可([使用:SDTitleBar使用说明]) +* [SDTitleLayout] :常规的能够满足开发需求的标题栏的封装，一般的titleBar均可([使用:SDTitleLayout使用说明]) ## widget -* [CenterAlignImageSpan] :图文混排对齐 -* [HexagonView] :正六边形 -* [JustifyTextView] :适用文字对齐，错乱修正等；原文地址：https://github.com/ufo22940268/android-justifiedtextview -* [PhotoViewPager] :可左右滑动照片查看器(案例：[使用:sample/activity/PhotoViewActivity]) -* [RoundImage] :圆形ImageView控件,直接在布局中使用([使用:sample/res/layout/fragment_view.xml]) -* [RoundFrameLayout] :可在布局中直接设置shape相关的属性（背景颜色、角度等） -* [RoundLinearLayout] :可在布局中直接设置shape相关的属性（背景颜色、角度等） -* [RoundRelativeLayout] :可在布局中直接设置shape相关的属性（背景颜色、角度等） -* [RoundTextView] :可在布局中直接设置shape相关的属性（背景颜色、角度等） +* [SDCenterAlignImageSpan] :图文混排对齐 +* [SDHexagonView] :正六边形TextView +* [SDLetterSpaceTextView] :可设置文字间距的TextView +* [SDRoundFrameLayout] :可在布局中直接设置shape相关的属性（背景颜色、角度等） +* [SDRoundImage] :圆形ImageView控件,直接在布局中使用 +* [SDRoundLinearLayout] :可在布局中直接设置shape相关的属性（背景颜色、角度等） +* [SDRoundRelativeLayout] :可在布局中直接设置shape相关的属性（背景颜色、角度等） +* [SDRoundTextView] :可在布局中直接设置shape相关的属性（背景颜色、角度等） +* [SDRadioButtom] :可设置图片大小的RadioButton * [SuperTextView]：超酷炫的TextView，可以设置出各种特效文字(原文地址：http://www.jianshu.com/p/1b91e11e441d) * [TabRadioButton] :可设置图片尺寸的RadioButton，适用于图文结合的RadioButton +* [JustifyTextView] :适用文字对齐，错乱修正等；原文地址：https://github.com/ufo22940268/android-justifiedtextview +* [PhotoViewPager] :可左右滑动照片查看器 ## util(工具类详细说明文档看[Document_Util]) -* [ActivityUtil] :页面工具类 -* [AppUtil] :获取应用、手机、安卓系统等信息,支持7.0的安装异常，需测试 -* [ClearUtil] :清除缓存、数据等相关应用 -* [CloseUtil] :关闭相关工具类 +* [SDActivityUtil] :页面工具类 +* [SDAppUtil] :获取应用、手机、安卓系统等信息,支持7.0的安装异常，需测试 +* [SDClearUtil] :清除缓存、数据等相关应用 +* [SDCloseUtil] :关闭相关工具类 * [CrashHandler] -* [DateUtil] ：时间、日期转换 +* [SDDateUtil] ：时间、日期转换 * [EncryptUtil] :加密算法相关工具类 -* [FileUtil] :文件处理相关工具类 -* [IntentUtil] ：Intent相关工具类 -* [LogUtil] ：日志打印控制工具类 -* [NetWorkUtil] :网络连接、类型等 -* [NumberUtil] :数字工具类 +* [SDFileUtil] :文件处理相关工具类 +* [SDIntentUtil] ：Intent相关工具类 +* [SDLogUtil] ：日志打印控制工具类 +* [SDNetWorkUtil] :网络连接、类型等 +* [SDNumberUtil] :数字工具类 * [ProcessUtil] -* [ScreenUtil] :屏幕相关工具类 -* [SDCardUtil] ：SD卡以及存储相关工具类 +* [SDScreenUtil] :屏幕相关工具类 +* [SDStorageUtil] ：SD卡以及存储相关工具类 * [ShellUtils] -* [SPUtil] ：SharedPreference的封装，用来储存数据([使用:sample/src/constants/AppInfo.java]) -* [StringUtil] :字符处理相关工具类 -* [ToastUtil] :toast吐司工具类(看下代码自己就可以用Toast写出各种各样的界面） -* [TransitionTools] :dp、px转换 +* [SDSPUtil] ：SharedPreference的封装，用来储存数据([使用:sample/src/constants/AppInfo.java]) +* [SDStringUtil] :字符处理相关工具类 +* [SDToast] :toast吐司工具类(看下代码自己就可以用Toast写出各种各样的界面） +* [SDTransitionUtil] :dp、px转换 参考资料：https://github.com/Blankj/AndroidUtilCode -[EditDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/EditDialog.java -[BottomPopupWindow]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/BottomPopupWindow.java -[EnsureDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/EnsureDialog.java + +[NiceDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/NiceDialog.java +[SDBottomDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDBottomDialog.java +[SDCustomDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDCustomDialog.java +[SDEditDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEditDialog.java +[SDEnsureDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEnsureDialog.java +[SDEnsureSubDialog]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEnsureSubDialog.java + + [PicassoCircleTransfer]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/PicassoCircleTransfer.java [QQStepView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/QQStepView.java -[TitleBar]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/view/TitleBar.java [JustifyTextView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/JustifyTextView.java [PhotoViewPager]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/PhotoViewPager.java -[RoundImage]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/RoundImage.java -[RoundFrameLayout]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/RoundFrameLayout.java -[RoundLinearLayout]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/RoundLinearLayout.java -[RoundRelativeLayout]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/RoundRelativeLayout.java -[RoundTextView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/RoundTextView.java [SuperTextView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SuperTextView.java -[TabRadioButton]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/TabRadioButton.java - - -[使用:sample/activity/DialogActivity]:https://github.com/SiberiaDante/SiberiaDanteLib/blob/master/sample/src/main/java/com/sample/ui/activity/view/DialogActivity.java -[使用:sample/activity/PhotoViewActivity]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/sample/src/main/java/com/sample/ui/activity/view/PhotoViewActivity.java -[使用:sample/activity/QQStepViewActivity]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/sample/src/main/java/com/sample/ui/activity/view/QQStepViewActivity.java -[使用:sample/res/layout/fragment_view.xml]:https://github.com/SiberiaDante/SiberiaDanteLib/blob/master/sample/src/main/res/layout/fragment_view.xml -[使用:TitleBar使用说明]:https://github.com/SiberiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/note/TitleBar.md -[使用:sample/src/constants/AppInfo.java]:https://github.com/SiberiaDante/SiberiaDanteLib/blob/master/sample/src/main/java/com/sample/constants/AppInfo.java - - - +[SDCenterAlignImageSpan]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDCenterAlignImageSpan.java +[SDHexagonView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDHexagonView.java +[SDLetterSpaceTextView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDLetterSpaceTextView.java +[SDRadioButton]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRadioButton.java +[SDRoundFrameLayout]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRoundFrameLayout.java +[SDRoundImage]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRoundImage.java +[SDRoundLinearLayout]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRoundLinearLayout.java +[SDRoundRelativeLayout]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRoundRelativeLayout.java +[SDRoundTextView]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRoundTextView.java -[ActivityUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/ActivityUtil.java -[AppUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/AppUtil.java -[ClearUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/ClearUtil.java -[CloseUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/CloseUtil.java -[DateUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/DateUtil.java +[SDActivityUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDActivityUtil.java +[SDAppUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDAppUtil.java +[SDClearUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDClearUtil.java +[SDCloseUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDCloseUtil.java +[SDDateUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDDateUtil.java [EncryptUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/EncryptUtil.java -[FileUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/FileUtil.java -[IntentUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/IntentUtil.java -[LogUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/LogUtil.java -[NetWorkUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/NetWorkUtil.java -[NumberUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/lib/util/NumberUtil.java -[ScreenUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/ScreenUtil.java -[StringUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/StringUtil.java -[TransitionTools]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/TransitionTools.java -[ToastUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/ToastUtil.java - -[Document_Util]:https://github.com/SiberiaDante/SiberiaDanteLib/blob/6501f32b327dfe511978d7aacef69b145e5a7a0f/DOCUMENT_UTIL.md +[SDFileUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDFileUtil.java +[SDIntentUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDIntentUtil.java +[SDLogUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDLogUtil.java +[SDNetWorkUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDNetWorkUtil.java +[SDNumberUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/lib/util/SDNumberUtil.java +[SDScreenUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDScreenUtil.java +[SDStringUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDStringUtil.java +[SDTransitionUtil]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDTransitionUtil.java +[SDToast]:https://github.com/SibreiaDante/SiberiaDanteLib/blob/master/siberiadante/src/main/java/com/siberiadante/lib/util/SDToast.java diff --git a/customapp/src/main/java/com/siberiadante/custom/constant/AppInfo.java b/customapp/src/main/java/com/siberiadante/custom/constant/AppInfo.java index 0a8ed79..242fb7a 100644 --- a/customapp/src/main/java/com/siberiadante/custom/constant/AppInfo.java +++ b/customapp/src/main/java/com/siberiadante/custom/constant/AppInfo.java @@ -1,6 +1,6 @@ package com.siberiadante.custom.constant; -import com.siberiadante.lib.util.SPUtil; +import com.siberiadante.lib.util.SDSPUtil; /** * @Created SiberiaDante @@ -11,18 +11,18 @@ */ public class AppInfo { - private SPUtil spUtil; + private SDSPUtil SDSPUtil; private AppInfo() { - spUtil = new SPUtil(Constants.INFO); + SDSPUtil = new SDSPUtil(Constants.INFO); } public static AppInfo getInstance() { return AppInfoHolder.appInfo; } - public SPUtil getSpUtil() { - return spUtil; + public SDSPUtil getSDSPUtil() { + return SDSPUtil; } private static class AppInfoHolder { @@ -30,6 +30,6 @@ private static class AppInfoHolder { } public boolean isDebug() { - return spUtil.getBoolean("is_debug"); + return SDSPUtil.getBoolean("is_debug"); } } diff --git a/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java b/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java index 46d1f42..ac3023d 100644 --- a/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java +++ b/customapp/src/main/java/com/siberiadante/custom/http/RetrofitManager.java @@ -5,7 +5,7 @@ import com.siberiadante.custom.constant.AppConfig; import com.siberiadante.custom.constant.Constants; import com.siberiadante.custom.http.manager.NetException; -import com.siberiadante.lib.util.StringUtil; +import com.siberiadante.lib.util.SDStringUtil; import com.siberiadante.lib.util.SDToast; import java.util.concurrent.TimeUnit; @@ -97,7 +97,7 @@ public ObservableSource apply(@NonNull Observable upstream) { public boolean test(@NonNull T t) throws Exception { if (((WrapResult) t).getCode() != 200) { final String errorMsg = ((WrapResult) t).getInfo(); - if (StringUtil.isEmpty(errorMsg)) { + if (SDStringUtil.isEmpty(errorMsg)) { SDToast.toast("服务器内部错误"); } else { SDToast.toast(errorMsg); diff --git a/customapp/src/main/java/com/siberiadante/custom/http/interceptor/RsqCheckInterceptor.java b/customapp/src/main/java/com/siberiadante/custom/http/interceptor/RsqCheckInterceptor.java index c1dfd7d..6c9e9ac 100644 --- a/customapp/src/main/java/com/siberiadante/custom/http/interceptor/RsqCheckInterceptor.java +++ b/customapp/src/main/java/com/siberiadante/custom/http/interceptor/RsqCheckInterceptor.java @@ -1,7 +1,7 @@ package com.siberiadante.custom.http.interceptor; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; import org.json.JSONObject; @@ -32,7 +32,7 @@ public Response intercept(Chain chain) throws IOException { if (code < 200 || code > 300) { throw new IOException(jsonObject.getString("info")); } - LogUtil.d(TAG, responseBody.toString()); + SDLogUtil.d(TAG, responseBody.toString()); } catch (Exception e) { e.printStackTrace(); throw new IOException("parase data error"); diff --git a/customapp/src/main/java/com/siberiadante/custom/http/manager/CacheInterceptor.java b/customapp/src/main/java/com/siberiadante/custom/http/manager/CacheInterceptor.java index 25447d2..3f45efc 100644 --- a/customapp/src/main/java/com/siberiadante/custom/http/manager/CacheInterceptor.java +++ b/customapp/src/main/java/com/siberiadante/custom/http/manager/CacheInterceptor.java @@ -1,6 +1,6 @@ package com.siberiadante.custom.http.manager; -import com.siberiadante.lib.util.NetWorkUtil; +import com.siberiadante.lib.util.SDNetWorkUtil; import java.io.IOException; @@ -24,7 +24,7 @@ public Response intercept(Chain chain) throws IOException { int maxAge = 60 * 60; // 有网络时 设置缓存超时时间1小时 int maxStale = 60 * 60 * 24 * 28; // 无网络时，设置超时为4周 Request request = chain.request(); - if (NetWorkUtil.isNetWorkConnected()) { + if (SDNetWorkUtil.isNetWorkConnected()) { request = request.newBuilder() .addHeader("HXM", "are_you_ok") .cacheControl(CacheControl.FORCE_NETWORK) @@ -36,7 +36,7 @@ public Response intercept(Chain chain) throws IOException { } Response response = chain.proceed(request); - if (NetWorkUtil.isNetWorkConnected()) { + if (SDNetWorkUtil.isNetWorkConnected()) { response = response.newBuilder() .removeHeader("Pragma") .header("Cache-Control", "public, max-age=" + maxAge) diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java b/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java index 35b372a..3985071 100644 --- a/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java +++ b/customapp/src/main/java/com/siberiadante/custom/ui/activity/BaseActivity.java @@ -1,13 +1,11 @@ package com.siberiadante.custom.ui.activity; import android.os.Bundle; -import android.os.PersistableBundle; import android.support.annotation.Nullable; import android.support.v7.app.AppCompatActivity; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; -import butterknife.BindView; import butterknife.ButterKnife; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.disposables.Disposable; @@ -63,6 +61,6 @@ protected void onPause() { protected void onDestroy() { super.onDestroy(); mCompositeDisposable.clear(); - LogUtil.d("onDestroy"); + SDLogUtil.d("onDestroy"); } } diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java b/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java index 3718ba7..b5028ad 100644 --- a/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java +++ b/customapp/src/main/java/com/siberiadante/custom/ui/activity/MainActivity.java @@ -20,9 +20,9 @@ import com.siberiadante.custom.ui.fragment.OneFragment; import com.siberiadante.custom.ui.fragment.ThreeFragment; import com.siberiadante.custom.ui.fragment.TwoFragment; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; import com.siberiadante.lib.util.SDToast; -import com.siberiadante.lib.widget.TabRadioButton; +import com.siberiadante.lib.widget.SDRadioButton; import java.util.List; @@ -46,7 +46,7 @@ public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedCh private long tempTime = 0; private int checkId; @BindViews({R.id.rb_recommend, R.id.rb_shop, R.id.rb_follow, R.id.rb_mine}) - public List radioButtons; + public List radioButtons; @Override protected void beforeSetContentView() { @@ -197,11 +197,11 @@ public void onNext(@NonNull WrapResult> listWrapResult) { final String string = data.toString(); Log.d(TAG, "onNext: " + string); - LogUtil.d(data.get(0).getDescription()); + SDLogUtil.d(data.get(0).getDescription()); - LogUtil.d(data.get(0).getCreate_time()); + SDLogUtil.d(data.get(0).getCreate_time()); - LogUtil.d(data.get(0).getTitle()); + SDLogUtil.d(data.get(0).getTitle()); } diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/OneFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/OneFragment.java index e1312fe..0d46102 100644 --- a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/OneFragment.java +++ b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/OneFragment.java @@ -9,7 +9,7 @@ import com.siberiadante.custom.R; import com.siberiadante.custom.ui.activity.Main2Activity; import com.siberiadante.custom.util.ImageLoadUtil; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; import com.siberiadante.lib.util.SDToast; import java.util.concurrent.TimeUnit; @@ -63,7 +63,7 @@ public void onClick(View v) { .subscribe(new Consumer() { @Override public void accept(@NonNull Long aLong) throws Exception { - LogUtil.d("----timer----"); + SDLogUtil.d("----timer----"); } }); diff --git a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/TwoFragment.java b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/TwoFragment.java index c503047..a2ae227 100644 --- a/customapp/src/main/java/com/siberiadante/custom/ui/fragment/TwoFragment.java +++ b/customapp/src/main/java/com/siberiadante/custom/ui/fragment/TwoFragment.java @@ -14,7 +14,7 @@ import com.siberiadante.custom.http.ApiService; import com.siberiadante.custom.http.Request; import com.siberiadante.custom.http.RetrofitManager; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; import com.siberiadante.lib.util.SDToast; import com.siberiadante.lib.view.titlebar.SDTitleBar; @@ -85,12 +85,12 @@ private void getLoginTest2() { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - LogUtil.d(TAG, "---------------------onSubscribe-----------------------"); + SDLogUtil.d(TAG, "---------------------onSubscribe-----------------------"); } @Override public void onNext(@NonNull WrapResult listWrapResult) { - LogUtil.d(TAG, "onNext:2222222222222222222----------------------- " + listWrapResult.getInfo()); + SDLogUtil.d(TAG, "onNext:2222222222222222222----------------------- " + listWrapResult.getInfo()); // adapter = new NewsAdapter(getActivity(), listWrapResult.getData()); // recyclerView.setAdapter(adapter); mLLProgress.setVisibility(View.GONE); @@ -98,12 +98,12 @@ public void onNext(@NonNull WrapResult listWrapResult) { @Override public void onError(@NonNull Throwable e) { - LogUtil.d(TAG, "onError"); + SDLogUtil.d(TAG, "onError"); } @Override public void onComplete() { - LogUtil.d(TAG, "onComplete"); + SDLogUtil.d(TAG, "onComplete"); mLLProgress.setVisibility(View.GONE); } }); @@ -123,12 +123,12 @@ private void getLoginTest() { .subscribe(new Observer>() { @Override public void onSubscribe(@NonNull Disposable d) { - LogUtil.d(TAG, "---------------------onSubscribe-----------------------"); + SDLogUtil.d(TAG, "---------------------onSubscribe-----------------------"); } @Override public void onNext(@NonNull WrapResult listWrapResult) { - LogUtil.d(TAG, "onNext:11111111111111111----------------------- " + listWrapResult.getInfo()); + SDLogUtil.d(TAG, "onNext:11111111111111111----------------------- " + listWrapResult.getInfo()); // adapter = new NewsAdapter(getActivity(), listWrapResult.getData()); // recyclerView.setAdapter(adapter); mLLProgress.setVisibility(View.GONE); @@ -136,13 +136,13 @@ public void onNext(@NonNull WrapResult listWrapResult) { @Override public void onError(@NonNull Throwable e) { - LogUtil.d(TAG, "onError"); + SDLogUtil.d(TAG, "onError"); } @Override public void onComplete() { - LogUtil.d(TAG, "onComplete"); + SDLogUtil.d(TAG, "onComplete"); mLLProgress.setVisibility(View.GONE); } }); diff --git a/customapp/src/main/java/com/siberiadante/custom/util/ImageLoadUtil.java b/customapp/src/main/java/com/siberiadante/custom/util/ImageLoadUtil.java index 790cb6b..5630f8a 100644 --- a/customapp/src/main/java/com/siberiadante/custom/util/ImageLoadUtil.java +++ b/customapp/src/main/java/com/siberiadante/custom/util/ImageLoadUtil.java @@ -1,7 +1,5 @@ package com.siberiadante.custom.util; -import android.content.Context; - import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.controller.BaseControllerListener; import com.facebook.drawee.drawable.ScalingUtils; @@ -12,7 +10,6 @@ import com.facebook.drawee.view.SimpleDraweeView; import com.siberiadante.custom.R; import com.siberiadante.custom.ui.MyApplication; -import com.siberiadante.lib.util.StringUtil; /** * @Created SiberiaDante diff --git a/customapp/src/main/java/com/siberiadante/custom/widget/GuideSlideImagePointView.java b/customapp/src/main/java/com/siberiadante/custom/widget/GuideSlideImagePointView.java index ab1f2a5..62b90a8 100644 --- a/customapp/src/main/java/com/siberiadante/custom/widget/GuideSlideImagePointView.java +++ b/customapp/src/main/java/com/siberiadante/custom/widget/GuideSlideImagePointView.java @@ -9,7 +9,7 @@ import android.widget.LinearLayout; import com.siberiadante.custom.R; -import com.siberiadante.lib.util.TransitionTools; +import com.siberiadante.lib.util.SDTransitionUtil; @TargetApi(Build.VERSION_CODES.HONEYCOMB) @@ -43,15 +43,15 @@ public void setCurrentSelectPoint(int currentIndex) { if (currentIndex == i) { iv.setImageResource(R.mipmap.guide_icon_true); layoutParams = new LayoutParams( - TransitionTools.dp2px(12), TransitionTools.dp2px(12)); + SDTransitionUtil.dp2px(12), SDTransitionUtil.dp2px(12)); } else { iv.setImageResource(R.mipmap.guide_icon_false); layoutParams = new LayoutParams( - TransitionTools.dp2px(9), TransitionTools.dp2px(9)); + SDTransitionUtil.dp2px(9), SDTransitionUtil.dp2px(9)); } - layoutParams.leftMargin = TransitionTools.dp2px(5); - layoutParams.rightMargin = TransitionTools.dp2px(5); + layoutParams.leftMargin = SDTransitionUtil.dp2px(5); + layoutParams.rightMargin = SDTransitionUtil.dp2px(5); iv.setLayoutParams(layoutParams); this.addView(iv); } diff --git a/customapp/src/main/java/com/siberiadante/custom/widget/TitleLayout.java b/customapp/src/main/java/com/siberiadante/custom/widget/TitleLayout.java index 43e3dec..db3e7ac 100644 --- a/customapp/src/main/java/com/siberiadante/custom/widget/TitleLayout.java +++ b/customapp/src/main/java/com/siberiadante/custom/widget/TitleLayout.java @@ -15,7 +15,6 @@ import android.widget.TextView; import com.siberiadante.custom.R; -import com.siberiadante.lib.util.LogUtil; /** diff --git a/customapp/src/main/res/layout/activity_main.xml b/customapp/src/main/res/layout/activity_main.xml index dbea6df..58142f4 100644 --- a/customapp/src/main/res/layout/activity_main.xml +++ b/customapp/src/main/res/layout/activity_main.xml @@ -22,14 +22,14 @@ android:layout_height="50dp" android:orientation="horizontal"> - - - - +``` +* 项目使用沉浸式状态栏的话，设置titleBar沉浸式： +``` + titleBar.setImmersive(true); + ``` +* 左侧以返回关功能为主：不显示内容或者显示图片+文字（仿IOS），可自己设置图片、文字，也可以使用默认文字图片 +``` + titleBar.setLeftImage(R.mipmap.back); + titleBar.setLeftText("返回"); + titleBar.setLeftListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ToastUtil.toast("点击了左侧"); + } + }); +``` +* 右侧可设置一个图片或者不显示内容，有监听事件 +``` + titleBar.setRightImage(R.mipmap.search); + titleBar.setRightListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ToastUtil.toast("点击了右侧"); + } + }); +``` +* 设置标题（可设置主标题和副标题，可设置字体颜色、字体，标题点击监听） +``` + titleBar.setTitle("各种Dialog组件封装"); + titleBar.setSubTitle("SiberiaDante"); + titleBar.setSubTitleColor(getResources().getColor(R.color.gray)); + titleBar.setTitleListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + ToastUtil.showTextLong("点击了标题"); + } + }); + ``` +* TitleBar设置底部分割线，可以是颜色、图片等 +``` + titleBar.setDivideBackground(getResources().getColor(R.color.colorPrimary)); +``` \ No newline at end of file diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 509d5a4..86d9fc0 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -32,7 +32,7 @@ + /> apkNameAll = AppUtil.getApkNameAll(); + final ArrayList apkNameAll = SDAppUtil.getApkNameAll(); for (int i = 0; i < apkNameAll.size(); i++) { final String s = apkNameAll.get(i); - LogUtil.d(TAG, "name---" + s); + SDLogUtil.d(TAG, "name---" + s); return s; } return null; @@ -83,22 +83,22 @@ private String getApkAll() { public void onClick(View view) { switch (view.getId()) { case R.id.un_install_app: -// AppUtil.unInstallApp("com.sample"); -// AppUtil.unInstallApp(this, "com.sample", 0); - boolean b = AppUtil.uninstallAppSilent("com.shuinsen.zhiri", false); +// SDAppUtil.unInstallApp("com.sample"); +// SDAppUtil.unInstallApp(this, "com.sample", 0); + boolean b = SDAppUtil.uninstallAppSilent("com.shuinsen.zhiri", false); Log.d(TAG, "onClick: uninstallAppSilent:" + b); break; case R.id.install_app: InputStream abpath = getClass().getResourceAsStream("/assets/japanStory"); try { String path = new String(InputStreamToByte(abpath)); - AppUtil.installApp(path, "com.sample.provider"); + SDAppUtil.installApp(path, "com.sample.provider"); } catch (IOException e) { e.printStackTrace(); } break; case R.id.setting_app: - AppUtil.openAppDetailsSettings(); + SDAppUtil.openAppDetailsSettings(); break; case R.id.iv_icon: setResult(10); diff --git a/sample/src/main/java/com/sample/ui/activity/util/ClearActivity.java b/sample/src/main/java/com/sample/ui/activity/util/ClearActivity.java index 2a5b275..76bac8c 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/ClearActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/ClearActivity.java @@ -5,7 +5,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.ClearUtil; +import com.siberiadante.lib.util.SDClearUtil; import java.io.File; @@ -26,13 +26,13 @@ private void initView() { private void initData() { File file = new File(""); - Log.d(TAG, "initData: clearInternalCache=" + ClearUtil.clearInternalCache()); - Log.d(TAG, "initData: clearInternalFiles=" + ClearUtil.clearInternalFiles()); - Log.d(TAG, "initData: clearInternalDbs=" + ClearUtil.clearInternalDbs()); - Log.d(TAG, "initData: clearInternalDbByName(String dbName)=" + ClearUtil.clearInternalDbByName("www")); - Log.d(TAG, "initData: clearInternalSP=" + ClearUtil.clearInternalSP()); - Log.d(TAG, "initData: " + ClearUtil.clearCustomCache("")); - Log.d(TAG, "initData: " + ClearUtil.clearCustomCache(file)); + Log.d(TAG, "initData: clearInternalCache=" + SDClearUtil.clearInternalCache()); + Log.d(TAG, "initData: clearInternalFiles=" + SDClearUtil.clearInternalFiles()); + Log.d(TAG, "initData: clearInternalDbs=" + SDClearUtil.clearInternalDbs()); + Log.d(TAG, "initData: clearInternalDbByName(String dbName)=" + SDClearUtil.clearInternalDbByName("www")); + Log.d(TAG, "initData: clearInternalSP=" + SDClearUtil.clearInternalSP()); + Log.d(TAG, "initData: " + SDClearUtil.clearCustomCache("")); + Log.d(TAG, "initData: " + SDClearUtil.clearCustomCache(file)); } diff --git a/sample/src/main/java/com/sample/ui/activity/util/DateUtilActivity.java b/sample/src/main/java/com/sample/ui/activity/util/DateUtilActivity.java index e7df832..3818965 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/DateUtilActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/DateUtilActivity.java @@ -5,7 +5,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.DateUtil; +import com.siberiadante.lib.util.SDDateUtil; public class DateUtilActivity extends BaseActivity { @@ -15,36 +15,36 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_date_util); TextView mTvDateUtil = (TextView) findViewById(R.id.tv_date_util); - final String timeStamp = DateUtil.getTimeStamp(); + final String timeStamp = SDDateUtil.getTimeStamp(); StringBuilder builder = new StringBuilder(); builder.append("显示当前时间："); builder.append("\n"); builder.append(timeStamp); builder.append("\n"); - builder.append(DateUtil.getStrToTime(timeStamp)); + builder.append(SDDateUtil.getStrToTime(timeStamp)); builder.append("\n"); - builder.append(DateUtil.getStrToTimeHm(timeStamp)); + builder.append(SDDateUtil.getStrToTimeHm(timeStamp)); builder.append("\n"); - builder.append(DateUtil.getStrToTimeHms(timeStamp)); + builder.append(SDDateUtil.getStrToTimeHms(timeStamp)); builder.append("\n"); - builder.append(DateUtil.getStrToTimeYMdHm(timeStamp)); + builder.append(SDDateUtil.getStrToTimeYMdHm(timeStamp)); builder.append("\n"); - builder.append(DateUtil.getSDFTimeHmA()); + builder.append(SDDateUtil.getSDFTimeHmA()); builder.append("\n"); - builder.append(DateUtil.getSDFTimeHms()); + builder.append(SDDateUtil.getSDFTimeHms()); builder.append("\n"); - builder.append(DateUtil.getSDFTimeYMd()); + builder.append(SDDateUtil.getSDFTimeYMd()); builder.append("\n"); - builder.append(DateUtil.getSDFTimeYMdHm()); + builder.append(SDDateUtil.getSDFTimeYMdHm()); builder.append("\n"); - builder.append(DateUtil.getSDFTimeYMdHms()); + builder.append(SDDateUtil.getSDFTimeYMdHms()); builder.append("\n"); - builder.append(DateUtil.getSDFTimeYMDHSM()); + builder.append(SDDateUtil.getSDFTimeYMDHSM()); builder.append("\n"); - builder.append(DateUtil.getStrToTime()); + builder.append(SDDateUtil.getStrToTime()); builder.append("\n"); - builder.append(DateUtil.getStrToSDFTime(timeStamp, "yyyy年MM月dd日")); + builder.append(SDDateUtil.getStrToSDFTime(timeStamp, "yyyy年MM月dd日")); builder.append("\n"); mTvDateUtil.setText(builder); diff --git a/sample/src/main/java/com/sample/ui/activity/util/LogUtilActivity.java b/sample/src/main/java/com/sample/ui/activity/util/LogUtilActivity.java index 62629c1..2a11847 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/LogUtilActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/LogUtilActivity.java @@ -4,7 +4,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; public class LogUtilActivity extends BaseActivity { @@ -14,6 +14,6 @@ public class LogUtilActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_log_util); - LogUtil.showSquareLogE(TAG, "saskflasffffffffffffafpokfkjksdssssssssssssjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"); + SDLogUtil.showSquareLogE(TAG, "saskflasffffffffffffafpokfkjksdssssssssssssjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"); } } diff --git a/sample/src/main/java/com/sample/ui/activity/util/NetworkActivity.java b/sample/src/main/java/com/sample/ui/activity/util/NetworkActivity.java index 938e324..5ef5b3e 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/NetworkActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/NetworkActivity.java @@ -7,7 +7,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.NetWorkUtil; +import com.siberiadante.lib.util.SDNetWorkUtil; public class NetworkActivity extends BaseActivity { @@ -27,14 +27,14 @@ public void initView() { mBtnOpenSetting.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - NetWorkUtil.openNetworkSettings(); + SDNetWorkUtil.openNetworkSettings(); } }); } public void initData() { - Log.d(TAG, "testNetworkUtil:isNetWorkConnected? " + NetWorkUtil.isNetWorkConnected()); - Log.d(TAG, "testNetworkUtil: isWifiConnected?" + NetWorkUtil.isWifiConnected()); - Log.d(TAG, "testNetworkUtil:getNetworkState= " + NetWorkUtil.getNetWorkType()); + Log.d(TAG, "testNetworkUtil:isNetWorkConnected? " + SDNetWorkUtil.isNetWorkConnected()); + Log.d(TAG, "testNetworkUtil: isWifiConnected?" + SDNetWorkUtil.isWifiConnected()); + Log.d(TAG, "testNetworkUtil:getNetworkState= " + SDNetWorkUtil.getNetWorkType()); } } diff --git a/sample/src/main/java/com/sample/ui/activity/util/NumberActivity.java b/sample/src/main/java/com/sample/ui/activity/util/NumberActivity.java index 47f24b6..ccf43b3 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/NumberActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/NumberActivity.java @@ -7,7 +7,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.NumberUtil; +import com.siberiadante.lib.util.SDNumberUtil; import com.siberiadante.lib.view.titlebar.SDTitleBar; import butterknife.ButterKnife; @@ -47,7 +47,7 @@ public void onClick(View view) { } private void testIsNumber() { - if (NumberUtil.isNumeric(edtInput.getText().toString())) { + if (SDNumberUtil.isNumeric(edtInput.getText().toString())) { mBtnOne.setText("true"); } else { mBtnOne.setText("false"); diff --git a/sample/src/main/java/com/sample/ui/activity/util/SDCardUtilActivity.java b/sample/src/main/java/com/sample/ui/activity/util/SDCardUtilActivity.java index 2e232ab..569344d 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/SDCardUtilActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/SDCardUtilActivity.java @@ -6,7 +6,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.SDCardUtil; +import com.siberiadante.lib.util.SDStorageUtil; public class SDCardUtilActivity extends BaseActivity { @@ -16,58 +16,58 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_sdcard_util); final TextView t = (TextView) findViewById(R.id.tv_sdscrd_content); final StringBuilder builder = new StringBuilder(); - builder.append("---判断SD卡是否可用---" + SDCardUtil.isSDCardMounted()); + builder.append("---判断SD卡是否可用---" + SDStorageUtil.isSDCardMounted()); builder.append("\n"); - builder.append("---判断SDCard是否可拆卸---" + SDCardUtil.isSDCarfRemovable()); + builder.append("---判断SDCard是否可拆卸---" + SDStorageUtil.isSDCarfRemovable()); builder.append("\n"); - builder.append("---getExternalStorageState---" + SDCardUtil.getExternalStorageState()); + builder.append("---getExternalStorageState---" + SDStorageUtil.getExternalStorageState()); builder.append("\n"); - builder.append("---获取SD卡的根目录---" + SDCardUtil.getSDCardBaseDir()); + builder.append("---获取SD卡的根目录---" + SDStorageUtil.getSDCardBaseDir()); builder.append("\n"); - builder.append("---获取SD卡的根目录---" + SDCardUtil.getSDCardPath()); + builder.append("---获取SD卡的根目录---" + SDStorageUtil.getSDCardPath()); builder.append("\n"); - builder.append("---获取SD卡data路径---" + SDCardUtil.getDataPath()); + builder.append("---获取SD卡data路径---" + SDStorageUtil.getDataPath()); builder.append("\n"); - builder.append("---获取SD卡的信息---" + SDCardUtil.getSDCardInfo()); + builder.append("---获取SD卡的信息---" + SDStorageUtil.getSDCardInfo()); builder.append("\n"); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - builder.append("---获取SD卡的完整空间大小---\n" + SDCardUtil.getSDCardSizeMB() + " MB"); + builder.append("---获取SD卡的完整空间大小---\n" + SDStorageUtil.getSDCardSizeMB() + " MB"); builder.append("\n"); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - builder.append("---获取SD卡的完整空间大小---" + SDCardUtil.getSDCardSizeKB() + " KB"); + builder.append("---获取SD卡的完整空间大小---" + SDStorageUtil.getSDCardSizeKB() + " KB"); builder.append("\n"); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - builder.append("---获取SD卡的完整空间大小---" + SDCardUtil.getSDCardSizeB() + " B"); + builder.append("---获取SD卡的完整空间大小---" + SDStorageUtil.getSDCardSizeB() + " B"); builder.append("\n"); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - builder.append("---获取SD卡的剩余空间大小---" + SDCardUtil.getSDCardFreeSizeMB() + " MB"); + builder.append("---获取SD卡的剩余空间大小---" + SDStorageUtil.getSDCardFreeSizeMB() + " MB"); builder.append("\n"); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { - builder.append("---获取SD卡的可用空间大小---" + SDCardUtil.getSDCardAvailableSizeMB() + " MB"); + builder.append("---获取SD卡的可用空间大小---" + SDStorageUtil.getSDCardAvailableSizeMB() + " MB"); builder.append("\n"); } - builder.append("---获取SD卡私有Cache目录的路径---" + SDCardUtil.getSDCardPrivateCacheDir()); + builder.append("---获取SD卡私有Cache目录的路径---" + SDStorageUtil.getSDCardPrivateCacheDir()); builder.append("\n"); - builder.append("---判断路径文件是否存在---" + SDCardUtil.isFileExist(SDCardUtil.getDataPath())); + builder.append("---判断路径文件是否存在---" + SDStorageUtil.isFileExist(SDStorageUtil.getDataPath())); builder.append("\n"); - builder.append("---获取当前程序路径 应用在内存上的目录---" + SDCardUtil.getCurrentAppStoragePath()); + builder.append("---获取当前程序路径 应用在内存上的目录---" + SDStorageUtil.getCurrentAppStoragePath()); builder.append("\n"); - builder.append("---应用的在内存上的缓存目录---" + SDCardUtil.getCurrentAppCachePath()); + builder.append("---应用的在内存上的缓存目录---" + SDStorageUtil.getCurrentAppCachePath()); builder.append("\n"); - builder.append("---应用在外部存储上的目录---" + SDCardUtil.getCurrentAppExternalStoragePath()); + builder.append("---应用在外部存储上的目录---" + SDStorageUtil.getCurrentAppExternalStoragePath()); builder.append("\n"); - builder.append("---应用的在外部存储上的缓存目录---" + SDCardUtil.getCurrentAppExternalCachePath()); + builder.append("---应用的在外部存储上的缓存目录---" + SDStorageUtil.getCurrentAppExternalCachePath()); builder.append("\n"); - builder.append("---获取该程序的安装包路径---" + SDCardUtil.getCurrentAppPackageResourcePath()); + builder.append("---获取该程序的安装包路径---" + SDStorageUtil.getCurrentAppPackageResourcePath()); builder.append("\n"); - builder.append("---获取程序默认数据库路径---" + SDCardUtil.getCurrentAppDatabasePath("sample")); + builder.append("---获取程序默认数据库路径---" + SDStorageUtil.getCurrentAppDatabasePath("sample")); builder.append("\n"); - builder.append("---获取下载文件存储路径---" + SDCardUtil.getDownloadCachePath()); + builder.append("---获取下载文件存储路径---" + SDStorageUtil.getDownloadCachePath()); builder.append("\n"); diff --git a/sample/src/main/java/com/sample/ui/activity/util/ScreenActivity.java b/sample/src/main/java/com/sample/ui/activity/util/ScreenActivity.java index 6bdb3fc..52dd9a5 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/ScreenActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/ScreenActivity.java @@ -6,7 +6,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.ScreenUtil; +import com.siberiadante.lib.util.SDScreenUtil; public class ScreenActivity extends BaseActivity { @@ -17,7 +17,7 @@ public class ScreenActivity extends BaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_screen_test); - ScreenUtil.setStatusTranslucent(this); + SDScreenUtil.setStatusTranslucent(this); initView(); initData(); } @@ -28,11 +28,11 @@ public void initView() { } public void initData() { - int screenWidth = ScreenUtil.getScreenWidthPx(); - int screenHeight = ScreenUtil.getScreenHeightPx(); - int screenWidthDp = ScreenUtil.getScreenWidthDp(); - int screenHeightDp = ScreenUtil.getScreenHeightDp(); - float density = ScreenUtil.getDensity(this); + int screenWidth = SDScreenUtil.getScreenWidthPx(); + int screenHeight = SDScreenUtil.getScreenHeightPx(); + int screenWidthDp = SDScreenUtil.getScreenWidthDp(); + int screenHeightDp = SDScreenUtil.getScreenHeightDp(); + float density = SDScreenUtil.getDensity(this); Log.d(TAG, "initData: density=" + density); Log.d(TAG, "initData:screenWidthPX= " + screenWidth + "px"); Log.d(TAG, "initData:screenHeightPX= " + screenHeight + "px"); diff --git a/sample/src/main/java/com/sample/ui/activity/util/ToastActivity.java b/sample/src/main/java/com/sample/ui/activity/util/ToastActivity.java index f4e719b..8004898 100644 --- a/sample/src/main/java/com/sample/ui/activity/util/ToastActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/util/ToastActivity.java @@ -7,7 +7,7 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; import com.siberiadante.lib.util.SDToast; import java.util.ArrayList; @@ -68,10 +68,10 @@ public void onClick(View view) { stringList.add("糗百一入深似海"); stringList.add("从此纯洁是路人"); SDToast.showLinesText(stringList, ContextCompat.getColor(this, R.color.white), 18, ContextCompat.getColor(this, R.color.black)); - LogUtil.d("-------------333-----------：" + ContextCompat.getColor(this, R.color.white)); + SDLogUtil.d("-------------333-----------：" + ContextCompat.getColor(this, R.color.white)); break; case R.id.btn_show_layout: - SDToast.showView(R.layout.dialog_ensure_layout); + SDToast.showView(R.layout.sd_dialog_ensure_layout); break; case R.id.btn_toast_normal: SDToast.normal("这是一个正常的Toast"); diff --git a/sample/src/main/java/com/sample/ui/activity/view/DialogActivity.java b/sample/src/main/java/com/sample/ui/activity/view/DialogActivity.java index 323dead..de7a92d 100644 --- a/sample/src/main/java/com/sample/ui/activity/view/DialogActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/view/DialogActivity.java @@ -10,11 +10,11 @@ import com.sample.R; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.util.ScreenUtil; +import com.siberiadante.lib.util.SDScreenUtil; import com.siberiadante.lib.util.SDToast; import com.siberiadante.lib.view.dialog.SDCustomDialog; import com.siberiadante.lib.view.dialog.SDEditDialog; -import com.siberiadante.lib.view.BottomPopupWindow; +import com.siberiadante.lib.view.dialog.SDBottomDialog; import com.siberiadante.lib.view.dialog.SDEnsureDialog; import com.siberiadante.lib.view.dialog.NiceDialog; import com.siberiadante.lib.view.dialog.SDEnsureSubDialog; @@ -37,7 +37,7 @@ public class DialogActivity extends BaseActivity implements View.OnClickListener protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_dialog); - ScreenUtil.setStatusTranslucent(this); + SDScreenUtil.setStatusTranslucent(this); initView(); initData(); // ATTENTION: This was auto-generated to implement the App Indexing API. @@ -180,18 +180,18 @@ public void onClick(View view) { } /** - * BottomPopupWindow + * SDBottomDialog */ private void showBottomPopupWindow() { - new BottomPopupWindow(this).builder() + new SDBottomDialog(this).builder() .setTitle("选择").setCancelable(false).setCanceled(true) - .addSheetItem("相机", BottomPopupWindow.SheetItemColor.Blue, new BottomPopupWindow.OnSheetItemClickListener() { + .addSheetItem("相机", SDBottomDialog.SheetItemColor.Blue, new SDBottomDialog.OnSheetItemClickListener() { @Override public void onClick(int which) { //需要对相机进行运行时权限的申请 } }) - .addSheetItem("相册", BottomPopupWindow.SheetItemColor.Blue, new BottomPopupWindow.OnSheetItemClickListener() { + .addSheetItem("相册", SDBottomDialog.SheetItemColor.Blue, new SDBottomDialog.OnSheetItemClickListener() { @Override public void onClick(int which) { //调用手机相册的方法,该方法在下面有具体实现 diff --git a/sample/src/main/java/com/sample/ui/activity/view/ImageSpanActivity.java b/sample/src/main/java/com/sample/ui/activity/view/ImageSpanActivity.java index 97b4bde..c68760c 100644 --- a/sample/src/main/java/com/sample/ui/activity/view/ImageSpanActivity.java +++ b/sample/src/main/java/com/sample/ui/activity/view/ImageSpanActivity.java @@ -8,9 +8,8 @@ import android.widget.TextView; import com.sample.R; -import com.sample.SampleApplication; import com.sample.ui.activity.BaseActivity; -import com.siberiadante.lib.widget.CenterAlignImageSpan; +import com.siberiadante.lib.widget.SDCenterAlignImageSpan; public class ImageSpanActivity extends BaseActivity { @@ -27,18 +26,18 @@ protected void onCreate(Bundle savedInstanceState) { textViewCustom = (TextView) findViewById(R.id.tv_image_span_custom); SpannableString spannableStringNoLineSpace = new SpannableString("默认的ImageSpan显示无lineSpacingExtra默认的ImageSpan显示无lineSpacingExtra默认的ImageSpan显示无lineSpacingExtra"); - final ImageSpan imageSpanNoLineSpace = new ImageSpan(this.getApplicationContext(), R.mipmap.ic_launcher, DynamicDrawableSpan.ALIGN_BASELINE);//默认ImageSpan + final ImageSpan imageSpanNoLineSpace = new ImageSpan(this.getApplicationContext(), R.drawable.share_qq, DynamicDrawableSpan.ALIGN_BASELINE);//默认ImageSpan spannableStringNoLineSpace.setSpan(imageSpanNoLineSpace, 0, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); textViewNoLineSpace.setText(spannableStringNoLineSpace); SpannableString spannableString = new SpannableString("默认的ImageSpan显示默认的ImageSpan显示默认的ImageSpan显示默认的ImageSpan显示默认的ImageSpan显示默认的ImageSpan显示默认的ImageSpan显示默认的ImageSpan显示"); - final ImageSpan imageSpan = new ImageSpan(this.getApplicationContext(), R.mipmap.ic_launcher, DynamicDrawableSpan.ALIGN_BASELINE);//默认ImageSpan + final ImageSpan imageSpan = new ImageSpan(this.getApplicationContext(),R.drawable.share_qq, DynamicDrawableSpan.ALIGN_BASELINE);//默认ImageSpan spannableString.setSpan(imageSpan, 0, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); textView.setText(spannableString); SpannableString spannableStringCustom = new SpannableString("测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排测试图文混排"); - CenterAlignImageSpan span = new CenterAlignImageSpan(this.getApplicationContext(), R.mipmap.ic_launcher, ImageSpan.ALIGN_BASELINE);//重写的ImageSpan + SDCenterAlignImageSpan span = new SDCenterAlignImageSpan(this.getApplicationContext(), R.drawable.share_qq, ImageSpan.ALIGN_BASELINE);//重写的ImageSpan spannableStringCustom.setSpan(span, 0, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); textViewCustom.setText(spannableStringCustom); } diff --git a/sample/src/main/java/com/sample/ui/fragment/MainFragment.java b/sample/src/main/java/com/sample/ui/fragment/MainFragment.java index 59f88bb..82f42f0 100644 --- a/sample/src/main/java/com/sample/ui/fragment/MainFragment.java +++ b/sample/src/main/java/com/sample/ui/fragment/MainFragment.java @@ -4,39 +4,18 @@ import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.Button; import com.jude.easyrecyclerview.EasyRecyclerView; import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter; import com.jude.easyrecyclerview.decoration.DividerDecoration; import com.sample.R; -import com.sample.adapter.CustomAdapter; import com.sample.adapter.MainFragmentAdapter; import com.sample.bean.MainData; -import com.sample.bean.UtilData; import com.sample.constants.Constants; -import com.sample.ui.BaseFragmentN; -import com.sample.ui.activity.WebViewActivity; -import com.sample.ui.activity.util.ActivityUtilActivity; -import com.sample.ui.activity.util.AppActivity; -import com.sample.ui.activity.util.ClearActivity; -import com.sample.ui.activity.util.DateUtilActivity; -import com.sample.ui.activity.util.LogUtilActivity; -import com.sample.ui.activity.util.NetworkActivity; -import com.sample.ui.activity.util.NumberActivity; -import com.sample.ui.activity.util.PermissionManagerActivity; -import com.sample.ui.activity.util.SDCardUtilActivity; -import com.sample.ui.activity.util.ScreenActivity; -import com.sample.ui.activity.util.ToastActivity; -import com.sample.util.JumpUtils; -import com.siberiadante.lib.util.ScreenUtil; -import com.siberiadante.lib.util.TransitionTools; -import com.squareup.haha.perflib.Main; +import com.siberiadante.lib.util.SDTransitionUtil; import java.util.ArrayList; import java.util.List; @@ -70,7 +49,7 @@ protected void onCreateViewLazy(Bundle savedInstanceState) { protected void initView() { mRecyclerView = ((EasyRecyclerView) findViewById(R.id.recyclerView_main)); mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - DividerDecoration itemDecoration = new DividerDecoration(Color.GRAY, TransitionTools.dip2px(1f), 0, 0); + DividerDecoration itemDecoration = new DividerDecoration(Color.GRAY, SDTransitionUtil.dip2px(1f), 0, 0); itemDecoration.setDrawHeaderFooter(false); mRecyclerView.addItemDecoration(itemDecoration); adapter = new MainFragmentAdapter(getActivity()); diff --git a/sample/src/main/java/com/sample/ui/fragment/OtherFragment.java b/sample/src/main/java/com/sample/ui/fragment/OtherFragment.java index 120e847..1fee3fe 100644 --- a/sample/src/main/java/com/sample/ui/fragment/OtherFragment.java +++ b/sample/src/main/java/com/sample/ui/fragment/OtherFragment.java @@ -6,14 +6,11 @@ import android.support.annotation.Nullable; import android.support.v4.app.Fragment; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import com.sample.R; -import com.sample.ui.BaseFragmentN; import com.sample.ui.activity.util.AppActivity; -import com.siberiadante.lib.util.LogUtil; +import com.siberiadante.lib.util.SDLogUtil; /** * @Created SiberiaDante @@ -36,7 +33,7 @@ public static OtherFragment getInstance(View view) { protected void onCreateViewLazy(Bundle savedInstanceState) { super.onCreateViewLazy(savedInstanceState); setContentView(R.layout.fragment_other); - LogUtil.d("-------------OtherFragment----------------"); + SDLogUtil.d("-------------OtherFragment----------------"); initView(); } diff --git a/sample/src/main/java/com/sample/ui/fragment/UtilFragment.java b/sample/src/main/java/com/sample/ui/fragment/UtilFragment.java index 821e97a..cd07f44 100644 --- a/sample/src/main/java/com/sample/ui/fragment/UtilFragment.java +++ b/sample/src/main/java/com/sample/ui/fragment/UtilFragment.java @@ -2,11 +2,8 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import com.github.clans.fab.FloatingActionButton; import com.jude.easyrecyclerview.EasyRecyclerView; @@ -15,7 +12,6 @@ import com.sample.R; import com.sample.adapter.CustomAdapter; import com.sample.bean.UtilData; -import com.sample.ui.BaseFragmentN; import com.sample.ui.activity.util.ActivityUtilActivity; import com.sample.ui.activity.util.AppActivity; import com.sample.ui.activity.util.ClearActivity; @@ -28,9 +24,8 @@ import com.sample.ui.activity.util.ScreenActivity; import com.sample.ui.activity.util.ToastActivity; import com.sample.util.JumpUtils; -import com.siberiadante.lib.util.ActivityUtil; -import com.siberiadante.lib.util.LogUtil; -import com.siberiadante.lib.util.TransitionTools; +import com.siberiadante.lib.util.SDLogUtil; +import com.siberiadante.lib.util.SDTransitionUtil; import java.util.ArrayList; import java.util.List; @@ -61,7 +56,7 @@ public static UtilFragment getInstance(View view) { protected void onCreateViewLazy(Bundle savedInstanceState) { super.onCreateViewLazy(savedInstanceState); setContentView(R.layout.fragment_util); - LogUtil.d("-------------UtilFragment----------------"); + SDLogUtil.d("-------------UtilFragment----------------"); initView(); initData(); } @@ -69,7 +64,7 @@ protected void onCreateViewLazy(Bundle savedInstanceState) { protected void initView() { mRecyclerView = ((EasyRecyclerView) findViewById(R.id.recyclerView_util)); mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - DividerDecoration itemDecoration = new DividerDecoration(Color.GRAY, TransitionTools.dip2px(1f), 0, 0); + DividerDecoration itemDecoration = new DividerDecoration(Color.GRAY, SDTransitionUtil.dip2px(1f), 0, 0); itemDecoration.setDrawHeaderFooter(false); mRecyclerView.addItemDecoration(itemDecoration); adapter = new CustomAdapter(getActivity()); diff --git a/sample/src/main/java/com/sample/ui/fragment/ViewFragment.java b/sample/src/main/java/com/sample/ui/fragment/ViewFragment.java index 3457cbb..0e39953 100644 --- a/sample/src/main/java/com/sample/ui/fragment/ViewFragment.java +++ b/sample/src/main/java/com/sample/ui/fragment/ViewFragment.java @@ -2,11 +2,8 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.v7.widget.LinearLayoutManager; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import com.github.clans.fab.FloatingActionButton; import com.jude.easyrecyclerview.EasyRecyclerView; @@ -15,7 +12,6 @@ import com.sample.R; import com.sample.adapter.CustomAdapter; import com.sample.bean.UtilData; -import com.sample.ui.BaseFragmentN; import com.sample.ui.activity.WebVideoActivity; import com.sample.ui.activity.animation.SDSpreadLikeViewActivity; import com.sample.ui.activity.view.DialogActivity; @@ -24,9 +20,9 @@ import com.sample.ui.activity.view.QQStepViewActivity; import com.sample.ui.activity.view.ShapeViewActivity; import com.sample.ui.activity.view.TitleLayoutActivity; -import com.siberiadante.lib.util.ActivityUtil; -import com.siberiadante.lib.util.LogUtil; -import com.siberiadante.lib.util.TransitionTools; +import com.siberiadante.lib.util.SDActivityUtil; +import com.siberiadante.lib.util.SDLogUtil; +import com.siberiadante.lib.util.SDTransitionUtil; import java.util.ArrayList; import java.util.List; @@ -55,7 +51,7 @@ public static ViewFragment getInstance(View view) { protected void onCreateViewLazy(Bundle savedInstanceState) { super.onCreateViewLazy(savedInstanceState); setContentView(R.layout.fragment_view); - LogUtil.d("-------------ViewFragment----------------"); + SDLogUtil.d("-------------ViewFragment----------------"); initView(); initData(); } @@ -63,7 +59,7 @@ protected void onCreateViewLazy(Bundle savedInstanceState) { protected void initView() { mRecyclerView = ((EasyRecyclerView) findViewById(R.id.erv_view)); mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); - DividerDecoration itemDecoration = new DividerDecoration(Color.GRAY, TransitionTools.dip2px(1f), 0, 0); + DividerDecoration itemDecoration = new DividerDecoration(Color.GRAY, SDTransitionUtil.dip2px(1f), 0, 0); itemDecoration.setDrawHeaderFooter(false); mRecyclerView.addItemDecoration(itemDecoration); adapter = new CustomAdapter(getActivity()); @@ -93,6 +89,6 @@ protected void initData() { @Override public void onItemClick(int position) { - ActivityUtil.launchActivity("com.sample", datas.get(position).getCls()); + SDActivityUtil.launchActivity("com.sample", datas.get(position).getCls()); } } diff --git a/sample/src/main/java/com/sample/util/JumpUtils.java b/sample/src/main/java/com/sample/util/JumpUtils.java index 0e3f07d..f7255be 100644 --- a/sample/src/main/java/com/sample/util/JumpUtils.java +++ b/sample/src/main/java/com/sample/util/JumpUtils.java @@ -1,22 +1,10 @@ package com.sample.util; -import android.app.Activity; -import android.content.ComponentName; -import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.v4.app.FragmentActivity; import com.sample.SampleApplication; -import com.sample.constants.Constants; -import com.sample.ui.activity.util.PermissionManagerActivity; -import com.sample.ui.activity.util.ScreenActivity; -import com.sample.ui.activity.view.DialogActivity; -import com.sample.ui.activity.view.ImageSpanActivity; -import com.sample.ui.activity.view.KeyBoardActivity; -import com.sample.ui.activity.view.QQStepViewActivity; -import com.sample.ui.activity.view.ShapeViewActivity; -import com.siberiadante.lib.util.ActivityUtil; +import com.siberiadante.lib.util.SDActivityUtil; /** * @Created SiberiaDante @@ -34,7 +22,7 @@ public class JumpUtils { * @param activityName */ public static void startJumpActivity(String activityName) { - ActivityUtil.launchActivity("com.sample", activityName); + SDActivityUtil.launchActivity("com.sample", activityName); } /** diff --git a/sample/src/main/res/layout/activity_app.xml b/sample/src/main/res/layout/activity_app.xml index 250afc5..28a32a9 100644 --- a/sample/src/main/res/layout/activity_app.xml +++ b/sample/src/main/res/layout/activity_app.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" app:d_is_immersive_state_bar="true" app:d_title_layout_background="@color/red" - app:d_title_layout_height="48dp" + app:d_title_layout_height="40dp" app:d_title_text="AppActivity" /> + android:text="超级自定义布局的Dialog,只需要传入自定义的布局和要设置点击事件的控件id即可" /> diff --git a/sample/src/main/res/layout/activity_image_span.xml b/sample/src/main/res/layout/activity_image_span.xml index 7f99433..f60bbf8 100644 --- a/sample/src/main/res/layout/activity_image_span.xml +++ b/sample/src/main/res/layout/activity_image_span.xml @@ -1,11 +1,20 @@ + + + + + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true"> - - - - diff --git a/sample/src/main/res/layout/activity_qqexercise_pedometer.xml b/sample/src/main/res/layout/activity_qqexercise_pedometer.xml index bc208bc..52b7402 100644 --- a/sample/src/main/res/layout/activity_qqexercise_pedometer.xml +++ b/sample/src/main/res/layout/activity_qqexercise_pedometer.xml @@ -10,8 +10,8 @@ - + android:layout_height="wrap_content" + app:d_title_layout_background="@color/blue" + app:d_title_layout_height="40dp" + app:d_is_immersive_state_bar="true" + app:d_title_text="沉浸式状态栏"/> - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:textSize="16sp" /> diff --git a/sample/src/main/res/layout/activity_sdcard_util.xml b/sample/src/main/res/layout/activity_sdcard_util.xml index c7ea135..dcf66ca 100644 --- a/sample/src/main/res/layout/activity_sdcard_util.xml +++ b/sample/src/main/res/layout/activity_sdcard_util.xml @@ -11,6 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:d_is_immersive_state_bar="true" + app:d_title_layout_height="40dp" app:d_title_layout_background="@color/blue" app:d_title_text="SDCardUtil" /> diff --git a/sample/src/main/res/layout/activity_shape_view.xml b/sample/src/main/res/layout/activity_shape_view.xml index 0c206ca..e5d7eda 100644 --- a/sample/src/main/res/layout/activity_shape_view.xml +++ b/sample/src/main/res/layout/activity_shape_view.xml @@ -91,7 +91,7 @@ android:layout_width="150dp" android:layout_height="150dp"> - + dante:d_title_layout_height="40dp" + dante:d_title_size="16sp" + dante:d_title_text="这里是一个标题" /> @@ -54,13 +52,13 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" dante:d_is_back_view="false" - dante:d_left_image="@mipmap/back_gray" + dante:d_left_image="@mipmap/back" dante:d_left_image_padding_start="10dp" dante:d_left_image_width="30dp" dante:d_line_height="1px" - dante:d_right_image="@mipmap/icon_collection" - dante:d_title_color="@color/black" - dante:d_title_layout_background="@color/red" + dante:d_right_image="@mipmap/search" + dante:d_title_color="@color/black_151414" + dante:d_title_layout_background="@color/orange_fd4c5B" dante:d_title_layout_height="50dp" dante:d_title_size="18sp" dante:d_title_text="这里是标题" /> @@ -71,17 +69,17 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" dante:d_is_back_view="false" - dante:d_left_image="@mipmap/back_gray" + dante:d_left_image="@mipmap/back" dante:d_left_image_padding_start="10dp" dante:d_left_image_width="30dp" dante:d_line_height="1px" - dante:d_right_image="@mipmap/icon_collection" + dante:d_right_image="@mipmap/search" dante:d_subtitle_size="12sp" dante:d_subtitle_text="副标题" - dante:d_title_color="@color/black" - dante:d_title_layout_background="@color/red" + dante:d_title_color="@color/gray" + dante:d_title_layout_background="@color/blue" dante:d_title_layout_height="50dp" dante:d_title_size="16sp" - dante:d_title_text="这里是标题" /> + dante:d_title_text="这里是一个主标题" /> diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml index 1778189..4483e9b 100644 --- a/sample/src/main/res/values/colors.xml +++ b/sample/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ #FF4081 #ffffff #000000 + #151414 #f50303 #03f907 #555555 diff --git a/siberiadante/src/main/java/com/siberiadante/lib/SiberiaDanteLib.java b/siberiadante/src/main/java/com/siberiadante/lib/SiberiaDanteLib.java index 8d8eb84..f956576 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/SiberiaDanteLib.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/SiberiaDanteLib.java @@ -8,7 +8,7 @@ import android.util.Log; import com.siberiadante.lib.constants.AppInfo; -import com.siberiadante.lib.util.DateUtil; +import com.siberiadante.lib.util.SDDateUtil; import java.util.LinkedList; import java.util.List; @@ -47,7 +47,7 @@ public static void initLib(Context context) { public static void setDebug(boolean isDebug) { Log.e("eeeeeeeeeeeee",""); AppInfo.getInstance().getSPUtils().put("is_debug", isDebug); - Log.e(TAG, "[---" + DateUtil.getSDFTimeYMDHSM() + "---] Enable Debug:--- " + isDebug + " ---"); + Log.e(TAG, "[---" + SDDateUtil.getSDFTimeYMDHSM() + "---] Enable Debug:--- " + isDebug + " ---"); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/base/BaseActivity.java b/siberiadante/src/main/java/com/siberiadante/lib/base/BaseActivity.java index 58565b9..792d288 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/base/BaseActivity.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/base/BaseActivity.java @@ -9,7 +9,7 @@ import android.view.View; import android.widget.EditText; -import com.siberiadante.lib.util.KeyBoardUtil; +import com.siberiadante.lib.util.SDKeyBoardUtil; /** * @Created SiberiaDante @@ -144,7 +144,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) { if (isTouchView(hideSoftByEditViewIds(), ev)) return super.dispatchTouchEvent(ev); //隐藏键盘 - KeyBoardUtil.hideInputForce(this); + SDKeyBoardUtil.hideInputForce(this); clearViewFocus(v, hideSoftByEditViewIds()); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/bean/AppInfo.java b/siberiadante/src/main/java/com/siberiadante/lib/bean/SDAppInfo.java similarity index 92% rename from siberiadante/src/main/java/com/siberiadante/lib/bean/AppInfo.java rename to siberiadante/src/main/java/com/siberiadante/lib/bean/SDAppInfo.java index 2ba635d..a322459 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/bean/AppInfo.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/bean/SDAppInfo.java @@ -11,7 +11,7 @@ * 博客园： http://www.cnblogs.com/shen-hua/ */ -public class AppInfo { +public class SDAppInfo { private String name; private Drawable icon; private String packageName; @@ -85,8 +85,8 @@ public void setVersionName(String versionName) { * @param versionCode 版本码 * @param isSystem 是否系统应用 */ - public AppInfo(String packageName, String name, Drawable icon, String packagePath, - String versionName, int versionCode, boolean isSystem) { + public SDAppInfo(String packageName, String name, Drawable icon, String packagePath, + String versionName, int versionCode, boolean isSystem) { this.setName(name); this.setIcon(icon); this.setPackageName(packageName); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/constants/AppInfo.java b/siberiadante/src/main/java/com/siberiadante/lib/constants/AppInfo.java index b9edc48..4629228 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/constants/AppInfo.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/constants/AppInfo.java @@ -1,6 +1,6 @@ package com.siberiadante.lib.constants; -import com.siberiadante.lib.util.SPUtil; +import com.siberiadante.lib.util.SDSPUtil; /** * @Created SiberiaDante @@ -11,17 +11,17 @@ */ public class AppInfo { - private SPUtil info; + private SDSPUtil info; private AppInfo() { - info = new SPUtil(Constants.INFO); + info = new SDSPUtil(Constants.INFO); } public static AppInfo getInstance() { return AppInfoHolder.appInfo; } - public SPUtil getSPUtils() { + public SDSPUtil getSPUtils() { return info; } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/CrashHandler.java b/siberiadante/src/main/java/com/siberiadante/lib/util/CrashHandler.java index a2cc7e1..de35668 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/CrashHandler.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/CrashHandler.java @@ -68,7 +68,7 @@ public void uncaughtException(Thread thread, Throwable ex) { try { Thread.sleep(3000); } catch (InterruptedException e) { - LogUtil.e(e.getMessage()); + SDLogUtil.e(e.getMessage()); } //退出程序 android.os.Process.killProcess(android.os.Process.myPid()); @@ -109,7 +109,7 @@ public void collectDeviceInfo(Context ctx) { infos.put("versionCode", versionCode); } } catch (PackageManager.NameNotFoundException e) { - LogUtil.e(e.getMessage()); + SDLogUtil.e(e.getMessage()); } Field[] fields = Build.class.getDeclaredFields(); for (Field field : fields) { @@ -117,7 +117,7 @@ public void collectDeviceInfo(Context ctx) { field.setAccessible(true); infos.put(field.getName(), field.get(null).toString()); } catch (Exception e) { - LogUtil.e(e.getMessage()); + SDLogUtil.e(e.getMessage()); } } @@ -151,7 +151,7 @@ private String saveCrashInfo2File(Throwable ex) { String result = writer.toString(); sb.append(result); sb.append("--------------------end---------------------------"); - LogUtil.e(sb.toString()); + SDLogUtil.e(sb.toString()); return null; } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/EncryptUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/EncryptUtil.java index 5fede03..16ca27a 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/EncryptUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/EncryptUtil.java @@ -226,7 +226,7 @@ public static byte[] encryptMD5File(File file) { e.printStackTrace(); return null; } finally { - CloseUtil.closeIO(fis); + SDCloseUtil.closeIO(fis); } } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/ActivityUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDActivityUtil.java similarity index 99% rename from siberiadante/src/main/java/com/siberiadante/lib/util/ActivityUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDActivityUtil.java index af7f8f6..15e27fe 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/ActivityUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDActivityUtil.java @@ -27,8 +27,8 @@ * Activity相关工具类 */ -public class ActivityUtil { - public ActivityUtil() { +public class SDActivityUtil { + public SDActivityUtil() { // throw new UnsupportedOperationException("unInit SiberiaDanteLib"); new SiberiaDanteLibException(); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/AppUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDAppUtil.java similarity index 92% rename from siberiadante/src/main/java/com/siberiadante/lib/util/AppUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDAppUtil.java index 86f50aa..fe77df5 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/AppUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDAppUtil.java @@ -18,8 +18,8 @@ import android.util.Log; import com.siberiadante.lib.SiberiaDanteLib; +import com.siberiadante.lib.bean.SDAppInfo; import com.siberiadante.lib.exception.SiberiaDanteLibException; -import com.siberiadante.lib.bean.AppInfo; import java.io.File; import java.util.ArrayList; @@ -31,10 +31,10 @@ * 获取应用/手机信息、判断应用是否安装，卸载/安装APP，手机网络面板设置等 */ -public class AppUtil { - public static final String TAG = AppUtil.class.getSimpleName(); +public class SDAppUtil { + public static final String TAG = SDAppUtil.class.getSimpleName(); - public AppUtil() { + public SDAppUtil() { new SiberiaDanteLibException(getClass().getSimpleName()); } @@ -225,7 +225,7 @@ public static String getMobileAndAPPInfo() { */ public static void launchApp(String packageName) { if (isSpace(packageName)) return; - SiberiaDanteLib.getContext().startActivity(IntentUtil.getLaunchAppIntent(packageName)); + SiberiaDanteLib.getContext().startActivity(SDIntentUtil.getLaunchAppIntent(packageName)); } /** @@ -237,7 +237,7 @@ public static void launchApp(String packageName) { */ public static void launchApp(Activity activity, String packageName, int requestCode) { if (isSpace(packageName)) return; - activity.startActivityForResult(IntentUtil.getLaunchAppIntent(packageName), requestCode); + activity.startActivityForResult(SDIntentUtil.getLaunchAppIntent(packageName), requestCode); } @@ -255,7 +255,7 @@ public static void openAppDetailsSettings() { */ public static void openAppDetailsSettings(String packageName) { if (isSpace(packageName)) return; - SiberiaDanteLib.getContext().startActivity(IntentUtil.getAppDetailsSettingsIntent(packageName)); + SiberiaDanteLib.getContext().startActivity(SDIntentUtil.getAppDetailsSettingsIntent(packageName)); } /** @@ -341,13 +341,13 @@ public static String getAppPath(String packageName) { ///TODO--sss待测试解决 public static ArrayList getApkNameAll() { - return getApkName(SDCardUtil.getSDCardPath()); + return getApkName(SDStorageUtil.getSDCardPath()); } //用到了递归 //这个参数我使用的时候传递的是Environment.getExternalStorageDirectory().getAbsolutePath() public static ArrayList getApkName(String path) { - LogUtil.d("---path---" + path); + SDLogUtil.d("---path---" + path); ArrayList list = new ArrayList<>(); File file = new File(path); if (file.isDirectory()) { @@ -617,13 +617,13 @@ public static boolean cleanAppData(String... dirPaths) { * @return {@code true}: 成功
{@code false}: 失败 */ public static boolean cleanAppData(File... dirs) { - boolean isSuccess = ClearUtil.clearInternalCache(); - isSuccess &= ClearUtil.clearInternalDbs(); - isSuccess &= ClearUtil.clearInternalSP(); - isSuccess &= ClearUtil.clearInternalFiles(); - isSuccess &= ClearUtil.clearExternalCache(); + boolean isSuccess = SDClearUtil.clearInternalCache(); + isSuccess &= SDClearUtil.clearInternalDbs(); + isSuccess &= SDClearUtil.clearInternalSP(); + isSuccess &= SDClearUtil.clearInternalFiles(); + isSuccess &= SDClearUtil.clearExternalCache(); for (File dir : dirs) { - isSuccess &= ClearUtil.clearCustomCache(dir); + isSuccess &= SDClearUtil.clearCustomCache(dir); } return isSuccess; } @@ -638,7 +638,7 @@ public static boolean cleanAppData(File... dirs) { *
参看https://developer.android.com/reference/android/support/v4/content/FileProvider.html */ public static void installApp(String filePath, String authority) { - installApp(FileUtil.getFileByPath(filePath), authority); + installApp(SDFileUtil.getFileByPath(filePath), authority); } /** @@ -649,10 +649,10 @@ public static void installApp(String filePath, String authority) { *
参看https://developer.android.com/reference/android/support/v4/content/FileProvider.html */ public static void installApp(File file, String authority) { - if (!FileUtil.isFileExists(file)) { + if (!SDFileUtil.isFileExists(file)) { return; } - SiberiaDanteLib.getContext().startActivity(IntentUtil.getInstallAppIntent(file, authority)); + SiberiaDanteLib.getContext().startActivity(SDIntentUtil.getInstallAppIntent(file, authority)); } /** @@ -665,7 +665,7 @@ public static void installApp(File file, String authority) { * @param requestCode 请求值 */ public static void installApp(Activity activity, String filePath, String authority, int requestCode) { - installApp(activity, FileUtil.getFileByPath(filePath), authority, requestCode); + installApp(activity, SDFileUtil.getFileByPath(filePath), authority, requestCode); } /** @@ -678,8 +678,8 @@ public static void installApp(Activity activity, String filePath, String authori * @param requestCode 请求值 */ public static void installApp(Activity activity, File file, String authority, int requestCode) { - if (!FileUtil.isFileExists(file)) return; - activity.startActivityForResult(IntentUtil.getInstallAppIntent(file, authority), requestCode); + if (!SDFileUtil.isFileExists(file)) return; + activity.startActivityForResult(SDIntentUtil.getInstallAppIntent(file, authority), requestCode); } /** @@ -690,8 +690,8 @@ public static void installApp(Activity activity, File file, String authority, in * @return {@code true}: 安装成功
{@code false}: 安装失败 */ public static boolean installAppSilent(String filePath) { - File file = FileUtil.getFileByPath(filePath); - if (!FileUtil.isFileExists(file)) return false; + File file = SDFileUtil.getFileByPath(filePath); + if (!SDFileUtil.isFileExists(file)) return false; String command = "LD_LIBRARY_PATH=/vendor/lib:/system/lib pm install " + filePath; ShellUtil.CommandResult commandResult = ShellUtil.execCmd(command, !isSystemApp(), true); return commandResult.successMsg != null && commandResult.successMsg.toLowerCase().contains("success"); @@ -701,22 +701,22 @@ public static boolean installAppSilent(String filePath) { /** * 获取App信息 - *

AppInfo（名称，图标，包名，版本号，版本Code，是否系统应用）

+ *

SDAppInfo（名称，图标，包名，版本号，版本Code，是否系统应用）

* * @return 当前应用的AppInfo */ - public static AppInfo getAppInfo() { + public static SDAppInfo getAppInfo() { return getAppInfo(SiberiaDanteLib.getContext().getPackageName()); } /** * 获取App信息 - *

AppInfo（名称，图标，包名，版本号，版本Code，是否系统应用）

+ *

SDAppInfo（名称，图标，包名，版本号，版本Code，是否系统应用）

* * @param packageName 包名 * @return 当前应用的AppInfo */ - public static AppInfo getAppInfo(String packageName) { + public static SDAppInfo getAppInfo(String packageName) { try { PackageManager pm = SiberiaDanteLib.getContext().getPackageManager(); PackageInfo pi = pm.getPackageInfo(packageName, 0); @@ -734,7 +734,7 @@ public static AppInfo getAppInfo(String packageName) { * @param pi 包的信息 * @return AppInfo类 */ - private static AppInfo getBean(PackageManager pm, PackageInfo pi) { + private static SDAppInfo getBean(PackageManager pm, PackageInfo pi) { if (pm == null || pi == null) { return null; } @@ -746,7 +746,7 @@ private static AppInfo getBean(PackageManager pm, PackageInfo pi) { String versionName = pi.versionName; int versionCode = pi.versionCode; boolean isSystem = (ApplicationInfo.FLAG_SYSTEM & ai.flags) != 0; - return new AppInfo(packageName, name, icon, packagePath, versionName, versionCode, isSystem); + return new SDAppInfo(packageName, name, icon, packagePath, versionName, versionCode, isSystem); } /** @@ -756,13 +756,13 @@ private static AppInfo getBean(PackageManager pm, PackageInfo pi) { * * @return 所有已安装的AppInfo列表 */ - public static List getAppsInfo() { - List list = new ArrayList<>(); + public static List getAppsInfo() { + List list = new ArrayList<>(); PackageManager pm = SiberiaDanteLib.getContext().getPackageManager(); // 获取系统中安装的所有软件信息 List installedPackages = pm.getInstalledPackages(0); for (PackageInfo pi : installedPackages) { - AppInfo ai = getBean(pm, pi); + SDAppInfo ai = getBean(pm, pi); if (ai == null) continue; list.add(ai); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/ClearUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDClearUtil.java similarity index 70% rename from siberiadante/src/main/java/com/siberiadante/lib/util/ClearUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDClearUtil.java index 325892b..6cfcb77 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/ClearUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDClearUtil.java @@ -6,12 +6,15 @@ import java.io.File; /** - * Created by SiberiaDante on 2017/5/15. - * 清除缓存、数据等相关应用 + * @Created SiberiaDante + * @Describe： 清除缓存、数据等相关应用 + * @Time: 2017/5/15 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante */ -public class ClearUtil { - public ClearUtil() { +public class SDClearUtil { + public SDClearUtil() { new SiberiaDanteLibException(); } @@ -22,7 +25,7 @@ public ClearUtil() { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearInternalCache() { - return FileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getCacheDir()); + return SDFileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getCacheDir()); } /** @@ -32,7 +35,7 @@ public static boolean clearInternalCache() { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearInternalFiles() { - return FileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getFilesDir()); + return SDFileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getFilesDir()); } /** @@ -42,7 +45,7 @@ public static boolean clearInternalFiles() { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearInternalDbs() { - return FileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getFilesDir().getParent() + File.separator + "databases"); + return SDFileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getFilesDir().getParent() + File.separator + "databases"); } /** @@ -63,7 +66,7 @@ public static boolean clearInternalDbByName(String dbName) { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearInternalSP() { - return FileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getFilesDir().getParent() + File.separator + "shared_prefs"); + return SDFileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getFilesDir().getParent() + File.separator + "shared_prefs"); } /** @@ -73,7 +76,7 @@ public static boolean clearInternalSP() { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearExternalCache() { - return SDCardUtil.isSDCardMounted() && FileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getExternalCacheDir()); + return SDStorageUtil.isSDCardMounted() && SDFileUtil.deleteFilesInDir(SiberiaDanteLib.getContext().getExternalCacheDir()); } /** @@ -83,7 +86,7 @@ public static boolean clearExternalCache() { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearCustomCache(String dirPath) { - return FileUtil.deleteFilesInDir(dirPath); + return SDFileUtil.deleteFilesInDir(dirPath); } /** @@ -93,6 +96,6 @@ public static boolean clearCustomCache(String dirPath) { * @return {@code true}: 清除成功
{@code false}: 清除失败 */ public static boolean clearCustomCache(File dir) { - return FileUtil.deleteFilesInDir(dir); + return SDFileUtil.deleteFilesInDir(dir); } } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/CloseUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDCloseUtil.java similarity index 72% rename from siberiadante/src/main/java/com/siberiadante/lib/util/CloseUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDCloseUtil.java index 8f2c4dd..1bdf91c 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/CloseUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDCloseUtil.java @@ -6,15 +6,20 @@ import java.io.IOException; /** - * Created by SiberiaDante on 2017/5/15. + * @Created SiberiaDante + * @Describe： 关闭相关工具类 + * @Time: 2017/5/15 + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante */ - -public class CloseUtil { - public CloseUtil() { +public class SDCloseUtil { + public SDCloseUtil() { new SiberiaDanteLibException(); } - /**关闭多个IO流 + /** + * 关闭多个IO流 + * * @param closeables io,io,io,... */ public static void closeIO(Closeable... closeables) { diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/DateUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDDateUtil.java similarity index 99% rename from siberiadante/src/main/java/com/siberiadante/lib/util/DateUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDDateUtil.java index 66ef13b..9e9faf8 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/DateUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDDateUtil.java @@ -35,7 +35,7 @@ * EEEE 'DATE('yyyy-MM-dd')' 'TIME('HH:mm:ss')' zzzz 星期五 DATE(2016-08-12) TIME(15:44:40) 中国标准时间 */ -public class DateUtil { +public class SDDateUtil { /** * 取得当前时间戳（精确到秒） diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/FileUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDFileUtil.java similarity index 98% rename from siberiadante/src/main/java/com/siberiadante/lib/util/FileUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDFileUtil.java index d484811..445fedd 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/FileUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDFileUtil.java @@ -28,11 +28,15 @@ import java.util.List; /** - * Created by SiberiaDante on 2017/5/4. - * 文件处理相关工具类 + * @Created SiberiaDante + * @Describe：文件处理相关工具类 + * @Time: 2017/5/4. + * @UpDate: + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante */ -public class FileUtil { +public class SDFileUtil { /** * 根据文件路径获取文件 * @@ -780,7 +784,7 @@ public static boolean writeFileFromIS(File file, InputStream is, boolean append) e.printStackTrace(); return false; } finally { - CloseUtil.closeIO(is, os); + SDCloseUtil.closeIO(is, os); } } @@ -816,7 +820,7 @@ public static boolean writeFileFromString(File file, String content, boolean app e.printStackTrace(); return false; } finally { - CloseUtil.closeIO(bw); + SDCloseUtil.closeIO(bw); } } @@ -888,7 +892,7 @@ public static List readFile2List(File file, int st, int end, String char e.printStackTrace(); return null; } finally { - CloseUtil.closeIO(reader); + SDCloseUtil.closeIO(reader); } } @@ -930,7 +934,7 @@ public static String readFile2String(File file, String charsetName) { e.printStackTrace(); return null; } finally { - CloseUtil.closeIO(reader); + SDCloseUtil.closeIO(reader); } } @@ -1006,7 +1010,7 @@ public static String getFileCharsetSimple(File file) { } catch (IOException e) { e.printStackTrace(); } finally { - CloseUtil.closeIO(is); + SDCloseUtil.closeIO(is); } switch (p) { case 0xefbb: @@ -1051,7 +1055,7 @@ public static int getFileLines(File file) { } catch (IOException e) { e.printStackTrace(); } finally { - CloseUtil.closeIO(is); + SDCloseUtil.closeIO(is); } return count; } @@ -1205,7 +1209,7 @@ public static byte[] getFileMD5(File file) { } catch (NoSuchAlgorithmException | IOException e) { e.printStackTrace(); } finally { - CloseUtil.closeIO(dis); + SDCloseUtil.closeIO(dis); } return null; } @@ -1346,7 +1350,7 @@ private static ByteArrayOutputStream input2OutputStream(InputStream is) { e.printStackTrace(); return null; } finally { - CloseUtil.closeIO(is); + SDCloseUtil.closeIO(is); } } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/IntentUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDIntentUtil.java similarity index 94% rename from siberiadante/src/main/java/com/siberiadante/lib/util/IntentUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDIntentUtil.java index 71dee1b..9b8901c 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/IntentUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDIntentUtil.java @@ -1,6 +1,5 @@ package com.siberiadante.lib.util; -import android.app.Activity; import android.content.ComponentName; import android.content.Intent; import android.net.Uri; @@ -14,15 +13,18 @@ import java.io.File; -import static android.icu.lang.UCharacter.GraphemeClusterBreak.T; - /** - * Created by SiberiaDante on 2017/5/15. + * @Created SiberiaDante + * @Describe： + * @Time: 2017/5/15. + * @UpDate: + * @Email: 994537867@qq.com + * @GitHub: https://github.com/SiberiaDante */ -public class IntentUtil { +public class SDIntentUtil { - public IntentUtil() { + public SDIntentUtil() { new SiberiaDanteLibException(); } @@ -35,7 +37,7 @@ public IntentUtil() { * @return intent */ public static Intent getInstallAppIntent(String filePath, String authority) { - return getInstallAppIntent(FileUtil.getFileByPath(filePath), authority); + return getInstallAppIntent(SDFileUtil.getFileByPath(filePath), authority); } /** @@ -116,7 +118,7 @@ public static Intent getShareTextIntent(String content) { * @return intent */ public static Intent getShareImageIntent(String content, String imagePath) { - return getShareImageIntent(content, FileUtil.getFileByPath(imagePath)); + return getShareImageIntent(content, SDFileUtil.getFileByPath(imagePath)); } /** @@ -127,7 +129,7 @@ public static Intent getShareImageIntent(String content, String imagePath) { * @return intent */ public static Intent getShareImageIntent(String content, File image) { - if (!FileUtil.isFileExists(image)) return null; + if (!SDFileUtil.isFileExists(image)) return null; return getShareImageIntent(content, Uri.fromFile(image)); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/KeyBoardUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDKeyBoardUtil.java similarity index 98% rename from siberiadante/src/main/java/com/siberiadante/lib/util/KeyBoardUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDKeyBoardUtil.java index dfa5e62..9009169 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/KeyBoardUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDKeyBoardUtil.java @@ -21,9 +21,9 @@ * @GitHub: https://github.com/SiberiaDante */ -public class KeyBoardUtil { +public class SDKeyBoardUtil { - private KeyBoardUtil() { + private SDKeyBoardUtil() { new SiberiaDanteLibException(getClass().getSimpleName()); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/LogUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDLogUtil.java similarity index 91% rename from siberiadante/src/main/java/com/siberiadante/lib/util/LogUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDLogUtil.java index 71112f0..1fb174f 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/LogUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDLogUtil.java @@ -1,7 +1,6 @@ package com.siberiadante.lib.util; import android.os.Environment; -import android.util.Config; import android.util.Log; import com.siberiadante.lib.SiberiaDanteLib; @@ -13,9 +12,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; /** * @Created SiberiaDante @@ -26,8 +22,8 @@ * can use */ -public class LogUtil { - public LogUtil() { +public class SDLogUtil { + public SDLogUtil() { new SiberiaDanteLibException(); } @@ -39,7 +35,7 @@ public LogUtil() { private static int CHUNK_SIZE = 106; //设置字节数 public static void setTag(String tag) { - LogUtil.TAG = tag; + SDLogUtil.TAG = tag; } public static void i(String msg) { @@ -100,7 +96,7 @@ public static void w(String tag, String msg) { * @param msg */ public static void printTimeLogI(String tag, String msg) { - d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); + d(tag + "[" + SDDateUtil.getSDFTime(SDDateUtil.getTimeStamp()) + "]:" + msg); } /** @@ -110,7 +106,7 @@ public static void printTimeLogI(String tag, String msg) { * @param msg */ public static void printTimeLogD(String tag, String msg) { - d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); + d(tag + "[" + SDDateUtil.getSDFTime(SDDateUtil.getTimeStamp()) + "]:" + msg); } /** @@ -120,7 +116,7 @@ public static void printTimeLogD(String tag, String msg) { * @param msg */ public static void printTimeLogE(String tag, String msg) { - d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); + d(tag + "[" + SDDateUtil.getSDFTime(SDDateUtil.getTimeStamp()) + "]:" + msg); } /** @@ -130,7 +126,7 @@ public static void printTimeLogE(String tag, String msg) { * @param msg */ public static void printTimeLogV(String tag, String msg) { - d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); + d(tag + "[" + SDDateUtil.getSDFTime(SDDateUtil.getTimeStamp()) + "]:" + msg); } /** @@ -140,7 +136,7 @@ public static void printTimeLogV(String tag, String msg) { * @param msg */ public static void printTimeLogW(String tag, String msg) { - d(tag + "[" + DateUtil.getSDFTime(DateUtil.getTimeStamp()) + "]:" + msg); + d(tag + "[" + SDDateUtil.getSDFTime(SDDateUtil.getTimeStamp()) + "]:" + msg); } /** @@ -200,7 +196,7 @@ public static void showLargeLog(String tag, String logContent, int showLength) { */ public static void eFile(String info) { long timestamp = System.currentTimeMillis(); - String time = DateUtil.getSDFTime(DateUtil.getTimeStamp()); + String time = SDDateUtil.getSDFTime(SDDateUtil.getTimeStamp()); String fileName = SiberiaDanteLib.getContext().getPackageName() + "crash-" + time + "-" + timestamp + ".log"; if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { String path = "/sdcard/crash/"; @@ -245,7 +241,7 @@ private static StackTraceElement getTargetStackTraceElement() { StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); for (StackTraceElement stackTraceElement : stackTrace) { - boolean isLogMethod = stackTraceElement.getClassName().equals(LogUtil.class.getName()); + boolean isLogMethod = stackTraceElement.getClassName().equals(SDLogUtil.class.getName()); if (shouldTrace && !isLogMethod) { targetStackTrace = stackTraceElement; break; @@ -263,7 +259,7 @@ private static String msgFormat(String stackstr, String msg) { e.printStackTrace(); } int length = bytes.length; - String newMsg = TOP_BORDER + "\n" + LEFT_BORDER + "\t" + DateUtil.getSDFTimeYMDHSM() + "\n" + LEFT_BORDER + "\t" + stackstr; + String newMsg = TOP_BORDER + "\n" + LEFT_BORDER + "\t" + SDDateUtil.getSDFTimeYMDHSM() + "\n" + LEFT_BORDER + "\t" + stackstr; if (length > CHUNK_SIZE) { int i = 0; while (i < length) { diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/MathUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDMathUtil.java similarity index 95% rename from siberiadante/src/main/java/com/siberiadante/lib/util/MathUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDMathUtil.java index 0250be0..e7e750c 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/MathUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDMathUtil.java @@ -8,7 +8,7 @@ * @GitHub: https://github.com/SiberiaDante */ -public class MathUtil { +public class SDMathUtil { /** * sin计算 * diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/NetWorkUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDNetWorkUtil.java similarity index 97% rename from siberiadante/src/main/java/com/siberiadante/lib/util/NetWorkUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDNetWorkUtil.java index 73f59f8..b11adc4 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/NetWorkUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDNetWorkUtil.java @@ -27,7 +27,7 @@ * @Describe can use */ -public class NetWorkUtil { +public class SDNetWorkUtil { // //没有网络连接 // private static final int NETWORK_NONE = 0; // //wifi连接 @@ -172,10 +172,10 @@ public static void setWifiEnabled(final boolean enabled) { * * @return {@code int}手机网络数据连接类型
*
    - *
  • {@link NetWorkUtil.NetworkType#NETWORK_2G}
    • - *
  • {@link NetWorkUtil.NetworkType#NETWORK_3G}
    • - *
  • {@link NetWorkUtil.NetworkType#NETWORK_4G}
    • - *
  • {@link NetWorkUtil.NetworkType#NETWORK_MOBILE}
    • + *
  • {@link SDNetWorkUtil.NetworkType#NETWORK_2G}
    • + *
  • {@link SDNetWorkUtil.NetworkType#NETWORK_3G}
    • + *
  • {@link SDNetWorkUtil.NetworkType#NETWORK_4G}
    • + *
  • {@link SDNetWorkUtil.NetworkType#NETWORK_MOBILE}
    • *
*/ public static NetworkType getNetWorkType() { diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/NumberUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDNumberUtil.java similarity index 96% rename from siberiadante/src/main/java/com/siberiadante/lib/util/NumberUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDNumberUtil.java index 3df23b1..9960dab 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/NumberUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDNumberUtil.java @@ -11,7 +11,7 @@ * @博客园： http://www.cnblogs.com/shen-hua/ */ -public class NumberUtil { +public class SDNumberUtil { /** * 判断str是否全是数字 diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/SPUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDSPUtil.java similarity index 97% rename from siberiadante/src/main/java/com/siberiadante/lib/util/SPUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDSPUtil.java index 3600f8b..6545c9f 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/SPUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDSPUtil.java @@ -11,13 +11,13 @@ /** * @Created SiberiaDante - * @Describe： 使用参考sample/src/constants/AppInfo.java + * @Describe： 使用参考sample/src/constants/SDAppInfo.java * @Time: 2017/8/3 * @Email: 994537867@qq.com * @GitHub: https://github.com/SiberiaDante */ -public final class SPUtil { +public final class SDSPUtil { private SharedPreferences sp; private SharedPreferences.Editor editor; @@ -28,7 +28,7 @@ public final class SPUtil { * * @param spName spName */ - public SPUtil(String spName) { + public SDSPUtil(String spName) { sp = SiberiaDanteLib.getContext().getSharedPreferences(spName, Context.MODE_PRIVATE); editor = sp.edit(); editor.apply(); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/ScreenUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDScreenUtil.java similarity index 98% rename from siberiadante/src/main/java/com/siberiadante/lib/util/ScreenUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDScreenUtil.java index f731351..9d8e344 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/ScreenUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDScreenUtil.java @@ -29,13 +29,13 @@ * 屏幕相关工具类 */ -public class ScreenUtil { +public class SDScreenUtil { private static final int INVALID_VAL = -1; private static final int COLOR_DEFAULT = Color.parseColor("#20000000"); - private ScreenUtil() { - new SiberiaDanteLibException(ScreenUtil.class.getName()); + private SDScreenUtil() { + new SiberiaDanteLibException(SDScreenUtil.class.getName()); } public static float getDensity(Activity activity) { @@ -91,7 +91,7 @@ public static int getScreenWidthDp() { WindowManager windowManager = (WindowManager) SiberiaDanteLib.getContext().getSystemService(Context.WINDOW_SERVICE); DisplayMetrics dm = new DisplayMetrics(); windowManager.getDefaultDisplay().getMetrics(dm); - return TransitionTools.px2dip(dm.widthPixels); + return SDTransitionUtil.px2dip(dm.widthPixels); } /** @@ -101,7 +101,7 @@ public static int getScreenHeightDp() { WindowManager windowManager = (WindowManager) SiberiaDanteLib.getContext().getSystemService(Context.WINDOW_SERVICE); DisplayMetrics dm = new DisplayMetrics(); windowManager.getDefaultDisplay().getMetrics(dm); - return TransitionTools.px2dip(dm.heightPixels); + return SDTransitionUtil.px2dip(dm.heightPixels); } /** diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/SDCardUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDStorageUtil.java similarity index 99% rename from siberiadante/src/main/java/com/siberiadante/lib/util/SDCardUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDStorageUtil.java index 8f58eae..78f90e5 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/SDCardUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDStorageUtil.java @@ -26,9 +26,9 @@ * Created by SiberiaDante on 2017/5/15. */ -public class SDCardUtil { +public class SDStorageUtil { - public SDCardUtil() { + public SDStorageUtil() { new SiberiaDanteLibException(getClass().getSimpleName()); } @@ -245,7 +245,7 @@ public static String getSDCardPath() { } catch (Exception e) { e.printStackTrace(); } finally { - CloseUtil.closeIO(bufferedReader); + SDCloseUtil.closeIO(bufferedReader); } return Environment.getExternalStorageDirectory().getPath() + File.separator; } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/StringUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDStringUtil.java similarity index 94% rename from siberiadante/src/main/java/com/siberiadante/lib/util/StringUtil.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDStringUtil.java index c8ca4e8..20063db 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/StringUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDStringUtil.java @@ -11,7 +11,7 @@ * @博客园： http://www.cnblogs.com/shen-hua/ */ -public class StringUtil { +public class SDStringUtil { /** * 判断字符串是否为空 * @@ -31,10 +31,10 @@ public static boolean isEmpty(String str) { */ public static boolean isHaveString(String str1, String str2) { if (str1.contains(str2)) { - LogUtil.d(true + ""); + SDLogUtil.d(true + ""); return true; } else { - LogUtil.d(false + ""); + SDLogUtil.d(false + ""); return false; } } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/SDToast.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDToast.java index 7bfa0a6..7c1f809 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/SDToast.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDToast.java @@ -368,7 +368,7 @@ private static Toast showLinesToastText(List contents, int backgroundCol } toastList.add(mToastLines); LinearLayout linearLayoutTop = new LinearLayout(SiberiaDanteLib.getContext());//创建线性布局 - linearLayoutTop.setPadding(TransitionTools.dip2px(paddingStart), TransitionTools.dip2px(paddingTop), TransitionTools.dip2px(paddingRight), TransitionTools.dip2px(paddingLeft)); + linearLayoutTop.setPadding(SDTransitionUtil.dip2px(paddingStart), SDTransitionUtil.dip2px(paddingTop), SDTransitionUtil.dip2px(paddingRight), SDTransitionUtil.dip2px(paddingLeft)); if (BACKGROUND_COLOR_NULL == backgroundColor) { linearLayoutTop.setBackgroundColor(DEFAULT_BACKGROUND_COLOR); @@ -842,7 +842,7 @@ public static Toast custom(@NonNull Context context, @NonNull String message, Dr if (currentToast == null) { currentToast = new Toast(context); } - final View toastLayout = ((LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.toast_layout, null); + final View toastLayout = ((LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.sd_toast_layout, null); final ImageView toastIcon = (ImageView) toastLayout.findViewById(R.id.toast_icon); final TextView toastTextView = (TextView) toastLayout.findViewById(R.id.toast_text); Drawable drawableFrame; diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/TransitionTools.java b/siberiadante/src/main/java/com/siberiadante/lib/util/SDTransitionUtil.java similarity index 98% rename from siberiadante/src/main/java/com/siberiadante/lib/util/TransitionTools.java rename to siberiadante/src/main/java/com/siberiadante/lib/util/SDTransitionUtil.java index 4b9c687..b65e4e4 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/TransitionTools.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/SDTransitionUtil.java @@ -4,7 +4,7 @@ import android.util.DisplayMetrics; import android.util.TypedValue; import com.siberiadante.lib.SiberiaDanteLib; -public class TransitionTools { +public class SDTransitionUtil { public static float getDensity(Activity activity) { //屏幕dpi DisplayMetrics displayMetrics = new DisplayMetrics(); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/util/ShellUtil.java b/siberiadante/src/main/java/com/siberiadante/lib/util/ShellUtil.java index 18338ff..dc4bb24 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/util/ShellUtil.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/util/ShellUtil.java @@ -115,7 +115,7 @@ public static CommandResult execCmd(String[] commands, boolean isRoot, boolean i } catch (Exception e) { e.printStackTrace(); } finally { - CloseUtil.closeIO(os, successResult, errorResult); + SDCloseUtil.closeIO(os, successResult, errorResult); if (process != null) { process.destroy(); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/view/base/nicedialog/BaseNiceDialog.java b/siberiadante/src/main/java/com/siberiadante/lib/view/base/nicedialog/BaseNiceDialog.java index e82a154..610d2c1 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/view/base/nicedialog/BaseNiceDialog.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/view/base/nicedialog/BaseNiceDialog.java @@ -14,8 +14,8 @@ import android.view.WindowManager; import com.siberiadante.lib.R; -import com.siberiadante.lib.util.ScreenUtil; -import com.siberiadante.lib.util.TransitionTools; +import com.siberiadante.lib.util.SDScreenUtil; +import com.siberiadante.lib.util.SDTransitionUtil; /** * @Created SiberiaDante @@ -117,15 +117,15 @@ private void initParams() { //设置dialog宽度 if (width == 0) { - lp.width = ScreenUtil.getScreenWidthPx() - 2 * TransitionTools.dp2px( margin); + lp.width = SDScreenUtil.getScreenWidthPx() - 2 * SDTransitionUtil.dp2px( margin); } else { - lp.width = TransitionTools.dp2px(width); + lp.width = SDTransitionUtil.dp2px(width); } //设置dialog高度 if (height == 0) { lp.height = WindowManager.LayoutParams.WRAP_CONTENT; } else { - lp.height = TransitionTools.dp2px(height); + lp.height = SDTransitionUtil.dp2px(height); } //设置dialog进入、退出的动画 diff --git a/siberiadante/src/main/java/com/siberiadante/lib/view/BottomPopupWindow.java b/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDBottomDialog.java similarity index 89% rename from siberiadante/src/main/java/com/siberiadante/lib/view/BottomPopupWindow.java rename to siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDBottomDialog.java index 05ff064..72c3d35 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/view/BottomPopupWindow.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDBottomDialog.java @@ -1,4 +1,4 @@ -package com.siberiadante.lib.view; +package com.siberiadante.lib.view.dialog; import android.app.Dialog; import android.content.Context; @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; - /** * @Created SiberiaDante * @Describe： 仿IOS实现底部弹窗，可拓展多个item @@ -26,7 +25,7 @@ * @Email: 994537867@qq.com * @GitHub: https://github.com/SiberiaDante */ -public class BottomPopupWindow { +public class SDBottomDialog { private Context context; private Dialog dialog; @@ -39,14 +38,14 @@ public class BottomPopupWindow { private Display display; private View view_line; - public BottomPopupWindow(Context context) { + public SDBottomDialog(Context context) { this.context = context; WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); display = windowManager.getDefaultDisplay(); } - public BottomPopupWindow builder() { - View view = LayoutInflater.from(context).inflate(R.layout.popup_window_bottom_layout, null); + public SDBottomDialog builder() { + View view = LayoutInflater.from(context).inflate(R.layout.sd_bottom_dialog_layout, null); view.setMinimumWidth(display.getWidth()); sLayout_content = (ScrollView) view.findViewById(R.id.scroll_view_layout_content); lLayout_content = (LinearLayout) view @@ -71,7 +70,7 @@ public void onClick(View v) { return this; } - public BottomPopupWindow setTitle(String title) { + public SDBottomDialog setTitle(String title) { showTitle = true; txt_title.setVisibility(View.VISIBLE); view_line.setVisibility(View.VISIBLE); @@ -79,7 +78,7 @@ public BottomPopupWindow setTitle(String title) { return this; } - public BottomPopupWindow setTitle(String title, int color, float size) { + public SDBottomDialog setTitle(String title, int color, float size) { showTitle = true; txt_title.setVisibility(View.VISIBLE); view_line.setVisibility(View.VISIBLE); @@ -89,20 +88,20 @@ public BottomPopupWindow setTitle(String title, int color, float size) { return this; } - public BottomPopupWindow setCancelable(boolean cancel) { + public SDBottomDialog setCancelable(boolean cancel) { dialog.setCancelable(cancel); return this; } - public BottomPopupWindow setCanceled(boolean cancel) { + public SDBottomDialog setCanceled(boolean cancel) { dialog.setCanceledOnTouchOutside(cancel); return this; } - public BottomPopupWindow addSheetItem(String strItem, SheetItemColor color, - OnSheetItemClickListener listener) { + public SDBottomDialog addSheetItem(String strItem, SheetItemColor color, + OnSheetItemClickListener listener) { if (sheetItemList == null) { - sheetItemList = new ArrayList(); + sheetItemList = new ArrayList<>(); } sheetItemList.add(new SheetItem(strItem, color, listener)); return this; @@ -187,13 +186,13 @@ public interface OnSheetItemClickListener { void onClick(int which); } - public class SheetItem { + private class SheetItem { String name; OnSheetItemClickListener itemClickListener; SheetItemColor color; - public SheetItem(String name, SheetItemColor color, - OnSheetItemClickListener itemClickListener) { + private SheetItem(String name, SheetItemColor color, + OnSheetItemClickListener itemClickListener) { this.name = name; this.color = color; this.itemClickListener = itemClickListener; diff --git a/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEditDialog.java b/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEditDialog.java index 2870fbf..5e4c96d 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEditDialog.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEditDialog.java @@ -42,7 +42,7 @@ public SDEditDialog(Context context) { } public SDEditDialog builder() { - View view = LayoutInflater.from(context).inflate(R.layout.dialog_alert_edit, null); + View view = LayoutInflater.from(context).inflate(R.layout.sd_dialog_alert_edit, null); mLinear_layout = (LinearLayout) view.findViewById(R.id.linear_alert_dialog_bg); mTvTitle = (TextView) view.findViewById(R.id.tv_alert_dialog_title); mEdtContent = (EditText) view.findViewById(R.id.edt_alert_dialog_content); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEnsureDialog.java b/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEnsureDialog.java index d415f33..d11d19a 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEnsureDialog.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/view/dialog/SDEnsureDialog.java @@ -52,7 +52,7 @@ public SDEnsureDialog(Context context) { * @return */ public SDEnsureDialog builder() { - final View view = LayoutInflater.from(context).inflate(R.layout.dialog_ensure_layout, null, false); + final View view = LayoutInflater.from(context).inflate(R.layout.sd_dialog_ensure_layout, null, false); LinearLayout mLinearDialog = ((LinearLayout) view.findViewById(R.id.linear_dialog)); mLinearBottom = ((LinearLayout) view.findViewById(R.id.linear_bottom)); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleBar.java b/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleBar.java index d045ea2..6abdefd 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleBar.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleBar.java @@ -14,8 +14,8 @@ import android.widget.TextView; import com.siberiadante.lib.R; -import com.siberiadante.lib.util.ScreenUtil; -import com.siberiadante.lib.util.TransitionTools; +import com.siberiadante.lib.util.SDScreenUtil; +import com.siberiadante.lib.util.SDTransitionUtil; /** * @Created SiberiaDante @@ -68,12 +68,12 @@ public SDTitleBar(Context context, AttributeSet attrs, int defStyleAttr) { private void init(Context context) { if (mImmersive) { - mStatusBarHeight = ScreenUtil.getStatusBarHeight(); + mStatusBarHeight = SDScreenUtil.getStatusBarHeight(); } - mActionPadding = TransitionTools.dip2px(5); - mOutPadding = TransitionTools.dip2px(8); - mHeight = TransitionTools.dip2px(DEFAULT_TITLE_BAR_HEIGHT); - mLRPadding = TransitionTools.dip2px(4); + mActionPadding = SDTransitionUtil.dip2px(5); + mOutPadding = SDTransitionUtil.dip2px(8); + mHeight = SDTransitionUtil.dip2px(DEFAULT_TITLE_BAR_HEIGHT); + mLRPadding = SDTransitionUtil.dip2px(4); initView(context); } @@ -173,7 +173,7 @@ public void setDivideBackground(Drawable drawable) { public void setImmersive(boolean immersive) { mImmersive = immersive; if (mImmersive) { - mStatusBarHeight = ScreenUtil.getStatusBarHeight(); + mStatusBarHeight = SDScreenUtil.getStatusBarHeight(); } else { mStatusBarHeight = 0; } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleLayout.java b/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleLayout.java index 2f58919..9eda497 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleLayout.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/view/titlebar/SDTitleLayout.java @@ -7,6 +7,7 @@ import android.support.annotation.AttrRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.Gravity; import android.view.LayoutInflater; @@ -18,10 +19,10 @@ import android.widget.TextView; import com.siberiadante.lib.R; -import com.siberiadante.lib.util.LogUtil; -import com.siberiadante.lib.util.ScreenUtil; -import com.siberiadante.lib.util.StringUtil; -import com.siberiadante.lib.util.TransitionTools; +import com.siberiadante.lib.util.SDLogUtil; +import com.siberiadante.lib.util.SDScreenUtil; +import com.siberiadante.lib.util.SDStringUtil; +import com.siberiadante.lib.util.SDTransitionUtil; /** * @Created SiberiaDante @@ -38,34 +39,34 @@ */ public class SDTitleLayout extends RelativeLayout { - private int mLayoutBarHeight = TransitionTools.dip2px(50); + private int mLayoutBarHeight = SDTransitionUtil.dip2px(40); private int mLeftImage; - private int mLeftImageWidth = TransitionTools.dip2px(30); - private int mLeftImagePaddingStart = TransitionTools.dip2px(10); + private int mLeftImageWidth = SDTransitionUtil.dip2px(30); + private int mLeftImagePaddingStart = SDTransitionUtil.dip2px(5); private String mLeftText = ""; - private int mLeftTextSize = TransitionTools.dip2px(16); + private int mLeftTextSize = SDTransitionUtil.dip2px(16); private int mLeftTextColor = Color.BLACK; - private int mLeftTextPaddingStart = TransitionTools.dip2px(10); + private int mLeftTextPaddingStart = SDTransitionUtil.dip2px(5); private String mTitle = ""; - private float mTitleSize = TransitionTools.dip2px(18); + private float mTitleSize = SDTransitionUtil.dip2px(18); private int mTitleColor = Color.BLACK; private String mSubTitle = ""; - private float mSubTitleSize = TransitionTools.dip2px(12); + private float mSubTitleSize = SDTransitionUtil.dip2px(12); private int mSubTitleColor = Color.GRAY; private int mRightImage; - private int mRightImageWidth = TransitionTools.dip2px(30); - private int mRightImagePaddingEnd = TransitionTools.dip2px(10); + private int mRightImageWidth = SDTransitionUtil.dip2px(30); + private int mRightImagePaddingEnd = SDTransitionUtil.dip2px(5); private String mRightText = ""; - private float mRightTextSize = TransitionTools.dip2px(16); + private float mRightTextSize = SDTransitionUtil.dip2px(16); private int mRightTextColor = Color.BLACK; - private int mRightTextPaddingEnd = TransitionTools.dip2px(10); + private int mRightTextPaddingEnd = SDTransitionUtil.dip2px(10); private int mLineHeight = 1; @@ -107,8 +108,8 @@ public SDTitleLayout(@NonNull Context context, @Nullable AttributeSet attrs, @At super(context, attrs, defStyleAttr); mContext = context; - mStatusBarHeight = ScreenUtil.getStatusBarHeight(); - inflate = LayoutInflater.from(context).inflate(R.layout.title_layout, null); + mStatusBarHeight = SDScreenUtil.getStatusBarHeight(); + inflate = LayoutInflater.from(context).inflate(R.layout.sd_title_layout, null); addView(inflate); TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.SDTitleLayout); @@ -209,48 +210,48 @@ private void initData() { mIvLeft.setLayoutParams(mIvLeftLayoutParams); mIvLeft.setPadding(mLeftImagePaddingStart, 0, 0, 0); mLeftTotalWidth += mLeftImageWidth; - LogUtil.d("---------" + mLeftTotalWidth + "------------"); + SDLogUtil.d("---------" + mLeftTotalWidth + "------------"); mLeftTotalWidth += mLeftImagePaddingStart; - LogUtil.d("---------" + mLeftTotalWidth + "------------"); + SDLogUtil.d("---------" + mLeftTotalWidth + "------------"); } else { mIvLeft.setVisibility(GONE); } - if (StringUtil.isEmpty(mLeftText)) { - LogUtil.d("-----------------null----------------"); + if (SDStringUtil.isEmpty(mLeftText)) { + SDLogUtil.d("-----------------null----------------"); mTvLeft.setPadding(0, 0, 100, 0); } //左边文字 - if (StringUtil.isEmpty(mLeftText)) { + if (SDStringUtil.isEmpty(mLeftText)) { mTvLeft.setVisibility(GONE); } else { mTvLeft.setVisibility(VISIBLE); mTvLeft.setText(mLeftText); - mTvLeft.setTextSize(TransitionTools.px2sp(mLeftTextSize)); + mTvLeft.setTextSize(SDTransitionUtil.px2sp(mLeftTextSize)); mTvLeft.setTextColor(mLeftTextColor); mTvLeft.setPadding(mLeftTextPaddingStart, 0, 0, 0); mLeftTotalWidth += mLeftTextPaddingStart; } //标题 - if (StringUtil.isEmpty(mTitle)) { + if (SDStringUtil.isEmpty(mTitle)) { mTvTitle.setVisibility(INVISIBLE); } else { mTvTitle.setVisibility(VISIBLE); mTvTitle.setText(mTitle); - mTvTitle.setTextSize(TransitionTools.px2sp(mTitleSize)); + mTvTitle.setTextSize(SDTransitionUtil.px2sp(mTitleSize)); mTvTitle.setTextColor(mTitleColor); } //副标题 - if (StringUtil.isEmpty(mSubTitle)) { + if (SDStringUtil.isEmpty(mSubTitle)) { mTvSubTitle.setVisibility(GONE); } else { mTvSubTitle.setVisibility(VISIBLE); mTvSubTitle.setText(mSubTitle); - mTvSubTitle.setTextSize(TransitionTools.px2sp(mSubTitleSize)); + mTvSubTitle.setTextSize(SDTransitionUtil.px2sp(mSubTitleSize)); mTvSubTitle.setTextColor(mSubTitleColor); mTvSubTitle.setGravity(Gravity.TOP | Gravity.CENTER); mTvTitle.setGravity(Gravity.BOTTOM | Gravity.CENTER); @@ -270,13 +271,13 @@ private void initData() { } //右边文字 - if (StringUtil.isEmpty(mRightText)) { + if (SDStringUtil.isEmpty(mRightText)) { mTvRight.setVisibility(GONE); } else { mTvRight.setVisibility(VISIBLE); mIvRight.setVisibility(GONE); mTvRight.setText(mRightText); - mTvRight.setTextSize(TransitionTools.px2sp(mRightTextSize)); + mTvRight.setTextSize(SDTransitionUtil.px2sp(mRightTextSize)); mTvRight.setTextColor(mRightTextColor); mTvRight.setPadding(0, 0, mRightImagePaddingEnd, 0); } @@ -329,7 +330,7 @@ private void initLayoutHeight() { * @param title */ public void setTitle(CharSequence title) { - if (!StringUtil.isEmpty(title.toString())) { + if (!SDStringUtil.isEmpty(title.toString())) { mTvTitle.setText(title); } } @@ -364,7 +365,7 @@ public void setTitleColor(int titleColor) { * @param titleColor */ public void setTitleStyle(String title, int titleSize, int titleColor) { - if (!StringUtil.isEmpty(title)) { + if (!SDStringUtil.isEmpty(title)) { mTvTitle.setText(title); } if (titleSize != 0) { @@ -381,7 +382,7 @@ public void setTitleStyle(String title, int titleSize, int titleColor) { * @param title */ public void setSubTitle(CharSequence title) { - if (!StringUtil.isEmpty(title.toString())) { + if (!SDStringUtil.isEmpty(title.toString())) { mTvSubTitle.setVisibility(VISIBLE); mTvSubTitle.setText(title); mTvSubTitle.setGravity(Gravity.TOP | Gravity.CENTER); @@ -425,7 +426,7 @@ public void setSubTitleColor(int titleColor) { * @param titleColor */ public void setSubTitleStyle(String title, int titleSize, int titleColor) { - if (!StringUtil.isEmpty(title)) { + if (!SDStringUtil.isEmpty(title)) { mTvSubTitle.setVisibility(VISIBLE); mTvSubTitle.setGravity(Gravity.TOP | Gravity.CENTER); mTvTitle.setGravity(Gravity.BOTTOM | Gravity.CENTER); @@ -445,7 +446,7 @@ public void setSubTitleStyle(String title, int titleSize, int titleColor) { * @param leftText */ public void setLeftText(String leftText) { - if (!StringUtil.isEmpty(leftText)) { + if (!SDStringUtil.isEmpty(leftText)) { mTvLeft.setText(leftText); } } @@ -480,7 +481,7 @@ public void setLeftTextColor(int leftTextColor) { * @param leftTextColor */ public void setLeftStyle(String leftText, int leftTextSize, int leftTextColor) { - if (!StringUtil.isEmpty(leftText)) { + if (!SDStringUtil.isEmpty(leftText)) { mTvTitle.setText(leftText); } if (leftTextSize != 0) { @@ -497,7 +498,7 @@ public void setLeftStyle(String leftText, int leftTextSize, int leftTextColor) { * @param rightText */ public void setRightText(String rightText) { - if (!StringUtil.isEmpty(rightText)) { + if (!SDStringUtil.isEmpty(rightText)) { mTvRight.setText(rightText); } } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/widget/JustifyTextView.java b/siberiadante/src/main/java/com/siberiadante/lib/widget/JustifyTextView.java index 85bac34..cdfb929 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/widget/JustifyTextView.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/widget/JustifyTextView.java @@ -2,6 +2,7 @@ import android.content.Context; import android.graphics.Canvas; +import android.support.v7.widget.AppCompatTextView; import android.text.Layout; import android.text.StaticLayout; import android.text.TextPaint; @@ -16,11 +17,12 @@ * @GitHub: https://github.com/SiberiaDante */ -public class JustifyTextView extends TextView { +public class JustifyTextView extends AppCompatTextView { private int mLineY; private int mViewWidth; + public JustifyTextView(Context context, AttributeSet attrs) { super(context, attrs); } @@ -46,7 +48,7 @@ protected void onDraw(Canvas canvas) { String line = text.substring(lineStart, lineEnd); float width = StaticLayout.getDesiredWidth(text, lineStart, lineEnd, getPaint()); - if (needScale(line) && i < layout.getLineCount() -1) { + if (needScale(line) && i < layout.getLineCount() - 1) { drawScaledText(canvas, lineStart, line, width); } else { canvas.drawText(line, 0, mLineY, paint); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/widget/LetterSpaceTextView.java b/siberiadante/src/main/java/com/siberiadante/lib/widget/LetterSpaceTextView.java deleted file mode 100644 index c7eb362..0000000 --- a/siberiadante/src/main/java/com/siberiadante/lib/widget/LetterSpaceTextView.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.siberiadante.lib.widget; - -import android.content.Context; -import android.support.v7.widget.AppCompatTextView; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.style.ScaleXSpan; -import android.util.AttributeSet; - -/** - * @Created SiberiaDante - * @Describe： 可设置字体间距的TextView - * @Time: 2017/9/7 - * @Email: 994537867@qq.com - * @GitHub: https://github.com/SiberiaDante - */ - -public class LetterSpaceTextView extends AppCompatTextView { - - private float spacing = Spacing.NORMAL; - private CharSequence originalText = ""; - - - public LetterSpaceTextView(Context context) { - super(context); - } - - public LetterSpaceTextView(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public LetterSpaceTextView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - - public float getSpacing() { - return this.spacing; - } - - public void setSpacing(float spacing) { - this.spacing = spacing; - applySpacing(); - } - - @Override - public void setText(CharSequence text, BufferType type) { - originalText = text; - applySpacing(); - } - - @Override - public CharSequence getText() { - return originalText; - } - - private void applySpacing() { - if (this == null || this.originalText == null) return; - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < originalText.length(); i++) { - builder.append(originalText.charAt(i)); - if (i + 1 < originalText.length()) { - builder.append("\u00A0"); - } - } - SpannableString finalText = new SpannableString(builder.toString()); - if (builder.toString().length() > 1) { - for (int i = 1; i < builder.toString().length(); i += 2) { - finalText.setSpan(new ScaleXSpan((spacing + 1) / 10), i, i + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - } - } - super.setText(finalText, BufferType.SPANNABLE); - } - - class Spacing { - final static float NORMAL = 0; - } -} \ No newline at end of file diff --git a/siberiadante/src/main/java/com/siberiadante/lib/widget/CenterAlignImageSpan.java b/siberiadante/src/main/java/com/siberiadante/lib/widget/SDCenterAlignImageSpan.java similarity index 91% rename from siberiadante/src/main/java/com/siberiadante/lib/widget/CenterAlignImageSpan.java rename to siberiadante/src/main/java/com/siberiadante/lib/widget/SDCenterAlignImageSpan.java index 90a06d4..a6f839b 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/widget/CenterAlignImageSpan.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/widget/SDCenterAlignImageSpan.java @@ -18,15 +18,15 @@ * @GitHub: https://github.com/SiberiaDante */ -public class CenterAlignImageSpan extends ImageSpan { +public class SDCenterAlignImageSpan extends ImageSpan { private WeakReference mDrawableRef; - public CenterAlignImageSpan(Context context, Bitmap bitmap, int verticalAlignment) { + public SDCenterAlignImageSpan(Context context, Bitmap bitmap, int verticalAlignment) { super(context, bitmap, verticalAlignment); } - public CenterAlignImageSpan(Context context, int resId, int verticalAlignment) { + public SDCenterAlignImageSpan(Context context, int resId, int verticalAlignment) { super(context, resId, verticalAlignment); } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/widget/HexagonView.java b/siberiadante/src/main/java/com/siberiadante/lib/widget/SDHexagonView.java similarity index 86% rename from siberiadante/src/main/java/com/siberiadante/lib/widget/HexagonView.java rename to siberiadante/src/main/java/com/siberiadante/lib/widget/SDHexagonView.java index a97992b..460c70a 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/widget/HexagonView.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/widget/SDHexagonView.java @@ -15,7 +15,7 @@ import android.view.View; import com.siberiadante.lib.R; -import com.siberiadante.lib.util.MathUtil; +import com.siberiadante.lib.util.SDMathUtil; /** * @Created SiberiaDante @@ -25,7 +25,7 @@ * @GitHub: https://github.com/SiberiaDante */ -public class HexagonView extends View { +public class SDHexagonView extends View { //正六边形的边数量 private static final int POLYGON_COUNT = 6; @@ -71,22 +71,22 @@ public class HexagonView extends View { private int mShadowColor; - public HexagonView(Context context) { + public SDHexagonView(Context context) { this(context, null); } - public HexagonView(Context context, AttributeSet attrs) { + public SDHexagonView(Context context, AttributeSet attrs) { this(context, attrs, 0); } - public HexagonView(Context context, AttributeSet attrs, int defStyleAttr) { + public SDHexagonView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - TypedArray mTypeArray = context.obtainStyledAttributes(attrs, R.styleable.HexagonView, defStyleAttr, 0); - mRadius = mTypeArray.getDimensionPixelSize(R.styleable.HexagonView_h_radius, 0); - mInnerColor = mTypeArray.getColor(R.styleable.HexagonView_h_innerColor, Color.WHITE); - mOuterColor = mTypeArray.getColor(R.styleable.HexagonView_h_outerColor, DEFAULT_OUTER_COLOR); - mOuterWidth = mTypeArray.getDimensionPixelSize(R.styleable.HexagonView_h_outerWidth, DEFAULT_OUTER_WIDTH); - isHasStroke = mTypeArray.getBoolean(R.styleable.HexagonView_h_isHasStroke, true); + TypedArray mTypeArray = context.obtainStyledAttributes(attrs, R.styleable.SDHexagonView, defStyleAttr, 0); + mRadius = mTypeArray.getDimensionPixelSize(R.styleable.SDHexagonView_h_radius, 0); + mInnerColor = mTypeArray.getColor(R.styleable.SDHexagonView_h_innerColor, Color.WHITE); + mOuterColor = mTypeArray.getColor(R.styleable.SDHexagonView_h_outerColor, DEFAULT_OUTER_COLOR); + mOuterWidth = mTypeArray.getDimensionPixelSize(R.styleable.SDHexagonView_h_outerWidth, DEFAULT_OUTER_WIDTH); + isHasStroke = mTypeArray.getBoolean(R.styleable.SDHexagonView_h_isHasStroke, true); mTypeArray.recycle(); initData(); } @@ -137,9 +137,9 @@ public void lineMultShape(int count) { //当前角度 int angle = 360 / count * i; if (i == 0) { - mViewPath.moveTo(mCenterX + mRadius * MathUtil.cos(angle), mCenterY + mRadius * MathUtil.sin(angle)); + mViewPath.moveTo(mCenterX + mRadius * SDMathUtil.cos(angle), mCenterY + mRadius * SDMathUtil.sin(angle)); } else { - mViewPath.lineTo(mCenterX + mRadius * MathUtil.cos(angle), mCenterY + mRadius * MathUtil.sin(angle)); + mViewPath.lineTo(mCenterX + mRadius * SDMathUtil.cos(angle), mCenterY + mRadius * SDMathUtil.sin(angle)); } } mViewPath.close(); diff --git a/siberiadante/src/main/java/com/siberiadante/lib/widget/TabRadioButton.java b/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRadioButton.java similarity index 79% rename from siberiadante/src/main/java/com/siberiadante/lib/widget/TabRadioButton.java rename to siberiadante/src/main/java/com/siberiadante/lib/widget/SDRadioButton.java index d3e53d3..bfe5d95 100644 --- a/siberiadante/src/main/java/com/siberiadante/lib/widget/TabRadioButton.java +++ b/siberiadante/src/main/java/com/siberiadante/lib/widget/SDRadioButton.java @@ -24,42 +24,42 @@ * @Tips: 在xml中需要必填属性：android:clickable"="true"; */ -public class TabRadioButton extends RadioButton { +public class SDRadioButton extends RadioButton { private int mDrawableSize;// xml文件中设置的大小 - public TabRadioButton(Context context) { + public SDRadioButton(Context context) { this(context, null, 0); } - public TabRadioButton(Context context, AttributeSet attrs) { + public SDRadioButton(Context context, AttributeSet attrs) { this(context, attrs, 0); } - public TabRadioButton(Context context, AttributeSet attrs, int defStyle) { + public SDRadioButton(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); // TODO Auto-generated constructor stub Drawable drawableLeft = null, drawableTop = null, drawableRight = null, drawableBottom = null; TypedArray a = context.obtainStyledAttributes(attrs, - R.styleable.TabRadioButton); + R.styleable.SDRadioButton); int n = a.getIndexCount(); for (int i = 0; i < n; i++) { int attr = a.getIndex(i); Log.i("MyRadioButton", "attr:" + attr); - if (attr == R.styleable.TabRadioButton_drawableSize) { - mDrawableSize = a.getDimensionPixelSize(R.styleable.TabRadioButton_drawableSize, 50); + if (attr == R.styleable.SDRadioButton_drawableSize) { + mDrawableSize = a.getDimensionPixelSize(R.styleable.SDRadioButton_drawableSize, 50); Log.i("MyRadioButton", "mDrawableSize:" + mDrawableSize); } - if (attr == R.styleable.TabRadioButton_drawableTop) { + if (attr == R.styleable.SDRadioButton_drawableTop) { drawableTop = a.getDrawable(attr); } - if (attr == R.styleable.TabRadioButton_drawableBottom) { + if (attr == R.styleable.SDRadioButton_drawableBottom) { drawableRight = a.getDrawable(attr); } - if (attr == R.styleable.TabRadioButton_drawableRight) { + if (attr == R.styleable.SDRadioButton_drawableRight) { drawableBottom = a.getDrawable(attr); } - if (attr == R.styleable.TabRadioButton_drawableLeft) { + if (attr == R.styleable.SDRadioButton_drawableLeft) { drawableLeft = a.getDrawable(attr); } } diff --git a/siberiadante/src/main/java/com/siberiadante/lib/widget/WrapRecyclerView.java b/siberiadante/src/main/java/com/siberiadante/lib/widget/WrapRecyclerView.java deleted file mode 100644 index 6a71ddb..0000000 --- a/siberiadante/src/main/java/com/siberiadante/lib/widget/WrapRecyclerView.java +++ /dev/null @@ -1,141 +0,0 @@ -//package com.siberiadante.lib.widget; -// -//import android.content.Context; -//import android.support.annotation.Nullable; -//import android.support.v7.widget.RecyclerView; -//import android.util.AttributeSet; -//import android.view.View; -// -//import com.siberiadante.lib.adapter.base.WrapRecyclerViewAdapter; -// -///** -// * @Created SiberiaDante -// * @Describe： -// * @Time: 2017/7/19 -// * @Email: 994537867@qq.com -// * @GitHub: https://github.com/SiberiaDante -// */ -// -//public class WrapRecyclerView extends RecyclerView { -// // 包裹了一层的头部底部Adapter -// private WrapRecyclerViewAdapter mWrapRecyclerAdapter; -// // 这个是列表数据的Adapter -// private RecyclerView.Adapter mAdapter; -// -// public WrapRecyclerView(Context context) { -// super(context); -// } -// -// public WrapRecyclerView(Context context, @Nullable AttributeSet attrs) { -// super(context, attrs); -// } -// -// public WrapRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) { -// super(context, attrs, defStyle); -// } -// @Override -// public void setAdapter(Adapter adapter) { -// // 为了防止多次设置Adapter -// if (mAdapter != null) { -// mAdapter.unregisterAdapterDataObserver(mDataObserver); -// mAdapter = null; -// } -// -// this.mAdapter = adapter; -// -// if (adapter instanceof WrapRecyclerViewAdapter) { -// mWrapRecyclerAdapter = (WrapRecyclerViewAdapter) adapter; -// } else { -// mWrapRecyclerAdapter = new WrapRecyclerViewAdapter(adapter); -// } -// -// super.setAdapter(mWrapRecyclerAdapter); -// -// // 注册一个观察者 -// mAdapter.registerAdapterDataObserver(mDataObserver); -// -// // 解决GridLayout添加头部和底部也要占据一行 -// mWrapRecyclerAdapter.adjustSpanSize(this); -// } -// -// // 添加头部 -// public void addHeaderView(View view) { -// // 如果没有Adapter那么就不添加，也可以选择抛异常提示 -// // 让他必须先设置Adapter然后才能添加，这里是仿照ListView的处理方式 -// if (mWrapRecyclerAdapter != null) { -// mWrapRecyclerAdapter.addHeaderView(view); -// } -// } -// -// // 添加底部 -// public void addFooterView(View view) { -// if (mWrapRecyclerAdapter != null) { -// mWrapRecyclerAdapter.addFooterView(view); -// } -// } -// -// // 移除头部 -// public void removeHeaderView(View view) { -// if (mWrapRecyclerAdapter != null) { -// mWrapRecyclerAdapter.removeHeaderView(view); -// } -// } -// -// // 移除底部 -// public void removeFooterView(View view) { -// if (mWrapRecyclerAdapter != null) { -// mWrapRecyclerAdapter.removeFooterView(view); -// } -// } -// -// private AdapterDataObserver mDataObserver = new AdapterDataObserver() { -// @Override -// public void onChanged() { -// if (mAdapter == null) return; -// // 观察者 列表Adapter更新 包裹的也需要更新不然列表的notifyDataSetChanged没效果 -// if (mWrapRecyclerAdapter != mAdapter) -// mWrapRecyclerAdapter.notifyDataSetChanged(); -// } -// -// @Override -// public void onItemRangeRemoved(int positionStart, int itemCount) { -// if (mAdapter == null) return; -// // 观察者 列表Adapter更新 包裹的也需要更新不然列表的notifyDataSetChanged没效果 -// if (mWrapRecyclerAdapter != mAdapter) -// mWrapRecyclerAdapter.notifyItemRemoved(positionStart); -// } -// -// @Override -// public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) { -// if (mAdapter == null) return; -// // 观察者 列表Adapter更新 包裹的也需要更新不然列表的notifyItemMoved没效果 -// if (mWrapRecyclerAdapter != mAdapter) -// mWrapRecyclerAdapter.notifyItemMoved(fromPosition, toPosition); -// } -// -// @Override -// public void onItemRangeChanged(int positionStart, int itemCount) { -// if (mAdapter == null) return; -// // 观察者 列表Adapter更新 包裹的也需要更新不然列表的notifyItemChanged没效果 -// if (mWrapRecyclerAdapter != mAdapter) -// mWrapRecyclerAdapter.notifyItemChanged(positionStart); -// } -// -// @Override -// public void onItemRangeChanged(int positionStart, int itemCount, Object payload) { -// if (mAdapter == null) return; -// // 观察者 列表Adapter更新 包裹的也需要更新不然列表的notifyItemChanged没效果 -// if (mWrapRecyclerAdapter != mAdapter) -// mWrapRecyclerAdapter.notifyItemChanged(positionStart,payload); -// } -// -// @Override -// public void onItemRangeInserted(int positionStart, int itemCount) { -// if (mAdapter == null) return; -// // 观察者 列表Adapter更新 包裹的也需要更新不然列表的notifyItemInserted没效果 -// if (mWrapRecyclerAdapter != mAdapter) -// mWrapRecyclerAdapter.notifyItemInserted(positionStart); -// } -// }; -// -//} diff --git a/siberiadante/src/main/res/layout/popup_window_bottom_layout.xml b/siberiadante/src/main/res/layout/sd_bottom_dialog_layout.xml similarity index 100% rename from siberiadante/src/main/res/layout/popup_window_bottom_layout.xml rename to siberiadante/src/main/res/layout/sd_bottom_dialog_layout.xml diff --git a/siberiadante/src/main/res/layout/dialog_alert_edit.xml b/siberiadante/src/main/res/layout/sd_dialog_alert_edit.xml similarity index 100% rename from siberiadante/src/main/res/layout/dialog_alert_edit.xml rename to siberiadante/src/main/res/layout/sd_dialog_alert_edit.xml diff --git a/siberiadante/src/main/res/layout/dialog_ensure_layout.xml b/siberiadante/src/main/res/layout/sd_dialog_ensure_layout.xml similarity index 100% rename from siberiadante/src/main/res/layout/dialog_ensure_layout.xml rename to siberiadante/src/main/res/layout/sd_dialog_ensure_layout.xml diff --git a/siberiadante/src/main/res/layout/title_layout.xml b/siberiadante/src/main/res/layout/sd_title_layout.xml similarity index 100% rename from siberiadante/src/main/res/layout/title_layout.xml rename to siberiadante/src/main/res/layout/sd_title_layout.xml diff --git a/siberiadante/src/main/res/layout/toast_layout.xml b/siberiadante/src/main/res/layout/sd_toast_layout.xml similarity index 100% rename from siberiadante/src/main/res/layout/toast_layout.xml rename to siberiadante/src/main/res/layout/sd_toast_layout.xml diff --git a/siberiadante/src/main/res/values/attrs.xml b/siberiadante/src/main/res/values/attrs.xml index 7ce8844..a32aafc 100644 --- a/siberiadante/src/main/res/values/attrs.xml +++ b/siberiadante/src/main/res/values/attrs.xml @@ -1,7 +1,7 @@ - + @@ -118,7 +118,7 @@ - + diff --git a/siberiadante/src/main/res/values/colors.xml b/siberiadante/src/main/res/values/colors.xml index 2a3ca50..a074f70 100644 --- a/siberiadante/src/main/res/values/colors.xml +++ b/siberiadante/src/main/res/values/colors.xml @@ -9,6 +9,7 @@ #fa0303 #FD4C5B #030bfa + #000dff #8F8F8F #8c8c8c #A5A5A5