From eb68c36335b6402dacb095a101812bf55d4cf9b3 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 23 Jul 2019 07:00:19 +0200 Subject: [PATCH 1/6] wip Signed-off-by: tobiasKaminsky --- .../java/com/owncloud/android/datamodel/OCFileUnitTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java b/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java index 0f508a5689c7..4f7f6e194570 100644 --- a/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java +++ b/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java @@ -37,7 +37,7 @@ * Instrumented unit test, to be run in an Android emulator or device. * * At the moment, it's a sample to validate the automatic test environment, in the scope of instrumented unit tests. - * + *vvlcvlc * Don't take it as an example of completeness. * * See http://developer.android.com/intl/es/training/testing/unit-testing/instrumented-unit-tests.html . From 4c5eca98ecab8f216f221b6f2f8b4c10ffac8432 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 23 Jul 2019 07:23:07 +0200 Subject: [PATCH 2/6] remove leftovers from bottom bar removing Signed-off-by: tobiasKaminsky --- src/main/res/drawable/settings.xml | 14 -------------- src/main/res/menu/navigation_bar_menu.xml | 19 ------------------- src/main/res/values/strings.xml | 1 - 3 files changed, 34 deletions(-) delete mode 100644 src/main/res/drawable/settings.xml delete mode 100644 src/main/res/menu/navigation_bar_menu.xml diff --git a/src/main/res/drawable/settings.xml b/src/main/res/drawable/settings.xml deleted file mode 100644 index ac022daeaf1b..000000000000 --- a/src/main/res/drawable/settings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/src/main/res/menu/navigation_bar_menu.xml b/src/main/res/menu/navigation_bar_menu.xml deleted file mode 100644 index 0cddd29c0dab..000000000000 --- a/src/main/res/menu/navigation_bar_menu.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e31aed7f5d55..285b07223318 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -27,7 +27,6 @@ Recently modified Shared Videos - Settings Uploads Activities Notifications From ac3a6d5421daddc9b971a1445311a74abd5e01e4 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 23 Jul 2019 07:26:35 +0200 Subject: [PATCH 3/6] reformat imports kotlin: do not use wildcard imports Signed-off-by: tobiasKaminsky --- .idea/codeStyles/Project.xml | 4 ++++ .../nextcloud/client/onboarding/OnboardingServiceImpl.kt | 9 ++++----- .../client/device/TestPowerManagementService.kt | 8 +++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 7cd663d7e01d..ae042bad430b 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -59,6 +59,10 @@ + + diff --git a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt b/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt index ba6cfd58ac37..4a909e4775a6 100644 --- a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt +++ b/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt @@ -22,12 +22,10 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.content.res.Resources - import com.nextcloud.client.account.CurrentAccountProvider import com.nextcloud.client.preferences.AppPreferences import com.owncloud.android.BuildConfig import com.owncloud.android.R -import com.owncloud.android.authentication.AuthenticatorActivity import com.owncloud.android.features.FeatureItem import com.owncloud.android.ui.activity.PassCodeActivity @@ -41,9 +39,10 @@ internal class OnboardingServiceImpl constructor( const val ITEM_VERSION_CODE = 99999999 } - private val notSeenYet: Boolean get() { - return BuildConfig.VERSION_CODE >= ITEM_VERSION_CODE && preferences.lastSeenVersionCode < ITEM_VERSION_CODE - } + private val notSeenYet: Boolean + get() { + return BuildConfig.VERSION_CODE >= ITEM_VERSION_CODE && preferences.lastSeenVersionCode < ITEM_VERSION_CODE + } override val whatsNew: Array get() = if (!isFirstRun && notSeenYet) { diff --git a/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt b/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt index 16b0869df770..1e767550ea5b 100644 --- a/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt +++ b/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt @@ -26,7 +26,13 @@ import android.content.Intent import android.os.BatteryManager import android.os.Build import android.os.PowerManager -import com.nhaarman.mockitokotlin2.* +import com.nhaarman.mockitokotlin2.any +import com.nhaarman.mockitokotlin2.anyOrNull +import com.nhaarman.mockitokotlin2.eq +import com.nhaarman.mockitokotlin2.mock +import com.nhaarman.mockitokotlin2.never +import com.nhaarman.mockitokotlin2.verify +import com.nhaarman.mockitokotlin2.whenever import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Before From fc01e9738eb3322089e095ae7203ee98642e2772 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 23 Jul 2019 07:32:11 +0200 Subject: [PATCH 4/6] wip Signed-off-by: tobiasKaminsky --- .../client/onboarding/OnboardingServiceImpl.kt | 1 + .../android/ui/activity/DrawerActivity.java | 18 ------------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt b/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt index 4a909e4775a6..157acb99c2fa 100644 --- a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt +++ b/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt @@ -26,6 +26,7 @@ import com.nextcloud.client.account.CurrentAccountProvider import com.nextcloud.client.preferences.AppPreferences import com.owncloud.android.BuildConfig import com.owncloud.android.R +import com.owncloud.android.authentication.AuthenticatorActivity import com.owncloud.android.features.FeatureItem import com.owncloud.android.ui.activity.PassCodeActivity diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index d56ac72153ca..b0974d1eb435 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -86,7 +86,6 @@ import com.owncloud.android.ui.events.AccountRemovedEvent; import com.owncloud.android.ui.events.ChangeMenuEvent; import com.owncloud.android.ui.events.DummyDrawerEvent; -import com.owncloud.android.ui.events.MenuItemClickEvent; import com.owncloud.android.ui.events.SearchEvent; import com.owncloud.android.ui.fragment.OCFileListFragment; import com.owncloud.android.ui.trashbin.TrashbinActivity; @@ -385,23 +384,6 @@ private void filterDrawerMenu(Menu menu, Account account) { DrawerMenuUtil.removeMenuItem(menu, R.id.nav_logout, !getResources().getBoolean(R.bool.show_drawer_logout)); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onMessageEvent(MenuItemClickEvent event) { - unsetAllDrawerMenuItems(); - - switch (event.menuItem.getItemId()) { - case R.id.nav_bar_files: - showFiles(false); - break; - case R.id.nav_bar_settings: - Intent settingsIntent = new Intent(getApplicationContext(), SettingsActivity.class); - startActivity(settingsIntent); - break; - default: - break; - } - } - @Subscribe(threadMode = ThreadMode.MAIN) public void onMessageEvent(DummyDrawerEvent event) { unsetAllDrawerMenuItems(); From 6a925b7f278e36d257177ad5fbda62b92523e165 Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 23 Jul 2019 07:52:50 +0200 Subject: [PATCH 5/6] wip Signed-off-by: tobiasKaminsky --- scripts/analysis/findbugs-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index 97964b3fde64..57214136334b 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -422 \ No newline at end of file +423 From e9b06843e8560bcd70f3fec06afe33621e92c2ce Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Tue, 23 Jul 2019 08:19:26 +0200 Subject: [PATCH 6/6] remove leftover Signed-off-by: tobiasKaminsky --- .../android/ui/fragment/OCFileListFragment.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java index 2dff582dc370..6e625999ef72 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -45,7 +45,6 @@ import android.view.ViewGroup; import android.widget.AbsListView; import android.widget.PopupMenu; -import android.widget.RelativeLayout; import com.google.android.material.snackbar.Snackbar; import com.nextcloud.client.account.UserAccountManager; @@ -279,17 +278,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, currentSearchType = SearchType.NO_SEARCH; } - if (savedInstanceState != null) { - final View fabView = v.findViewById(R.id.fab_main); - final RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) - fabView.getLayoutParams(); - layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1); - new Handler().post(() -> { - fabView.setLayoutParams(layoutParams); - fabView.invalidate(); - }); - } - Bundle args = getArguments(); boolean allowContextualActions = args != null && args.getBoolean(ARG_ALLOW_CONTEXTUAL_ACTIONS, false); if (allowContextualActions) {