Skip to content

Commit b48c157

Browse files
surinder-tsyssurinder-tsys
committed
Code refactored for code merging.
1 parent 825f128 commit b48c157

File tree

13 files changed

+172
-152
lines changed

13 files changed

+172
-152
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,6 @@
224224
android:name=".ui.preview.PreviewImageActivity"
225225
android:exported="false"
226226
android:theme="@style/Theme.ownCloud.Overlay" />
227-
228-
<activity
229-
android:name="com.nmc.android.ui.ScanActivity"
230-
android:configChanges="orientation|screenSize|keyboardHidden"
231-
android:screenOrientation="portrait"
232-
android:exported="false"
233-
android:windowSoftInputMode="stateAlwaysHidden"/>
234-
235227
<service
236228
android:name=".authentication.AccountAuthenticatorService"
237229
android:exported="false">
@@ -500,6 +492,14 @@
500492
android:name="com.nextcloud.client.documentscan.DocumentScanActivity"
501493
android:exported="false"
502494
android:theme="@style/Theme.ownCloud.Toolbar" />
495+
496+
<activity
497+
android:name="com.nmc.android.ui.ScanActivity"
498+
android:configChanges="orientation|screenSize|keyboardHidden"
499+
android:screenOrientation="portrait"
500+
android:exported="false"
501+
android:windowSoftInputMode="stateAlwaysHidden"/>
502+
503503
</application>
504504

505505
<queries>

‎app/src/main/java/com/nextcloud/client/di/ComponentsModule.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
import com.nextcloud.client.widget.DashboardWidgetProvider;
3535
import com.nextcloud.client.widget.DashboardWidgetService;
3636
import com.nextcloud.ui.ChooseAccountDialogFragment;
37-
import com.nextcloud.ui.SetStatusDialogFragment;
38-
import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
3937
import com.nmc.android.ui.SaveScannedDocumentFragment;
4038
import com.nmc.android.ui.ScanActivity;
39+
import com.nextcloud.ui.SetStatusDialogFragment;
40+
import com.nextcloud.ui.fileactions.FileActionsBottomSheet;
4141
import com.owncloud.android.MainApp;
4242
import com.owncloud.android.authentication.AuthenticatorActivity;
4343
import com.owncloud.android.authentication.DeepLinkLoginActivity;
@@ -461,18 +461,17 @@ abstract class ComponentsModule {
461461
abstract FilesUploadHelper filesUploadHelper();
462462

463463
@ContributesAndroidInjector
464-
abstract SslUntrustedCertDialog sslUntrustedCertDialog();
464+
abstract ScanActivity scanActivity();
465465

466466
@ContributesAndroidInjector
467-
abstract FileActionsBottomSheet fileActionsBottomSheet();
467+
abstract SaveScannedDocumentFragment saveScannedDocumentFragment();
468468

469469
@ContributesAndroidInjector
470-
abstract DocumentScanActivity documentScanActivity();
470+
abstract SslUntrustedCertDialog sslUntrustedCertDialog();
471471

472472
@ContributesAndroidInjector
473-
abstract ScanActivity scanActivity();
473+
abstract FileActionsBottomSheet fileActionsBottomSheet();
474474

475475
@ContributesAndroidInjector
476-
abstract SaveScannedDocumentFragment saveScannedDocumentFragment();
477-
476+
abstract DocumentScanActivity documentScanActivity();
478477
}

