CustomSettings Implementation

app/src/androidTest/java/com/alphawallet/app/CustomSettingsTest.java

@@ -0,0 +1,39 @@
+package com.alphawallet.app;
+
+import static com.alphawallet.app.assertions.Should.shouldSee;
+import static com.alphawallet.app.steps.Steps.createNewWallet;
+import static com.alphawallet.app.util.Helper.waitUntilLoaded;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+import com.alphawallet.app.util.Helper;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.net.URL;
+
+public class CustomSettingsTest extends BaseE2ETest
+{
+    private static File getFileFromPath(Object obj)
+    {
+        ClassLoader classLoader = obj.getClass().getClassLoader();
+        assert classLoader != null;
+        URL resource = classLoader.getResource("assets/custom_view_settings.json");
+        return new File(resource.getPath());
+    }
+
+    @Test
+    public void fileObjectShouldNotBeNull() throws Exception
+    {
+        File file = getFileFromPath(this);
+        assertThat(file, notNullValue());
+
+        createNewWallet();
+        Helper.wait(1);
+        shouldSee(R.id.back);
+        waitUntilLoaded();
+    }
+
+}
+

app/src/main/assets/custom_view_settings.json

@@ -0,0 +1,41 @@
+{
+  "exclusive_chains": [
+    {
+      "chain": 1
+    }
+  ],
+  "locked_chains": [
+    {
+      "chain": 1
+    },
+    {
+      "chain": 4
+    },
+    {
+      "chain": 10
+    }
+  ],
+  "locked_tokens": [
+    {
+      "tokenAddress": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+      "tokenName": "USD Coin",
+      "tokenSymbol": "USDC",
+      "tokenDecimals": 6,
+      "isEnabled": true,
+      "chainId": 1
+    }
+  ],
+  "dark_mode": false,
+  "isShowContractAddress": true,
+  "startupDelay": 0,
+  "imageOverride": 0,
+  "isHideDappBrowser": false,
+  "isHideTabBar": false,
+  "isHasDirectTransfer": true,
+  "isCanChangeWallets": true,
+  "isHideEIP681": false,
+  "isCanAddTokens": true,
+  "isShowManageTokens": true,
+  "isShowAllNetworks": false,
+  "getDecimalPlaces": 5
+}

app/src/main/java/com/alphawallet/app/di/RepositoriesModule.java

@@ -30,6 +30,7 @@
 import com.alphawallet.app.service.AnalyticsService;
 import com.alphawallet.app.service.AnalyticsServiceType;
 import com.alphawallet.app.service.AssetDefinitionService;
+import com.alphawallet.app.service.CustomSettings;
 import com.alphawallet.app.service.GasService;
 import com.alphawallet.app.service.IPFSService;
 import com.alphawallet.app.service.IPFSServiceType;
@@ -178,9 +179,9 @@ TokenRepositoryType provideTokenRepository(
 
     @Singleton
     @Provides
-    TokenLocalSource provideRealmTokenSource(RealmManager realmManager, EthereumNetworkRepositoryType ethereumNetworkRepository)
+    TokenLocalSource provideRealmTokenSource(RealmManager realmManager, EthereumNetworkRepositoryType ethereumNetworkRepository, CustomSettings customSettings)
     {
-        return new TokensRealmSource(realmManager, ethereumNetworkRepository);
+        return new TokensRealmSource(realmManager, ethereumNetworkRepository, customSettings);
     }
 
     @Singleton
@@ -196,9 +197,10 @@ TokensService provideTokensServices(EthereumNetworkRepositoryType ethereumNetwor
                                         TokenRepositoryType tokenRepository,
                                         TickerService tickerService,
                                         OpenSeaService openseaService,
-                                        AnalyticsServiceType analyticsService)
+                                        AnalyticsServiceType analyticsService,
+                                        CustomSettings customSettings)
     {
-        return new TokensService(ethereumNetworkRepository, tokenRepository, tickerService, openseaService, analyticsService);
+        return new TokensService(ethereumNetworkRepository, tokenRepository, tickerService, openseaService, analyticsService, customSettings);
     }
 
     @Singleton
@@ -262,6 +264,13 @@ AssetDefinitionService providingAssetDefinitionServices(IPFSServiceType ipfsServ
         return new AssetDefinitionService(ipfsService, ctx, notificationService, realmManager, tokensService, tls, alphaService);
     }
 
+    @Singleton
+    @Provides
+    CustomSettings provideCustomSettings(@ApplicationContext Context context)
+    {
+        return new CustomSettings(context);
+    }
+
     @Singleton
     @Provides
     KeyService provideKeyService(@ApplicationContext Context ctx, AnalyticsServiceType analyticsService)

app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java

@@ -72,11 +72,11 @@
 import com.alphawallet.app.R;
 import com.alphawallet.app.entity.ContractLocator;
 import com.alphawallet.app.entity.ContractType;
