Divider color fixed, bottom sheet fixed, unnecessary themes and color…

…s deleted. (#437)
Swati4star · Sep 28, 2018 · d18644b · d18644b
1 parent 28dea04
commit d18644b
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 76 deletions.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,7 +22,7 @@
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
-                android:theme="@style/ActivityThemeDark.Toolbar"
+                android:theme="@style/ToolbarTheme"
                 app:titleTextColor="?attr/titleToolbarTextColor"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize" />

diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_gravity="center_vertical"
-        android:background="?attr/colorPrimary"
+        android:background="?attr/bottomSheetColor"
         android:orientation="horizontal"
         android:weightSum="3">
 
@@ -25,7 +25,8 @@
             android:layout_height="40dp"
             android:layout_alignParentStart="true"
             android:gravity="center"
-            android:text="@string/viewFiles" />
+            android:text="@string/viewFiles"
+            android:textColor="?attr/bottomSheetTextColor" />
 
         <ImageView
             android:id="@+id/downArrow"

diff --git a/app/src/main/res/layout/fragment_extract_images.xml b/app/src/main/res/layout/fragment_extract_images.xml
@@ -15,7 +15,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/selectFile"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="24dp"
@@ -25,7 +25,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/extractImages"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/selectFile"

diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
@@ -39,7 +39,7 @@
 
         <Button
             android:id="@+id/getStarted"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="150dp"

diff --git a/app/src/main/res/layout/fragment_images_to_pdf.xml b/app/src/main/res/layout/fragment_images_to_pdf.xml
@@ -26,7 +26,7 @@
 
                 <com.dd.morphingbutton.MorphingButton
                     android:id="@+id/addImages"
-                    style="@style/AppThemeWhite.MorphingButton"
+                    style="@style/MorphingButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -36,7 +36,7 @@
 
                 <com.dd.morphingbutton.MorphingButton
                     android:id="@+id/pdfOpen"
-                    style="@style/AppThemeWhite.MorphingButton"
+                    style="@style/MorphingButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -48,7 +48,7 @@
 
                 <com.dd.morphingbutton.MorphingButton
                     android:id="@+id/pdfCreate"
-                    style="@style/AppThemeWhite.MorphingButton"
+                    style="@style/MorphingButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"

diff --git a/app/src/main/res/layout/fragment_merge_files.xml b/app/src/main/res/layout/fragment_merge_files.xml
@@ -14,7 +14,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/mergebtn"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -32,7 +32,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/selectFiles"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

diff --git a/app/src/main/res/layout/fragment_remove_pages.xml b/app/src/main/res/layout/fragment_remove_pages.xml
@@ -53,7 +53,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/pdfCreate"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

diff --git a/app/src/main/res/layout/fragment_split_files.xml b/app/src/main/res/layout/fragment_split_files.xml
@@ -28,7 +28,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/selectFile"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="24dp"
@@ -41,7 +41,7 @@
 
         <com.dd.morphingbutton.MorphingButton
             android:id="@+id/splitFiles"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"

diff --git a/app/src/main/res/layout/fragment_text_to_pdf.xml b/app/src/main/res/layout/fragment_text_to_pdf.xml
@@ -23,15 +23,15 @@
 
                 <com.dd.morphingbutton.MorphingButton
                     android:id="@+id/selectFile"
-                    style="@style/AppThemeWhite.MorphingButton"
+                    style="@style/MorphingButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
                     android:text="@string/select_text_file" />
 
                 <com.dd.morphingbutton.MorphingButton
                     android:id="@+id/createtextpdf"
-                    style="@style/AppThemeWhite.MorphingButton"
+                    style="@style/MorphingButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"

diff --git a/app/src/main/res/layout/fragment_view_files.xml b/app/src/main/res/layout/fragment_view_files.xml
@@ -175,7 +175,7 @@
 
         <Button
             android:id="@+id/getStarted"
-            style="@style/AppThemeWhite.MorphingButton"
+            style="@style/MorphingButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="150dp"

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -6,14 +6,12 @@
     </declare-styleable>
 
     <declare-styleable name="CTAppTheme">
-        <attr name="primaryTextColor" format="color"/>
-        <attr name="secondaryTextColor" format="color"/>
-        <attr name="dividerColor" format="color"/>
-        <attr name="backgroundCardColor" format="color"/>
         <attr name="titleToolbarTextColor" format="color"/>
         <attr name="iconTintOnCard" format="color"/>
         <attr name="historyIconColor" format="color"/>
         <attr name="customDividerColor" format="color"/>
         <attr name="navigationIconTint" format="color"/>
+        <attr name="bottomSheetColor" format="color"/>
+        <attr name="bottomSheetTextColor" format="color"/>
     </declare-styleable>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -9,21 +9,10 @@
     <color name="gray_background">#eceff1</color>
     <color name="black">#000000</color>
     <color name="red">#FF0000</color>
-
-
+
     <color name="colorBackground_black">#0A0808</color>
     <color name="colorBackground_dark">#7C7F87</color>
 
-    <color name="primaryTextColorLight">#F4F4F6</color>
-    <color name="secondaryTextColorLight">#96F4F4F6</color>
-    <color name="backgroundCardColorLight">#FFFF</color>
-    <color name="dividerColorLight">#F2F2F3</color>
-
-    <color name="primaryTextColorDark">#33343B</color>
-    <color name="secondaryTextColorDark">#8033343B</color>
-    <color name="backgroundCardColorDark">#28292e</color>
-    <color name="dividerColorDark">#F2F2F3</color>
-
     <color name="windowBackground_light">#F4F4F6</color>
     <color name="windowBackground_dark">#33343B</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -14,23 +14,8 @@
         <item name="historyIconColor">@color/black</item>
         <item name="customDividerColor">@color/black</item>
         <item name="navigationIconTint">@color/colorGray</item>
-    </style>
-
-    <style name="AppThemeWhite.MorphingButton">
-        <item name="android:textColor">@color/mb_white</item>
-    </style>
-
-    <style name="AppThemeWhite.AboutUSTextViewMedium" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:drawableTint">@color/colorGray</item>
-    </style>
-
-    <style name="AppThemeWhite.AboutUSTextViewSmall" parent="TextAppearance.AppCompat.Small">
-        <item name="android:drawableTint">@color/colorGray</item>
-    </style>
-
-    <style name="AppThemeWhite.PDFconverter">
-        <item name="android:textColor">@color/mb_white</item>
-        <item name="colorAccent">@color/colorGray</item>
+        <item name="bottomSheetColor">?attr/colorPrimary</item>
+        <item name="bottomSheetTextColor">@color/mb_white</item>
     </style>
 
     <style name="AppThemeBlack" parent="Theme.AppCompat.NoActionBar">
@@ -39,44 +24,41 @@
         <item name="iconTintOnCard">@color/mb_white</item>
         <item name="customDividerColor">@color/windowBackground_dark</item>
         <item name="navigationIconTint">@color/colorGray</item>
+        <item name="bottomSheetColor">@color/mb_white</item>
+        <item name="bottomSheetTextColor">@color/black</item>
     </style>
 
-    <!-- Light base activity theme -->
-    <style name="ActivityTheme.Primary.Base.Light" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:textColorSecondary">@color/mb_white</item>
-        <item name="primaryTextColor">@color/primaryTextColorLight</item>
-        <item name="secondaryTextColor">@color/secondaryTextColorLight</item>
-        <item name="backgroundCardColor">@color/backgroundCardColorLight</item>
-        <item name="dividerColor">@color/dividerColorLight</item>
-    </style>
-    <!-- Dark base activity theme -->
-    <style name="ActivityTheme.Primary.Base.Dark" parent="Theme.AppCompat.NoActionBar">
-
-        <item name="backgroundCardColor">@color/backgroundCardColorDark</item>
-        <item name="dividerColor">@color/dividerColorDark</item>
-    </style>
-
-    <!-- Specific Feed activity theme -->
-    <style name="ActivityThemeLight" parent="ActivityTheme.Primary.Base.Light">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="titleToolbarTextColor">@color/mb_white</item>
-        <item name="android:windowBackground">@color/windowBackground_light</item>
-    </style>
-
-    <style name="ActivityThemeDark" parent="ActivityTheme.Primary.Base.Dark">
+    <style name="ActivityThemeDark" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/colorPrimaryDark</item>
         <item name="android:windowBackground">@color/windowBackground_dark</item>
         <item name="titleToolbarTextColor">@color/mb_white</item>
         <item name="iconTintOnCard">@color/mb_white</item>
         <item name="historyIconColor">@color/black</item>
         <item name="customDividerColor">@color/black</item>
         <item name="navigationIconTint">@color/colorGray</item>
+        <item name="bottomSheetColor">?attr/colorPrimary</item>
+        <item name="bottomSheetTextColor">@color/mb_white</item>
     </style>
 
-    <style name="ActivityThemeDark.Toolbar">
+    <style name="ToolbarTheme">
         <item name="android:textColorSecondary">@color/mb_white</item>
     </style>
 
+    <style name="MorphingButton">
+        <item name="android:textColor">@color/mb_white</item>
+    </style>
+
+    <style name="AboutUSTextViewMedium" parent="TextAppearance.AppCompat.Medium">
+        <item name="android:drawableTint">@color/colorGray</item>
+    </style>
+
+    <style name="AboutUSTextViewSmall" parent="TextAppearance.AppCompat.Small">
+        <item name="android:drawableTint">@color/colorGray</item>
+    </style>
+
+    <style name="PDFconverter">
+        <item name="android:textColor">@color/mb_white</item>
+        <item name="colorAccent">@color/colorGray</item>
+    </style>
+
 </resources>