IOS Username, Password, Payment and Device Linking flow

.gitignore

@@ -85,3 +85,4 @@ liblantern_amd64.dylib
 lib/generated_bindings.dart
 
 *.env
+ExportOptions.plist

.tx/config

@@ -12,9 +12,8 @@ lang_map     = zh-Hant: zh-rHK, bn_IN: bn-rIN, bg_BG: bg-rBG, ku_IQ: ku-rIQ, pl_
 
 [o:lantern-1:p:lantern:r:lantern-flutter]
 file_filter  = assets/locales/<lang>.po
-source_file  = assets/locales/en.po
+source_file  = assets/locales/en-us.po
 source_lang  = en_US
 type         = PO
 minimum_perc = 80
-lang_map     = hi_IN: hi-in, zh_CN: zh-cn, zh_HK: zh-hk, ru_RU: ru-ru, fa_IR: fa-ir, es_CU: es-cu, es_EU: es-es, fr_FR: fr-fr, fr_CA: fr-ca
-
+lang_map     = hi_IN: hi-in, zh_CN: zh-cn, zh_HK: zh-hk, ru_RU: ru-ru, fa_IR: fa-ir, es_CU: es-cu, es: es-es, fr_FR: fr-fr, fr_CA: fr-ca, ar: ar-eg, ur: ur-in, vi: vi-vn, tr: tr-tr, th: th-th, bn: bn-bd, my: my-mm, ms: ms-my

Makefile

@@ -29,6 +29,9 @@ internalsdk/protos/%.pb.go: protos_shared/%.proto
 internalsdk/protos/vpn.pb.go: protos_shared/vpn.proto
 	@protoc --go_out=internalsdk protos_shared/vpn.proto
 
+internalsdk/protos/auth.pb.go: protos_shared/auth.proto
+	@protoc --go_out=internalsdk protos_shared/auth.proto
+
 # Compiles autorouter routes
 routes: lib/core/router/router.gr.dart
 
@@ -462,6 +465,10 @@ set-version:
 
 
 ios-release:set-version guard-SENTRY_AUTH_TOKEN guard-SENTRY_ORG guard-SENTRY_PROJECT_IOS build-framework
+	@echo "Flutter Clean"
+	flutter clean
+	@echo "Flutter pub get"
+	flutter pub get
 	@echo "Creating the Flutter iOS build..."
 	flutter build ipa --flavor prod --release --export-options-plist ./ExportOptions.plist
 	@echo "Uploading debug symbols to Sentry..."
@@ -692,6 +699,21 @@ build-framework: assert-go-version install-gomobile
 	mkdir -p $(INTERNALSDK_FRAMEWORK_DIR)
 	mv ./$(INTERNALSDK_FRAMEWORK_NAME) $(INTERNALSDK_FRAMEWORK_DIR)/$(INTERNALSDK_FRAMEWORK_NAME)
 
+build-release-framework: assert-go-version install-gomobile
+	@echo "Nuking $(INTERNALSDK_FRAMEWORK_DIR) and $(MINISQL_FRAMEWORK_DIR)"
+	rm -Rf $(INTERNALSDK_FRAMEWORK_DIR) $(MINISQL_FRAMEWORK_DIR)
+	@echo "generating Ios.xcFramework"
+	go env -w 'GOPRIVATE=github.com/getlantern/*' && \
+	gomobile init && \
+	gomobile bind -target=ios \
+	-tags='headless lantern ios netgo' \
+	-ldflags="$(LDFLAGS)"  \
+    		$(GOMOBILE_EXTRA_BUILD_FLAGS) \
+    		github.com/getlantern/lantern-client/internalsdk github.com/getlantern/pathdb/testsupport github.com/getlantern/pathdb/minisql github.com/getlantern/lantern-client/internalsdk/ios
+	@echo "moving framework"
+	mkdir -p $(INTERNALSDK_FRAMEWORK_DIR)
+	mv ./$(INTERNALSDK_FRAMEWORK_NAME) $(INTERNALSDK_FRAMEWORK_DIR)/$(INTERNALSDK_FRAMEWORK_NAME)
+
 
 install-gomobile:
 	@echo "installing gomobile" && \

android/app/src/main/java/org/getlantern/lantern/model/ProPlan.java

@@ -292,7 +292,7 @@ public String getFormattedPrice(Map<String, Long> price) {
         return getFormattedPrice(price, false);
     }
 
-    private String getFormattedPrice(Map<String, Long> price, boolean formatFloat) {
+    private String  getFormattedPrice(Map<String, Long> price, boolean formatFloat) {
         final String formattedPrice;
         Long currencyPrice = price.get(currencyCode);
         if (currencyPrice == null) {