mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

show multiaccount intro only if multiaccount is enabled

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2018-02-22 07:49:22 +01:00 committed by AndyScherzinger
parent b805a7182d
commit 099f52ce03
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
2 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/com/owncloud/android/features/FeatureList.java
View file

@ -28,6 +28,7 @@ import android.os.Parcelable;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
@ -42,37 +43,40 @@ public class FeatureList {
private static final int VERSION_3_0_0 = 30000099;
private static final int BETA_VERSION_0 = 0;
static final private FeatureItem featuresList[] = {
static public ArrayList<FeatureItem> get(boolean isMultiAccount) {
ArrayList<FeatureItem> featuresList = new ArrayList<>();
// Basic features showed on first install
new FeatureItem(R.drawable.whats_new_files,
featuresList.add(new FeatureItem(R.drawable.whats_new_files,
R.string.welcome_feature_1_title, R.string.welcome_feature_1_text,
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN, true, false),
new FeatureItem(R.drawable.whats_new_accounts,
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN, true, false));
if (isMultiAccount) {
featuresList.add(new FeatureItem(R.drawable.whats_new_accounts,
R.string.welcome_feature_2_title, R.string.welcome_feature_2_text,
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN, true, false),
new FeatureItem(R.drawable.whats_new_auto_upload,
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN, true, false));
}
featuresList.add(new FeatureItem(R.drawable.whats_new_auto_upload,
R.string.welcome_feature_3_title, R.string.welcome_feature_3_text,
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN, true, false),
// 3.0.0
new FeatureItem(R.drawable.whats_new_end_to_end_encryption, R.string.whats_new_end_to_end_encryption_title,
R.string.whats_new_end_to_end_encryption_content, VERSION_3_0_0, BETA_VERSION_0,
SHOW_ON_UPGRADE, false, false),
new FeatureItem(R.drawable.whats_new_resized_images, R.string.whats_new_resized_images_title,
R.string.whats_new_resized_images_content, VERSION_3_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE,
false, false),
new FeatureItem(R.drawable.whats_new_ipv6, R.string.whats_new_ipv6_title,
R.string.whats_new_ipv6_content, VERSION_3_0_0,
BETA_VERSION_0, SHOW_ON_UPGRADE, false, false),
};
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN, true, false));
// 3.0.0
featuresList.add(new FeatureItem(R.drawable.whats_new_end_to_end_encryption,
R.string.whats_new_end_to_end_encryption_title, R.string.whats_new_end_to_end_encryption_content,
VERSION_3_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false, false));
featuresList.add(new FeatureItem(R.drawable.whats_new_resized_images, R.string.whats_new_resized_images_title,
R.string.whats_new_resized_images_content, VERSION_3_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE,
false, false));
featuresList.add(new FeatureItem(R.drawable.whats_new_ipv6, R.string.whats_new_ipv6_title,
R.string.whats_new_ipv6_content, VERSION_3_0_0,
BETA_VERSION_0, SHOW_ON_UPGRADE, false, false));
static public FeatureItem[] get() {
return featuresList;
}
static public FeatureItem[] getFiltered(final int lastSeenVersionCode, final boolean isFirstRun, boolean isBeta) {
static public FeatureItem[] getFiltered(int lastSeenVersionCode, boolean isFirstRun, boolean isBeta,
boolean isMultiAccount) {
List<FeatureItem> features = new LinkedList<>();
for (FeatureItem item : get()) {
for (FeatureItem item : get(isMultiAccount)) {
final int itemVersionCode = isBeta ? item.getBetaVersionNumber() : item.getVersionCode();
if (isFirstRun && item.shouldShowOnFirstRun()) {
features.add(item);

14
src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
View file

@ -87,6 +87,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
mProgress = findViewById(R.id.progressIndicator);
mPager = findViewById(R.id.contentPanel);
final boolean isBeta = getResources().getBoolean(R.bool.is_beta);
final boolean isMultiAccount = getResources().getBoolean(R.bool.multiaccount_support);
String[] urls = getResources().getStringArray(R.array.whatsnew_urls);
// Sometimes, accounts are not deleted when you uninstall the application so we'll do it now
@ -106,7 +107,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
mPager.setAdapter(featuresWebViewAdapter);
} else {
FeaturesViewAdapter featuresViewAdapter = new FeaturesViewAdapter(getSupportFragmentManager(),
FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta));
FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta, isMultiAccount));
mProgress.setNumberOfSteps(featuresViewAdapter.getCount());
mPager.setAdapter(featuresViewAdapter);
}
@ -215,12 +216,11 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
static private boolean shouldShow(Context context) {
final boolean isBeta = context.getResources().getBoolean(R.bool.is_beta);
return (isFirstRun() && context instanceof AccountAuthenticatorActivity) ||
(
!(isFirstRun() && (context instanceof FileDisplayActivity)) &&
!(context instanceof PassCodeActivity) &&
(FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta).length > 0)
);
final boolean isMultiAccount = context.getResources().getBoolean(R.bool.multiaccount_support);
return (isFirstRun() && context instanceof AccountAuthenticatorActivity) || (!(isFirstRun() &&
(context instanceof FileDisplayActivity)) && !(context instanceof PassCodeActivity) &&
(FeatureList.getFiltered(getLastSeenVersionCode(), isFirstRun(), isBeta, isMultiAccount).length > 0));
}
@Override