From 8620028afe3a7e744d0723d076b4038dad846d93 Mon Sep 17 00:00:00 2001
From: William Jordan-Cooley
 <williamjordan-cooley@Williams-MacBook-Pro-3.local>
Date: Mon, 15 Jan 2024 17:12:50 -0500
Subject: [PATCH] simplifying language model

---
 lib/pangea/config/environment.dart                 |  2 +-
 .../controllers/language_list_controller.dart      |  8 ++++----
 lib/pangea/models/language_model.dart              | 14 ++------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lib/pangea/config/environment.dart b/lib/pangea/config/environment.dart
index e55f66423..b33854fd7 100644
--- a/lib/pangea/config/environment.dart
+++ b/lib/pangea/config/environment.dart
@@ -27,7 +27,7 @@ class Environment {
   }
 
   static String get choreoApi {
-    // return "http://localhost:8000/choreo";
+    return "http://localhost:8000/choreo";
     return dotenv.env['CHOREO_API'] ?? 'Not found';
   }
 
diff --git a/lib/pangea/controllers/language_list_controller.dart b/lib/pangea/controllers/language_list_controller.dart
index ef86fead9..087c1804f 100644
--- a/lib/pangea/controllers/language_list_controller.dart
+++ b/lib/pangea/controllers/language_list_controller.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 import 'dart:developer';
 
-import 'package:flutter/foundation.dart';
-
 import 'package:fluffychat/pangea/constants/language_keys.dart';
 import 'package:fluffychat/pangea/models/language_model.dart';
 import 'package:fluffychat/pangea/repo/language_repo.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
+import 'package:flutter/foundation.dart';
+
 import '../constants/language_list_keys.dart';
 import '../utils/shared_prefs.dart';
 
@@ -20,10 +20,10 @@ class PangeaLanguage {
   List<LanguageModel> get langList => _langList;
 
   List<LanguageModel> get targetOptions =>
-      _langList.where((element) => element.languageType == 2).toList();
+      _langList.where((element) => element.l2).toList();
 
   List<LanguageModel> get baseOptions =>
-      _langList.where((element) => element.languageType == 1).toList();
+      _langList.where((element) => element.l1).toList();
 
   static Future<void> initialize() async {
     try {
diff --git a/lib/pangea/models/language_model.dart b/lib/pangea/models/language_model.dart
index d7b6409b5..24090c60e 100644
--- a/lib/pangea/models/language_model.dart
+++ b/lib/pangea/models/language_model.dart
@@ -1,16 +1,14 @@
 import 'dart:developer';
 
+import 'package:fluffychat/pangea/constants/language_keys.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import 'package:fluffychat/pangea/constants/language_keys.dart';
 import '../utils/error_handler.dart';
 
 class LanguageModel {
   final String langCode;
-  final int languageType;
   final String languageFlag;
   final String displayName;
   final bool l2;
@@ -18,7 +16,6 @@ class LanguageModel {
 
   LanguageModel({
     required this.langCode,
-    required this.languageType,
     required this.languageFlag,
     required this.displayName,
     required this.l2,
@@ -34,10 +31,6 @@ class LanguageModel {
 
     return LanguageModel(
       langCode: code,
-      languageType: json['language_type'] is String &&
-              (json['language_type'] as String).isNotEmpty
-          ? int.parse(json['language_type'])
-          : json['language_type'],
       languageFlag: json['language_flag'] ?? "",
       displayName: _LanguageLocal.getDisplayName(
         code != LanguageKeys.unknownLanguage ? code : json['language_name'],
@@ -50,7 +43,6 @@ class LanguageModel {
   toJson() => {
         'language_code': langCode,
         'language_name': displayName,
-        'language_type': languageType,
         'language_flag': languageFlag,
         'l2': l2,
         'l1': l1,
@@ -75,7 +67,6 @@ class LanguageModel {
   //PTODO - add flag for unknown
   static LanguageModel get unknown => LanguageModel(
         langCode: LanguageKeys.unknownLanguage,
-        languageType: 1,
         languageFlag: "",
         displayName: "Unknown",
         l2: false,
@@ -90,11 +81,10 @@ class LanguageModel {
         l1: false,
         langCode: LanguageKeys.multiLanguage,
         languageFlag: 'assets/colors.png',
-        languageType: 3,
       );
 
   // Discuss with Jordan
-  bool get hasContextualDefinitionSupport => languageType == 2;
+  bool get hasContextualDefinitionSupport => l2;
 
   String? getDisplayName(BuildContext context) {
     switch (langCode) {