Skip to content

Commit eb94e28

Browse files
surinder-tsyssurinder-tsys
committed
Code refactored.
1 parent 688d6b0 commit eb94e28

File tree

8 files changed

+164
-79
lines changed

8 files changed

+164
-79
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object SearchViewThemeUtils {
1111
val editText: SearchView.SearchAutoComplete = searchView.findViewById(R.id.search_src_text)
1212
editText.textSize = 16F
1313
editText.setTextColor(fontColor)
14-
editText.highlightColor = context.resources.getColor(R.color.search_et_highlight_color, null)
14+
editText.highlightColor = context.resources.getColor(R.color.et_highlight_color, null)
1515
editText.setHintTextColor(context.resources.getColor(R.color.fontSecondaryAppbar, null))
1616
val closeButton: ImageView = searchView.findViewById(R.id.search_close_btn)
1717
closeButton.setColorFilter(fontColor)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
7474
private LinearLayout mInfoBox;
7575
private TextView mInfoBoxMessage;
7676
protected AppCompatSpinner mToolbarSpinner;
77-
private ImageView mToolbarBackIcon;
7877
private boolean isHomeSearchToolbarShow = false;
78+
private ImageView mToolbarBackIcon;
7979

8080
@Inject public ThemeColorUtils themeColorUtils;
8181
@Inject public ThemeUtils themeUtils;
@@ -94,8 +94,8 @@ private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListB
9494
mHomeSearchToolbar = findViewById(R.id.home_toolbar);
9595
mMenuButton = findViewById(R.id.menu_button);
9696
mSearchText = findViewById(R.id.search_text);
97-
mSwitchAccountButton = findViewById(R.id.switch_account_button);
9897
mToolbarBackIcon = findViewById(R.id.toolbar_back_icon);
98+
mSwitchAccountButton = findViewById(R.id.switch_account_button);
9999

100100
if (showSortListButtonGroup) {
101101
findViewById(R.id.sort_list_button_group).setVisibility(View.VISIBLE);

‎app/src/main/java/com/owncloud/android/utils/DisplayUtils.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
import java.util.Locale;
107107
import java.util.Map;
108108
import java.util.TimeZone;
109+
import java.util.concurrent.RejectedExecutionException;
109110

110111
import androidx.annotation.NonNull;
111112
import androidx.annotation.Nullable;
@@ -1022,4 +1023,5 @@ public static boolean isTablet() {
10221023
public static boolean isLandscapeOrientation() {
10231024
return MainApp.getAppContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
10241025
}
1026+
10251027
}

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,14 @@
111111
<string name="common_cancel">Abbrechen</string>
112112
<string name="common_cancel_sync">Synchronisierung abbrechen</string>
113113
<string name="common_choose_account">Konto auswählen</string>
114+
<string name="common_confirm">Übernehmen</string>
114115
<string name="common_copy">Kopieren</string>
115116
<string name="common_delete">Löschen</string>
116117
<string name="common_error">Fehler</string>
117118
<string name="common_error_out_memory">Nicht genügend Speicher</string>
118119
<string name="common_error_unknown">Unbekannter Fehler</string>
119120
<string name="common_loading">Lade…</string>
121+
<string name="common_next">Weiter</string>
120122
<string name="common_no">Nein</string>
121123
<string name="common_ok">OK</string>
122124
<string name="common_pending">Ausstehend</string>
@@ -129,8 +131,6 @@
129131
<string name="common_skip">Überspringen</string>
130132
<string name="common_switch_account">Konto wechseln</string>
131133
<string name="common_switch_to_account">Zu Konto wechseln</string>
132-
<string name="common_next">Weiter</string>
133-
<string name="common_confirm">Übernehmen</string>
134134
<string name="common_yes">Ja</string>
135135
<string name="community_beta_headline">Testen Sie die Entwickler-Version</string>
136136
<string name="community_beta_text">Dies beinhaltet neue Funktionalitäten und ist nicht komplett qualitätsgesichert. Es können daher Fehler/Bugs auftreten, melden Sie uns solche bitte.</string>
@@ -922,6 +922,10 @@
922922
<string name="write_email">E-Mail senden</string>
923923
<string name="wrong_storage_path">Speicherordner existiert nicht!</string>
924924
<string name="wrong_storage_path_desc">Ursache könnte die Wiederherstellung einer Sicherungskopie auf einem anderen Gerät sein. Der Standard-Ordner wird jetzt wieder verwendet. Bitte überprüfen Sie die Einstellungen bezüglich des Speicherortes.</string>
925+
<plurals name="sync_fail_in_favourites_content">
926+
<item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
927+
<item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
928+
</plurals>
925929
<!-- sharing related strings start -->
926930
<string name="share_permission_read_only">Nur lesen</string>
927931
<string name="share_permission_can_edit">Kann Bearbeiten</string>
@@ -959,10 +963,6 @@
959963
<string name="expiration_date">Expiration Date</string>
960964
<string name="empty_shares">Noch keine Freigaben erstellt.</string>
961965
<!-- sharing related strings end -->
962-
<plurals name="sync_fail_in_favourites_content">
963-
<item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
964-
<item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
965-
</plurals>
966966
<plurals name="sync_foreign_files_forgotten_content">
967967
<item quantity="one">%1$d Datei im %2$s-Verzeichnis konnten nicht kopiert werden nach </item>
968968
<item quantity="other">%1$d Dateien im %2$s-Verzeichnis konnten nicht kopiert werden nach </item>

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

Lines changed: 64 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@
2525
<color name="disabled_text">#ff6F6F6F</color>
2626
<color name="secondary_text_color">#A5A5A5</color>
2727
<color name="list_divider_background">#222222</color>
28-
<color name="list_icon_color">@color/grey_30</color>
29-
30-
<!-- Share Colors -->
31-
<color name="share_title_txt_color">#FFFFFF</color>
32-
<color name="share_subtitle_txt_color">@color/grey_30</color>
33-
<color name="share_info_txt_color">@color/grey_0</color>
34-
<color name="share_search_border_color">@color/grey_0</color>
35-
<color name="share_btn_txt_color">@color/grey_0</color>
36-
<color name="share_list_item_txt_color">@color/grey_0</color>
37-
<color name="share_disabled_txt_color">@color/grey_60</color>
38-
<color name="share_txt_color">@color/grey_0</color>
39-
<color name="share_et_divider">#FFFFFF</color>
4028

4129
<!-- Colors -->
4230
<color name="dark">#ffffff</color>
@@ -46,11 +34,60 @@
4634
<color name="nc_grey">#222222</color>
4735
<color name="icon_on_nc_grey">#ffffff</color>
4836

37+
<!-- Multiselect backgrounds -->
38+
<color name="action_mode_background">@color/appbar</color>
39+
<color name="selected_item_background">#373535</color>
40+
41+
<color name="filelist_icon_background">#222222</color>
42+
<color name="standard_grey">#DADADA</color>
43+
44+
<color name="drawer_menu_icon">#ffffff</color>
45+
<color name="bg_fallback_highlight">#737373</color>
46+
<color name="drawer_active_item_background">@color/white</color>
47+
48+
<!-- App bar -->
49+
<color name="appbar">#1E1E1E</color>
50+
<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+
4981
<!-- Bottom Sheet Colors -->
5082
<color name="bottom_sheet_bg_color">@color/grey_80</color>
5183
<color name="bottom_sheet_icon_color">@color/grey_30</color>
5284
<color name="bottom_sheet_txt_color">@color/grey_0</color>
5385

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+
5491
<!-- Switch Compat Colors -->
5592
<color name="switch_thumb_checked_disabled">@color/grey_70</color>
5693
<color name="switch_track_checked_disabled">@color/grey_60</color>
@@ -61,18 +98,20 @@
6198
<color name="checkbox_checked_disabled">@color/grey_70</color>
6299
<color name="checkbox_unchecked_disabled">@color/grey_70</color>
63100

64-
<!-- Multiselect backgrounds -->
65-
<color name="action_mode_background">@color/appbar</color>
66-
<color name="selected_item_background">#373535</color>
67-
68-
<color name="filelist_icon_background">#222222</color>
69-
<color name="standard_grey">#DADADA</color>
70-
71-
<color name="drawer_menu_icon">#ffffff</color>
72-
<color name="bg_fallback_highlight">#737373</color>
73-
<color name="drawer_active_item_background">@color/white</color>
101+
<!-- Share Colors -->
102+
<color name="share_title_txt_color">#FFFFFF</color>
103+
<color name="share_subtitle_txt_color">@color/grey_30</color>
104+
<color name="share_info_txt_color">@color/grey_0</color>
105+
<color name="share_search_border_color">@color/grey_0</color>
106+
<color name="share_btn_txt_color">@color/grey_0</color>
107+
<color name="share_list_item_txt_color">@color/grey_0</color>
108+
<color name="share_disabled_txt_color">@color/grey_60</color>
109+
<color name="share_txt_color">@color/grey_0</color>
110+
<color name="share_et_divider">#FFFFFF</color>
74111

75-
<!-- App bar -->
76-
<color name="appbar">#1E1E1E</color>
77-
<color name="fontAppbar">@android:color/white</color>
112+
<!-- Scan Colors -->
113+
<color name="scan_doc_bg_color">#121212</color>
114+
<color name="scan_text_color">@color/grey_0</color>
115+
<color name="scan_edit_bottom_color">@color/grey_80</color>
116+
<color name="scan_count_bg_color">@color/grey_80</color>
78117
</resources>

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

Lines changed: 78 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,11 @@
3232
<color name="dark_background_text_color">#EEEEEE</color>
3333
<color name="transparent">#00000000</color>
3434
<color name="secondary_text_color">#666666</color>
35-
<color name="search_et_highlight_color">#77c4ff</color>
36-
<color name="list_icon_color">#191919</color>
3735
<color name="highlight_textColor_Warning">#e53935</color>
3836

39-
<!-- Share Colors -->
40-
<color name="share_title_txt_color">#191919</color>
41-
<color name="share_subtitle_txt_color">@color/grey_30</color>
42-
<color name="share_info_txt_color">#191919</color>
43-
<color name="share_search_border_color">#191919</color>
44-
<color name="share_btn_txt_color">#191919</color>
45-
<color name="share_list_item_txt_color">#191919</color>
46-
<color name="share_disabled_txt_color">@color/grey_30</color>
47-
<color name="share_txt_color">#191919</color>
48-
<color name="share_et_divider">#000000</color>
49-
<color name="share_warning_txt_color">#191919</color>
50-
<color name="sharing_warning_bg_color">#F6E5EB</color>
51-
<color name="sharing_warning_border_color">#C16F81</color>
52-
<color name="share_color">#0D39DF</color>
53-
5437
<!-- Colors -->
5538
<color name="standard_grey">#757575</color>
5639
<color name="actionbar_shadow">#222222</color>
57-
<color name="dark_grey">#101010</color>
58-
<color name="grey_0">#F2F2F2</color>
59-
<color name="grey_10">#E5E5E5</color>
60-
<color name="grey_30">#B2B2B2</color>
61-
<color name="grey_60">#666666</color>
62-
<color name="grey_70">#4C4C4C</color>
63-
<color name="grey_80">#333333</color>
6440
<color name="grey_200">#EEEEEE</color>
6541
<color name="grey_400">#BDBDBD</color>
6642
<color name="grey_600">#666666</color>
@@ -83,11 +59,6 @@
8359
<color name="nc_grey">#ededed</color>
8460
<color name="icon_on_nc_grey">#000000</color>
8561

86-
<!-- Bottom Sheet Colors -->
87-
<color name="bottom_sheet_bg_color">#FFFFFF</color>
88-
<color name="bottom_sheet_icon_color">#191919</color>
89-
<color name="bottom_sheet_txt_color">#191919</color>
90-
9162
<color name="process_dialog_background">#ffffff</color>
9263
<color name="indicator_dot_selected">#ffffff</color>
9364
<color name="drawer_shadow">#000000</color>
@@ -106,6 +77,62 @@
10677
<color name="bg_fallback_highlight">#616161</color>
10778
<color name="drawer_active_item_background">#80000000</color>
10879

80+
<!-- App bar -->
81+
<color name="appbar">@android:color/white</color>
82+
<color name="fontAppbar">#666666</color>
83+
<color name="fontSecondaryAppbar">#A5A5A5</color>
84+
85+
<!-- NMC Colors -->
86+
<color name="icon_color">#191919</color>
87+
<color name="sort_text_color">@color/primary</color>
88+
<color name="list_icon_color">#191919</color>
89+
<color name="warning_icon_color">#191919</color>
90+
<color name="divider_color">@color/grey_30</color>
91+
<color name="spinner_bg_color">@android:color/white</color>
92+
<color name="refresh_layout_bg_color">#FFFFFF</color>
93+
<color name="primary_button_disabled_color">@color/grey_0</color>
94+
<color name="toolbar_divider_color">#CCCCCC</color>
95+
<color name="et_highlight_color">#77c4ff</color>
96+
<color name="white_trans_70">#B3FFFFFF</color>
97+
<color name="progress_bar_background">@color/grey_10</color>
98+
99+
<!-- Grey Colors -->
100+
<color name="dark_grey">#101010</color>
101+
<color name="grey_0">#F2F2F2</color>
102+
<color name="grey_10">#E5E5E5</color>
103+
<color name="grey_30">#B2B2B2</color>
104+
<color name="grey_60">#666666</color>
105+
<color name="grey_70">#4C4C4C</color>
106+
<color name="grey_80">#333333</color>
107+
108+
<!-- Snackbar Colors -->
109+
<color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
110+
<color name="snackbar_txt_color">@color/white</color>
111+
112+
<!-- Alert Dialog Colors -->
113+
<color name="alert_bg_color">#FFFFFF</color>
114+
<color name="alert_txt_color">#191919</color>
115+
116+
<!-- NavigationView colors -->
117+
<color name="nav_selected_bg_color">@color/grey_0</color>
118+
<color name="nav_txt_unselected_color">#191919</color>
119+
<color name="nav_txt_selected_color">@color/primary</color>
120+
<color name="nav_icon_unselected_color">#191919</color>
121+
<color name="nav_icon_selected_color">@color/primary</color>
122+
<color name="nav_divider_color">@color/grey_30</color>
123+
<color name="nav_bg_color">@color/white</color>
124+
<color name="drawer_quota_txt_color">#191919</color>
125+
126+
<!-- Bottom Sheet Colors -->
127+
<color name="bottom_sheet_bg_color">#FFFFFF</color>
128+
<color name="bottom_sheet_icon_color">#191919</color>
129+
<color name="bottom_sheet_txt_color">#191919</color>
130+
131+
<!-- Popup Menu Colors -->
132+
<color name="popup_menu_bg">#FFFFFF</color>
133+
<color name="popup_menu_txt_color">#191919</color>
134+
<color name="overflow_bg_color">#FFFFFF</color>
135+
109136
<!-- Switch Compat Colors -->
110137
<color name="switch_thumb_checked_enabled">@color/primary</color>
111138
<color name="switch_track_checked_enabled">#F399C7</color>
@@ -122,10 +149,27 @@
122149
<color name="checkbox_checked_disabled">@color/grey_30</color>
123150
<color name="checkbox_unchecked_disabled">#CCCCCC</color>
124151

125-
<!-- App bar -->
126-
<color name="appbar">@android:color/white</color>
127-
<color name="fontAppbar">#666666</color>
128-
<color name="white_trans_70">#B3FFFFFF</color>
129-
<color name="fontSecondaryAppbar">#A5A5A5</color>
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>
130166
<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>
131175
</resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
<dimen name="notification_row_item_height">145dp</dimen>
3232
<dimen name="button_stroke_width">1dp</dimen>
3333
<dimen name="txt_size_13sp">13sp</dimen>
34-
</resources>
34+
</resources>

0 commit comments

Comments
 (0)