Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Divider color fixed, bottom sheet fixed, unnecessary themes and colors deleted. #437

Merged
merged 36 commits into from
Sep 28, 2018
Merged

Divider color fixed, bottom sheet fixed, unnecessary themes and colors deleted. #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2523b47
Merge pull request #1 from Swati4star/master
sasfmlzr Sep 24, 2018
c4b64ed
Add icon for settings theme.
sasfmlzr Sep 25, 2018
7a0f4c6
Add options for setting theme.
sasfmlzr Sep 25, 2018
ceb918b
Add working themes.
sasfmlzr Sep 25, 2018
6db974f
ActivityMain styles completed.
sasfmlzr Sep 26, 2018
f55a0e9
Change styles.
sasfmlzr Sep 26, 2018
790e17a
Fix bug, when icon for Version is invisible.
sasfmlzr Sep 26, 2018
4e3fbb8
AppTheme is better.
sasfmlzr Sep 26, 2018
d899716
AppTheme is better.
sasfmlzr Sep 26, 2018
7b66b6f
AppTheme is better.
sasfmlzr Sep 26, 2018
81046bf
Theme working is better.
sasfmlzr Sep 27, 2018
68a3d51
Delete unused theme.
sasfmlzr Sep 27, 2018
138e30f
Merge pull request #2 from Swati4star/master
sasfmlzr Sep 27, 2018
af14d74
Merge remote-tracking branch 'origin/master' into Add-themes-to-the-app
sasfmlzr Sep 27, 2018
840c01d
Design is better.
sasfmlzr Sep 27, 2018
3134398
Fix bug, when i testing feedback.
sasfmlzr Sep 27, 2018
9acb9f4
Clean code.
sasfmlzr Sep 27, 2018
ea8291e
Fix bug, when actionbar is null(error).
sasfmlzr Sep 27, 2018
13c915a
Apply themes for other activity.
sasfmlzr Sep 27, 2018
febfebb
Fix translation bug.
sasfmlzr Sep 27, 2018
7866547
Fix bottom_sheet view.
sasfmlzr Sep 27, 2018
9c441aa
Fix color for custom card.
sasfmlzr Sep 27, 2018
dd9d8c1
Fix color icon in layout_item_history.
sasfmlzr Sep 27, 2018
c692017
Fix divider color.
sasfmlzr Sep 27, 2018
cde9464
Merge pull request #3 from Swati4star/master
sasfmlzr Sep 27, 2018
d3b01d5
Merging changes.
sasfmlzr Sep 27, 2018
15d4502
Revert: Merging changes.
sasfmlzr Sep 27, 2018
59488c3
Toolbar color icon fixed.
sasfmlzr Sep 27, 2018
b668835
Toolbar color icon fixed.
sasfmlzr Sep 27, 2018
6b188cc
Toolbar color icon fixed.
sasfmlzr Sep 27, 2018
946eec2
Merge pull request #4 from sasfmlzr/Add-themes-to-the-app
sasfmlzr Sep 28, 2018
7e72db9
Fix bottom sheet colors.
sasfmlzr Sep 28, 2018
f3ba7a9
Fix bottom sheet colors.
sasfmlzr Sep 28, 2018
4aebd1a
Remove unnecessary themes.
sasfmlzr Sep 28, 2018
5c046cf
Remove unnecessary colors.
sasfmlzr Sep 28, 2018
99c277d
Merge branch 'master' into master
sasfmlzr Sep 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/bottom_sheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_extract_images.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_history.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_images_to_pdf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_merge_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_remove_pages.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_split_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_text_to_pdf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_view_files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
13 changes: 1 addition & 12 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
68 changes: 25 additions & 43 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>