Skip to content

Commit ecad275

Browse files
surinder-tsyssurinder-tsys
committed
Customized floating action button.
1 parent 5c24ba7 commit ecad275

File tree

4 files changed

+143
-6
lines changed

4 files changed

+143
-6
lines changed

‎app/src/main/java/com/nmc/android/utils/FabThemeUtils.kt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package com.nmc.android.utils
2+
3+
import android.content.Context
4+
import android.content.res.ColorStateList
5+
import android.graphics.Color
6+
import com.google.android.material.floatingactionbutton.FloatingActionButton
7+
import com.owncloud.android.R
8+
9+
object FabThemeUtils {
10+
@JvmStatic
11+
fun colorFloatingActionButton(
12+
context: Context,
13+
button: FloatingActionButton
14+
) {
15+
val primaryColor = context.resources.getColor(R.color.primary, null)
16+
val disableColor = context.resources.getColor(R.color.grey_0, null)
17+
18+
val bgStates = arrayOf(
19+
intArrayOf(android.R.attr.state_enabled),
20+
intArrayOf(-android.R.attr.state_enabled),
21+
)
22+
val bgColors = intArrayOf(
23+
primaryColor,
24+
disableColor
25+
)
26+
27+
button.backgroundTintList = ColorStateList(bgStates, bgColors)
28+
29+
val imageStates = arrayOf(
30+
intArrayOf(android.R.attr.state_enabled),
31+
intArrayOf(-android.R.attr.state_enabled),
32+
)
33+
val imageColors = intArrayOf(
34+
Color.WHITE,
35+
disableColor
36+
)
37+
38+
button.imageTintList = ColorStateList(imageStates, imageColors)
39+
}
40+
}

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import com.nextcloud.common.NextcloudClient;
5757
import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
5858
import com.nextcloud.utils.EditorUtils;
59+
import com.nmc.android.utils.FabThemeUtils;
5960
import com.nextcloud.utils.ShortcutUtil;
6061
import com.nextcloud.utils.extensions.BundleExtensionsKt;
6162
import com.nextcloud.utils.extensions.FileExtensionsKt;
@@ -331,7 +332,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
331332

332333
if (mFabMain != null) {
333334
// is not available in FolderPickerActivity
334-
viewThemeUtils.material.themeFAB(mFabMain);
335+
//NMC customization
336+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
335337
}
336338

