mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move auto upload to settings

Browse source 
Resolves #6793

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2020-11-27 19:13:27 +01:00
parent a7fed0fc49
commit fca4e92749
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
6 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file

@ -314,8 +314,6 @@ public abstract class DrawerActivity extends ToolbarActivity
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_contacts, !getResources().getBoolean(R.bool.contacts_backup)
|| !getResources().getBoolean(R.bool.show_drawer_contacts_backup));
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_synced_folders,
getResources().getBoolean(R.bool.syncedFolder_light));
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_logout, !getResources().getBoolean(R.bool.show_drawer_logout));
}
@ -367,9 +365,6 @@ public abstract class DrawerActivity extends ToolbarActivity
case R.id.nav_notifications:
startActivity(NotificationsActivity.class);
break;
case R.id.nav_synced_folders:
startActivity(SyncedFoldersActivity.class);
break;
case R.id.nav_contacts:
ContactsPreferenceActivity.startActivity(this);
break;

18
src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
View file

@ -317,6 +317,8 @@ public class SettingsActivity extends ThemedPreferenceActivity
preferenceCategoryMore.setTitle(ThemeUtils.getColoredTitle(getString(R.string.prefs_category_more),
accentColor));
setupAutoUploadPreference(preferenceCategoryMore);
setupCalendarPreference(preferenceCategoryMore);
setupContactsBackupPreference(preferenceCategoryMore);
@ -455,6 +457,18 @@ public class SettingsActivity extends ThemedPreferenceActivity
}
}
private void setupAutoUploadPreference(PreferenceCategory preferenceCategoryMore) {
Preference autoUpload = findPreference("syncedFolders");
if (getResources().getBoolean(R.bool.syncedFolder_light)) {
preferenceCategoryMore.removePreference(autoUpload);
} else {
autoUpload.setOnPreferenceClickListener(preference -> {
SyncedFoldersActivity.startActivityWithoutSidebar(this);
return true;
});
}
}
private void setupContactsBackupPreference(PreferenceCategory preferenceCategoryMore) {
boolean contactsBackupEnabled = !getResources().getBoolean(R.bool.show_drawer_contacts_backup)
&& getResources().getBoolean(R.bool.contacts_backup);
@ -618,9 +632,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
if (getResources().getBoolean(R.bool.syncedFolder_light)
&& Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
pSyncedFolder.setOnPreferenceClickListener(preference -> {
Intent syncedFoldersIntent = new Intent(getApplicationContext(), SyncedFoldersActivity.class);
syncedFoldersIntent.putExtra(SyncedFoldersActivity.EXTRA_SHOW_SIDEBAR, false);
startActivity(syncedFoldersIntent);
SyncedFoldersActivity.startActivityWithoutSidebar(this);
return true;
});
} else {

17
src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java
View file

@ -115,6 +115,12 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
@Inject Clock clock;
@Inject BackgroundJobManager backgroundJobManager;
public static void startActivityWithoutSidebar(Context context) {
Intent intent = new Intent(context, SyncedFoldersActivity.class);
intent.putExtra(EXTRA_SHOW_SIDEBAR, false);
context.startActivity(intent);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -151,13 +157,17 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
setupToolbar();
updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_synced_folders));
// setup drawer
setupDrawer(R.id.nav_synced_folders);
if (!showSidebar) {
setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
if (mDrawerToggle != null) {
mDrawerToggle.setDrawerIndicatorEnabled(false);
}
}
// TODO: The content loading should be done asynchronously
setupContent();
@ -800,7 +810,6 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
@Override
protected void onResume() {
super.onResume();
setDrawerMenuItemChecked(R.id.nav_synced_folders);
}
private void showBatteryOptimizationInfo() {

5
src/main/res/menu/partial_drawer_entries.xml
View file

@ -76,11 +76,6 @@
android:id="@+id/nav_notifications"
android:icon="@drawable/nav_notifications"
android:title="@string/drawer_item_notifications"/>
<item
android:orderInCategory="0"
android:id="@+id/nav_synced_folders"
android:icon="@drawable/nav_synced_folders"
android:title="@string/drawer_synced_folders"/>
<item
android:id="@+id/nav_uploads"
android:icon="@drawable/uploads"

1
src/main/res/values/strings.xml
View file

@ -52,6 +52,7 @@
<string name="prefs_calendar_contacts_no_store_error">Neither F-Droid nor Google Play is installed</string>
<string name="prefs_calendar_contacts_sync_setup_successful">Calendar &amp; contacts sync set up</string>
<string name="prefs_daily_contacts_sync_summary">Daily backup of your contacts</string>
<string name="prefs_sycned_folders_summary">Manage folders for auto upload</string>
<string name="prefs_help">Help</string>
<string name="prefs_recommend">Recommend to friend</string>
<string name="prefs_imprint">Imprint</string>

4
src/main/res/xml/preferences.xml
View file

@ -60,6 +60,10 @@
</PreferenceCategory>
<PreferenceCategory android:title="@string/prefs_category_more" android:key="more">
<Preference
android:title="@string/drawer_synced_folders"
android:key="syncedFolders"
android:summary="@string/prefs_sycned_folders_summary"/>
<Preference android:title="@string/prefs_calendar_contacts"
android:key="calendar_contacts"
android:summary="@string/prefs_calendar_contacts_summary" />