Skip to content

Commit d873d84

Browse files
surinder-tsyssurinder-tsys
committed
SwipeRefreshLayout Customized.
1 parent e625f45 commit d873d84

File tree

8 files changed

+184
-7
lines changed

8 files changed

+184
-7
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.nmc.android.utils
2+
3+
import android.content.Context
4+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
5+
import com.owncloud.android.R
6+
7+
object SwipeRefreshThemeUtils {
8+
@JvmStatic
9+
fun themeSwipeRefreshLayout(context: Context, swipeRefreshLayout: SwipeRefreshLayout) {
10+
swipeRefreshLayout.setColorSchemeColors(context.resources.getColor(R.color.primary, null))
11+
swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.refresh_layout_bg_color)
12+
}
13+
}

‎app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import com.nextcloud.client.account.UserAccountManager
3535
import com.nextcloud.client.jobs.NotificationWork
3636
import com.nextcloud.client.network.ClientFactory.CreationException
3737
import com.nextcloud.java.util.Optional
38+
import com.nmc.android.utils.SwipeRefreshThemeUtils
3839
import com.owncloud.android.R
3940
import com.owncloud.android.databinding.NotificationsLayoutBinding
4041
import com.owncloud.android.datamodel.ArbitraryDataProvider
@@ -92,8 +93,10 @@ class NotificationsActivity : DrawerActivity(), NotificationsContract.View {
9293
}
9394

9495
private fun setupContainingList() {
95-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)
96-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty)
96+
//NMC Customisation
97+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingList);
98+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingEmpty);
99+
97100
binding.swipeContainingList.setOnRefreshListener {
98101
setLoadingMessage()
99102
binding.swipeContainingList.isRefreshing = true

‎app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.nextcloud.client.jobs.BackgroundJobManager;
4545
import com.nextcloud.client.network.ConnectivityService;
4646
import com.nextcloud.client.utils.Throttler;
47+
import com.nmc.android.utils.SwipeRefreshThemeUtils;
4748
import com.owncloud.android.R;
4849
import com.owncloud.android.databinding.UploadListLayoutBinding;
4950
import com.owncloud.android.datamodel.OCFile;
@@ -176,7 +177,8 @@ private void setupContent() {
176177
binding.list.setLayoutManager(lm);
177178
binding.list.setAdapter(uploadListAdapter);
178179

179-
viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeListRefreshLayout);
180+
//NMC Customisation
181+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, swipeListRefreshLayout);
180182
swipeListRefreshLayout.setOnRefreshListener(this::refresh);
181183

182184
loadItems();

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.nextcloud.client.di.Injectable;
5555
import com.nextcloud.client.preferences.AppPreferences;
5656
import com.nextcloud.client.preferences.AppPreferencesImpl;
57+
import com.nmc.android.utils.SwipeRefreshThemeUtils;
5758
import com.owncloud.android.MainApp;
5859
import com.owncloud.android.R;
5960
import com.owncloud.android.databinding.ListFragmentBinding;
@@ -348,7 +349,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
348349

349350
// Pull-down to refresh layout
350351
mRefreshListLayout = binding.swipeContainingList;
351-
viewThemeUtils.androidx.themeSwipeRefreshLayout(mRefreshListLayout);
352+
//NMC Customisation
353+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), mRefreshListLayout);
352354
mRefreshListLayout.setOnRefreshListener(this);
353355

354356
mSortButton = getActivity().findViewById(R.id.sort_button);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import com.nextcloud.client.network.ClientFactory;
4040
import com.nextcloud.common.NextcloudClient;
4141
import com.nextcloud.utils.extensions.BundleExtensionsKt;
42+
import com.nmc.android.utils.SwipeRefreshThemeUtils;
4243
import com.owncloud.android.R;
4344
import com.owncloud.android.databinding.FileDetailsActivitiesFragmentBinding;
4445
import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -144,8 +145,9 @@ public View onCreateView(@NonNull LayoutInflater inflater,
144145

145146
setupView();
146147

147-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty);
148-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList);
148+
//NMC Customisation
149+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), binding.swipeContainingEmpty);
150+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), binding.swipeContainingList);
149151

150152
fetchAndSetData(-1);
151153

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import com.nextcloud.client.account.CurrentAccountProvider
4040
import com.nextcloud.client.di.Injectable
4141
import com.nextcloud.client.network.ClientFactory
4242
import com.nextcloud.client.preferences.AppPreferences
43+
import com.nmc.android.utils.SwipeRefreshThemeUtils
4344
import com.owncloud.android.R
4445
import com.owncloud.android.databinding.TrashbinActivityBinding
4546
import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile
@@ -159,7 +160,8 @@ class TrashbinActivity :
159160
recyclerView.setHasFooter(true)
160161
recyclerView.layoutManager = LinearLayoutManager(this)
161162

162-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)
163+
// NMC Customisation
164+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingList)
163165
binding.swipeContainingList.setOnRefreshListener { loadFolder() }
164166
viewThemeUtils.material.colorMaterialTextButton(findViewById(R.id.sort_button))
165167

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

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

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

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

0 commit comments

Comments
 (0)