‎app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,15 @@ default void onDarkThemeModeChanged(DarkMode mode) {
356356

357357
void setPowerCheckDisabled(boolean value);
358358

359+
/**
360+
* Saves the previously selected storage path to save scanned document
361+
* default value will be Scan folder which will be automatically created first time
362+
* @param path of the folder previously selected
363+
*/
364+
void setUploadScansLastPath(String path);
365+
366+
String getUploadScansLastPath();
367+
359368
void increasePinWrongAttempts();
360369

361370
void resetPinWrongAttempts();
@@ -377,12 +386,4 @@ default void onDarkThemeModeChanged(DarkMode mode) {
377386
boolean isStoragePermissionRequested();
378387

379388
void setStoragePermissionRequested(boolean value);
380-
381-
/**
382-
* Saves the previously selected storage path to save scanned document
383-
* default value will be Scan folder which will be automatically created first time
384-
* @param path of the folder previously selected
385-
*/
386-
void setUploadScansLastPath(String path);
387-
String getUploadScansLastPath();
388389
}

‎app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import android.content.SharedPreferences;
2727

2828
import com.nextcloud.client.account.User;
29+
import com.nmc.android.ui.ScanActivity;
2930
import com.nextcloud.client.account.UserAccountManager;
3031
import com.nextcloud.client.account.UserAccountManagerImpl;
31-
import com.nmc.android.ui.ScanActivity;
3232
import com.owncloud.android.datamodel.ArbitraryDataProvider;
3333
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
3434
import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -81,6 +81,7 @@ public final class AppPreferencesImpl implements AppPreferences {
8181
private static final String PREF__AUTO_UPLOAD_SPLIT_OUT = "autoUploadEntriesSplitOut";
8282
private static final String PREF__AUTO_UPLOAD_INIT = "autoUploadInit";
8383
private static final String PREF__FOLDER_SORT_ORDER = "folder_sort_order";
84+
private static final String PREF__UPLOAD_SCANS_LAST_PATH = "upload_scans_last_path";
8485
private static final String PREF__FOLDER_LAYOUT = "folder_layout";
8586

8687
private static final String PREF__LOCK_TIMESTAMP = "lock_timestamp";
@@ -100,8 +101,6 @@ public final class AppPreferencesImpl implements AppPreferences {
100101

101102
private static final String PREF__STORAGE_PERMISSION_REQUESTED = "storage_permission_requested";
102103

103-
private static final String PREF__UPLOAD_SCANS_LAST_PATH = "upload_scans_last_path";
104-
105104
private final Context context;
106105
private final SharedPreferences preferences;
107106
private final UserAccountManager userAccountManager;
@@ -654,6 +653,16 @@ public void setPowerCheckDisabled(boolean value) {
654653
preferences.edit().putBoolean(PREF__POWER_CHECK_DISABLED, value).apply();
655654
}
656655

656+
@Override
657+
public void setUploadScansLastPath(String path) {
658+
preferences.edit().putString(PREF__UPLOAD_SCANS_LAST_PATH, path).apply();
659+
}
660+
661+
@Override
662+
public String getUploadScansLastPath() {
663+
return preferences.getString(PREF__UPLOAD_SCANS_LAST_PATH, ScanActivity.DEFAULT_UPLOAD_SCAN_PATH);
664+
}
665+
657666
public void increasePinWrongAttempts() {
658667
int count = preferences.getInt(PREF__PIN_BRUTE_FORCE_COUNT, 0);
659668
preferences.edit().putInt(PREF__PIN_BRUTE_FORCE_COUNT, count + 1).apply();
@@ -714,14 +723,4 @@ public void setStoragePermissionRequested(boolean value) {
714723
public int computeBruteForceDelay(int count) {
715724
return (int) Math.min(count / 3d, 10);
716725
}
717-
718-
@Override
719-
public void setUploadScansLastPath(String path) {
720-
preferences.edit().putString(PREF__UPLOAD_SCANS_LAST_PATH, path).apply();
721-
}
722-
723-
@Override
724-
public String getUploadScansLastPath() {
725-
return preferences.getString(PREF__UPLOAD_SCANS_LAST_PATH, ScanActivity.DEFAULT_UPLOAD_SCAN_PATH);
726-
}
727726
}

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
*
44
* @author Tobias Kaminsky
55
* @author Chris Narkiewicz <hello@ezaquarii.com>
6-
*
6+
* @author TSI-mc
77
* Copyright (C) 2018 Tobias Kaminsky
88
* Copyright (C) 2018 Nextcloud
99
* Copyright (C) 2020 Chris Narkiewicz <hello@ezaquarii.com>
10+
* Copyright (C) 2023 TSI-mc
1011
*
1112
* This program is free software; you can redistribute it and/or
1213
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -642,6 +643,9 @@ public void swapDirectory(
642643
notifyDataSetChanged();
643644
}
644645

646+
/**
647+
* method will only called if only folders has to show
648+
*/
645649
public void showOnlyFolder(
646650
User account,
647651
OCFile directory,
@@ -653,7 +657,10 @@ public void showOnlyFolder(
653657

654658
if (updatedStorageManager != null && !updatedStorageManager.equals(mStorageManager)) {
655659
mStorageManager = updatedStorageManager;
656-
ocFileListDelegate.setShowShareAvatar(CapabilityUtils.getCapability(account, activity).getVersion().isShareesOnDavSupported());
660+
ocFileListDelegate.setShowShareAvatar(mStorageManager
661+
.getCapability(user.getAccountName())
662+
.getVersion()
663+
.isShareesOnDavSupported());
657664
this.user = account;
658665
}
659666

@@ -692,7 +699,7 @@ public void showOnlyFolder(
692699
mFilesAll.clear();
693700
}
694701

695-
notifyDataSetChanged();
702+
new Handler(Looper.getMainLooper()).post(this::notifyDataSetChanged);
696703
}
697704

698705
public void setData(List<Object> objects,
@@ -848,7 +855,10 @@ private void parseVirtuals(List<Object> objects, SearchType searchType) {
848855
}
849856

850857
if (!onlyMedia || MimeTypeUtil.isImage(ocFile) || MimeTypeUtil.isVideo(ocFile)) {
851-
mFiles.add(ocFile);
858+
//handling duplicates for favorites section
859+
if (mFiles.isEmpty() || !mFiles.contains(ocFile)) {
860+
mFiles.add(ocFile);
861+
}
852862
}
853863

854864
ContentValues cv = new ContentValues();

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import com.nextcloud.client.di.Injectable;
5555
import com.nextcloud.client.documentscan.DocumentScanActivity;
5656
import com.nextcloud.client.jobs.BackgroundJobManager;
57-
import com.nextcloud.client.jobs.BackgroundJobManagerImpl;
5857
import com.nextcloud.client.network.ClientFactory;
5958
import com.nextcloud.client.preferences.AppPreferences;
6059
import com.nextcloud.client.utils.Throttler;
@@ -83,8 +82,6 @@
8382
import com.owncloud.android.ui.activity.FileDisplayActivity;
8483
import com.owncloud.android.ui.activity.FolderPickerActivity;
8584
import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
86-
import com.nmc.android.ui.ScanDocumentFragment;
87-
import com.owncloud.android.ui.activity.ToolbarActivity;
8885
import com.owncloud.android.ui.activity.UploadFilesActivity;
8986
import com.owncloud.android.ui.adapter.CommonOCFileListAdapterInterface;
9087
import com.owncloud.android.ui.adapter.OCFileListAdapter;
@@ -230,10 +227,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
230227

231228
private boolean mShowOnlyFolder, mHideEncryptedFolder;
232229

233-
//this variable will help us to provide number of span count for grid view
234-
//the width for single item is approx to 360
235-
private static final int GRID_ITEM_DEFAULT_WIDTH = 360;
236-
237230
protected enum MenuItemAddRemove {
238231
DO_NOTHING,
239232
REMOVE_SORT,

‎app/src/main/res/values-b+en+001/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,6 @@
10201020
selection is allowed.</string>
10211021
<string name="camera_permission_rationale">Please navigate to App info in settings and give permission manually.</string>
10221022
<string name="camera_permission_denied">You cannot scan document without camera permission.</string>
1023-
<string name="search_result_empty">Search for a file (at least 2 characters)</string>
10241023
<string name="description_add_more_scan">Add more document</string>
10251024
<string name="description_crop_scan">Crop scanned document</string>
10261025
<string name="description_filter_scan">Filter scanned document</string>

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

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -925,6 +925,55 @@
925925
<string name="write_email">E-Mail senden</string>
926926
<string name="wrong_storage_path">Speicherordner existiert nicht!</string>
927927
<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>
928+
<!-- nmc scanning related strings start -->
929+
<string name="result_scan_doc_dont_move">Nicht bewegen</string>
930+
<string name="result_scan_doc_move_closer">Näher heranbewegen</string>
931+
<string name="result_scan_doc_perspective">Perspektive</string>
932+
<string name="result_scan_doc_no_doc">Kein Dokument</string>
933+
<string name="result_scan_doc_bg_noisy">Hintergrund zu unruhig</string>
934+
<string name="result_scan_doc_aspect_ratio">Falsches Bildformat.\nDrehen Sie Ihr Gerät.</string>
935+
<string name="result_scan_doc_poor_light">Schwaches Licht</string>
936+
<string name="scanned_doc_count">%d von %d</string>
937+
<string name="title_edit_scan">Scam Bearbeiten</string>
938+
<string name="title_crop_scan">Scan beschneiden</string>
939+
<string name="crop_btn_reset_crop_text">Rahmen zurücksetzen</string>
940+
<string name="crop_btn_detect_doc_text">Dokument erkennen</string>
941+
<string name="edit_scan_filter_dialog_title">Filter anwenden</string>
942+
<string name="edit_scan_filter_none">Kein Filter</string>
943+
<string name="edit_scan_filter_pure_binarized">Whiteboard</string>
944+
<string name="edit_scan_filter_color_enhanced">Foto Filter</string>
945+
<string name="edit_scan_filter_b_n_w">Black &amp; White</string>
946+
<string name="edit_scan_filter_color_document">Dokument Filter</string>
947+
<string name="edit_scan_filter_grey">Grau</string>
948+
<string name="automatic">Automatisch</string>
949+
<string name="flash">Blitz</string>
950+
<string name="title_save_as">Speichern unter</string>
951+
<string name="scan_save_filename">Dateiname</string>
952+
<string name="scan_save_location">Speicherort</string>
953+
<string name="scan_save_location_root">/Hauptverzeichnis</string>
954+
<string name="scan_save_file_type">Dateityp</string>
955+
<string name="scan_save_without_text_recognition">Speichern ohne Texterkennung</string>
956+
<string name="scan_save_with_text_recognition">Speichern mit Texterkennung</string>
957+
<string name="scan_save_file_type_txt">Textdokument (txt)</string>
958+
<string name="scan_save_pdf_password">PDF-Passwort</string>
959+
<string name="scan_save_set_password_hint">Passwort setzen</string>
960+
<string name="scan_save_no_file_select_toast">Selectieren Sie mindestens einen Dateityp</string>
961+
<string name="save_scan_empty_pdf_password">Bitte geben Sie ein Passwort für das zu erstellende PDF ein oder deaktivieren Sie die Funktion.</string>
962+
<string name="scan_save_file_type_text">Sie können die Datei mit oder ohne Texterkennung abspeichern. Mehrfachauswahl ist erlaubt.</string>
963+
<string name="choose_location">Speicherort wählen</string>
964+
<string name="common_select">Auswählen</string>
965+
<string name="camera_permission_rationale">Bitte geben Sie unter Apps &amp; Benachrichtigungen in den Einstellungen manuell die Erlaubnis.</string>
966+
<string name="camera_permission_denied">Sie können keine Dokumente scannen ohne die Erlaubnis die Kamera zu verwenden.</string>
967+
<string name="description_add_more_scan">Weiteres Dokument hinzufügen</string>
968+
<string name="description_crop_scan">Gescanntes Dokument zuschneiden</string>
969+
<string name="description_filter_scan">Gescanntes Dokument filtern</string>
970+
<string name="description_rotate_scan">Gescanntes Dokument drehen</string>
971+
<string name="description_delete_scan">Gescanntes Dokument löschen</string>
972+
<string name="description_edit_filename">Scan-Dateinamen bearbeiten</string>
973+
<string name="description_edit_location">Scan-Speicherort bearbeiten</string>
974+
<string name="dialog_ok">Ok</string>
975+
<string name="dialog_save_scan_message">Das Speichern kann einige Minuten in Anspruch nehmen, insbesondere wenn Sie mehrere Seiten und Dateiformate ausgewählt haben.</string>
976+
<!-- nmc scanning related strings end -->
928977
<plurals name="sync_fail_in_favourites_content">
929978
<item quantity="one">Inhalte von %1$d Datei konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
930979
<item quantity="other">Inhalte von %1$d Dateien konnten nicht synchronisiert werden (Konflikte: %2$d)</item>
@@ -981,53 +1030,4 @@
9811030
<item quantity="one">%d ausgewählt</item>
9821031
<item quantity="other">%d ausgewählt</item>
9831032
</plurals>
984-
985-
<string name="result_scan_doc_dont_move">Nicht bewegen</string>
986-
<string name="result_scan_doc_move_closer">Näher heranbewegen</string>
987-
<string name="result_scan_doc_perspective">Perspektive</string>
988-
<string name="result_scan_doc_no_doc">Kein Dokument</string>
989-
<string name="result_scan_doc_bg_noisy">Hintergrund zu unruhig</string>
990-
<string name="result_scan_doc_aspect_ratio">Falsches Bildformat.\nDrehen Sie Ihr Gerät.</string>
991-
<string name="result_scan_doc_poor_light">Schwaches Licht</string>
992-
<string name="scanned_doc_count">%d von %d</string>
993-
<string name="title_edit_scan">Scam Bearbeiten</string>
994-
<string name="title_crop_scan">Scan beschneiden</string>
995-
<string name="crop_btn_reset_crop_text">Rahmen zurücksetzen</string>
996-
<string name="crop_btn_detect_doc_text">Dokument erkennen</string>
997-
<string name="edit_scan_filter_dialog_title">Filter anwenden</string>
998-
<string name="edit_scan_filter_none">Kein Filter</string>
999-
<string name="edit_scan_filter_pure_binarized">Whiteboard</string>
1000-
<string name="edit_scan_filter_color_enhanced">Foto Filter</string>
1001-
<string name="edit_scan_filter_b_n_w">Black &amp; White</string>
1002-
<string name="edit_scan_filter_color_document">Dokument Filter</string>
1003-
<string name="edit_scan_filter_grey">Grau</string>
1004-
<string name="automatic">Automatisch</string>
1005-
<string name="flash">Blitz</string>
1006-
<string name="title_save_as">Speichern unter</string>
1007-
<string name="scan_save_filename">Dateiname</string>
1008-
<string name="scan_save_location">Speicherort</string>
1009-
<string name="scan_save_location_root">/Hauptverzeichnis</string>
1010-
<string name="scan_save_file_type">Dateityp</string>
1011-
<string name="scan_save_without_text_recognition">Speichern ohne Texterkennung</string>
1012-
<string name="scan_save_with_text_recognition">Speichern mit Texterkennung</string>
1013-
<string name="scan_save_file_type_txt">Textdokument (txt)</string>
1014-
<string name="scan_save_pdf_password">PDF-Passwort</string>
1015-
<string name="scan_save_set_password_hint">Passwort setzen</string>
1016-
<string name="scan_save_no_file_select_toast">Selectieren Sie mindestens einen Dateityp</string>
1017-
<string name="save_scan_empty_pdf_password">Bitte geben Sie ein Passwort für das zu erstellende PDF ein oder deaktivieren Sie die Funktion.</string>
1018-
<string name="scan_save_file_type_text">Sie können die Datei mit oder ohne Texterkennung abspeichern. Mehrfachauswahl ist erlaubt.</string>
1019-
<string name="choose_location">Speicherort wählen</string>
1020-
<string name="common_select">Auswählen</string>
1021-
<string name="camera_permission_rationale">Bitte geben Sie unter Apps &amp; Benachrichtigungen in den Einstellungen manuell die Erlaubnis.</string>
1022-
<string name="camera_permission_denied">Sie können keine Dokumente scannen ohne die Erlaubnis die Kamera zu verwenden.</string>
1023-
<string name="search_result_empty">Eine Datei suchen (mindestens 2 Zeichen)</string>
1024-
<string name="description_add_more_scan">Weiteres Dokument hinzufügen</string>
1025-
<string name="description_crop_scan">Gescanntes Dokument zuschneiden</string>
1026-
<string name="description_filter_scan">Gescanntes Dokument filtern</string>
1027-
<string name="description_rotate_scan">Gescanntes Dokument drehen</string>
1028-
<string name="description_delete_scan">Gescanntes Dokument löschen</string>
1029-
<string name="description_edit_filename">Scan-Dateinamen bearbeiten</string>
1030-
<string name="description_edit_location">Scan-Speicherort bearbeiten</string>
1031-
<string name="dialog_ok">Ok</string>
1032-
<string name="dialog_save_scan_message">Das Speichern kann einige Minuten in Anspruch nehmen, insbesondere wenn Sie mehrere Seiten und Dateiformate ausgewählt haben.</string>
10331033
</resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
<!-- Colors -->
3030
<color name="dark">#ffffff</color>
3131
<color name="bg_default">#121212</color>
32+
<color name="grey">#373535</color>
3233
<color name="primary_button_text_color">#000000</color>
3334
<color name="grey_200">#818181</color>
3435
<color name="nc_grey">#222222</color>
3536
<color name="icon_on_nc_grey">#ffffff</color>
36-
<color name="grey">#373535</color>
3737

3838
<!-- Multiselect backgrounds -->
3939
<color name="action_mode_background">@color/appbar</color>

0 commit comments

Comments
 (0)