Skip to content

Commit 4d4d222

Browse files
surinder-tsyssurinder-tsys
committed
SwipeRefreshLayout Customized.
1 parent 78f85e7 commit 4d4d222

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
@@ -20,6 +20,7 @@ import com.nextcloud.client.account.UserAccountManager
2020
import com.nextcloud.client.jobs.NotificationWork
2121
import com.nextcloud.client.network.ClientFactory.CreationException
2222
import com.nextcloud.common.NextcloudClient
23+
import com.nmc.android.utils.SwipeRefreshThemeUtils
2324
import com.owncloud.android.R
2425
import com.owncloud.android.databinding.NotificationsLayoutBinding
2526
import com.owncloud.android.datamodel.ArbitraryDataProvider
@@ -77,8 +78,10 @@ class NotificationsActivity : DrawerActivity(), NotificationsContract.View {
7778
}
7879

7980
private fun setupContainingList() {
80-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)
81-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty)
81+
//NMC Customisation
82+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingList);
83+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingEmpty);
84+
8285
binding.swipeContainingList.setOnRefreshListener {
8386
setLoadingMessage()
8487
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
@@ -31,6 +31,7 @@
3131
import com.nextcloud.client.utils.Throttler;
3232
import com.nextcloud.model.WorkerState;
3333
import com.nextcloud.model.WorkerStateLiveData;
34+
import com.nmc.android.utils.SwipeRefreshThemeUtils;
3435
import com.owncloud.android.R;
3536
import com.owncloud.android.databinding.UploadListLayoutBinding;
3637
import com.owncloud.android.datamodel.OCFile;
@@ -179,7 +180,8 @@ private void setupContent() {
179180
binding.list.setLayoutManager(lm);
180181
binding.list.setAdapter(uploadListAdapter);
181182

182-
viewThemeUtils.androidx.themeSwipeRefreshLayout(swipeListRefreshLayout);
183+
//NMC Customisation
184+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, swipeListRefreshLayout);
183185
swipeListRefreshLayout.setOnRefreshListener(this::refresh);
184186

185187
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
@@ -45,6 +45,7 @@
4545
import com.nextcloud.client.di.Injectable;
4646
import com.nextcloud.client.preferences.AppPreferences;
4747
import com.nextcloud.client.preferences.AppPreferencesImpl;
48+
import com.nmc.android.utils.SwipeRefreshThemeUtils;
4849
import com.owncloud.android.MainApp;
4950
import com.owncloud.android.R;
5051
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
@@ -24,6 +24,7 @@
2424
import com.nextcloud.common.NextcloudClient;
2525
import com.nextcloud.utils.extensions.BundleExtensionsKt;
2626
import com.nextcloud.utils.extensions.FileExtensionsKt;
27+
import com.nmc.android.utils.SwipeRefreshThemeUtils;
2728
import com.owncloud.android.R;
2829
import com.owncloud.android.databinding.FileDetailsActivitiesFragmentBinding;
2930
import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -130,8 +131,9 @@ public View onCreateView(@NonNull LayoutInflater inflater,
130131

131132
setupView();
132133

133-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty);
134-
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList);
134+
//NMC Customisation
135+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), binding.swipeContainingEmpty);
136+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(requireContext(), binding.swipeContainingList);
135137

136138
isLoadingActivities = true;
137139
fetchAndSetData(-1);

‎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
@@ -25,6 +25,7 @@ import com.nextcloud.client.account.CurrentAccountProvider
2525
import com.nextcloud.client.di.Injectable
2626
import com.nextcloud.client.network.ClientFactory
2727
import com.nextcloud.client.preferences.AppPreferences
28+
import com.nmc.android.utils.SwipeRefreshThemeUtils
2829
import com.owncloud.android.R
2930
import com.owncloud.android.databinding.TrashbinActivityBinding
3031
import com.owncloud.android.lib.resources.trashbin.model.TrashbinFile
@@ -150,7 +151,8 @@ class TrashbinActivity :
150151
recyclerView.setHasFooter(true)
151152
recyclerView.layoutManager = LinearLayoutManager(this)
152153

153-
viewThemeUtils?.androidx?.themeSwipeRefreshLayout(binding.swipeContainingList)
154+
// NMC Customisation
155+
SwipeRefreshThemeUtils.themeSwipeRefreshLayout(this, binding.swipeContainingList)
154156
binding.swipeContainingList.setOnRefreshListener { loadFolder() }
155157
viewThemeUtils?.material?.colorMaterialTextButton(findViewById(R.id.sort_button))
156158

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

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

‎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)