Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
门心叼龙
android-mvp-mvvm-flytour
提交
034a6d1f
A
android-mvp-mvvm-flytour
项目概览
门心叼龙
/
android-mvp-mvvm-flytour
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
6
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
android-mvp-mvvm-flytour
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
6
Issue
6
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
034a6d1f
编写于
5月 29, 2019
作者:
门心叼龙
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
news refresh add
上级
0788e7b6
变更
28
隐藏空白更改
内联
并排
Showing
28 changed file
with
633 addition
and
1190 deletion
+633
-1190
.gradle/4.6/fileContent/fileContent.lock
.gradle/4.6/fileContent/fileContent.lock
+0
-0
.gradle/4.6/fileHashes/fileHashes.bin
.gradle/4.6/fileHashes/fileHashes.bin
+0
-0
.gradle/4.6/fileHashes/fileHashes.lock
.gradle/4.6/fileHashes/fileHashes.lock
+0
-0
.gradle/4.6/fileHashes/resourceHashesCache.bin
.gradle/4.6/fileHashes/resourceHashesCache.bin
+0
-0
.gradle/4.6/javaCompile/classAnalysis.bin
.gradle/4.6/javaCompile/classAnalysis.bin
+0
-0
.gradle/4.6/javaCompile/jarAnalysis.bin
.gradle/4.6/javaCompile/jarAnalysis.bin
+0
-0
.gradle/4.6/javaCompile/javaCompile.lock
.gradle/4.6/javaCompile/javaCompile.lock
+0
-0
.gradle/4.6/javaCompile/taskHistory.bin
.gradle/4.6/javaCompile/taskHistory.bin
+0
-0
.gradle/4.6/javaCompile/taskJars.bin
.gradle/4.6/javaCompile/taskJars.bin
+0
-0
.gradle/4.6/taskHistory/taskHistory.bin
.gradle/4.6/taskHistory/taskHistory.bin
+0
-0
.gradle/4.6/taskHistory/taskHistory.lock
.gradle/4.6/taskHistory/taskHistory.lock
+0
-0
.gradle/buildOutputCleanup/buildOutputCleanup.lock
.gradle/buildOutputCleanup/buildOutputCleanup.lock
+0
-0
.idea/workspace.xml
.idea/workspace.xml
+443
-1143
FlyTour.iml
FlyTour.iml
+0
-8
lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment$1.class
...vac/classes/com/fly/tour/common/base/BaseFragment$1.class
+0
-0
lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment.class
...Javac/classes/com/fly/tour/common/base/BaseFragment.class
+0
-0
lib_common/src/main/java/com/fly/tour/common/base/BaseFragment.java
.../src/main/java/com/fly/tour/common/base/BaseFragment.java
+4
-0
lib_common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment.java
...in/java/com/fly/tour/common/base/BaseRefreshFragment.java
+3
-0
lib_common/src/main/java/com/fly/tour/common/event/EventCode.java
...on/src/main/java/com/fly/tour/common/event/EventCode.java
+6
-0
lib_common/src/main/java/com/fly/tour/common/event/me/NewsDetailCurdEvent.java
...ava/com/fly/tour/common/event/me/NewsDetailCurdEvent.java
+16
-0
lib_common/src/main/java/com/fly/tour/common/event/me/NewsTypeCrudEvent.java
.../java/com/fly/tour/common/event/me/NewsTypeCrudEvent.java
+16
-0
lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java
.../main/java/com/fly/tour/common/manager/NewsDBManager.java
+6
-9
lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java
...b_news/src/main/java/com/fly/tour/db/entity/NewsType.java
+5
-0
module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java
...me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java
+5
-0
module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java
...ava/com/fly/tour/me/presenter/NewsDetailAddPresenter.java
+4
-0
module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java
...java/com/fly/tour/me/presenter/NewsTypeListPresenter.java
+7
-0
module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java
...ain/java/com/fly/tour/news/fragment/MainNewsFragment.java
+105
-30
module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java
...ain/java/com/fly/tour/news/fragment/NewsListFragment.java
+13
-0
未找到文件。
.gradle/4.6/fileContent/fileContent.lock
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/fileHashes/fileHashes.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/fileHashes/fileHashes.lock
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/fileHashes/resourceHashesCache.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/javaCompile/classAnalysis.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/javaCompile/jarAnalysis.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/javaCompile/javaCompile.lock
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/javaCompile/taskHistory.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/javaCompile/taskJars.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/taskHistory/taskHistory.bin
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/4.6/taskHistory/taskHistory.lock
浏览文件 @
034a6d1f
无法预览此类型文件
.gradle/buildOutputCleanup/buildOutputCleanup.lock
浏览文件 @
034a6d1f
无法预览此类型文件
.idea/workspace.xml
浏览文件 @
034a6d1f
...
...
@@ -6,7 +6,8 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="MYTAG" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
</component>
<component name="CMakeSettings">
...
...
@@ -16,6 +17,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4d282b9c-a0de-4236-bc7b-9ff67b569c52" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/me/NewsDetailCurdEvent.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/me/NewsTypeCrudEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.6/fileContent/fileContent.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileContent/fileContent.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/fileHashes/resourceHashesCache.bin" afterDir="false" />
...
...
@@ -28,821 +32,19 @@
<change beforePath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.6/taskHistory/taskHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlyTour.iml" beforeDir="false" afterPath="$PROJECT_DIR$/FlyTour.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment.class" beforeDir="false" afterPath="$PROJECT_DIR$/lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/BaseFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/BaseFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/EventCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/EventCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-anydpi-v21/ic_launcher_background.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-hdpi/ic_launcher_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-ldpi/ic_launcher_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-mdpi/ic_launcher_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-xhdpi/ic_launcher_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-xxhdpi/ic_launcher_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/res/pngs/debug/drawable-xxxhdpi/ic_launcher_background.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/generated/source/buildConfig/debug/com/fly/tour/BuildConfig.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/debug.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-af.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-am.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ar.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-as.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-az.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-b+sr+Latn.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-be.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-bg.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-bn.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-bs.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ca.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-cs.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-da.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-de.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-el.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-en-rAU.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-en-rCA.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-en-rGB.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-en-rIN.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-en-rXC.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-es-rUS.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-es.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-et.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-eu.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-fa.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-fi.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-fr-rCA.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-fr.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-gl.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-gu.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-h720dp-v13.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-hdpi-v4.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-hi.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-hr.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-hu.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-hy.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-in.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-is.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-it.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-iw.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ja.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ka.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-kk.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-km.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-kn.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ko.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ky.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-land.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-large-v4.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ldltr-v21.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-lo.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-lt.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-lv.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-mk.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ml.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-mn.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-mr.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ms.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-my.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-nb.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ne.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-night-v8.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-nl.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-or.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-pa.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-pl.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-port.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-pt-rBR.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-pt-rPT.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-pt.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ro.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ru.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-si.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sk.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sl.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sq.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sr.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sv.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sw.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sw360dp-v13.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sw480dp-v13.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sw600dp-v13.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-sw720dp-v13.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ta.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-te.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-th.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-tl.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-tr.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-uk.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-ur.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-uz.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v16.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v17.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v18.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v21.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v22.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v23.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v24.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v25.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v26.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-v28.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-vi.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-watch-v20.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-watch-v21.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-xlarge-v4.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-zh-rCN.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-zh-rHK.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-zh-rTW.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-zh.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values-zu.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/multi-v2/values.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/blame/res/debug/single/debug.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/incremental/mergeDebugResources/merger.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/instant_run_merged_manifests/debug/processDebugManifest/instant-run/output.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/merged_manifests/debug/processDebugManifest/merged/AndroidManifest.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/merged_manifests/debug/processDebugManifest/merged/output.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/processed_res/debug/processDebugResources/out/resources-debug.ap_" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim-v21_design_bottom_sheet_slide_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim-v21_design_bottom_sheet_slide_out.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_fade_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_fade_out.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_grow_fade_in_from_bottom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_popup_enter.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_popup_exit.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_shrink_fade_out_from_bottom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_slide_in_bottom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_slide_in_top.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_slide_out_bottom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_slide_out_top.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_tooltip_enter.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_abc_tooltip_exit.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_design_bottom_sheet_slide_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_design_bottom_sheet_slide_out.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_design_snackbar_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/anim_design_snackbar_out.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator-v21_design_appbar_state_list_animator.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_design_fab_hide_motion_spec.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_design_fab_show_motion_spec.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_btn_state_list_anim.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_btn_unelevated_state_list_anim.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_chip_state_list_anim.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_fab_hide_motion_spec.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_fab_show_motion_spec.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_fab_transformation_sheet_collapse_spec.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/animator_mtrl_fab_transformation_sheet_expand_spec.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v21_abc_btn_colored_borderless_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_btn_colored_borderless_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_btn_colored_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_color_highlight_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_tint_btn_checkable.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_tint_default.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_tint_edittext.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_tint_seek_thumb.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_tint_spinner.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_abc_tint_switch_track.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color-v23_design_tint_password_toggle.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_background_cache_hint_selector_material_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_background_cache_hint_selector_material_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_btn_colored_borderless_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_btn_colored_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_hint_foreground_material_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_hint_foreground_material_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_primary_text_disable_only_material_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_primary_text_disable_only_material_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_primary_text_material_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_primary_text_material_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_search_url_text.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_secondary_text_material_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_secondary_text_material_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_tint_btn_checkable.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_tint_default.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_tint_edittext.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_tint_seek_thumb.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_tint_spinner.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_abc_tint_switch_track.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_design_error.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_design_tint_password_toggle.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mis_default_text_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mis_folder_text_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_bottom_nav_colored_item_tint.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_bottom_nav_item_tint.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_btn_bg_color_selector.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_btn_ripple_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_btn_stroke_color_selector.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_btn_text_btn_ripple_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_btn_text_color_selector.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_chip_background_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_chip_close_icon_tint.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_chip_ripple_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_chip_text_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_fab_ripple_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_tabs_colored_ripple_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_tabs_icon_color_selector.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_tabs_icon_color_selector_colored.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_tabs_legacy_text_color_selector.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_tabs_ripple_color.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_mtrl_text_btn_text_color_selector.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_switch_thumb_material_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/color_switch_thumb_material_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-anydpi-v21_design_ic_visibility.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-anydpi-v21_design_ic_visibility_off.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-anydpi-v21_ic_launcher_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_star_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_star_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_star_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_star_half_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_star_half_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_ic_star_half_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_focused_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_longpressed_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_pressed_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_pressed_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_popup_background_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_design_ic_visibility.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_design_ic_visibility_off.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_low_normal.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_normal.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_normal_pressed.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-hdpi_ic_launcher_background.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldpi_ic_launcher_background.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-hdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-hdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-hdpi-v17_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-mdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-mdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-mdpi-v17_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xhdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xhdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xhdpi-v17_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xxhdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xxhdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xxhdpi-v17_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xxxhdpi-v17_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xxxhdpi-v17_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-ldrtl-xxxhdpi-v17_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_half_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_half_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_ic_star_half_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_focused_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_longpressed_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_pressed_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_pressed_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_popup_background_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_design_ic_visibility.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_design_ic_visibility_off.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_pressed.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_normal.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_normal_pressed.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notify_panel_notification_icon_bg.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-mdpi_ic_launcher_background.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_abc_action_bar_item_background_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_abc_btn_colored_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_abc_dialog_material_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_abc_edit_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_abc_list_divider_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_avd_hide_password.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_avd_show_password.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_design_bottom_navigation_item_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_design_password_eye.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v21_notification_action_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v23_abc_control_background_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v24_ic_launcher_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-v24_ic_launcher_foreground.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-watch-v20_abc_dialog_material_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_star_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_star_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_star_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_star_half_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_star_half_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_ic_star_half_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_focused_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_longpressed_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_pressed_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_pressed_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_popup_background_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_design_ic_visibility.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_design_ic_visibility_off.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_mis_btn_back.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_mis_default_check_s.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_mis_ic_menu_back.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_mis_selector_indicator.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_low_normal.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_low_pressed.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_normal.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notification_bg_normal_pressed.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi-v4_notify_panel_notification_icon_bg.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xhdpi_ic_launcher_background.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ab_share_pack_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_cab_background_top_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_commit_search_api_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_star_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_star_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_star_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_star_half_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_star_half_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_ic_star_half_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_divider_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_focused_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_longpressed_holo.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_pressed_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_pressed_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_selector_disabled_holo_dark.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_list_selector_disabled_holo_light.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_menu_hardkey_panel_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_popup_background_mtrl_mult.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_scrubber_control_off_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_scrubber_primary_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_scrubber_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_text_select_handle_middle_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_text_select_handle_middle_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_textfield_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_textfield_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_textfield_search_activated_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_abc_textfield_search_default_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_design_ic_visibility.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_design_ic_visibility_off.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_asv.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_asy.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_btn_selected.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_btn_unselected.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_default_check.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_default_error.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi-v4_mis_text_indicator.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxhdpi_ic_launcher_background.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_btn_check_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_btn_check_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_btn_radio_to_on_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_btn_radio_to_on_mtrl_015.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_btn_switch_to_on_mtrl_00001.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_btn_switch_to_on_mtrl_00012.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_menu_copy_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_menu_cut_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_menu_paste_mtrl_am_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_menu_selectall_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_menu_share_mtrl_alpha.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_star_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_star_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_star_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_star_half_black_16dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_star_half_black_36dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_ic_star_half_black_48dp.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_000.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_scrubber_control_to_pressed_mtrl_005.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_spinner_mtrl_am_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_switch_track_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_tab_indicator_mtrl_alpha.9.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_text_select_handle_left_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_text_select_handle_left_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_text_select_handle_right_mtrl_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_abc_text_select_handle_right_mtrl_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_design_ic_visibility.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi-v4_design_ic_visibility_off.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable-xxxhdpi_ic_launcher_background.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_btn_borderless_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_btn_check_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_btn_colored_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_btn_default_mtrl_shape.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_btn_radio_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_cab_background_internal_bg.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_cab_background_top_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_dialog_material_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_edit_text_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_ab_back_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_arrow_drop_right_black_24dp.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_clear_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_go_search_api_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_menu_overflow_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_search_api_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ic_voice_search_api_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_item_background_holo_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_item_background_holo_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_list_divider_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_list_selector_background_transition_holo_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_list_selector_background_transition_holo_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_list_selector_holo_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_list_selector_holo_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ratingbar_indicator_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ratingbar_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_ratingbar_small_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_seekbar_thumb_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_seekbar_tick_mark_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_seekbar_track_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_spinner_textfield_background_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_switch_thumb_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_tab_indicator_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_text_cursor_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_textfield_search_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_abc_vector_test.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_btn_back_menu.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_design_bottom_navigation_item_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_design_fab_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_design_password_eye.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_design_snackbar_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_bottom_discover.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_bottom_my.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_bottom_trip.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_mtrl_chip_checked_black.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_mtrl_chip_checked_circle.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_mtrl_chip_close_circle.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_trip_record_btn_bg.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_trip_record_toolbar_bg.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_ic_trip_record_toolbar_pause.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_mis_action_btn.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_mtrl_snackbar_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_mtrl_tabs_default_indicator.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_navigation_empty_icon.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_notification_bg.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_notification_bg_low.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_notification_icon_background.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_notification_tile_bg.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_rotate_progress_bg.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_tooltip_frame_dark.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/drawable_tooltip_frame_light.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator-v21_mtrl_fast_out_linear_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator-v21_mtrl_fast_out_slow_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator-v21_mtrl_linear_out_slow_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator_mtrl_fast_out_linear_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator_mtrl_fast_out_slow_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator_mtrl_linear.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/interpolator_mtrl_linear_out_slow_in.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-sw600dp-v13_design_layout_snackbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-sw600dp-v13_mtrl_layout_snackbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v14_mis_fragment_multi_image.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v16_notification_template_custom_big.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v21_notification_action_tombstone.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v21_notification_template_custom_big.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v21_notification_template_icon_group.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-v26_abc_screen_toolbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-watch-v20_abc_alert_dialog_button_bar_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout-watch-v20_abc_alert_dialog_title_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_action_bar_title_item.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_action_bar_up_container.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_action_menu_item_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_action_menu_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_action_mode_bar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_action_mode_close_item_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_activity_chooser_view.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_activity_chooser_view_list_item.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_alert_dialog_button_bar_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_alert_dialog_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_alert_dialog_title_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_cascading_menu_item_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_dialog_title_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_expanded_menu_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_list_menu_item_checkbox.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_list_menu_item_icon.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_list_menu_item_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_list_menu_item_radio.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_popup_menu_header_item_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_popup_menu_item_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_screen_content_include.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_screen_simple.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_screen_simple_overlay_action_mode.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_screen_toolbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_search_dropdown_item_icons_2line.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_search_view.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_select_dialog_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_abc_tooltip.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_activity_main.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_button_network_err.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_common_toolbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_bottom_navigation_item.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_bottom_sheet_dialog.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_layout_snackbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_layout_snackbar_include.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_layout_tab_icon.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_layout_tab_text.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_menu_item_action_area.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_navigation_item.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_navigation_item_header.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_navigation_item_separator.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_navigation_item_subheader.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_navigation_menu.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_navigation_menu_item.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_design_text_input_password_icon.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_fragment_discover_main.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_fragment_me_main.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_fragment_photo_select.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mis_activity_default.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mis_cmp_customer_actionbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mis_list_item_camera.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mis_list_item_folder.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mis_list_item_image.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mtrl_layout_snackbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_mtrl_layout_snackbar_include.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_action.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_action_tombstone.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_media_action.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_media_cancel_action.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_big_media.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_big_media_custom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_big_media_narrow.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_big_media_narrow_custom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_icon_group.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_lines_media.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_media.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_media_custom.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_part_chronometer.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_notification_template_part_time.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_rotate_progress_dialog_layout.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_select_dialog_item_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_select_dialog_multichoice_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_select_dialog_singlechoice_material.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_support_simple_spinner_dropdown_item.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_view_record_toolbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/layout_view_record_topbar.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/menu_menu_navigation.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-anydpi-v26_ic_launcher.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-anydpi-v26_ic_launcher_round.xml.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-hdpi_ic_launcher.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-hdpi_ic_launcher_round.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-mdpi_ic_launcher.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-mdpi_ic_launcher_round.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_default_ptr_rotate.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_expend_btn.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_ic_menu_back_dark.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_ic_menu_back_light.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_ic_network.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_ic_tour_track.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_map_icon_end.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_map_icon_my.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_map_icon_pic.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_map_icon_start.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_map_icon_video.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_food.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_mileage.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_pause.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_photo.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_pic.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_start.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_stop.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_time.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_icon_video.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_record_pic_map_empty.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_reduce_btn.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_rotate_process_success.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_rotate_progress_back_bg.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_rotate_progress_front_bg.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_tabbar_icon_find_normal.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_tabbar_icon_find_select.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_tabbar_icon_my_normal.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_tabbar_icon_my_select.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_tabbar_icon_trip_normal.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi-v4_tabbar_icon_trip_select.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi_ic_launcher.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xhdpi_ic_launcher_round.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xxhdpi_ic_launcher.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xxhdpi_ic_launcher_round.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xxxhdpi_ic_launcher.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/mipmap-xxxhdpi_ic_launcher_round.png.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-af_values-af.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-am_values-am.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ar_values-ar.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-as_values-as.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-az_values-az.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-b+sr+Latn_values-b+sr+Latn.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-be_values-be.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-bg_values-bg.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-bn_values-bn.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ca_values-ca.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-cs_values-cs.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-da_values-da.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-de_values-de.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-el_values-el.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-en-rAU_values-en-rAU.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-en-rCA_values-en-rCA.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-en-rGB_values-en-rGB.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-en-rIN_values-en-rIN.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-en-rXC_values-en-rXC.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-es-rUS_values-es-rUS.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-es_values-es.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-et_values-et.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-eu_values-eu.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-fa_values-fa.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-fi_values-fi.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-fr-rCA_values-fr-rCA.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-fr_values-fr.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-gl_values-gl.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-gu_values-gu.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-h720dp-v13_values-h720dp-v13.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-hdpi-v4_values-hdpi-v4.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-hi_values-hi.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-hr_values-hr.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-hu_values-hu.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-hy_values-hy.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-is_values-is.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-it_values-it.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ja_values-ja.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ka_values-ka.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-kk_values-kk.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-km_values-km.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-kn_values-kn.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ko_values-ko.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ky_values-ky.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-land_values-land.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-large-v4_values-large-v4.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ldltr-v21_values-ldltr-v21.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-lo_values-lo.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-lt_values-lt.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-lv_values-lv.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-mk_values-mk.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ml_values-ml.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-mn_values-mn.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-mr_values-mr.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ms_values-ms.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-my_values-my.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-nb_values-nb.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ne_values-ne.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-night-v8_values-night-v8.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-nl_values-nl.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-or_values-or.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-pa_values-pa.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-pl_values-pl.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-port_values-port.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-pt-rBR_values-pt-rBR.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-pt-rPT_values-pt-rPT.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-pt_values-pt.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ro_values-ro.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ru_values-ru.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-si_values-si.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sk_values-sk.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sl_values-sl.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sq_values-sq.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sr_values-sr.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sv_values-sv.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sw360dp-v13_values-sw360dp-v13.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sw480dp-v13_values-sw480dp-v13.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sw600dp-v13_values-sw600dp-v13.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sw720dp-v13_values-sw720dp-v13.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-sw_values-sw.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ta_values-ta.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-te_values-te.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-th_values-th.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-tl_values-tl.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-tr_values-tr.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-uk_values-uk.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-ur_values-ur.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-uz_values-uz.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v17_values-v17.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v18_values-v18.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v21_values-v21.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v22_values-v22.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v23_values-v23.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v24_values-v24.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v25_values-v25.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v26_values-v26.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-v28_values-v28.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-vi_values-vi.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-watch-v20_values-watch-v20.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-watch-v21_values-watch-v21.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-xlarge-v4_values-xlarge-v4.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-zh-rCN_values-zh-rCN.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-zh-rHK_values-zh-rHK.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-zh-rTW_values-zh-rTW.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-zh_values-zh.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values-zu_values-zu.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/res/merged/debug/values_values.arsc.flat" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/intermediates/split_list/debug/splitsDiscoveryTaskDebug/split-list.gson" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/module_app/build/outputs/logs/manifest-merger-debug-report.txt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java" beforeDir="false" afterPath="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
...
...
@@ -865,95 +67,121 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="
NewsList
Fragment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/
NewsList
Fragment.java">
<file leaf-file-name="
MainNews
Fragment.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/
MainNews
Fragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
147
">
<caret line="
30" column="113" selection-start-line="30" selection-start-column="113" selection-end-line="30" selection-end-column="1
13" />
<state relative-caret-position="
234
">
<caret line="
167" column="13" selection-start-line="167" selection-start-column="13" selection-end-line="167" selection-end-column="
13" />
<folding>
<element signature="e#1837#1838#0" expanded="true" />
<element signature="e#1864#1865#0" expanded="true" />
<element signature="e#1017#1018#0" expanded="true" />
<element signature="e#1062#1063#0" expanded="true" />
<element signature="e#1109#1110#0" expanded="true" />
<element signature="e#1159#1160#0" expanded="true" />
<element signature="e#3036#3037#0" expanded="true" />
<element signature="e#3103#3104#0" expanded="true" />
<element signature="e#2768#2769#0" expanded="true" />
<element signature="e#2819#2820#0" expanded="true" />
<element signature="e#2989#2990#0" expanded="true" />
<element signature="e#3049#3050#0" expanded="true" />
<element signature="e#2589#2590#0" expanded="true" />
<element signature="e#2616#2617#0" expanded="true" />
<element signature="e#4960#4961#0" expanded="true" />
<element signature="e#4991#4992#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="News
ListPresenter.java" pinned="false" current-in-tab="tru
e">
<entry file="file://$PROJECT_DIR$/module_
news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter
.java">
<file leaf-file-name="News
DetailAddActivity.java" pinned="false" current-in-tab="fals
e">
<entry file="file://$PROJECT_DIR$/module_
me/src/main/java/com/fly/tour/me/NewsDetailAddActivity
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
297
">
<caret line="
38" selection-start-line="38" selection-end-line="38
" />
<state relative-caret-position="
426
">
<caret line="
74" column="37" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="37
" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2496#3272#0" expanded="true" />
<element signature="e#3271#3272#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="News
ListModel
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/module_
news/src/main/java/com/fly/tour/news/model/NewsListModel
.java">
<file leaf-file-name="News
DetailAddPresenter
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/module_
me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="29" column="34" selection-start-line="29" selection-start-column="34" selection-end-line="29" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#799#800#0" expanded="true" />
<element signature="e#856#857#0" expanded="true" />
</folding>
<state relative-caret-position="380">
<caret line="39" column="49" selection-start-line="39" selection-start-column="49" selection-end-line="39" selection-end-column="49" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="NewsDetail
Dao
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib_
db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao
.java">
<file leaf-file-name="NewsDetail
CurdEvent
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib_
common/src/main/java/com/fly/tour/common/event/me/NewsDetailCurdEvent
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158">
<caret line="55" selection-start-line="55" selection-end-line="55" />
<state relative-caret-position="300">
<caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
<folding>
<element signature="e#329#330#0" expanded="true" />
<element signature="e#356#357#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="
news_type
" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/res/raw/news_type
">
<file leaf-file-name="
NewsTypeListActivity.java
" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
module_me/src/main/java/com/fly/tour/me/NewsTypeListActivity.java
">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
175
">
<caret line="
7" column="2" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2
" />
<state relative-caret-position="
352
">
<caret line="
69" column="45" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45
" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="NewsType
Dao
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao
.java">
<file leaf-file-name="NewsType
ListPresenter
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
672
">
<caret line="
64" column="42" selection-start-line="64" selection-start-column="42" selection-end-line="64" selection-end-column="4
2" />
<state relative-caret-position="
1425
">
<caret line="
80" column="102" selection-start-line="80" selection-start-column="102" selection-end-line="80" selection-end-column="10
2" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="
news_detail
" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib_common/src/main/
res/raw/news_detail
">
<file leaf-file-name="
BaseRefreshFragment.java
" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib_common/src/main/
java/com/fly/tour/common/base/BaseRefreshFragment.java
">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="300" selection-start-line="5" selection-start-column="300" selection-end-line="5" selection-end-column="300" />
<state relative-caret-position="284">
<caret line="71" selection-start-line="71" selection-end-line="71" />
<folding>
<element signature="e#974#1135#0" expanded="true" />
<element signature="e#1134#1135#0" expanded="true" />
<element signature="e#1183#1347#0" expanded="true" />
<element signature="e#1346#1347#0" expanded="true" />
<element signature="e#1395#1559#0" expanded="true" />
<element signature="e#1558#1559#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="
BaseAdapter.java" pinned="false" current-in-tab="fals
e">
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/java/com/fly/tour/common/base/BaseAdapter
.java">
<file leaf-file-name="
NewsListFragment.java" pinned="false" current-in-tab="tru
e">
<entry file="file://$PROJECT_DIR$/
module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="755">
<caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<state relative-caret-position="402">
<caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
<folding>
<element signature="e#1837#1838#0" expanded="true" />
<element signature="e#1864#1865#0" expanded="true" />
<element signature="e#2666#2667#0" expanded="true" />
<element signature="e#2706#2707#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="News
DBManag
er.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManag
er.java">
<file leaf-file-name="News
ListPresent
er.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresent
er.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
191
">
<caret line="
54" column="33" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="33
" />
<state relative-caret-position="
83
">
<caret line="
37" selection-start-line="37" selection-end-line="37
" />
<folding>
<element signature="imports" expanded="true" />
</folding>
...
...
@@ -961,11 +189,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="
MainNewsFragment
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment
.java">
<file leaf-file-name="
NewsDetailDao
.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/
lib_db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
222
">
<caret line="
25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24
" />
<state relative-caret-position="
458
">
<caret line="
55" selection-start-line="55" selection-end-line="55
" />
</state>
</provider>
</entry>
...
...
@@ -992,6 +220,11 @@
<find>rxjava2</find>
<find>txt_news_detail_title_value</find>
<find>typeid</find>
<find>NewsFragmentAdapter</find>
<find>mRefreshLayout</find>
<find>initView</find>
<find>initCommonView</find>
<find>initNewsListFragment()</find>
</findStrings>
</component>
<component name="Git.Settings">
...
...
@@ -10166,15 +9399,8 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/view/CommonDialogFragment.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/contract/NewsTypeListContract.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/model/NewsTypeListModel.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/res/layout/fragment_common_dialog.xml" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/EventCode.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/RequestCode.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeListActivity.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java" />
<option value="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/NewsDBConfig.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/util/DateUtil.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/adapter/NewsTypeListAdapter.java" />
...
...
@@ -10182,7 +9408,6 @@
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/model/NewsDetailModel.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/model/NewsDetailAddModel.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/contract/NewsDetailAddContract.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/fragment/MeFragment.java" />
<option value="$PROJECT_DIR$/module_me/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/view/BottomSelectDialog.java" />
...
...
@@ -10194,7 +9419,6 @@
<option value="$PROJECT_DIR$/module_me/src/main/res/layout/activity_news_detail_add.xml" />
<option value="$PROJECT_DIR$/module_app/src/main/java/com/fly/tour/manager/ChannelManager.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/KeyCode.java" />
<option value="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java" />
<option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsAIFragment.java" />
<option value="$PROJECT_DIR$/module_news/src/main/res/layout/fragment_trip_main.xml" />
<option value="$PROJECT_DIR$/module_news/src/main/res/layout/fragment_news_main.xml" />
...
...
@@ -10212,11 +9436,20 @@
<option value="$PROJECT_DIR$/module_app/src/main/java/com/fly/tour/MyApplication.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/res/raw/news_detail" />
<option value="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao.java" />
<option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java" />
<option value="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao.java" />
<option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java" />
<option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/me/NewsTypeCrudEvent.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/EventCode.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java" />
<option value="$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/BaseFragment.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java" />
<option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java" />
<option value="$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java" />
<option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/me/NewsDetailCurdEvent.java" />
<option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java" />
</list>
</option>
</component>
...
...
@@ -10231,6 +9464,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
...
...
@@ -10238,11 +9472,119 @@
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="fly" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="fly" type="462c0819:PsiDirectoryNode" />
<item name="tour" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="fly" type="462c0819:PsiDirectoryNode" />
<item name="tour" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="fly" type="462c0819:PsiDirectoryNode" />
<item name="tour" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="event" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="fly" type="462c0819:PsiDirectoryNode" />
<item name="tour" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="event" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="FlyTour" type="b2602c69:ProjectViewProjectNode" />
<item name="FlyTour" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="lib_common" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="fly" type="462c0819:PsiDirectoryNode" />
<item name="tour" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
<item name="event" type="462c0819:PsiDirectoryNode" />
<item name="me" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="AndroidView" />
</panes>
...
...
@@ -10254,6 +9596,7 @@
<property name="SHOW_ALL_PROCESSES" value="false" />
<property name="android.sdk.path" value="D:/soft/android/android-sdk_r24.4.1-windows/android-sdk-windows" />
<property name="device.picker.selection" value="9922e083" />
<property name="extract.method.default.visibility" value="private" />
<property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
</component>
<component name="RecentsManager">
...
...
@@ -10503,7 +9846,14 @@
<option name="project" value="LOCAL" />
<updated>1559040159497</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="channel auto add">
<created>1559042669679</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1559042669679</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="ToolWindowManager">
...
...
@@ -10511,30 +9861,30 @@
<layout>
<window_info anchor="right" id="PlantUML" order="3" />
<window_info anchor="bottom" id="Android Profiler" order="12" />
<window_info id="Build Variants" order="3" side_tool="true" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="bottom" id="Logcat" order="10" weight="0.57162726" />
<window_info id="Capture Tool" order="6" />
<window_info id="Designer" order="2" />
<window_info anchor="bottom" id="Build" order="7" weight="0.6272601" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Device File Explorer" order="6" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.2642559" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette	" order="9" />
<window_info id="Image Layers" order="7" />
<window_info id="Build Variants" order="3" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="
right" id="Preview" order="5
" />
<window_info anchor="
bottom" id="Event Log" order="8" side_tool="true
" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32962447" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32962447" />
<window_info anchor="bottom" id="Terminal" order="11" />
<window_info anchor="bottom" id="Logcat" order="10" weight="0.66063976" />
<window_info id="Captures" order="4" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30157593" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32823366" />
<window_info id="Capture Tool" order="6" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3653295" />
<window_info anchor="bottom" id="Build" order="7" weight="0.6272601" />
<window_info anchor="bottom" id="Find" order="1" weight="0.1961057" />
<window_info anchor="right" id="Gradle" order="7" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Device File Explorer" order="6" side_tool="true" weight="0.3295129" />
<window_info anchor="right" id="Theme Preview" order="8" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.2642559" />
<window_info id="Favorites" order="5" side_tool="true" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="right" id="Preview" order="5" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
...
...
@@ -10545,10 +9895,9 @@
<window_info anchor="bottom" id="Build" order="7" weight="0.6272601" />
<window_info id="Designer" order="2" />
<window_info anchor="right" id="PlantUML" order="3" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32962447" />
<window_info id="Build Variants" order="3" side_tool="true" />
<window_info id="Image Layers" order="7" />
<window_info anchor="
right" id="Commander" order="0" weight="0.4
" />
<window_info anchor="
bottom" id="Run" order="2" weight="0.32962447
" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Android Profiler" order="12" />
...
...
@@ -10556,23 +9905,24 @@
<window_info id="Captures" order="4" weight="0.25" />
<window_info id="Capture Tool" order="6" />
<window_info anchor="right" id="Capture Analysis" order="4" />
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="right" id="Preview" order="5" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32823366" />
<window_info anchor="right" id="Device File Explorer" order="6" side_tool="true" />
<window_info anchor="bottom" id="Logcat" order="10" weight="0.57162726" />
<window_info anchor="right" id="Device File Explorer" order="6" side_tool="true" weight="0.3295129" />
<window_info active="true" anchor="bottom" id="Logcat" order="10" visible="true" weight="0.66063976" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32962447" />
<window_info anchor="bottom" id="Terminal" order="11" />
<window_info anchor="right" id="Gradle" order="7" />
<window_info
active="true" content_ui="combo" id="Project" order="0" visible="true
" weight="0.30157593" />
<window_info
content_ui="combo" id="Project" order="0
" weight="0.30157593" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Palette	" order="9" />
<window_info anchor="right" id="Theme Preview" order="8" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.2642559" />
<window_info anchor="bottom" id="Find" order="1" weight="0.1961057" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.2642559" />
</layout-to-restore>
</component>
<component name="VcsContentAnnotationSettings">
...
...
@@ -10591,185 +9941,29 @@
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeListActivity.java</url>
<line>40</line>
<properties />
<option name="timeStamp" value="3" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao.java</url>
<line>55</line>
<properties />
<option name="timeStamp" value="4" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java</url>
<line>6
3
</line>
<line>6
0
</line>
<properties />
<option name="timeStamp" value="6" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java</url>
<line>5
9
</line>
<line>5
6
</line>
<properties />
<option name="timeStamp" value="7" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java</url>
<line>
81
</line>
<line>
78
</line>
<properties />
<option name="timeStamp" value="8" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter.java</url>
<line>42</line>
<properties />
<option name="timeStamp" value="11" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao.java</url>
<line>41</line>
<properties />
<option name="timeStamp" value="12" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java</url>
<line>28</line>
<properties />
<option name="timeStamp" value="13" />
</line-breakpoint>
</breakpoints>
<option name="time" value="
14
" />
<option name="time" value="
23
" />
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/contract/NewsDetailAddContract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
</state>
</provider>
<provider editor-type-id="android-manifest">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="35" column="37" lean-forward="true" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/res/layout/activity_news_type_add.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="25" column="10" selection-start-line="14" selection-start-column="3" selection-end-line="25" selection-end-column="10" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/res/layout/item_news_type_select.xml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="38" selection-start-column="38" selection-end-column="38" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/res/layout/fragment_bottom_select.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="15" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeListActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1577">
<caret line="121" column="46" selection-start-line="121" selection-start-column="46" selection-end-line="121" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/adapter/NewsTypeSelectAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
<folding>
<element signature="e#993#994#0" expanded="true" />
<element signature="e#1023#1024#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/adapter/NewsTypeShowAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2060#2378#0" expanded="true" />
<element signature="e#2377#2378#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/res/layout/view_setting_bar.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="32" selection-end-line="51" selection-end-column="17" />
</state>
</provider>
<provider editor-type-id="android-designer2">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/view/SettingBarView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="50" column="39" selection-start-line="50" selection-start-column="39" selection-end-line="50" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsDetailAddActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
<folding>
<element signature="e#1477#1668#0" expanded="true" />
<element signature="e#1847#2066#0" expanded="true" />
<element signature="e#2065#2066#0" expanded="true" />
<element signature="e#1667#1668#0" expanded="true" />
<element signature="e#2362#2556#0" expanded="true" />
<element signature="e#2555#2556#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/res/layout/activity_news_detail_add.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
...
...
@@ -10803,9 +9997,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="49" lean-forward="true" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
...
...
@@ -10826,13 +10017,7 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsMobileFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsMobileFragment.java" />
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/KeyCode.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
...
...
@@ -10854,24 +10039,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="14" column="26" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#568#569#0" expanded="true" />
<element signature="e#598#599#0" expanded="true" />
<element signature="e#812#813#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
<element signature="e#1368#1369#0" expanded="true" />
<element signature="e#1419#1420#0" expanded="true" />
<element signature="e#1485#1486#0" expanded="true" />
<element signature="e#1534#1535#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_news/src/main/res/layout/fragment_news_main.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
...
...
@@ -10893,9 +10060,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="19" column="29" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
...
...
@@ -10953,12 +10117,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116">
<caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding>
<element signature="e#461#462#0" expanded="true" />
<element signature="e#490#491#0" expanded="true" />
<element signature="e#737#738#0" expanded="true" />
<element signature="e#767#768#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
...
...
@@ -10980,10 +10138,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="136" selection-start-line="136" selection-end-line="136" />
<folding>
<element signature="e#3625#3626#0" expanded="true" />
<element signature="e#3664#3665#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
...
...
@@ -10994,122 +10148,268 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment
.java">
<entry file="file://$PROJECT_DIR$/
module_app/src/main/java/com/fly/tour/MyApplication
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
222
">
<caret line="1
7" column="148" selection-start-line="17" selection-start-column="148" selection-end-line="17" selection-end-column="148
" />
<state relative-caret-position="
400
">
<caret line="1
6" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43
" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/Base
Fragment
.java">
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/base/Base
Adapter
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="122" column="19" selection-start-line="122" selection-start-column="19" selection-end-line="122" selection-end-column="19" />
<state relative-caret-position="755">
<caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/model/NewsListModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="29" column="34" selection-start-line="29" selection-start-column="34" selection-end-line="29" selection-end-column="34" />
<folding>
<element signature="e#4359#4360#0" expanded="true" />
<element signature="e#4387#4388#0" expanded="true" />
<element signature="imports" expanded="true" />
<element signature="e#799#800#0" expanded="true" />
<element signature="e#856#857#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/
java/com/fly/tour/common/base/BaseMvpFragment.java
">
<entry file="file://$PROJECT_DIR$/lib_common/src/main/
res/raw/news_detail
">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1
10
">
<caret line="
15" column="100" selection-start-line="15" selection-start-column="100" selection-end-line="15" selection-end-column="1
00" />
<state relative-caret-position="1
25
">
<caret line="
5" column="300" selection-start-line="5" selection-start-column="300" selection-end-line="5" selection-end-column="3
00" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/
module_app/src/main/java/com/fly/tour/MyApplication.java
">
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/res/raw/news_type
">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="43" selection-start-line="16" selection-start-column="43" selection-end-line="16" selection-end-column="43" />
<state relative-caret-position="175">
<caret line="7" column="2" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="672">
<caret line="64" column="42" selection-start-line="64" selection-start-column="42" selection-end-line="64" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/BaseEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="17" column="40" selection-start-line="17" selection-start-column="40" selection-end-line="17" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/me/NewsTypeCrudEvent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
<folding>
<element signature="e#323#324#0" expanded="true" />
<element signature="e#350#351#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/event/EventCode.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
<caret line="29" column="36" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.m2/repository/caches/transforms-1/files-1.1/viewpager-28.0.0.aar/96fe3b1ad28947de51b880e4936f976e/jars/classes.jar!/android/support/v4/view/PagerAdapter.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212">
<caret line="89" column="16" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/.m2/repository/caches/transforms-1/files-1.1/support-fragment-28.0.0.aar/f65a24b428141e82af00d828b3b06614/jars/classes.jar!/android/support/v4/app/FragmentManagerImpl.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="143">
<caret line="1415" selection-start-line="1415" selection-end-line="1415" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeAddPresenter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="31" selection-start-line="31" selection-end-line="31" />
</state>
</provider>
</entry>
<entry file="file://D:/soft/android/android-sdk_r24.4.1-windows/android-sdk-windows/sources/android-28/java/lang/Object.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="48">
<caret line="271" column="18" selection-start-line="271" selection-start-column="18" selection-end-line="271" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="74" column="18" selection-start-line="74" selection-start-column="18" selection-end-line="74" selection-end-column="18" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#812#813#0" expanded="true" />
<element signature="e#836#837#0" expanded="true" />
<element signature="e#1368#1369#0" expanded="true" />
<element signature="e#1419#1420#0" expanded="true" />
<element signature="e#1485#1486#0" expanded="true" />
<element signature="e#1534#1535#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/
base/BaseAdapt
er.java">
<entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/tour/common/
manager/NewsDBManag
er.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="755">
<caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
<state relative-caret-position="1541">
<caret line="81" column="45" selection-start-line="81" selection-start-column="45" selection-end-line="81" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2845#2846#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_
news/src/main/java/com/fly/tour/news/model/NewsListModel
.java">
<entry file="file://$PROJECT_DIR$/module_
me/src/main/java/com/fly/tour/me/NewsTypeAddActivity
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1
10
">
<caret line="
29" column="34" selection-start-line="29" selection-start-column="34" selection-end-line="29" selection-end-column="34
" />
<state relative-caret-position="1
41
">
<caret line="
68" column="11" selection-start-line="68" selection-start-column="11" selection-end-line="68" selection-end-column="11
" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#799#800#0" expanded="true" />
<element signature="e#856#857#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_
db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao
.java">
<entry file="file://$PROJECT_DIR$/lib_
common/src/main/java/com/fly/tour/common/base/BaseMvpFragment
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1
58
">
<caret line="
55" selection-start-line="55" selection-end-line="55
" />
<state relative-caret-position="1
10
">
<caret line="
15" column="106" selection-start-line="15" selection-start-column="106" selection-end-line="15" selection-end-column="106
" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_common/src/main/
res/raw/news_detail
">
<entry file="file://$PROJECT_DIR$/lib_common/src/main/
java/com/fly/tour/common/base/BaseFragment.java
">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="300" selection-start-line="5" selection-start-column="300" selection-end-line="5" selection-end-column="300" />
<state relative-caret-position="203">
<caret line="73" column="30" selection-start-line="73" selection-start-column="16" selection-end-line="73" selection-end-column="30" />
<folding>
<element signature="e#4359#4360#0" expanded="true" />
<element signature="e#4387#4388#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_
common/src/main/res/raw/news_type
">
<entry file="file://$PROJECT_DIR$/lib_
db_news/src/main/java/com/fly/tour/db/dao/NewsDetailDao.java
">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
175
">
<caret line="
7" column="2" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2
" />
<state relative-caret-position="
458
">
<caret line="
55" selection-start-line="55" selection-end-line="55
" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManag
er.java">
<entry file="file://$PROJECT_DIR$/
module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresent
er.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
191
">
<caret line="
54" column="33" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="33
" />
<state relative-caret-position="
83
">
<caret line="
37" selection-start-line="37" selection-end-line="37
" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib_
db_news/src/main/java/com/fly/tour/db/dao/NewsTypeDao
.java">
<entry file="file://$PROJECT_DIR$/lib_
common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="672">
<caret line="64" column="42" selection-start-line="64" selection-start-column="42" selection-end-line="64" selection-end-column="42" />
<state relative-caret-position="284">
<caret line="71" selection-start-line="71" selection-end-line="71" />
<folding>
<element signature="e#974#1135#0" expanded="true" />
<element signature="e#1134#1135#0" expanded="true" />
<element signature="e#1183#1347#0" expanded="true" />
<element signature="e#1346#1347#0" expanded="true" />
<element signature="e#1395#1559#0" expanded="true" />
<element signature="e#1558#1559#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/NewsTypeListActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="69" column="45" selection-start-line="69" selection-start-column="45" selection-end-line="69" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1425">
<caret line="80" column="102" selection-start-line="80" selection-start-column="102" selection-end-line="80" selection-end-column="102" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
<state relative-caret-position="234">
<caret line="167" column="13" selection-start-line="167" selection-start-column="13" selection-end-line="167" selection-end-column="13" />
<folding>
<element signature="e#1017#1018#0" expanded="true" />
<element signature="e#1062#1063#0" expanded="true" />
<element signature="e#1109#1110#0" expanded="true" />
<element signature="e#1159#1160#0" expanded="true" />
<element signature="e#3036#3037#0" expanded="true" />
<element signature="e#3103#3104#0" expanded="true" />
<element signature="e#2768#2769#0" expanded="true" />
<element signature="e#2819#2820#0" expanded="true" />
<element signature="e#2989#2990#0" expanded="true" />
<element signature="e#3049#3050#0" expanded="true" />
<element signature="e#2589#2590#0" expanded="true" />
<element signature="e#2616#2617#0" expanded="true" />
<element signature="e#4960#4961#0" expanded="true" />
<element signature="e#4991#4992#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_
news/src/main/java/com/fly/tour/news/fragment/NewsListFragment
.java">
<entry file="file://$PROJECT_DIR$/module_
me/src/main/java/com/fly/tour/me/NewsDetailAddActivity
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
147
">
<caret line="
30" column="113" selection-start-line="30" selection-start-column="113" selection-end-line="30" selection-end-column="113
" />
<state relative-caret-position="
426
">
<caret line="
74" column="37" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="37
" />
<folding>
<element signature="e#
1837#1838
#0" expanded="true" />
<element signature="e#
1864#1865
#0" expanded="true" />
<element signature="e#
2496#3272
#0" expanded="true" />
<element signature="e#
3271#3272
#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/
module_news/src/main/java/com/fly/tour/news/presenter/NewsListPresenter
.java">
<entry file="file://$PROJECT_DIR$/
lib_common/src/main/java/com/fly/tour/common/event/me/NewsDetailCurdEvent
.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="
297
">
<caret line="
38" selection-start-line="38" selection-end-line="38
" />
<state relative-caret-position="
300
">
<caret line="
12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4
" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#329#330#0" expanded="true" />
<element signature="e#356#357#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="39" column="49" selection-start-line="39" selection-start-column="49" selection-end-line="39" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="402">
<caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
<folding>
<element signature="e#1837#1838#0" expanded="true" />
<element signature="e#1864#1865#0" expanded="true" />
<element signature="e#2666#2667#0" expanded="true" />
<element signature="e#2706#2707#0" expanded="true" />
</folding>
</state>
</provider>
...
...
FlyTour.iml
浏览文件 @
034a6d1f
<?xml version="1.0" encoding="UTF-8"?>
<module
external.linked.project.id=
"FlyTour"
external.linked.project.path=
"$MODULE_DIR$"
external.root.project.path=
"$MODULE_DIR$"
external.system.id=
"GRADLE"
type=
"JAVA_MODULE"
version=
"4"
>
<component
name=
"FacetManager"
>
<facet
type=
"java-gradle"
name=
"Java-Gradle"
>
<configuration>
<option
name=
"BUILD_FOLDER_PATH"
value=
"$MODULE_DIR$/build"
/>
<option
name=
"BUILDABLE"
value=
"false"
/>
</configuration>
</facet>
</component>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_7"
inherit-compiler-output=
"true"
>
<exclude-output
/>
<content
url=
"file://$MODULE_DIR$"
>
...
...
lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment$1.class
浏览文件 @
034a6d1f
无法预览此类型文件
lib_common/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/fly/tour/common/base/BaseFragment.class
浏览文件 @
034a6d1f
无法预览此类型文件
lib_common/src/main/java/com/fly/tour/common/base/BaseFragment.java
浏览文件 @
034a6d1f
...
...
@@ -15,6 +15,7 @@ import com.fly.tour.common.R;
import
com.fly.tour.common.event.common.BaseFragmentEvent
;
import
com.fly.tour.common.mvp.BaseView
;
import
com.fly.tour.common.util.NetUtil
;
import
com.fly.tour.common.util.log.KLog
;
import
com.fly.tour.common.view.LoadingInitView
;
import
com.fly.tour.common.view.LoadingTransView
;
import
com.fly.tour.common.view.NetErrorView
;
...
...
@@ -112,6 +113,9 @@ public abstract class BaseFragment extends Fragment implements BaseView {
private
void
lazyLoad
()
{
//这里进行双重标记判断,必须确保onCreateView加载完毕且页面可见,才加载数据
KLog
.
v
(
"MYTAG"
,
"lazyLoad start..."
);
KLog
.
v
(
"MYTAG"
,
"isViewCreated:"
+
isViewCreated
);
KLog
.
v
(
"MYTAG"
,
"isViewVisable"
+
isViewVisable
);
if
(
isViewCreated
&&
isViewVisable
)
{
initData
();
//数据加载完毕,恢复标记,防止重复加载
...
...
lib_common/src/main/java/com/fly/tour/common/base/BaseRefreshFragment.java
浏览文件 @
034a6d1f
...
...
@@ -5,6 +5,7 @@ import android.view.View;
import
com.fly.tour.common.mvp.BaseModel
;
import
com.fly.tour.common.mvp.BaseRefreshPresenter
;
import
com.fly.tour.common.mvp.BaseRefreshView
;
import
com.fly.tour.common.util.log.KLog
;
import
com.refresh.lib.BaseRefreshLayout
;
import
com.refresh.lib.DaisyRefreshLayout
;
...
...
@@ -68,7 +69,9 @@ public abstract class BaseRefreshFragment<M extends BaseModel,V extends BaseRefr
@Override
public
void
autoLoadData
()
{
KLog
.
v
(
"MYTAG"
,
"autoLoadData start..."
);
if
(
mRefreshLayout
!=
null
){
KLog
.
v
(
"MYTAG"
,
"autoLoadData1 start..."
);
mRefreshLayout
.
autoRefresh
();
}
}
...
...
lib_common/src/main/java/com/fly/tour/common/event/EventCode.java
浏览文件 @
034a6d1f
...
...
@@ -22,5 +22,11 @@ public interface EventCode {
interface
MeCode
{
//4000开始
int
NEWS_TYPE_ADD
=
4000
;
int
NEWS_TYPE_DELETE
=
4001
;
int
NEWS_TYPE_UPDATE
=
4002
;
int
NEWS_TYPE_QUERY
=
4003
;
int
news_detail_add
=
4004
;
}
}
lib_common/src/main/java/com/fly/tour/common/event/me/NewsDetailCurdEvent.java
0 → 100644
浏览文件 @
034a6d1f
package
com.fly.tour.common.event.me
;
import
com.fly.tour.common.event.BaseEvent
;
/**
* Description: <NewsDetailCurdEvent><br>
* Author: gxl<br>
* Date: 2019/5/29<br>
* Version: V1.0.0<br>
* Update: <br>
*/
public
class
NewsDetailCurdEvent
extends
BaseEvent
{
public
NewsDetailCurdEvent
(
int
code
)
{
super
(
code
);
}
}
lib_common/src/main/java/com/fly/tour/common/event/me/NewsTypeCrudEvent.java
0 → 100644
浏览文件 @
034a6d1f
package
com.fly.tour.common.event.me
;
import
com.fly.tour.common.event.BaseEvent
;
/**
* Description: <NewsTypeCrudEvent><br>
* Author: gxl<br>
* Date: 2019/5/29<br>
* Version: V1.0.0<br>
* Update: <br>
*/
public
class
NewsTypeCrudEvent
extends
BaseEvent
{
public
NewsTypeCrudEvent
(
int
code
)
{
super
(
code
);
}
}
lib_common/src/main/java/com/fly/tour/common/manager/NewsDBManager.java
浏览文件 @
034a6d1f
...
...
@@ -28,7 +28,6 @@ public class NewsDBManager {
public
static
final
String
TAG
=
NewsDBManager
.
class
.
getSimpleName
();
private
static
NewsDBManager
newsDBManager
;
private
Context
mContext
;
private
List
<
NewsType
>
mListNewsType
;
private
NewsDBManager
(
Context
context
)
{
mContext
=
context
;
...
...
@@ -46,18 +45,16 @@ public class NewsDBManager {
}
public
void
initNewsDB
()
{
NewsTypeDao
n
ewsTypeDao
=
new
NewsTypeDao
(
mContext
);
if
(
n
ewsTypeDao
.
isEmpty
())
{
NewsTypeDao
mN
ewsTypeDao
=
new
NewsTypeDao
(
mContext
);
if
(
mN
ewsTypeDao
.
isEmpty
())
{
Gson
gson
=
new
Gson
();
Type
type
=
new
TypeToken
<
List
<
NewsType
>>()
{
}.
getType
();
mListNewsType
=
gson
.
fromJson
(
getStringByResId
(
R
.
raw
.
news_type
),
type
);
newsTypeDao
.
addListNewStype
(
mListNewsType
);
}
else
{
mListNewsType
=
newsTypeDao
.
getListNewsType
();
List
<
NewsType
>
mListNewsType
=
gson
.
fromJson
(
getStringByResId
(
R
.
raw
.
news_type
),
type
);
mNewsTypeDao
.
addListNewStype
(
mListNewsType
);
}
NewsDetailDao
newsDetailDao
=
new
NewsDetailDao
(
mContext
);
if
(
newsDetailDao
.
isEmpty
())
{
if
(
newsDetailDao
.
isEmpty
())
{
Gson
gson
=
new
Gson
();
Type
type
=
new
TypeToken
<
List
<
NewsDetail
>>()
{
}.
getType
();
...
...
@@ -83,6 +80,6 @@ public class NewsDBManager {
}
public
List
<
NewsType
>
getListNewsType
()
{
return
mListNewsType
;
return
new
NewsTypeDao
(
mContext
).
getListNewsType
()
;
}
}
lib_db_news/src/main/java/com/fly/tour/db/entity/NewsType.java
浏览文件 @
034a6d1f
...
...
@@ -70,4 +70,9 @@ public class NewsType implements Parcelable {
return
new
NewsType
[
size
];
}
};
@Override
public
String
toString
()
{
return
"NewsType{"
+
"id="
+
id
+
", typename='"
+
typename
+
'\''
+
", addtime='"
+
addtime
+
'\''
+
'}'
;
}
}
module_me/src/main/java/com/fly/tour/me/NewsTypeAddActivity.java
浏览文件 @
034a6d1f
...
...
@@ -8,12 +8,16 @@ import android.view.View;
import
android.widget.Button
;
import
com.fly.tour.common.base.BaseMvpActivity
;
import
com.fly.tour.common.event.EventCode
;
import
com.fly.tour.common.event.me.NewsTypeCrudEvent
;
import
com.fly.tour.common.util.ToastUtil
;
import
com.fly.tour.common.view.SettingBarView
;
import
com.fly.tour.me.contract.NewsTypeAddContract
;
import
com.fly.tour.me.model.NewsTypeAddModel
;
import
com.fly.tour.me.presenter.NewsTypeAddPresenter
;
import
org.greenrobot.eventbus.EventBus
;
/**
* Description: <NewsTypeAddActivity><br>
* Author: gxl<br>
...
...
@@ -72,6 +76,7 @@ public class NewsTypeAddActivity extends BaseMvpActivity<NewsTypeAddModel,NewsTy
@Override
public
void
finishActivity
()
{
EventBus
.
getDefault
().
post
(
new
NewsTypeCrudEvent
(
EventCode
.
MeCode
.
NEWS_TYPE_ADD
));
setResult
(
Activity
.
RESULT_OK
,
new
Intent
());
super
.
finishActivity
();
}
...
...
module_me/src/main/java/com/fly/tour/me/presenter/NewsDetailAddPresenter.java
浏览文件 @
034a6d1f
...
...
@@ -3,11 +3,14 @@ package com.fly.tour.me.presenter;
import
android.content.Context
;
import
android.os.Handler
;
import
com.fly.tour.common.event.me.NewsDetailCurdEvent
;
import
com.fly.tour.common.mvp.BasePresenter
;
import
com.fly.tour.common.util.ToastUtil
;
import
com.fly.tour.me.contract.NewsDetailAddContract
;
import
com.fly.tour.me.model.NewsDetailAddModel
;
import
org.greenrobot.eventbus.EventBus
;
/**
* Description: <NewsDetailAddPresenter><br>
* Author: gxl<br>
...
...
@@ -36,6 +39,7 @@ public class NewsDetailAddPresenter extends BasePresenter<NewsDetailAddModel,New
ToastUtil
.
showToast
(
"添加成功"
);
mView
.
hideTransLoadingView
();
mView
.
finishActivity
();
EventBus
.
getDefault
().
post
(
new
NewsDetailCurdEvent
(
type
));
}
else
{
ToastUtil
.
showToast
(
"添加失败"
);
}
...
...
module_me/src/main/java/com/fly/tour/me/presenter/NewsTypeListPresenter.java
浏览文件 @
034a6d1f
...
...
@@ -2,12 +2,17 @@ package com.fly.tour.me.presenter;
import
android.content.Context
;
import
com.fly.tour.common.event.EventCode
;
import
com.fly.tour.common.event.me.NewsTypeCrudEvent
;
import
com.fly.tour.common.mvp.BaseRefreshPresenter
;
import
com.fly.tour.common.util.ToastUtil
;
import
com.fly.tour.common.util.log.KLog
;
import
com.fly.tour.db.entity.NewsType
;
import
com.fly.tour.me.contract.NewsTypeListContract
;
import
com.fly.tour.me.model.NewsTypeListModel
;
import
org.greenrobot.eventbus.EventBus
;
import
java.util.List
;
import
java.util.logging.Handler
;
...
...
@@ -42,6 +47,7 @@ public class NewsTypeListPresenter extends BaseRefreshPresenter<NewsTypeListMode
@Override
public
void
run
()
{
List
<
NewsType
>
listNewsType
=
mModel
.
getListNewsType
();
KLog
.
v
(
"MYTAG"
,
"listNewsType:"
+
listNewsType
.
toString
());
if
(
listNewsType
!=
null
&&
listNewsType
.
size
()
>
0
)
{
mView
.
refreshData
(
listNewsType
);
}
else
{
...
...
@@ -72,6 +78,7 @@ public class NewsTypeListPresenter extends BaseRefreshPresenter<NewsTypeListMode
if
(
mModel
.
deleteNewsTypeById
(
id
)){
ToastUtil
.
showToast
(
"删除成功"
);
refreshData
();
EventBus
.
getDefault
().
post
(
new
NewsTypeCrudEvent
(
EventCode
.
MeCode
.
NEWS_TYPE_DELETE
));
}
else
{
ToastUtil
.
showToast
(
"删除失败"
);
}
...
...
module_news/src/main/java/com/fly/tour/news/fragment/MainNewsFragment.java
浏览文件 @
034a6d1f
package
com.fly.tour.news.fragment
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.support.design.widget.TabLayout
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentPagerAdapter
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.view.ViewPager
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.fly.tour.common.base.BaseFragment
;
import
com.fly.tour.common.event.me.NewsTypeCrudEvent
;
import
com.fly.tour.common.manager.NewsDBManager
;
import
com.fly.tour.common.util.log.KLog
;
import
com.fly.tour.db.entity.NewsType
;
import
com.fly.tour.trip.R
;
import
org.greenrobot.eventbus.Subscribe
;
import
org.greenrobot.eventbus.ThreadMode
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.logging.Handler
;
/**
* Description: <MainNewsFragment><br>
...
...
@@ -23,20 +34,11 @@ import java.util.List;
*/
public
class
MainNewsFragment
extends
BaseFragment
{
private
List
<
String
>
titles
=
new
ArrayList
<>();
private
List
<
NewsListFragment
>
mArrayList
=
new
ArrayList
<
NewsListFragment
>()
{
{
List
<
NewsType
>
listNewsType
=
NewsDBManager
.
getInstance
(
getContext
()).
getListNewsType
();
if
(
listNewsType
!=
null
&&
listNewsType
.
size
()
>
0
){
for
(
int
i
=
0
;
i
<
listNewsType
.
size
();
i
++){
NewsType
newsType
=
listNewsType
.
get
(
i
);
add
(
NewsListFragment
.
newInstance
(
newsType
));
titles
.
add
(
newsType
.
getTypename
());
}
}
}
};
private
List
<
NewsListFragment
>
mListFragments
=
new
ArrayList
<>();
private
TabLayout
mTabLayout
;
private
ViewPager
mViewPager
;
private
NewsFragmentAdapter
mNewsFragmentAdapter
;
private
boolean
mIsfresh
;
public
static
MainNewsFragment
newInstance
()
{
return
new
MainNewsFragment
();
...
...
@@ -46,6 +48,7 @@ public class MainNewsFragment extends BaseFragment {
public
int
onBindLayout
()
{
return
R
.
layout
.
fragment_news_main
;
}
@Override
public
void
initView
(
View
view
)
{
mViewPager
=
view
.
findViewById
(
R
.
id
.
pager_tour
);
...
...
@@ -62,28 +65,16 @@ public class MainNewsFragment extends BaseFragment {
@Override
public
void
initListener
()
{
mViewPager
.
setOffscreenPageLimit
(
mArrayList
.
size
());
mViewPager
.
setAdapter
(
new
FragmentPagerAdapter
(
getActivity
().
getSupportFragmentManager
())
{
@Override
public
Fragment
getItem
(
int
position
)
{
return
mArrayList
.
get
(
position
);
}
@Override
public
int
getCount
()
{
return
mArrayList
.
size
();
}
initNewsListFragment
();
//mViewPager.setOffscreenPageLimit(mListFragments.size());
mNewsFragmentAdapter
=
new
NewsFragmentAdapter
(
getChildFragmentManager
());
mViewPager
.
setAdapter
(
mNewsFragmentAdapter
);
mNewsFragmentAdapter
.
refreshViewPager
(
mListFragments
);
@Nullable
@Override
public
CharSequence
getPageTitle
(
int
position
)
{
return
titles
.
get
(
position
);
}
});
mTabLayout
.
addOnTabSelectedListener
(
new
TabLayout
.
OnTabSelectedListener
()
{
@Override
public
void
onTabSelected
(
TabLayout
.
Tab
tab
)
{
m
ArrayList
.
get
(
tab
.
getPosition
()).
autoLoadData
();
m
ListFragments
.
get
(
tab
.
getPosition
()).
autoLoadData
();
}
@Override
...
...
@@ -99,8 +90,92 @@ public class MainNewsFragment extends BaseFragment {
mTabLayout
.
setupWithViewPager
(
mViewPager
);
}
class
NewsFragmentAdapter
extends
FragmentPagerAdapter
{
public
FragmentManager
mFragmentManager
;
List
<
NewsListFragment
>
pages
;
public
NewsFragmentAdapter
(
FragmentManager
fm
)
{
super
(
fm
);
mFragmentManager
=
fm
;
}
@Override
public
Fragment
getItem
(
int
position
)
{
if
(
pages
!=
null
)
{
return
pages
.
get
(
position
);
}
return
null
;
}
@Override
public
int
getCount
()
{
return
pages
!=
null
?
pages
.
size
()
:
0
;
}
@Nullable
@Override
public
CharSequence
getPageTitle
(
int
position
)
{
return
titles
.
get
(
position
);
}
@Override
public
int
getItemPosition
(
@NonNull
Object
object
)
{
return
POSITION_NONE
;
}
public
void
refreshViewPager
(
List
<
NewsListFragment
>
listFragments
)
{
if
(
pages
!=
null
&&
pages
.
size
()
>
0
)
{
FragmentTransaction
fragmentTransaction
=
mFragmentManager
.
beginTransaction
();
for
(
NewsListFragment
fragment
:
pages
)
{
fragmentTransaction
.
remove
(
fragment
);
}
fragmentTransaction
.
commit
();
mFragmentManager
.
executePendingTransactions
();
}
pages
=
listFragments
;
notifyDataSetChanged
();
mViewPager
.
setCurrentItem
(
0
);
}
}
private
void
initNewsListFragment
()
{
List
<
NewsType
>
listNewsType
=
NewsDBManager
.
getInstance
(
getContext
()).
getListNewsType
();
KLog
.
v
(
"MYTAG"
,
"initNewsListFragment start..."
+
listNewsType
.
toString
());
mListFragments
.
clear
();
titles
.
clear
();
if
(
listNewsType
!=
null
&&
listNewsType
.
size
()
>
0
)
{
for
(
int
i
=
0
;
i
<
listNewsType
.
size
();
i
++)
{
NewsType
newsType
=
listNewsType
.
get
(
i
);
mListFragments
.
add
(
NewsListFragment
.
newInstance
(
newsType
));
titles
.
add
(
newsType
.
getTypename
());
}
}
}
@Override
public
String
getToolbarTitle
()
{
return
null
;
}
@Subscribe
(
threadMode
=
ThreadMode
.
MAIN
)
public
void
onEvent
(
NewsTypeCrudEvent
event
)
{
mIsfresh
=
true
;
}
@Override
public
void
onHiddenChanged
(
boolean
hidden
)
{
super
.
onHiddenChanged
(
hidden
);
KLog
.
v
(
"MYTAG"
,
"onHiddenChanged start..."
+
hidden
);
if
(
mIsfresh
&&
!
hidden
)
{
KLog
.
v
(
"MYTAG"
,
"ViewPager refresh start..."
);
mIsfresh
=
false
;
mViewPager
.
setCurrentItem
(
mListFragments
.
size
()
-
1
);
initNewsListFragment
();
//mViewPager.setOffscreenPageLimit(mListFragments.size());
mNewsFragmentAdapter
.
refreshViewPager
(
mListFragments
);
}
}
}
module_news/src/main/java/com/fly/tour/news/fragment/NewsListFragment.java
浏览文件 @
034a6d1f
...
...
@@ -10,7 +10,9 @@ import android.view.View;
import
com.fly.tour.common.base.BaseFragment
;
import
com.fly.tour.common.base.BaseRefreshFragment
;
import
com.fly.tour.common.event.KeyCode
;
import
com.fly.tour.common.event.me.NewsDetailCurdEvent
;
import
com.fly.tour.common.mvp.BaseRefreshPresenter
;
import
com.fly.tour.common.util.log.KLog
;
import
com.fly.tour.db.entity.NewsDetail
;
import
com.fly.tour.db.entity.NewsType
;
import
com.fly.tour.news.adapter.NewsListAdatper
;
...
...
@@ -19,6 +21,9 @@ import com.fly.tour.news.model.NewsListModel;
import
com.fly.tour.news.presenter.NewsListPresenter
;
import
com.fly.tour.trip.R
;
import
org.greenrobot.eventbus.Subscribe
;
import
org.greenrobot.eventbus.ThreadMode
;
import
java.util.List
;
/**
...
...
@@ -61,6 +66,7 @@ public class NewsListFragment extends BaseRefreshFragment<NewsListModel,NewsList
@Override
public
void
initView
(
View
view
)
{
KLog
.
v
(
"MYTAG"
,
"initView start:"
+
mNewsType
.
getTypename
());
mRecViewNewsDetail
=
view
.
findViewById
(
R
.
id
.
recview_news_list
);
mRecViewNewsDetail
.
setLayoutManager
(
new
LinearLayoutManager
(
mActivity
));
mNewsListAdatper
=
new
NewsListAdatper
(
mActivity
);
...
...
@@ -70,6 +76,7 @@ public class NewsListFragment extends BaseRefreshFragment<NewsListModel,NewsList
@Override
public
void
initData
()
{
mPresenter
.
setNewsType
(
mNewsType
.
getId
());
KLog
.
v
(
"MYTAG"
,
"initData start:"
+
mNewsType
.
getTypename
());
autoLoadData
();
}
...
...
@@ -114,4 +121,10 @@ public class NewsListFragment extends BaseRefreshFragment<NewsListModel,NewsList
public
void
loadMoreData
(
List
<
NewsDetail
>
data
)
{
mNewsListAdatper
.
addAll
(
data
);
}
@Subscribe
(
threadMode
=
ThreadMode
.
MAIN
)
public
void
onEvent
(
NewsDetailCurdEvent
curdEvent
){
if
(
curdEvent
.
getCode
()
==
mNewsType
.
getId
()){
autoLoadData
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录