Feat/add mp widget issue 86

app/build.gradle.kts

@@ -187,6 +187,7 @@ dependencies {
         }
     }
 
+    implementation("androidx.webkit:webkit:1.9.0")
     implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.legacy.support)

app/src/main/java/com/brainwallet/data/model/IntroLanguageResource.kt

@@ -133,14 +133,6 @@ class IntroLanguageResource {
             "Sei sicuro di voler cambiare la lingua in italiano?",
             Language.ITALIAN
             ),
-            IntroLanguage(
-                Language.BLANK.code,
-                Language.BLANK.title,
-                " ",
-                R.raw.english,
-                " ",
-                Language.BLANK
-            ),
         )
     }
 

app/src/main/java/com/brainwallet/data/model/Language.kt

@@ -23,7 +23,6 @@ enum class Language(
     CHINESE_SIMPLIFIED("zh-CN", "简化字", "选择语言"),
     HINDI("hi", "हिंदी", "भाषा चुने"),
     ITALIAN("it", "Italiano", "Seleziona la lingua"),
-    BLANK(" ", " ", " "),
     ;
 
     companion object {

app/src/main/java/com/brainwallet/navigation/MainNav.kt

@@ -10,6 +10,7 @@ import androidx.navigation.toRoute
 import com.brainwallet.ui.screens.inputwords.InputWordsScreen
 import com.brainwallet.ui.screens.ready.ReadyScreen
 import com.brainwallet.ui.screens.setpasscode.SetPasscodeScreen
+import com.brainwallet.ui.screens.topup.TopUpScreen
 import com.brainwallet.ui.screens.unlock.UnLockScreen
 import com.brainwallet.ui.screens.welcome.WelcomeScreen
 import com.brainwallet.ui.screens.yourseedproveit.YourSeedProveItScreen
@@ -65,6 +66,12 @@ fun NavGraphBuilder.mainNavGraph(
     composable<Route.Ready> {
         ReadyScreen(onNavigate = onNavigate)
     }
+
+    composable<Route.TopUp> { navBackStackEntry ->
+        val route: Route.TopUp = navBackStackEntry.toRoute()
+        TopUpScreen(onNavigate = onNavigate)
+    }
+
     composable<Route.SetPasscode> { navBackStackEntry ->
         val route: Route.SetPasscode = navBackStackEntry.toRoute()
         SetPasscodeScreen(onNavigate = onNavigate, passcode = route.passcode)
@@ -90,6 +97,8 @@ fun NavGraphBuilder.mainNavGraph(
             seedWords = route.seedWords
         )
     }
+
+
     /**
      * for now, still using old activity & fragment [com.brainwallet.presenter.activities.BreadActivity]
      */

app/src/main/java/com/brainwallet/navigation/Route.kt

@@ -12,6 +12,9 @@ sealed class Route : JavaSerializable {
     @Serializable
     object Ready : Route()
 
+    @Serializable
+    object TopUp : Route()
+
     @Serializable
     data class SetPasscode(
         val passcode: List<Int> = emptyList()
@@ -37,4 +40,5 @@ sealed class Route : JavaSerializable {
 
     @Serializable
     object UnLock : Route()
+
 }

app/src/main/java/com/brainwallet/presenter/activities/PaperKeyProveActivity.kt

@@ -4,10 +4,6 @@ import android.os.Bundle
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import com.brainwallet.databinding.ActivityPaperKeyProveBinding
 import com.brainwallet.presenter.activities.util.BRActivity
-import com.brainwallet.tools.animation.BRAnimator
-import com.brainwallet.tools.manager.BRSharedPrefs
-import com.brainwallet.ui.screens.yourseedproveit.YourSeedProveItEvent
-import com.brainwallet.ui.screens.yourseedproveit.YourSeedProveItScreen
 import com.brainwallet.ui.theme.setContentWithTheme
 
 @Deprecated(message = "move to compose")

app/src/main/java/com/brainwallet/presenter/fragments/FragmentMenu.java

@@ -74,7 +74,7 @@ public View onCreateView(LayoutInflater inflater,
         itemList.add(new BRMenuItem(getString(R.string.MenuButton_support), R.drawable.faq_question_black, v -> {
             CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
             CustomTabsIntent customTabsIntent = builder.build();
-            customTabsIntent.launchUrl(getContext(), Uri.parse(BRConstants.CUSTOMER_SUPPORT_LINK));
+            customTabsIntent.launchUrl(getContext(), Uri.parse(BRConstants.WEB_LINK));
             AnalyticsManager.logCustomEvent(BRConstants._20201118_DTGS);
         }));
 

app/src/main/java/com/brainwallet/tools/manager/BRApiManager.java

@@ -119,16 +119,8 @@ public void startTimer(Context context) {
         timer.schedule(timerTask, 0, 4000);
     }
 
-    public void stopTimerTask() {
-        //stop the timer, if it's not already null
-        if (timer != null) {
-            timer.cancel();
-            timer = null;
-        }
-    }
-
     public JSONArray fetchRates(Activity activity) {
-        String jsonString = createGETRequestURL(activity, getBaseUrlProd() + "/api/v1/rates");
+        String jsonString = createGETRequestURL(activity, BW_API_PROD_HOST + "/api/v1/rates");
         JSONArray jsonArray = null;
         if (jsonString == null) return null;
         try {
@@ -180,17 +172,14 @@ private String createGETRequestURL(Context app, String myURL) {
                 Timber.i("timber: urlGET: %s resp is null", myURL);
                 return null;
             }
-            response = resp.body().string();
-            String strDate = resp.header("date");
-            if (strDate == null) {
-                Timber.i("timber: urlGET: strDate is null!");
-                return response;
-            }
-            SimpleDateFormat formatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
-            Date date = formatter.parse(strDate);
-            long timeStamp = date.getTime();
+            ///Set timestamp to prefs
+            long timeStamp = new Date().getTime();
             BRSharedPrefs.putSecureTime(app, timeStamp);
-        } catch (ParseException | IOException e) {
+
+            assert resp.body() != null;
+            response = resp.body().string();
+
+        } catch (IOException e) {
             Timber.e(e);
         } finally {
             if (resp != null) resp.close();

app/src/main/java/com/brainwallet/tools/util/BRConstants.java

@@ -98,8 +98,8 @@ private BRConstants() {
     public static final String TWITTER_LINK = "https://twitter.com/Brainwallet_App";
     public static final String INSTAGRAM_LINK = "https://www.instagram.com/brainwalletapp";
     public static final String WEB_LINK = "https://brainwallet.co";
-    public static final String TOS_LINK = "https://brainwallet.co/privacy";
-    public static String CUSTOMER_SUPPORT_LINK = "https://support.brainwallet.co/hc/en-us/requests/new";
+    public static final String TOS_LINK = "https://brainwallet.co/privacy-policy.html";
+    public static final String MOBILE_MP_LINK = "https://brainwallet.co/mobile-top-up.html";
     public static String BITREFILL_AFFILIATE_LINK = "https://www.bitrefill.com/";
 
     /**

app/src/main/java/com/brainwallet/ui/composable/MediumButton.kt

@@ -0,0 +1,54 @@
+package com.brainwallet.ui.composable
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.graphics.drawscope.ContentDrawScope
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.brainwallet.ui.screens.welcome.WelcomeScreen
+import com.brainwallet.ui.theme.BrainwalletColors
+import com.brainwallet.ui.theme.BrainwalletTheme
+
+@Composable
+fun MediumTextButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    colors: ButtonColors = ButtonDefaults.buttonColors(
+        containerColor = BrainwalletTheme.colors.surface,
+        contentColor = BrainwalletTheme.colors.content
+    ),
+    shape: Shape = ButtonDefaults.shape,
+    content: @Composable RowScope.() -> Unit
+) {
+    FilledTonalButton(
+        modifier = modifier
+            .fillMaxWidth()
+            .height(45.dp),
+        onClick = onClick,
+        colors = colors,
+        shape = shape,
+        content = content
+    )
+}
+@Preview
+@Composable
+fun MediumTextButtonPreview() {
+    MediumTextButton(
+        modifier = TODO(),
+        onClick = TODO(),
+        colors = TODO(),
+        shape = TODO(),
+        content = TODO()
+    )
+}
+

app/src/main/java/com/brainwallet/ui/screens/ready/ReadyScreen.kt

@@ -124,7 +124,7 @@ fun ReadyScreen(
 
             BorderedLargeButton(
                 onClick = {
-                    onNavigate.invoke(UiEffect.Navigate(Route.SetPasscode()))
+                   onNavigate.invoke(UiEffect.Navigate(Route.SetPasscode()))
                 },
                 modifier = Modifier.fillMaxWidth()
 
@@ -134,7 +134,6 @@ fun ReadyScreen(
                     style = MaterialTheme.typography.bodyLarge
                 )
             }
-
             Spacer(modifier = Modifier.weight(0.05f))
         }
     }