Allow cloud import from setup screen

app/src/main/java/ru/ytkab0bp/slicebeam/SetupActivity.java

@@ -95,6 +95,7 @@ import ru.ytkab0bp.slicebeam.components.BeamAlertDialogBuilder;
 import ru.ytkab0bp.slicebeam.components.CloudManageBottomSheet;
 import ru.ytkab0bp.slicebeam.config.ConfigObject;
 import ru.ytkab0bp.slicebeam.events.BeamServerDataUpdatedEvent;
+import ru.ytkab0bp.slicebeam.events.CloudFeaturesUpdatedEvent;
 import ru.ytkab0bp.slicebeam.events.CloudLoginStateUpdatedEvent;
 import ru.ytkab0bp.slicebeam.recycler.BigHeaderItem;
 import ru.ytkab0bp.slicebeam.recycler.PreferenceItem;
@@ -121,6 +122,7 @@ public class SetupActivity extends AppCompatActivity {
     public final static String EXTRA_ABOUT = "about";
     public final static String EXTRA_BOOSTY_ONLY = "boosty_only";
     public final static String EXTRA_CLOUD_PROFILE = "cloud_profile";
+    public final static String EXTRA_CLOUD_IMPORT_FROM_SETUP = "cloud_import_from_setup";
 
     private final static String TAG = "SetupActivity";
 
@@ -164,6 +166,7 @@ public class SetupActivity extends AppCompatActivity {
     private boolean about;
     private boolean boostyOnly;
     private boolean cloudProfile;
+    private boolean cloudImport;
 
     private List<ConfigObject> enabledPrinters = new ArrayList<>();
 
@@ -182,6 +185,7 @@ public class SetupActivity extends AppCompatActivity {
         about = getIntent().getBooleanExtra(EXTRA_ABOUT, false);
         boostyOnly = getIntent().getBooleanExtra(EXTRA_BOOSTY_ONLY, false);
         cloudProfile = getIntent().getBooleanExtra(EXTRA_CLOUD_PROFILE, false);
+        cloudImport = getIntent().getBooleanExtra(EXTRA_CLOUD_IMPORT_FROM_SETUP, false);
 
         if (!about && !boostyOnly && !cloudProfile) {
             new BeamAlertDialogBuilder(this)
@@ -508,6 +512,21 @@ public class SetupActivity extends AppCompatActivity {
         if (cloudProfile) {
             cloudItem.bindLoginButton(true);
             cloudItem.bindFeatures();
+
+            if (Prefs.getCloudAPIToken() != null && cloudImport) {
+                finish();
+            }
+        } else if (!about && !boostyOnly) {
+            if (Prefs.getCloudAPIToken() != null) {
+                pager.setCurrentItem(pager.getAdapter().getItemCount() - 1);
+            }
+        }
+    }
+
+    @EventHandler(runOnMainThread = true)
+    public void onCloudFeaturesUpdated(CloudFeaturesUpdatedEvent e) {
+        if (!about && !boostyOnly && !cloudProfile) {
+            reposItem.onCloudInfoUpdated();
         }
     }
 
@@ -1104,6 +1123,8 @@ public class SetupActivity extends AppCompatActivity {
         private ProgressBar progressBar;
         private FrameLayout loadedLayout;
         private SimpleRecyclerAdapter adapter;
+        private TextView cloudImportView;
+        private TextView cloudOrView;
         private TextView customProfileView;
         private TextView buttonView;
 
@@ -1120,10 +1141,29 @@ public class SetupActivity extends AppCompatActivity {
 
             LinearLayout ll = new LinearLayout(ctx);
             ll.setOrientation(LinearLayout.VERTICAL);
+            cloudImportView = new TextView(ctx);
+            cloudImportView.setVisibility(View.GONE);
+            cloudImportView.setText(R.string.IntroImportFromCloud);
+            cloudImportView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
+            cloudImportView.setGravity(Gravity.CENTER);
+            cloudImportView.setPadding(ViewUtils.dp(12), ViewUtils.dp(8), ViewUtils.dp(12), ViewUtils.dp(8));
+            cloudImportView.setOnClickListener(v -> startActivity(new Intent(v.getContext(), SetupActivity.class).putExtra(SetupActivity.EXTRA_CLOUD_PROFILE, true).putExtra(SetupActivity.EXTRA_CLOUD_IMPORT_FROM_SETUP, true)));
+            ll.addView(cloudImportView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewUtils.dp(48)) {{
+                leftMargin = rightMargin = ViewUtils.dp(16);
+            }});
+
+            cloudOrView = new TextView(ctx);
+            cloudOrView.setVisibility(View.GONE);
+            cloudOrView.setText(R.string.IntroImportOr);
+            cloudOrView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+            cloudOrView.setGravity(Gravity.CENTER);
+            ll.addView(cloudOrView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) {{
+                leftMargin = rightMargin = ViewUtils.dp(16);
+            }});
+
             customProfileView = new TextView(ctx);
             customProfileView.setText(R.string.IntroCustomProfile);
             customProfileView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
-            customProfileView.setTextColor(ThemesRepo.getColor(android.R.attr.colorAccent));
             customProfileView.setGravity(Gravity.CENTER);
             customProfileView.setPadding(ViewUtils.dp(12), ViewUtils.dp(8), ViewUtils.dp(12), ViewUtils.dp(8));
             customProfileView.setOnClickListener(v -> {
@@ -1132,8 +1172,9 @@ public class SetupActivity extends AppCompatActivity {
                 SetupActivity.this.adapter.notifyItemRangeInserted(REPOS_INDEX + 1, SetupActivity.this.adapter.getItemCount() - REPOS_INDEX - 1);
                 scrollToNext();
             });
-            ll.addView(customProfileView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) {{
+            ll.addView(customProfileView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewUtils.dp(48)) {{
-                bottomMargin = ViewUtils.dp(12);
+                leftMargin = rightMargin = ViewUtils.dp(16);
+                bottomMargin = ViewUtils.dp(6);
             }});
 
             buttonView = new TextView(ctx);
@@ -1180,7 +1221,13 @@ public class SetupActivity extends AppCompatActivity {
         @Override
         public void onBindView(View view) {
             progressBar.setIndeterminateTintList(ColorStateList.valueOf(ThemesRepo.getColor(android.R.attr.colorAccent)));
+            cloudImportView.setTextColor(ThemesRepo.getColor(android.R.attr.colorAccent));
+            cloudImportView.setBackground(ViewUtils.createRipple(ThemesRepo.getColor(android.R.attr.colorControlHighlight), 16));
+            cloudImportView.setVisibility(BeamServerData.isCloudAvailable() ? View.VISIBLE : View.GONE);
+            cloudOrView.setTextColor(ThemesRepo.getColor(android.R.attr.textColorSecondary));
+            cloudOrView.setVisibility(BeamServerData.isCloudAvailable() ? View.VISIBLE : View.GONE);
             customProfileView.setTextColor(ThemesRepo.getColor(android.R.attr.colorAccent));
+            customProfileView.setBackground(ViewUtils.createRipple(ThemesRepo.getColor(android.R.attr.colorControlHighlight), 16));
             buttonView.setBackground(ViewUtils.createRipple(ThemesRepo.getColor(android.R.attr.colorControlHighlight), ThemesRepo.getColor(android.R.attr.colorAccent), 16));
 
             if (adapter.getItemCount() == 0 && isReposLoaded) {
@@ -1203,6 +1250,10 @@ public class SetupActivity extends AppCompatActivity {
             }
         }
 
+        public void onCloudInfoUpdated() {
+            cloudImportView.setVisibility(BeamServerData.isCloudAvailable() ? View.VISIBLE : View.GONE);
+        }
+
         public void onReposLoaded() {
             List<SimpleRecyclerItem> items = new ArrayList<>(repos);
             items.add(new TextHintRecyclerItem(SliceBeam.INSTANCE.getString(R.string.IntroSelectRepos)));

app/src/main/java/ru/ytkab0bp/slicebeam/cloud/CloudController.java

@@ -329,7 +329,15 @@ public class CloudController {
         CloudAPI.INSTANCE.syncGetState(new APICallback<CloudAPI.SyncState>() {
             @Override
             public void onResponse(CloudAPI.SyncState response) {
-                if (response.usedSize == 0) {
+                if (SliceBeam.CONFIG == null && response.usedSize != 0) {
+                    // Setup screen, no config yet
+                    downloadData(response.lastUpdatedDate);
+                } else if (response.usedSize == 0) {
+                    if (SliceBeam.CONFIG == null) {
+                        SliceBeam.EVENT_BUS.fireEvent(new NeedDismissSnackbarEvent(CLOUD_SYNC_TAG));
+                        return;
+                    }
+
                     // No data on server yet, send anyway
                     uploadData(modified);
                 } else if (response.lastUpdatedDate != Prefs.getCloudRemoteLastModified()) {

app/src/main/res/values-ru/strings.xml

@@ -129,6 +129,8 @@
     <string name="IntroLetStartWithColor">Давайте начнём с вашего любимого цвета.</string>
     <string name="IntroFailedToLoadRepos">Не удалось загрузить репозитории!</string>
     <string name="IntroSelectRepos">Выберите репозитории для загрузки профилей.</string>
+    <string name="IntroImportFromCloud">Импортировать из облака Beam</string>
+    <string name="IntroImportOr">Или</string>
     <string name="IntroCustomProfile">Использовать пользовательский профиль</string>
     <string name="IntroCustomProfileHeader">Пользовательские</string>
     <string name="IntroCustomProfileName">Пользовательский профиль</string>

app/src/main/res/values/strings.xml

@@ -131,6 +131,8 @@
     <string name="IntroLetStartWithColor">Let\'s start with your favorite color.</string>
     <string name="IntroFailedToLoadRepos">Failed to load repositories from network!</string>
     <string name="IntroSelectRepos">Select repositories to fetch profiles.</string>
+    <string name="IntroImportFromCloud">Import from Beam Cloud</string>
+    <string name="IntroImportOr">Or</string>
     <string name="IntroCustomProfile">Use custom profile</string>
     <string name="IntroCustomProfileHeader">Custom</string>
     <string name="IntroCustomProfileName">Custom profile</string>