Skip to content

Commit

Permalink
Code refactored.
Browse files Browse the repository at this point in the history
  • Loading branch information
@surinder-tsys
surinder-tsys committed May 16, 2023
1 parent 688d6b0 commit 207e05e
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 33 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
private LinearLayout mInfoBox;
private TextView mInfoBoxMessage;
protected AppCompatSpinner mToolbarSpinner;
private ImageView mToolbarBackIcon;
private boolean isHomeSearchToolbarShow = false;
private ImageView mToolbarBackIcon;

@Inject public ThemeColorUtils themeColorUtils;
@Inject public ThemeUtils themeUtils;
Expand All @@ -94,8 +94,8 @@ private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListB
mHomeSearchToolbar = findViewById(R.id.home_toolbar);
mMenuButton = findViewById(R.id.menu_button);
mSearchText = findViewById(R.id.search_text);
mSwitchAccountButton = findViewById(R.id.switch_account_button);
mToolbarBackIcon = findViewById(R.id.toolbar_back_icon);
mSwitchAccountButton = findViewById(R.id.switch_account_button);

if (showSortListButtonGroup) {
findViewById(R.id.sort_list_button_group).setVisibility(View.VISIBLE);
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/utils/DisplayUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1022,4 +1022,5 @@ public static boolean isTablet() {
public static boolean isLandscapeOrientation() {
return MainApp.getAppContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
}

}
12 changes: 6 additions & 6 deletions app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,14 @@
<string name="common_cancel">Abbrechen</string>
<string name="common_cancel_sync">Synchronisierung abbrechen</string>
<string name="common_choose_account">Konto auswählen</string>
<string name="common_confirm">Übernehmen</string>
<string name="common_copy">Kopieren</string>
<string name="common_delete">Löschen</string>
<string name="common_error">Fehler</string>
<string name="common_error_out_memory">Nicht genügend Speicher</string>
<string name="common_error_unknown">Unbekannter Fehler</string>
<string name="common_loading">Lade…</string>
<string name="common_next">Weiter</string>
<string name="common_no">Nein</string>
<string name="common_ok">OK</string>
<string name="common_pending">Ausstehend</string>
Expand All @@ -129,8 +131,6 @@
<string name="common_skip">Überspringen</string>
<string name="common_switch_account">Konto wechseln</string>
<string name="common_switch_to_account">Zu Konto wechseln</string>
<string name="common_next">Weiter</string>
<string name="common_confirm">Übernehmen</string>
<string name="common_yes">Ja</string>
<string name="community_beta_headline">Testen Sie die Entwickler-Version</string>
<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>
Expand Down Expand Up @@ -922,6 +922,10 @@
<string name="write_email">E-Mail senden</string>
<string name="wrong_storage_path">Speicherordner existiert nicht!</string>
<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>
<plurals name="sync_fail_in_favourites_content">
<item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
<item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
</plurals>
<!-- sharing related strings start -->
<string name="share_permission_read_only">Nur lesen</string>
<string name="share_permission_can_edit">Kann Bearbeiten</string>
Expand Down Expand Up @@ -959,10 +963,6 @@
<string name="expiration_date">Expiration Date</string>
<string name="empty_shares">Noch keine Freigaben erstellt.</string>
<!-- sharing related strings end -->
<plurals name="sync_fail_in_favourites_content">
<item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
<item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
</plurals>
<plurals name="sync_foreign_files_forgotten_content">
<item quantity="one">%1$d Datei im %2$s-Verzeichnis konnten nicht kopiert werden nach </item>
<item quantity="other">%1$d Dateien im %2$s-Verzeichnis konnten nicht kopiert werden nach </item>
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/res/values-night/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,6 @@
<color name="list_divider_background">#222222</color>
<color name="list_icon_color">@color/grey_30</color>

<!-- Share Colors -->
<color name="share_title_txt_color">#FFFFFF</color>
<color name="share_subtitle_txt_color">@color/grey_30</color>
<color name="share_info_txt_color">@color/grey_0</color>
<color name="share_search_border_color">@color/grey_0</color>
<color name="share_btn_txt_color">@color/grey_0</color>
<color name="share_list_item_txt_color">@color/grey_0</color>
<color name="share_disabled_txt_color">@color/grey_60</color>
<color name="share_txt_color">@color/grey_0</color>
<color name="share_et_divider">#FFFFFF</color>

<!-- Colors -->
<color name="dark">#ffffff</color>
<color name="bg_default">#121212</color>
Expand All @@ -61,6 +50,17 @@
<color name="checkbox_checked_disabled">@color/grey_70</color>
<color name="checkbox_unchecked_disabled">@color/grey_70</color>

<!-- Share Colors -->
<color name="share_title_txt_color">#FFFFFF</color>
<color name="share_subtitle_txt_color">@color/grey_30</color>
<color name="share_info_txt_color">@color/grey_0</color>
<color name="share_search_border_color">@color/grey_0</color>
<color name="share_btn_txt_color">@color/grey_0</color>
<color name="share_list_item_txt_color">@color/grey_0</color>
<color name="share_disabled_txt_color">@color/grey_60</color>
<color name="share_txt_color">@color/grey_0</color>
<color name="share_et_divider">#FFFFFF</color>

<!-- Multiselect backgrounds -->
<color name="action_mode_background">@color/appbar</color>
<color name="selected_item_background">#373535</color>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<color name="list_item_lastmod_and_filesize_text">@color/secondary_text_color</color>
<color name="black">#000000</color>
<color name="white">#ffffff</color>
<color name="search_et_highlight_color">#77c4ff</color>
<color name="white_helper_text">#B3FFFFFF</color>
<color name="text_color">#333333</color>
<color name="drawer_text_color">@color/secondary_text_color</color>
Expand All @@ -29,11 +30,10 @@
<color name="list_divider_background">#eeeeee</color>
<color name="fg_inverse">#FFFFFF</color>
<color name="filelist_icon_background">#DDDDDD</color>
<color name="list_icon_color">#191919</color>
<color name="dark_background_text_color">#EEEEEE</color>
<color name="transparent">#00000000</color>
<color name="secondary_text_color">#666666</color>
<color name="search_et_highlight_color">#77c4ff</color>
<color name="list_icon_color">#191919</color>
<color name="highlight_textColor_Warning">#e53935</color>

<!-- Share Colors -->
Expand Down Expand Up @@ -125,7 +125,7 @@
<!-- App bar -->
<color name="appbar">@android:color/white</color>
<color name="fontAppbar">#666666</color>
<color name="white_trans_70">#B3FFFFFF</color>
<color name="fontSecondaryAppbar">#A5A5A5</color>
<color name="white_trans_70">#B3FFFFFF</color>
<color name="shared_with_me_color">#0099ff</color>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
<dimen name="notification_row_item_height">145dp</dimen>
<dimen name="button_stroke_width">1dp</dimen>
<dimen name="txt_size_13sp">13sp</dimen>
</resources>
</resources>
20 changes: 10 additions & 10 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@
<string name="common_share">Share</string>
<string name="common_skip">Skip</string>
<string name="common_copy">Copy</string>
<string name="common_confirm">Confirm</string>
<string name="common_next">Next</string>
<string name="about_title">About</string>
<string name="delete_account">Remove account</string>
<string name="delete_account_warning">Remove account %s and delete all local files?\n\nDeletion cannot be undone.</string>
Expand Down Expand Up @@ -947,7 +945,6 @@
<string name="share_link_folder">Link to folder</string>
<string name="share_link_file">Link to file</string>
<string name="allow_resharing">Allow resharing</string>
<string name="link_share_read_only">Read only</string>
<string name="link_share_editing">Editing</string>
<string name="link_share_allow_upload_and_editing">Allow upload and editing</string>
<string name="link_share_file_drop">File drop (upload only)</string>
Expand Down Expand Up @@ -981,14 +978,8 @@
<string name="wrong_storage_path">Data storage folder does not exist!</string>
<string name="wrong_storage_path_desc">This might be due to a backup restore on another device. Falling back to default. Please check settings to adjust data storage folder.</string>
<string name="dialog_close">Close</string>
<string name="direct_login_failed">Login via direct link failed!</string>
<string name="login_url_helper_text">The link to your %1$s web interface when you open it in the browser.</string>
<string name="brute_force_delay">Delayed due to too many wrong attempts</string>
<string name="create">Create</string>
<string name="select_one_template">Please select one template</string>
<string name="choose_template_helper_text">Please choose a template and enter a file name.</string>
<string name="share_permission_secure_file_drop">Secure file drop</string>
<!-- sharing related strings start -->
<string name="link_share_read_only">Read only</string>
<string name="share_permission_read_only">Read only</string>
<string name="share_permission_can_edit">Can edit</string>
<string name="share_permission_file_drop">Filedrop only</string>
Expand Down Expand Up @@ -1025,6 +1016,15 @@
<string name="placeholder_receivedMessage">Received</string>
<string name="placeholder_sharedMessage">Shared</string>
<!-- sharing related strings end -->
<string name="direct_login_failed">Login via direct link failed!</string>
<string name="login_url_helper_text">The link to your %1$s web interface when you open it in the browser.</string>
<string name="brute_force_delay">Delayed due to too many wrong attempts</string>
<string name="create">Create</string>
<string name="select_one_template">Please select one template</string>
<string name="choose_template_helper_text">Please choose a template and enter a file name.</string>
<string name="share_permission_secure_file_drop">Secure file drop</string>
<string name="common_next">Next</string>
<string name="common_confirm">Confirm</string>
<string name="strict_mode">Strict mode: no HTTP connection allowed!</string>
<string name="destination_filename">Destination filename</string>
<string name="suggest">Suggest</string>
Expand Down

0 comments on commit 207e05e

Please sign in to comment.