Skip to content

Commit 1088e01

Browse files
surinder-tsyssurinder-tsys
committed
Customized popup menu, overflow menu and Fastscroller.
1 parent f59caa7 commit 1088e01

File tree

11 files changed

+198
-11
lines changed

11 files changed

+198
-11
lines changed

‎app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import java.util.concurrent.Executors;
5151

5252
import androidx.annotation.NonNull;
53+
import androidx.appcompat.view.ContextThemeWrapper;
5354

5455
/**
5556
* Adapter to display all auto-synced folders and/or instant upload media folders.
@@ -298,7 +299,9 @@ public void onBindHeaderViewHolder(SectionedViewHolder commonHolder, final int s
298299
}
299300

300301
private void onOverflowIconClicked(int section, SyncedFolderDisplayItem item, View view) {
301-
PopupMenu popup = new PopupMenu(context, view);
302+
//NMC Customisation
303+
ContextThemeWrapper ctw = new ContextThemeWrapper(context, R.style.CustomPopupTheme);
304+
PopupMenu popup = new PopupMenu(ctw, view);
302305
popup.inflate(R.menu.synced_folders_adapter);
303306
popup.setOnMenuItemClickListener(i -> optionsItemSelected(i, section, item));
304307
popup.getMenu()

‎app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import java.util.Arrays;
7676

7777
import androidx.annotation.NonNull;
78+
import androidx.appcompat.view.ContextThemeWrapper;
7879

7980
/**
8081
* This Adapter populates a ListView with following types of uploads: pending, active, completed. Filtering possible.
@@ -567,7 +568,9 @@ private void showItemConflictPopup(User user,
567568
OCUpload item,
568569
String status,
569570
View view) {
570-
PopupMenu popup = new PopupMenu(MainApp.getAppContext(), view);
571+
//NMC Customisation
572+
ContextThemeWrapper ctw = new ContextThemeWrapper(MainApp.getAppContext(), R.style.CustomPopupTheme);
573+
PopupMenu popup = new PopupMenu(ctw, view);
571574
popup.inflate(R.menu.upload_list_item_file_conflict);
572575
popup.setOnMenuItemClickListener(i -> {
573576
int itemId = i.getItemId();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757

5858
import androidx.annotation.NonNull;
5959
import androidx.annotation.Nullable;
60+
import androidx.core.content.ContextCompat;
6061
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
6162
import androidx.recyclerview.widget.GridLayoutManager;
6263
import androidx.recyclerview.widget.RecyclerView;
@@ -290,7 +291,8 @@ public void onCreateOptionsMenu(Menu menu, @NonNull MenuInflater inflater) {
290291
MenuItem menuItem = menu.findItem(R.id.action_three_dot_icon);
291292

292293
if (menuItem != null) {
293-
viewThemeUtils.platform.colorMenuItemText(requireContext(), menuItem);
294+
//NMC customization
295+
menuItem.setIcon(viewThemeUtils.platform.colorDrawable(menuItem.getIcon(), ContextCompat.getColor(requireContext(), R.color.fontAppbar)));
294296
}
295297

296298
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,8 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
749749
MenuInflater inflater = getActivity().getMenuInflater();
750750
inflater.inflate(R.menu.custom_menu_placeholder, menu);
751751
final MenuItem item = menu.findItem(R.id.custom_menu_placeholder_item);
752-
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.white)));
752+
//NMC customization
753+
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.fontAppbar)));
753754
mode.invalidate();
754755

755756
//set actionMode color

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,8 @@ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflat
377377
super.onCreateOptionsMenu(menu, inflater);
378378
inflater.inflate(R.menu.custom_menu_placeholder, menu);
379379
final MenuItem item = menu.findItem(R.id.custom_menu_placeholder_item);
380-
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.white)));
380+
//NMC customization
381+
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.fontAppbar)));
381382
}
382383

383384
@Override

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
7676
import com.owncloud.android.ui.fragment.FileFragment;
7777
import com.owncloud.android.utils.MimeTypeUtil;
78+
import com.owncloud.android.utils.theme.ViewThemeUtils;
7879

7980
import java.lang.ref.WeakReference;
8081
import java.util.ArrayList;
@@ -89,6 +90,7 @@
8990
import androidx.annotation.StringRes;
9091
import androidx.appcompat.content.res.AppCompatResources;
9192
import androidx.core.graphics.drawable.DrawableCompat;
93+
import androidx.core.content.ContextCompat;
9294
import androidx.drawerlayout.widget.DrawerLayout;
9395
import androidx.fragment.app.FragmentActivity;
9496
import androidx.fragment.app.FragmentManager;
@@ -138,6 +140,7 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
138140
@Inject ClientFactory clientFactory;
139141
@Inject UserAccountManager accountManager;
140142
@Inject BackgroundJobManager backgroundJobManager;
143+
@Inject ViewThemeUtils viewThemeUtils;
141144
FragmentPreviewMediaBinding binding;
142145
private ViewGroup emptyListView;
143146
private ExoPlayer exoPlayer;
@@ -415,6 +418,9 @@ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflat
415418
super.onCreateOptionsMenu(menu, inflater);
416419
menu.removeItem(R.id.action_search);
417420
inflater.inflate(R.menu.custom_menu_placeholder, menu);
421+
//NMC customization
422+
final MenuItem item = menu.findItem(R.id.custom_menu_placeholder_item);
423+
item.setIcon(viewThemeUtils.platform.colorDrawable(item.getIcon(), ContextCompat.getColor(requireContext(), R.color.fontAppbar)));
418424
}
419425

420426
@Override

‎app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import android.widget.TextView
3333
import android.widget.Toast
3434
import androidx.activity.OnBackPressedCallback
3535
import androidx.annotation.VisibleForTesting
36+
import androidx.appcompat.view.ContextThemeWrapper
3637
import androidx.core.content.res.ResourcesCompat
3738
import androidx.recyclerview.widget.LinearLayoutManager
3839
import com.google.android.material.snackbar.Snackbar
@@ -221,7 +222,9 @@ class TrashbinActivity :
221222
}
222223

223224
override fun onOverflowIconClicked(file: TrashbinFile, view: View) {
224-
val popup = PopupMenu(this, view)
225+
// NMC Customization
226+
val ctw = ContextThemeWrapper(this, R.style.CustomPopupTheme)
227+
val popup = PopupMenu(ctw, view)
225228
popup.inflate(R.menu.item_trashbin)
226229
popup.setOnMenuItemClickListener {
227230
trashbinPresenter?.removeTrashbinFile(file)

‎app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ class FilesSpecificViewThemeUtils @Inject constructor(
118118
.setThumbDrawable(getThumbDrawable(context))
119119
.setPopupStyle {
120120
PopupStyles.MD2.accept(it)
121-
it.background = FastScrollPopupBackground(context, scheme.primary)
121+
//NMC customisation
122+
it.background = FastScrollPopupBackground(context, context.resources.getColor(R.color.primary, null))
122123
}
123124
}
124125
}
@@ -132,7 +133,7 @@ class FilesSpecificViewThemeUtils @Inject constructor(
132133
me.zhanghai.android.fastscroll.R.drawable.afs_md2_thumb,
133134
null
134135
)
135-
return androidViewThemeUtils.tintPrimaryDrawable(context, thumbDrawable)!!
136+
return androidViewThemeUtils.colorDrawable(thumbDrawable!!, context.resources.getColor(R.color.primary, null))
136137
}
137138

138139
private fun getHomeAsUpIcon(isMenu: Boolean): Int {

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,68 @@
4949
<!-- App bar -->
5050
<color name="appbar">#1E1E1E</color>
5151
<color name="fontAppbar">@android:color/white</color>
52+
53+
<!-- NMC Colors -->
54+
<color name="icon_color">#FFFFFF</color>
55+
<color name="sort_text_color">@color/grey_30</color>
56+
<color name="list_icon_color">@color/grey_30</color>
57+
<color name="warning_icon_color">#CCCCCC</color>
58+
<color name="divider_color">@color/grey_70</color>
59+
<color name="spinner_bg_color">@color/grey_80</color>
60+
<color name="refresh_layout_bg_color">#2D2D2D</color>
61+
<color name="primary_button_disabled_color">@color/grey_70</color>
62+
<color name="toolbar_divider_color">@color/grey_70</color>
63+
64+
<!-- Snackbar Colors -->
65+
<color name="snackbar_bg_color">@color/grey_80</color>
66+
<color name="snackbar_txt_color">@color/grey_0</color>
67+
68+
<!-- Alert Dialog Colors -->
69+
<color name="alert_bg_color">@color/grey_80</color>
70+
<color name="alert_txt_color">@color/grey_0</color>
71+
72+
<!-- NavigationView colors -->
73+
<color name="nav_selected_bg_color">@color/grey_60</color>
74+
<color name="nav_txt_unselected_color">@color/grey_0</color>
75+
<color name="nav_txt_selected_color">@color/grey_0</color>
76+
<color name="nav_icon_unselected_color">@color/grey_30</color>
77+
<color name="nav_icon_selected_color">#FFFFFF</color>
78+
<color name="nav_divider_color">@color/grey_30</color>
79+
<color name="nav_bg_color">@color/grey_80</color>
80+
<color name="drawer_quota_txt_color">#FFFFFF</color>
81+
82+
<!-- Bottom Sheet Colors -->
83+
<color name="bottom_sheet_bg_color">@color/grey_80</color>
84+
<color name="bottom_sheet_icon_color">@color/grey_30</color>
85+
<color name="bottom_sheet_txt_color">@color/grey_0</color>
86+
87+
<!-- Popup Menu Colors -->
88+
<color name="popup_menu_bg">@color/grey_80</color>
89+
<color name="popup_menu_txt_color">@color/grey_0</color>
90+
<color name="overflow_bg_color">@color/grey_80</color>
91+
92+
<!-- Switch Compat Colors -->
93+
<color name="switch_thumb_disabled">@color/grey_70</color>
94+
<color name="switch_track_disabled">@color/grey_60</color>
95+
96+
<!-- Checkbox Colors -->
97+
<color name="checkbox_checked_disabled">@color/grey_70</color>
98+
<color name="checkbox_unchecked_disabled">@color/grey_70</color>
99+
100+
<!-- Share Colors -->
101+
<color name="share_title_txt_color">#FFFFFF</color>
102+
<color name="share_subtitle_txt_color">@color/grey_30</color>
103+
<color name="share_info_txt_color">@color/grey_0</color>
104+
<color name="share_search_border_color">@color/grey_0</color>
105+
<color name="share_btn_txt_color">@color/grey_0</color>
106+
<color name="share_list_item_txt_color">@color/grey_0</color>
107+
<color name="share_disabled_txt_color">@color/grey_60</color>
108+
<color name="share_txt_color">@color/grey_0</color>
109+
<color name="share_et_divider">#FFFFFF</color>
110+
111+
<!-- Scan Colors -->
112+
<color name="scan_doc_bg_color">#121212</color>
113+
<color name="scan_text_color">@color/grey_0</color>
114+
<color name="scan_edit_bottom_color">@color/grey_80</color>
115+
<color name="scan_count_bg_color">@color/grey_80</color>
52116
</resources>

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

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

0 commit comments

Comments
 (0)