Hack to get z:Lang working again, hack is that it can only return the…

… first conditional result, irrespective of the condition result.
Keflon · Feb 26, 2024 · 2264ce8 · 2264ce8
1 parent 9ef8180
commit 2264ce8
Showing 1 changed file with 35 additions and 15 deletions.
diff --git a/FunctionZero.Maui.Controls/MarkupExtensions/BaseLanguageExtension.cs b/FunctionZero.Maui.Controls/MarkupExtensions/BaseLanguageExtension.cs
@@ -1,6 +1,7 @@
 using FunctionZero.ExpressionParserZero.BackingStore;
 using FunctionZero.ExpressionParserZero.Evaluator;
 using System.ComponentModel;
+using static System.Net.Mime.MediaTypeNames;
 
 namespace FunctionZero.Maui.MarkupExtensions
 {
@@ -62,6 +63,27 @@ object IMarkupExtension.ProvideValue(IServiceProvider serviceProvider)
         public static readonly BindableProperty LookupProperty =
             BindableProperty.CreateAttached("Lookup", typeof(List<List<(ExpressionTree, string)>>), typeof(Element), null, BindingMode.OneWay, null, LookupPropertyChanged);
 
+        //private static void LookupPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+        //{
+        //    var langHost = GetLangHost(bindable);
+
+        //    List<List<(ExpressionTree, string)>> lookup = GetLookup(bindable);
+        //    if (lookup != null)
+        //    {
+        //        string to = "???";
+        //        if (lookup.Count > (int)(object)langHost.TextId)
+        //        {
+        //            List<(ExpressionTree, string)> thing =  lookup[(int)(object)langHost.TextId];
+        //            to = lookup[(int)(object)langHost.TextId];
+        //        }
+        //        if (langHost.ShowOff)
+        //            CrossFadeText(langHost, to);
+        //        else
+        //            langHost.Text = GetLookup(bindable)[(int)(object)langHost.TextId];
+
+        //    }
+        //}
+
         private static void LookupPropertyChanged(BindableObject bindable, object oldValue, object newValue)
         {
             var langHost = GetLangHost(bindable);
@@ -72,30 +94,28 @@ private static void LookupPropertyChanged(BindableObject bindable, object oldVal
                 string to = "???";
                 if (lookup.Count > (int)(object)langHost.TextId)
                 {
-                    List<(ExpressionTree, string)> thing =  lookup[(int)(object)langHost.TextId];
+                    List<(ExpressionTree, string)> thing = lookup[(int)(object)langHost.TextId];
 
 
 
 
-                        foreach ((ExpressionTree, string) item in thing)
-                        {
-                            var result = item.Item1.Evaluate(host).Pop();
-                            if (result.Type == ExpressionParserZero.Operands.OperandType.Bool)
-                                if ((bool)result.GetValue() == true)
-                                    return item.Item2;
-                        }
-                        return $"textId {textId} not found.";
+                    foreach ((ExpressionTree, string) item in thing)
+                    {
+                        langHost.Text = item.Item2;
+                        return;
 
+                        //var result = item.Item1.Evaluate(host).Pop();
+                        //if (result.Type == ExpressionParserZero.Operands.OperandType.Bool)
+                        //    if ((bool)result.GetValue() == true)
+                        //        return item.Item2;
+                    }
+                    //return $"textId {textId} not found.";
 
 
 
-                    to = lookup[(int)(object)langHost.TextId];
-                }
-                if (langHost.ShowOff)
-                    CrossFadeText(langHost, to);
-                else
-                    langHost.Text = GetLookup(bindable)[(int)(object)langHost.TextId];
 
+                    //to = lookup[(int)(object)langHost.TextId];
+                }
             }
         }