337339
Log_OC.i(TAG, "onCreateView() end");
@@ -483,7 +485,8 @@ public void registerFabListener() {
483485

484486
if (mFabMain != null) {
485487
// is not available in FolderPickerActivity
486-
viewThemeUtils.material.themeFAB(mFabMain);
488+
//NMC customization
489+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
487490
mFabMain.setOnClickListener(v -> {
488491
final OCFileListBottomSheetDialog dialog =
489492
new OCFileListBottomSheetDialog(activity,
@@ -2002,7 +2005,8 @@ public void setFabVisible(final boolean visible) {
20022005
getActivity().runOnUiThread(() -> {
20032006
if (visible) {
20042007
mFabMain.show();
2005-
viewThemeUtils.material.themeFAB(mFabMain);
2008+
//NMC customization
2009+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
20062010
} else {
20072011
mFabMain.hide();
20082012
}
@@ -2052,10 +2056,12 @@ public void setFabEnabled(final boolean enabled) {
20522056
getActivity().runOnUiThread(() -> {
20532057
if (enabled) {
20542058
mFabMain.setEnabled(true);
2055-
viewThemeUtils.material.themeFAB(mFabMain);
2059+
//NMC customization
2060+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
20562061
} else {
20572062
mFabMain.setEnabled(false);
2058-
viewThemeUtils.material.themeFAB(mFabMain);
2063+
//NMC customization
2064+
FabThemeUtils.colorFloatingActionButton(requireContext(), mFabMain);
20592065
}
20602066
});
20612067
}

‎app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.nextcloud.android.lib.richWorkspace.RichWorkspaceDirectEditingRemoteOperation;
2121
import com.nextcloud.client.account.UserAccountManager;
2222
import com.nextcloud.utils.extensions.FileExtensionsKt;
23+
import com.nmc.android.utils.FabThemeUtils;
2324
import com.owncloud.android.R;
2425
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
2526
import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -92,7 +93,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
9293
fabMain.setOnClickListener(v -> edit());
9394

9495
fabMain.setImageResource(R.drawable.ic_edit);
95-
viewThemeUtils.material.themeFAB(fabMain);
96+
//NMC customization
97+
FabThemeUtils.colorFloatingActionButton(requireActivity(), fabMain);
9698

9799
return view;
98100
}

‎app/src/main/res/values/colors.xml‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,93 @@
7575
<color name="appbar">@android:color/white</color>
7676
<color name="fontAppbar">#666666</color>
7777
<color name="fontSecondaryAppbar">#A5A5A5</color>
78+
79+
<!-- NMC Colors -->
80+
<color name="icon_color">#191919</color>
81+
<color name="sort_text_color">@color/primary</color>
82+
<color name="list_icon_color">#191919</color>
83+
<color name="warning_icon_color">#191919</color>
84+
<color name="divider_color">@color/grey_30</color>
85+
<color name="spinner_bg_color">@android:color/white</color>
86+
<color name="refresh_layout_bg_color">#FFFFFF</color>
87+
<color name="primary_button_disabled_color">@color/grey_0</color>
88+
<color name="toolbar_divider_color">#CCCCCC</color>
89+
<color name="et_highlight_color">#77c4ff</color>
90+
<color name="white_trans_70">#B3FFFFFF</color>
91+
<color name="progress_bar_background">@color/grey_10</color>
92+
93+
<!-- Grey Colors -->
94+
<color name="dark_grey">#101010</color>
95+
<color name="grey_0">#F2F2F2</color>
96+
<color name="grey_10">#E5E5E5</color>
97+
<color name="grey_30">#B2B2B2</color>
98+
<color name="grey_60">#666666</color>
99+
<color name="grey_70">#4C4C4C</color>
100+
<color name="grey_80">#333333</color>
101+
102+
<!-- Snackbar Colors -->
103+
<color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
104+
<color name="snackbar_txt_color">@color/white</color>
105+
106+
<!-- Alert Dialog Colors -->
107+
<color name="alert_bg_color">#FFFFFF</color>
108+
<color name="alert_txt_color">#191919</color>
109+
110+
<!-- NavigationView colors -->
111+
<color name="nav_selected_bg_color">@color/grey_0</color>
112+
<color name="nav_txt_unselected_color">#191919</color>
113+
<color name="nav_txt_selected_color">@color/primary</color>
114+
<color name="nav_icon_unselected_color">#191919</color>
115+
<color name="nav_icon_selected_color">@color/primary</color>
116+
<color name="nav_divider_color">@color/grey_30</color>
117+
<color name="nav_bg_color">@color/white</color>
118+
<color name="drawer_quota_txt_color">#191919</color>
119+
120+
<!-- Bottom Sheet Colors -->
121+
<color name="bottom_sheet_bg_color">#FFFFFF</color>
122+
<color name="bottom_sheet_icon_color">#191919</color>
123+
<color name="bottom_sheet_txt_color">#191919</color>
124+
125+
<!-- Popup Menu Colors -->
126+
<color name="popup_menu_bg">#FFFFFF</color>
127+
<color name="popup_menu_txt_color">#191919</color>
128+
<color name="overflow_bg_color">#FFFFFF</color>
129+
130+
<!-- Switch Compat Colors -->
131+
<color name="switch_thumb_checked_enabled">@color/primary</color>
132+
<color name="switch_track_checked_enabled">#F399C7</color>
133+
<color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
134+
<color name="switch_track_unchecked_enabled">@color/grey_30</color>
135+
<color name="switch_thumb_disabled">@color/grey_10</color>
136+
<color name="switch_track_disabled">@color/grey_0</color>
137+
138+
<!-- Checkbox Colors -->
139+
<color name="checkbox_checked_enabled">@color/primary</color>
140+
<color name="checkbox_unchecked_enabled">@color/grey_30</color>
141+
<color name="checkbox_checked_disabled">@color/grey_30</color>
142+
<color name="checkbox_unchecked_disabled">#CCCCCC</color>
143+
144+
<!-- Share Colors -->
145+
<color name="share_title_txt_color">#191919</color>
146+
<color name="share_subtitle_txt_color">@color/grey_30</color>
147+
<color name="share_info_txt_color">#191919</color>
148+
<color name="share_search_border_color">#191919</color>
149+
<color name="share_btn_txt_color">#191919</color>
150+
<color name="share_list_item_txt_color">#191919</color>
151+
<color name="share_disabled_txt_color">@color/grey_30</color>
152+
<color name="share_txt_color">#191919</color>
153+
<color name="share_et_divider">#000000</color>
154+
<color name="share_warning_txt_color">#191919</color>
155+
<color name="sharing_warning_bg_color">#F6E5EB</color>
156+
<color name="sharing_warning_border_color">#C16F81</color>
157+
<color name="share_color">#0D39DF</color>
158+
<color name="shared_with_me_color">#0099ff</color>
159+
160+
<!-- Scan Colors -->
161+
<color name="scan_doc_bg_color">@color/grey_0</color>
162+
<color name="scan_text_color">#191919</color>
163+
<color name="scan_edit_bottom_color">@color/grey_0</color>
164+
<color name="scan_count_bg_color">@color/grey_30</color>
165+
<color name="neptune">#77b6bb</color>
166+
<color name="neptune_50">#5077b6bb</color>
78167
</resources>

0 commit comments

Comments
 (0)