Merge branch 'master' into androidx

CymChad · Jan 13, 2019 · 002a6be · 002a6be
2 parents 2323975 + 8e5bb8a
commit 002a6be
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 17 deletions.
diff --git a/app/src/main/res/mipmap-xhdpi/dress_icon.png b/app/src/main/res/mipmap-xhdpi/dress_icon.png
diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="toolbar_padding_top">25dp</dimen>
-</resources>
+<resources></resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -7,5 +7,4 @@
     <dimen name="dp_40">40dp</dimen>
 
     <dimen name="sp_14">14sp</dimen>
-    <dimen name="toolbar_padding_top">0dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,4 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">BRVAH</string>
-    <string name="title_activity_header_and_footer_use">HeaderAndFooterUseActivity</string>
-    <string name="error">Network error</string>
     <string name="network_err">Simulation network error</string>
     <string name="empty_network_error">Network error, Click Retry</string>
     <string name="empty_no_data">There is no data, Click Retry</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -42,13 +42,6 @@
     </style>
 
 
-
-
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
-
     <style name="bg">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>

diff --git a/library/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml
@@ -5,9 +5,6 @@
     <dimen name="dp_4">4dp</dimen>
     <dimen name="dp_10">10dp</dimen>
     <dimen name="dp_40">40dp</dimen>
-    <dimen name="dp_72">72dp</dimen>
 
-    <dimen name="sp_12">12sp</dimen>
     <dimen name="sp_14">14sp</dimen>
-    <dimen name="sp_16">16sp</dimen>
 </resources>