-import com.alphawallet.app.entity.CustomViewSettings;
 import com.alphawallet.app.entity.NetworkInfo;
 import com.alphawallet.app.entity.Wallet;
 import com.alphawallet.app.entity.tokens.Token;
 import com.alphawallet.app.entity.tokens.TokenInfo;
+import com.alphawallet.app.service.CustomSettings;
 import com.alphawallet.app.util.Utils;
 import com.alphawallet.token.entity.ChainSpec;
 import com.google.gson.Gson;
@@ -895,7 +895,7 @@ public List<Long> getSelectedFilters(boolean isMainNet)
     @Override
     public Long getDefaultNetwork(boolean isMainNet)
     {
-        return isMainNet ? CustomViewSettings.primaryChain : GOERLI_ID;
+        return isMainNet ? CustomSettings.primaryChain : GOERLI_ID;
     }
 
     @Override
@@ -1084,14 +1084,9 @@ public static List<ChainSpec> extraChains()
         return null;
     }
 
-    public static List<Long> addDefaultNetworks()
-    {
-        return CustomViewSettings.alwaysVisibleChains;
-    }
-
     public static ContractLocator getOverrideToken()
     {
-        return new ContractLocator("", CustomViewSettings.primaryChain, ContractType.ETHEREUM);
+        return new ContractLocator("", CustomSettings.primaryChain, ContractType.ETHEREUM);
     }
 
     @Override

app/src/main/java/com/alphawallet/app/repository/TokensRealmSource.java

@@ -8,7 +8,6 @@
 import android.util.Pair;
 
 import com.alphawallet.app.entity.ContractType;
-import com.alphawallet.app.entity.CustomViewSettings;
 import com.alphawallet.app.entity.NetworkInfo;
 import com.alphawallet.app.entity.Wallet;
 import com.alphawallet.app.entity.nftassets.NFTAsset;
@@ -25,6 +24,7 @@
 import com.alphawallet.app.repository.entity.RealmTokenMapping;
 import com.alphawallet.app.repository.entity.RealmTokenTicker;
 import com.alphawallet.app.service.AssetDefinitionService;
+import com.alphawallet.app.service.CustomSettings;
 import com.alphawallet.app.service.RealmManager;
 import com.alphawallet.app.util.Utils;
 import com.alphawallet.token.entity.ContractAddress;
@@ -62,10 +62,13 @@ public class TokensRealmSource implements TokenLocalSource {
 
     private final RealmManager realmManager;
     private final EthereumNetworkRepositoryType ethereumNetworkRepository;
+    private final CustomSettings customSettings;
 
-    public TokensRealmSource(RealmManager realmManager, EthereumNetworkRepositoryType ethereumNetworkRepository) {
+    public TokensRealmSource(RealmManager realmManager, EthereumNetworkRepositoryType ethereumNetworkRepository, CustomSettings customSettings)
+    {
         this.realmManager = realmManager;
         this.ethereumNetworkRepository = ethereumNetworkRepository;
+        this.customSettings = customSettings;
     }
 
     @Override
@@ -472,7 +475,7 @@ else if (!newBalance.equals(currentBalance) || !checkEthToken(realm, token))
                 }
 
                 if (!realmToken.isVisibilityChanged() && realmToken.isEnabled() && newBalance != null && newBalance.equals("0")
-                    && !(token.isEthereum() && CustomViewSettings.alwaysShow(token.tokenInfo.chainId)))
+                    && !(token.isEthereum() && customSettings.alwaysShow(token.tokenInfo.chainId)))
                 {
                     realm.executeTransaction(r -> {
                         realmToken.setEnabled(false);
@@ -481,7 +484,7 @@ else if (!newBalance.equals(currentBalance) || !checkEthToken(realm, token))
                 }
                 else if ((!realmToken.isVisibilityChanged() && !realmToken.isEnabled()) &&
                         (token.balance.compareTo(BigDecimal.ZERO) > 0 ||
-                                (token.isEthereum() && CustomViewSettings.alwaysShow(token.tokenInfo.chainId) && !realmToken.isEnabled()))) // enable if base token should be showing
+                                (token.isEthereum() && customSettings.alwaysShow(token.tokenInfo.chainId) && !realmToken.isEnabled()))) // enable if base token should be showing
                 {
                     realm.executeTransaction(r -> {
                         realmToken.setEnabled(true);
@@ -492,7 +495,7 @@ else if ((!realmToken.isVisibilityChanged() && !realmToken.isEnabled()) &&
             else
             {
                 balanceChanged = true;
-                if (token.isEthereum() && CustomViewSettings.alwaysShow(token.tokenInfo.chainId)) token.tokenInfo.isEnabled = true;
+                if (token.isEthereum() && customSettings.alwaysShow(token.tokenInfo.chainId)) token.tokenInfo.isEnabled = true;
                 //write token
                 realm.executeTransaction(r -> {
                     token.balance = balance;