From eadede21f24796ccd1150a7b726626847c08521a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 28 Aug 2020 19:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A8=A1=E5=BC=8F=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../module_ext_drawable_weather_bkg.xml | 2 +- .../src/main/res/values/colors.xml | 1 + skin/mogo-skin-light/build.gradle | 3 +- .../module_ext_drawable_weather_bkg_light.xml | 9 ++ .../values-xhdpi-1920x1000/dimens.xml | 147 +++++++++++++++++ .../values-xhdpi/dimens.xml | 147 +++++++++++++++++ .../module-extensions-res/values/colors.xml | 4 + .../module-extensions-res/values/dimens.xml | 151 ++++++++++++++++++ 9 files changed, 463 insertions(+), 3 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml create mode 100644 skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml diff --git a/app/build.gradle b/app/build.gradle index 162ff590f5..96dae5d2ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -283,7 +283,7 @@ dependencies { implementation rootProject.ext.dependencies.carcall implementation rootProject.ext.dependencies.mogologlib - implementation "com.zhidao.adasconfig:adasconfig:1.0.1" + implementation "com.zhidao.adasconfig:adasconfig:1.0.5" if (Boolean.valueOf(RELEASE)) { implementation rootProject.ext.dependencies.mogocommons diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml index 90fb7a2eaf..0a3cfd0361 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_weather_bkg.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/colors.xml b/modules/mogo-module-extensions/src/main/res/values/colors.xml index 550f80dff1..e948980dea 100644 --- a/modules/mogo-module-extensions/src/main/res/values/colors.xml +++ b/modules/mogo-module-extensions/src/main/res/values/colors.xml @@ -1,4 +1,5 @@ #FFFFFF + #BF30334C \ No newline at end of file diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle index 45dab90777..81d610ee6c 100644 --- a/skin/mogo-skin-light/build.gradle +++ b/skin/mogo-skin-light/build.gradle @@ -30,7 +30,8 @@ android { main { res.srcDirs = [ 'src/main/res', - 'src/main/module-apps-res' + 'src/main/module-apps-res', + 'src/main/module-extensions-res' ] } } diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml new file mode 100644 index 0000000000..293e2cfc90 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/drawable/module_ext_drawable_weather_bkg_light.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml new file mode 100644 index 0000000000..ad9dc6d8fb --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,147 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 120px + 32px + 60px + 92px + 24px + 48px + 2px + 120px + 120px + 120px + 30px + 30px + 32px + 32px + + 120px + 120px + 32px + 60px + 32px + 60px + 32px + 20px + + + 100px + 60px + 60px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 30px + 30px + 30px + 20px + + 103px + 103px + + + 1058px + 210px + 144px + 159px + 159px + 70px + 70px + 56px + 83px + 24px + 40px + 60px + 50px + 12px + 10px + 40px + 30px + 34px + 24px + 28px + 23px + 17px + 17px + 36px + 36px + -2px + 95px + + 30px + 40px + 40px + 15px + 15px + 5px + 50px + 56px + 30px + 56px + 30px + 56px + 30px + 15px + 15px + + + 1000px + 390px + 200px + 200px + 240px + 30px + 120px + 120px + 30px + 22px + 28px + 28px + 30px + 90px + 90px + 6dp + 15px + 4px + 10px + 20px + + 40px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..7423964cdd --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/values-xhdpi/dimens.xml @@ -0,0 +1,147 @@ + + + + 90px + 32px + 2px + 16px + 26px + 26px + 32px + + 90px + 32px + 2px + 100px + 90px + 2px + 54px + 100px + 90px + + 180px + 180px + 2px + 60px + 60px + 28px + + 32px + 2px + + 120px + 32px + 60px + 92px + 24px + 48px + 2px + 120px + 120px + 120px + 30px + 30px + 32px + 32px + + 120px + 120px + 32px + 60px + 32px + 60px + 32px + 20px + + + 100px + 60px + 60px + 32px + 48px + 80px + 28px + 26px + 44px + 44px + 18px + 34px + 26px + 28px + 30px + 30px + 30px + 20px + + 103px + 103px + + + 1058px + 210px + 144px + 159px + 159px + 70px + 70px + 56px + 83px + 24px + 40px + 60px + 50px + 12px + 10px + 40px + 30px + 34px + 24px + 28px + 24px + 17px + 17px + 36px + 36px + -2px + 95px + + 30px + 40px + 40px + 15px + 15px + 5px + 50px + 37px + 26px + 37px + 26px + 37px + 26px + 15px + 15px + + + 1000px + 390px + 200px + 200px + 240px + 30px + 120px + 120px + 30px + 22px + 28px + 28px + 30px + 90px + 90px + 6dp + 15px + 4px + 10px + 20px + + 34px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml new file mode 100644 index 0000000000..80efe27112 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/values/colors.xml @@ -0,0 +1,4 @@ + + + #CFCACA + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml new file mode 100644 index 0000000000..26b9b2c5fe --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-extensions-res/values/dimens.xml @@ -0,0 +1,151 @@ + + + + 58px + 18px + 1px + 11.2px + 10.8px + 17px + 20px + + 58px + 19px + 1px + 64.2px + 58px + 1px + 33.4px + 64.2px + 58px + + + 96px + 96px + 1px + 32px + 32px + 15px + + 20px + 1px + + 66px + 20px + 34.5px + 58px + 17px + 31.4px + 1.2px + 66px + 66px + 66px + 16px + 16px + 34.5px + 20px + + + 66px + 66px + 20px + 32px + 20px + 30px + 16px + 8px + + + 56px + 32px + 32px + + 22px + 28px + 22px + 22px + 16px + 24px + 24px + 18px + 18.48px + 16px + 22px + 16px + 15px + 15px + 11.73px + + 56px + 56px + + + 544px + 117px + 80px + 85px + 85px + 40px + 40px + 30px + 44px + 13px + 20px + 32px + 28px + 7px + 5px + 22px + 16px + 18px + 24px + 15px + 13px + 58px + + 9px + 9px + 18px + 18px + -1px + + 30px + 23px + 23px + 15px + 15px + 5px + 20px + 14px + 20px + 14px + 20px + 14px + 34px + 8px + 8px + + + 550px + 208px + 100px + 100px + 16px + 142px + 66px + 66px + 16px + 12px + 14px + 14px + 18px + 58px + 58px + 3dp + 10px + 4px + 6px + 10px + + 19px + \ No newline at end of file