From addf8d89962bf3de6d70330f9264d0e4d866613e Mon Sep 17 00:00:00 2001
From: cyberta <cyberta@riseup.net>
Date: Sat, 29 Jul 2023 17:15:05 +0200
Subject: update design and UX for provider setup

---
 .../viewmodel/ProviderSelectionViewModel.java      | 81 ++++++++++++++++++++++
 .../ProviderSelectionViewModelFactory.java         | 28 ++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModel.java
 create mode 100644 app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModelFactory.java

(limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel')

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModel.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModel.java
new file mode 100644
index 00000000..e3880181
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModel.java
@@ -0,0 +1,81 @@
+package se.leap.bitmaskclient.providersetup.fragments.viewmodel;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.util.Patterns;
+import android.view.View;
+import android.webkit.URLUtil;
+
+import androidx.lifecycle.ViewModel;
+
+import java.io.File;
+import java.util.List;
+
+import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.providersetup.ProviderManager;
+
+public class ProviderSelectionViewModel extends ViewModel {
+    private final ProviderManager providerManager;
+    public static int ADD_PROVIDER = 100100100;
+
+    private int selected = 0;
+    private String customUrl;
+
+    public ProviderSelectionViewModel(AssetManager assetManager, File externalFilesDir) {
+        providerManager = ProviderManager.getInstance(assetManager, externalFilesDir);
+        providerManager.setAddDummyEntry(false);
+    }
+
+    public int size() {
+        return providerManager.size();
+    }
+
+    public List<Provider> providers() {
+        return providerManager.providers();
+    }
+
+   public Provider getProvider(int pos) {
+        return providerManager.get(pos);
+   }
+
+    public void setSelected(int checkedId) {
+        selected = checkedId;
+    }
+
+    public int getSelected() {
+        return selected;
+    }
+
+    public boolean isValidConfig() {
+        if (selected == ADD_PROVIDER) {
+            return URLUtil.isValidUrl(customUrl) && Patterns.WEB_URL.matcher(customUrl).matches();
+        }
+        return true;
+    }
+
+    public CharSequence getProviderDescription(Context context) {
+        if (selected == ADD_PROVIDER) {
+            return context.getText(R.string.add_provider_description);
+        }
+        Provider provider = getProvider(selected);
+        if ("riseup.net".equals(provider.getDomain())) {
+            return context.getText(R.string.provider_description_riseup);
+        }
+        if ("calyx.net".equals(provider.getDomain())) {
+            return context.getText(R.string.provider_description_calyx);
+        }
+        return provider.getDescription();
+    }
+
+    public int getEditProviderVisibility() {
+        if (selected == ADD_PROVIDER) {
+            return View.VISIBLE;
+        }
+        return View.GONE;
+    }
+
+    public void setCustomUrl(String url) {
+        customUrl = url;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModelFactory.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModelFactory.java
new file mode 100644
index 00000000..a21e4924
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/viewmodel/ProviderSelectionViewModelFactory.java
@@ -0,0 +1,28 @@
+package se.leap.bitmaskclient.providersetup.fragments.viewmodel;
+
+import android.content.res.AssetManager;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import java.io.File;
+
+public class ProviderSelectionViewModelFactory implements ViewModelProvider.Factory {
+    private final AssetManager assetManager;
+    private final File externalFilesDir;
+
+    public ProviderSelectionViewModelFactory(AssetManager assetManager, File externalFilesDir) {
+        this.assetManager = assetManager;
+        this.externalFilesDir = externalFilesDir;
+    }
+
+    @NonNull
+    @Override
+    public <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+        if (modelClass.isAssignableFrom(ProviderSelectionViewModel.class)) {
+            return (T) new ProviderSelectionViewModel(assetManager, externalFilesDir);
+        }
+        throw new IllegalArgumentException("Unknown ViewModel class");
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3