提交人：jtm

提交内容:优化显示内容

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -374,6 +374,41 @@ object DataFactory {
         EntranceType.download_new_recipes
     )
 
+
+
+    private var bgResIds1 = arrayListOf<Int>(
+        R.drawable.entrance_bg_1,
+        R.drawable.entrance_bg_3,
+        R.drawable.entrance_bg_2,
+        R.drawable.entrance_bg_4
+    )
+    private var iconResIds1 = arrayListOf<Int>(
+        R.drawable.entrance_icon_1,
+        R.drawable.entrance_icon_3,
+        R.drawable.entrance_icon_2,
+        R.drawable.entrance_icon_4
+    )
+    private var titleStrIds1 = mutableListOf<Int>(
+        R.string.automatic_recipes,
+        R.string.manual_cooking,
+        R.string.automatic_programmes,
+        R.string.download_new_recipes
+    )
+    private var title2StrIds1 = mutableListOf<Int>(
+        R.string.Automatic_recipes,
+        R.string.Manual_cooking,
+        R.string.Automatic_programmes,
+        R.string.Download_new_recipes
+    )
+
+
+    private var typeList1 = mutableListOf<EntranceType>(
+        EntranceType.automatic_recipes,
+        EntranceType.manual_cooking,
+        EntranceType.automatic_programmes,
+        EntranceType.download_new_recipes
+    )
+
     fun getEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds.indices) {
@@ -389,6 +424,23 @@ object DataFactory {
         }
         return dataList
     }
+
+
+    fun getNightEntranceData():MutableList<EntranceData>{
+        val dataList = mutableListOf<EntranceData>()
+        for (i in iconResIds1.indices) {
+            dataList.add(
+                EntranceData(
+                    bgResIds1[i],
+                    iconResIds1[i],
+                    titleStrIds1[i],
+                    title2StrIds1[i],
+                    typeList1[i]
+                )
+            )
+        }
+        return dataList
+    }
 }
 
 fun getTime(hour: Int, minute: Int): String {

BusinessCommon/src/main/res/layout/direction_view.xml

@@ -24,7 +24,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:paddingStart="@dimen/convert_60px"
-            android:text="@string/turn_left"
+            android:text="@string/turn_right"
             android:textColor="#E60012"
             android:textSize="@dimen/convert_20px" />
 
@@ -35,7 +35,7 @@
             android:layout_weight="1"
             android:gravity="center"
             android:paddingEnd="@dimen/convert_60px"
-            android:text="@string/turn_right"
+            android:text="@string/turn_left"
             android:textColor="#ffffff"
             android:textSize="@dimen/convert_20px" />
     </LinearLayout>

BusinessCommon/src/main/res/values-en/strings.xml

@@ -42,7 +42,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="adapted_cooking">ADAPTED COOKING</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">BOIL WATER</string>
-    <string name="chop">FERMENT</string>
+    <string name="chop">Chop</string>
     <string name="slow_cook">SLOW COOK</string>
     <string name="knead_dough">KNEAD DOUGH</string>
     <string name="steam">STEAM</string>

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -1,235 +1,254 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <string name="not_a_member_yet">Not a %1s yet?</string>
-    <string name="member">member</string>
-    <string name="select_language">Select Language</string>
-    <string name="next">NEXT</string>
-    <string name="english">English</string>
-    <string name="chinese">简体中文</string>
+    <string name="not_a_member_yet">Pas encore %1s?</string>
+    <string name="member">Membre</string>
+    <string name="select_language">Séléctionner la langue</string>
+    <string name="next">Suivant</string>
+    <string name="english">Anglais</string>
+    <string name="chinese">Chinois</string>
     <string name="france">Français</string>
-    <string name="japan">日本語</string>
-    <string name="skip">SKIP</string>
-    <string name="recipes">RECIPES</string>
-    <string name="mode">MODE</string>
-    <string name="sunday">Sunday</string>
-    <string name="monday">Monday</string>
-    <string name="tuesday">Tuesday</string>
-    <string name="wednesday">Wednesday</string>
-    <string name="thursday">Thursday</string>
-    <string name="friday">Friday</string>
-    <string name="saturday">Saturday</string>
-    <string name="resume">RESUME</string>
-    <string name="privacy_policy">Privacy policy</string>
+    <string name="japan">Japonais</string>
+    <string name="skip">Passer cette étape</string>
+    <string name="recipes">Recettes</string>
+    <string name="mode">Mode</string>
+    <string name="sunday">Dimanche</string>
+    <string name="monday">Lundi</string>
+    <string name="tuesday">Mardi</string>
+    <string name="wednesday">Mercredi</string>
+    <string name="thursday">Jeudi</string>
+    <string name="friday">Vendredi</string>
+    <string name="saturday">Samedi</string>
+    <string name="resume">Résumé</string>
+    <string name="privacy_policy">Politique de confidentialité</string>
     <string name="privacy_policy_content">1.How do we collect and use your personal information
-Nanfang plus client is an online information platform developed and operated by Guangdong Nanfang newspaper mobile media Co.,Ltd.(hereinafter referred to as"we").In theprocess of using the southern plus client service,we will collect the information you actively provide when using the service or arising from using the service in the following ways to provide you with services,optimize our services and ensure the security of your account.</string>
-    <string name="i_agree">I Agree</string>
-    <string name="i_have_read_the_privacy_policy">I have read the privacy policy</string>
-    <string name="second">Second</string>
-    <string name="wifi">WIFI</string>
-    <string name="off_line">OFF-LINE</string>
-    <string name="ok">OK</string>
-    <string name="on_line">ON-LINE</string>
-    <string name="pwd_can_not_be_empty">pwd can not be empty!</string>
-    <string name="skin_for_now">Skin for now</string>
-    <string name="login">Login</string>
-    <string name="online_recipes">Online Recipes</string>
-    <string name="cook_history">Cooking history</string>
-    <string name="favourite_recipes">Favourite recipes</string>
-    <string name="settings">Settings</string>
+Nanfang plus client is an online information platform developed and operated by Guangdong Nanfang newspaper mobile media Co.,Ltd.(hereinafter referred to as&quot;we&quot;).In theprocess of using the southern plus client service,we will collect the information you actively provide when using the service or arising from using the service in the following ways to provide you with services,optimize our services and ensure the security of your account.</string>
+    <string name="i_agree">J\'accepte</string>
+    <string name="i_have_read_the_privacy_policy">J\'ai lu la politique de confidentialité</string>
+    <string name="second">Secondes</string>
+    <string name="wifi">Wifi</string>
+    <string name="off_line">Wifi hors ligne</string>
+    <string name="ok">Ok</string>
+    <string name="on_line">Wifi disponible</string>
+    <string name="pwd_can_not_be_empty">Ce champs ne peut pas être vide</string>
+    <string name="skin_for_now">S\'enregistrer plus tard</string>
+    <string name="login">Identifiant</string>
+    <string name="online_recipes">Recettes en ligne</string>
+    <string name="cook_history">Historique</string>
+    <string name="favourite_recipes">Recettes favorites</string>
+    <string name="settings">Paramètres</string>
     <string name="grid_view">Grid view</string>
-    <string name="list_view">List view</string>
-    <string name="adapted_cooking">ADAPTED COOKING</string>
-    <string name="scales">SCALES</string>
+    <string name="list_view">Aperçu de la liste</string>
+    <string name="adapted_cooking">Programmes automatiques</string>
+    <string name="scales">Balance</string>
     <string name="boil_water">BOIL WATER</string>
-    <string name="chop">FERMENT</string>
-    <string name="slow_cook">SLOW COOK</string>
-    <string name="knead_dough">KNEAD DOUGH</string>
-    <string name="steam">STEAM</string>
-    <string name="food_processor">FOOD PROCESSOR</string>
-    <string name="turbo">TURBO</string>
-    <string name="language">LANGUAGE</string>
-    <string name="sound">SOUND</string>
-    <string name="brightness">BRIGHTNESS</string>
-    <string name="user_account">USER ACCOUNT</string>
-    <string name="storage">STORAGE</string>
-    <string name="reset">RESTORE FACTORY SETTINGS</string>
-    <string name="about">ABOUT</string>
-    <string name="weight">WEIGHT</string>
-    <string name="local_recipes">Local recipes</string>
-    <string name="download">Download</string>
-    <string name="downloading">Downloading</string>
-    <string name="enter_search">Enter search</string>
-    <string name="search">Search</string>
-    <string name="most_popular">Most popular</string>
-    <string name="newest">Newest</string>
-    <string name="the_most_commonly_searched">The most commonly searched</string>
-    <string name="notice">Notice</string>
-    <string name="all">ALL</string>
-    <string name="Recipes">Recipes</string>
-    <string name="ingredients">Ingredients</string>
-    <string name="Brightness">Brightness</string>
-    <string name="screen_lock_time">Screen lock time</string>
+    <string name="chop">Chop</string>
+    <string name="slow_cook">Mijoter</string>
+    <string name="knead_dough">Pétrir</string>
+    <string name="steam">Vapeur</string>
+    <string name="food_processor">Râper/trancher</string>
+    <string name="turbo">Pulse</string>
+    <string name="language">Langues</string>
+    <string name="sound">Volume</string>
+    <string name="brightness">Luminosité</string>
+    <string name="user_account">Compte utilisateur</string>
+    <string name="storage">Stokage</string>
+    <string name="reset">Réinitialiser les paramètres</string>
+    <string name="about">Mises à jour</string>
+    <string name="weight">Poids</string>
+    <string name="local_recipes">Recettes stockées</string>
+    <string name="download">Télécharger</string>
+    <string name="downloading">Téléchargement</string>
+    <string name="enter_search">Que recherchez-vous?</string>
+    <string name="search">Recherche</string>
+    <string name="most_popular">Recettes populaires</string>
+    <string name="newest">Nouvelles recettes</string>
+    <string name="the_most_commonly_searched">Recettes les plus recherchées</string>
+    <string name="notice">Notes</string>
+    <string name="all">Catégories</string>
+    <string name="Recipes">Recettes</string>
+    <string name="ingredients">Ingrédients</string>
+    <string name="Brightness">Luminosité</string>
+    <string name="screen_lock_time">Ecran en veille</string>
     <string name="time_3min">3Min</string>
-    <string name="time_5min">5Min</string>
     <string name="time_10min">10Min</string>
     <string name="time_30min">30Min</string>
     <string name="Sound">Sound</string>
-    <string name="text_to_speech">Text to speech</string>
-    <string name="Language">Language</string>
-    <string name="Continue">CONTINUE</string>
-    <string name="start_cooking">START COOKING</string>
-    <string name="off">OFF</string>
-    <string name="on">ON</string>
-    <string name="update_the_recipes">Update the recipes</string>
+    <string name="text_to_speech">Commande vocale</string>
+    <string name="Language">Langues</string>
+    <string name="Continue">Continuer</string>
+    <string name="start_cooking">C\'est parti !</string>
+    <string name="off">Off</string>
+    <string name="on">On</string>
+    <string name="update_the_recipes">Mise à jour des recettes</string>
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
-    <string name="tp">FIRMWARE</string>
-    <string name="serial_number">SN</string>
-    <string name="standby_time">MODEL</string>
-    <string name="update">Update</string>
-    <string name="About">About</string>
-    <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
-    <string name="yes">YES</string>
-    <string name="restore_factory_settings">Restore factory settings</string>
-
-    <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
-    <string name="network_wifi_status_saved">Saved</string>
-    <string name="network_wifi_status_idle" />
-    <string name="network_wifi_status_disabled">"Stopped"</string>
-    <string name="network_wifi_status_network_failure">"IP address configuration failure"</string>
-    <string name="network_wifi_status_wifi_failure">"WLAN connection failure"</string>
-    <string name="network_wifi_status_password_failure">"There is a problem with authentication"</string>
-    <string name="network_wifi_status_scanning">Scanning...</string>
-    <string name="network_wifi_status_connecting">Connecting…</string>
-    <string name="network_wifi_status_authenticating">Authentication in progress…</string>
-    <string name="network_wifi_status_obtaining_ip_address">obtaining IP address…</string>
-    <string name="network_wifi_status_connected">Connected</string>
-    <string name="network_wifi_status_suspended">Suspended</string>
-    <string name="network_wifi_status_disconnecting">Disconnecting…</string>
-    <string name="network_wifi_status_disconnected">Disconnected</string>
-    <string name="network_wifi_status_failed">Failed</string>
-    <string name="network_wifi_status_blocked">Blocked</string>
-    <string name="network_wifi_status_verifying_poor_link">Temporarily shut down (bad network condition)</string>
-    <string name="start">START</string>
-    <string name="pause">PAUSE</string>
-    <string name="cancel">CANCEL</string>
-    <string name="confirm">CONFIRM</string>
-    <string name="stop">STOP</string>
-    <string name="turn_right">TURN\nRIGHT</string>
-    <string name="turn_left">TURN\nLEFT</string>
-    <string name="temperature">TEMPERATURE</string>
-    <string name="time">TIME</string>
-    <string name="speed">SPEED</string>
-    <string name="direction">DIRECTION</string>
-    <string name="bad">Bad</string>
-    <string name="imperfect">Imperfect</string>
-    <string name="ordinary">Ordinary</string>
-    <string name="good">Good</string>
-    <string name="perfect">Perfect</string>
-    <string name="are_you_sure_to_delete">Are you sure to delete?</string>
-    <string name="no">NO</string>
-    <string name="unset_param_tips">Please set the operation parameters</string>
-    <string name="pmpt_confirm">Confirm</string>
-    <string name="pmpt_cancel">Cancel</string>
-    <string name="pmpt_msg">Tips</string>
-    <string name="dev_end_of_run_tips">Finish!</string>
-    <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
-    <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
-    <string name="update_msg">System updating, please wait～</string>
-    <string name="update_title">Is it the latest version？</string>
-    <string name="finish_download">Downloaded</string>
-    <string name="download_fail">Download failure</string>
-    <string name="start_download">Start to download</string>
-    <string name="weight_overload_tips">Weighing overload</string>
-    <string name="forgot_password">Forgotten password</string>
-    <string name="enter_email_id">Enter Email ID</string>
-    <string name="enter_password">Enter Password</string>
-    <string name="register">Register</string>
-    <string name="launch_detail">Join us today and enjoy the ultimate cooking expenence</string>
-    <string name="login_sign_up">Login / Sign up</string>
-    <string name="skip_for_now">Skip for now</string>
-    <string name="reset_password">Reset Password</string>
-    <string name="enter_captcha">Enter Captcha</string>
-    <string name="send_email">Send Email</string>
-    <string name="enter_password_again">Enter Password Again</string>
-    <string name="enter_the_captcha_obtained_from_the_mail">Enter the Captcha obtained from the mail</string>
-    <string name="nickname">Nickname</string>
-    <string name="enter_nickname">Enter Nickname</string>
-    <string name="Gender">Gender</string>
-    <string name="male">Male</string>
+    <string name="tp">TP</string>
+    <string name="serial_number">Numéro de série</string>
+    <string name="standby_time">Dernière mise à jour</string>
+    <string name="update">Mise à jour</string>
+    <string name="About">A propos du robot</string>
+    <string name="are_you_sure_to_restore_factory_settings">Etes-vous sûre de réinitialiser les paramètres?</string>
+    <string name="yes">Oui</string>
+    <string name="restore_factory_settings">Réinitialiser les paramètres</string>
+    <string name="network_wifi_status_connected_no_internet">Connecté mais le réseau est instable</string>
+    <string name="network_wifi_status_saved">Sauvegarder</string>
+    <string name="network_wifi_status_idle"/>
+    <string name="network_wifi_status_disabled">&quot;Stopped&quot;</string>
+    <string name="network_wifi_status_network_failure">&quot;IP address configuration failure&quot;</string>
+    <string name="network_wifi_status_wifi_failure">Problème de connexion</string>
+    <string name="network_wifi_status_password_failure">Problème d\'authentification</string>
+    <string name="network_wifi_status_scanning">Recherche...</string>
+    <string name="network_wifi_status_connecting">Connecté au wifi</string>
+    <string name="network_wifi_status_authenticating">Authentification en cours</string>
+    <string name="network_wifi_status_obtaining_ip_address">Récupération de l\'adresse IP</string>
+    <string name="network_wifi_status_connected">Connecté</string>
+    <string name="network_wifi_status_suspended">Connexion wifi en attente d\'un réseau</string>
+    <string name="network_wifi_status_disconnecting">Déconnexion</string>
+    <string name="network_wifi_status_disconnected">Déconnecté</string>
+    <string name="network_wifi_status_failed">Echec de connexion</string>
+    <string name="network_wifi_status_blocked">Connexion bloquée</string>
+    <string name="network_wifi_status_verifying_poor_link">Connexion momentanément interrompue (Mauvaise connexion)</string>
+    <string name="start">Départ</string>
+    <string name="pause">Pause</string>
+    <string name="cancel">Annuler</string>
+    <string name="confirm">Confirmer</string>
+    <string name="stop">Stop</string>
+    <string name="turn_right">Sens droite</string>
+    <string name="turn_left">Sens gauche</string>
+    <string name="temperature">Température</string>
+    <string name="time">Temps</string>
+    <string name="speed">Vitesse</string>
+    <string name="direction">Sens de rotation</string>
+    <string name="bad">Mauvais</string>
+    <string name="imperfect">Peu mieux faire</string>
+    <string name="ordinary">Pal mal</string>
+    <string name="good">Très bon</string>
+    <string name="perfect">Un délice</string>
+    <string name="are_you_sure_to_delete">Etes-vous sûre de vouloir supprimer?</string>
+    <string name="no">Non</string>
+    <string name="unset_param_tips">Sélectionnez vos paramètres : température, temps, vitesse></string>
+    <string name="pmpt_confirm">Confirmer</string>
+    <string name="pmpt_cancel">Annuler</string>
+    <string name="pmpt_msg">Conseil</string>
+    <string name="dev_end_of_run_tips">Bon appetit ! </string>
+    <string name="hight_temp_warning_tips">Attention, la température excède 60 degrès et la vitesse 3, êtes-vous sûre de vouloir continuer? </string>
+    <string name="hight_temp_turbo_tips">Attention, la température excède 60 degrès, vous ne pouvez pas utiliser la fonction Pulse. Merci d\'attendre que le bol refroidisse</string>
+    <string name="update_msg">Le système se met à jour, merci de patienter</string>
+    <string name="update_title">Dernière version téléchargée</string>
+    <string name="finish_download">Fin de téléchargement</string>
+    <string name="download_fail">Echec de téléchargmement</string>
+    <string name="start_download">Lancer le téléchargement</string>
+    <string name="weight_overload_tips">Charge trop importante dans le bol</string>
+    <string name="forgot_password">Mot de passe oublié</string>
+    <string name="enter_email_id">Adresse email</string>
+    <string name="enter_password">Mot de passe</string>
+    <string name="register">Vous n\'êtes pas encore membre de la communauté POWERCHEF?</string>
+    <string name="launch_detail">Rejoignez-nous et profitez d\'une expérience culinaire sublimée !</string>
+    <string name="login_sign_up">Se connecter / S\'enregistrer</string>
+    <string name="skip_for_now">S\'enregistrer plus tard</string>
+    <string name="reset_password">Réinitialiser le mot de passe</string>
+    <string name="enter_captcha">Entrer le code</string>
+    <string name="send_email">Email de confirmation envoyé</string>
+    <string name="enter_password_again">Confirmer le mot de passe</string>
+    <string name="enter_the_captcha_obtained_from_the_mail">Entrer le code reçu par email</string>
+    <string name="nickname">Pseudo</string>
+    <string name="enter_nickname">Entrez votre pseudo</string>
+    <string name="Gender">Sexe</string>
+    <string name="male">Masculin</string>
     <string name="age">Age</string>
-    <string name="save">Save</string>
-    <string name="cancellation_of_account">Cancellation of account</string>
-    <string name="sign_up_it_s_free">Sign up, it\'s FREE</string>
-    <string name="pwd_requirement">Composed of letters and numbers,with no less than 8 digits.</string>
-    <string name="please_select_age">Please select age</string>
-    <string name="cancel_lower">Cancel</string>
-    <string name="female">Female</string>
-    <string name="tare">TARE</string>
-    <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
-    <string name="reset_button">RESET</string>
-    <string name="finish">Finish!</string>
-    <string name="error">Error</string>
-    <string name="download_failed">Download failed</string>
-    <string name="warning">Warning!</string>
-    <string name="lid_unlock">Lid unlock</string>
-    <string name="share_with_more_people">Share with more people</string>
-    <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
-    <string name="enter_what_you_want_to_say">Enter what you want to say</string>
-    <string name="note_title">NOTE TITLE</string>
-    <string name="type_your_notes_here">Type your notes here</string>
+    <string name="save">Sauvegarder</string>
+    <string name="cancellation_of_account">Annulation du compte</string>
+    <string name="sign_up_it_s_free">Inscrivez-vous!C\'est gratuit !</string>
+    <string name="pwd_requirement">Le mot de passe doit être composé d\'au moins 8 lettres et chiffres</string>
+    <string name="please_select_age">Selectionnez un âge</string>
+    <string name="cancel_lower">Annuler</string>
+    <string name="female">Femme</string>
+    <string name="tare">Tare</string>
+    <string name="keep_cooking_in_the_background">Laisser l\'étape de cuisson se poursuivre?</string>
+    <string name="Reset">Remise à zéro</string>
+    <string name="finish">Souhaitez-vous mettre fin à cette action?</string>
+    <string name="error">Erreur</string>
+    <string name="download_failed">Echec de téléchargement</string>
+    <string name="warning">Attention</string>
+    <string name="lid_unlock">Couvercle mal fermé</string>
+    <string name="share_with_more_people">Partager à votre communauté</string>
+    <string name="scan_qr_code_with_camera">Scannez le QRcode avec votre smartphone</string>
+    <string name="enter_what_you_want_to_say">Ajoutez un commentaire</string>
+    <string name="note_title">Vos notes</string>
+    <string name="type_your_notes_here">Saisissez vos notes ici</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
     <string name="per_serving">Per serving</string>
-    <string name="preparation">Preparation:</string>
+    <string name="preparation">Temps de préparation : </string>
     <string name="hours">h</string>
     <string name="min">min</string>
-    <string name="ready_in">Ready in:</string>
-    <string name="jar">JAR</string>
+    <string name="ready_in">Recette prête en :</string>
+    <string name="jar">personnes</string>
     <string name="serving_sizes">Serving sizes</string>
-    <string name="score">Score</string>
-    <string name="share">Share</string>
-    <string name="delete">Delete</string>
-    <string name="recipe_update_tips">A total of {{num}} recipes have been found. Do you want to download them?</string>
-    <string name="no_recipe_update_tips">No new recipe data package \n Currently the latest version</string>
-    <string name="recipe_update_process_tips">({{progress}})Recipe data downloading…</string>
-    <string name="recipe_update_finish">Recipe data update completed</string>
-    <string name="update_recipe_title">Recipe update</string>
-    <string name="restore_confirm_tips">Are you sure to restore to the factory settings?</string>
-    <string name="change_lang_tips">The program is running, please close the program to perform this operation again!</string>
-    <string name="exit_weight_align">Exit calibration</string>
-    <string name="weight_aligning">Calibrating..</string>
-    <string name="weight_one_kg_tips">Please put on weight 1 KGS</string>
-    <string name="weight_two_kg_tips">Please put on weight 2 KGS</string>
-    <string name="weight_align_success">Calibrate successfully!</string>
-    <string name="change_lang_tips2">After switch the language, recipe languages will change at the same time and restart. Are you sure to switch the language? </string>
-    <string name="pot_clover_not_clost_tips">The lid is unlocked. Please lock the lid first and start.</string>
-    <string name="screen_saver_title">Do you want to enter the breath screen?</string>
-    <string name="sex">Sex</string>
-    <string name="wight">WEIGHT</string>
-    <string name="running_block_tips">Please stop the running program and start new programs.</string>
-    <string name="unset_target_time">Time has not been set.</string>
-    <string name="recipe_complete">RECIPE COMPLETED</string>
-    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
-    <string name="gan_sao_yi_chan">Please add water</string>
-    <string name="empty_notice">Empty Notice</string>
-    <string name="press_the_button">Press the button</string>
-    <string name="please_fill_in">Please fill in</string>
-    <string name="Password_is_not_the_same">Password is not the same</string>
-    <string name="enter">ENTER</string>
-    <string name="repeat">REPEAT</string>
-    <string name="automatic_recipes">Automatic\nrecipes</string>
-    <string name="automatic_programmes">Automatic\nProgrammes</string>
-    <string name="manual_cooking">Manual\ncooking</string>
-    <string name="download_new_recipes">Download\nnew recipes</string>
-    <string name="home">HOME</string>
-    <string name="back">BACK</string>
-    <string name="historical_search">Historical search</string>
-
-    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
-    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
-    <string name="Manual_cooking">MANUAL COOKING</string>
-    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
-
+    <string name="score">Notation de la recette</string>
+    <string name="share">Partager la recette</string>
+    <string name="delete">Supprimer la recette</string>
+    <string name="recipe_update_tips">Nous avons trouvé{{num}}  nouvelles recettes, voulez-vous les télécharger?</string>
+    <string name="no_recipe_update_tips">Il n\'y a pas de nouvelles recettes disponibles</string>
+    <string name="recipe_update_process_tips">({{progress}})Chargement des nouvelles recettes en cours</string>
+    <string name="recipe_update_finish">Toutes les nouvelles recettes sont maintenant téléchargées</string>
+    <string name="update_recipe_title">Mise à jour des recettes</string>
+    <string name="restore_confirm_tips">Etes-vous sûre de vouloir réinitialisé les paramètres de votre robot?</string>
+    <string name="change_lang_tips">Un programme de cuisson est en cours, attendez la fin du programme pour effectuer cette opération</string>
+    <string name="exit_weight_align">Sortir du calibrage de la balance</string>
+    <string name="weight_aligning">Calibrage de la balance en cours</string>
+    <string name="weight_one_kg_tips">Calibrez la balance sur 1kg</string>
+    <string name="weight_two_kg_tips">Calibrez la balance sur 2kg</string>
+    <string name="weight_align_success">La balance est calibrée avec succès !</string>
+    <string name="change_lang_tips2">Après le paramètrage de la langue, les recettes se mettrons automatiquement à jour et redémarreront. Etes-vous sûre de vouloir changer de langue?</string>
+    <string name="pot_clover_not_clost_tips">Le couvercle n\'est pas fermé. Veuillez le fermer pour continuer</string>
+    <string name="screen_saver_title">Voulez-vous mettre l\'écran en veille?</string>
+    <string name="sex">Sexe</string>
+    <string name="wight">Balance</string>
+    <string name="running_block_tips">Veuillez arrêter ce programme pour en démarrer un autre</string>
+    <string name="unset_target_time">Le temps n\'a pas été paramétré</string>
+    <string name="empty_notice">Notes vides</string>
+    <string name="app_name">Mises à jour système Android</string>
+    <string name="please_fill_in">Veuillez remplir</string>
+    <string name="Password_is_not_the_same">Le mot de passe n\'est pas le même</string>
+    <string name="enter">Entrer</string>
+    <string name="repeat">Répéter</string>
+    <string name="automatic_recipes">Recettes automatiques</string>
+    <string name="automatic_programmes">Programmes automatiques</string>
+    <string name="manual_cooking">Mode Manuel</string>
+    <string name="download_new_recipes">Nouvelles recettes</string>
+    <string name="home">Menu</string>
+    <string name="back">Retour</string>
+    <string name="historical_search">Historique de recherche</string>
+    <string name="Automatic_recipes">Recettes automatiques</string>
+    <string name="Automatic_programmes">Programmes automatiques</string>
+    <string name="Manual_cooking">Mode manuel</string>
+    <string name="Download_new_recipes">Nouvelles recettes</string>
+    <string name="press_the_button">Appuyez sur le bouton</string>
+    <string name="recipe_complete">Recette réalisée avec succès !</string>
+    <string name="engjoy_your_meal">Bon Appétit !</string>
+    <string name="gan_sao_yi_chan">Veuillez ajouter de l\'eau</string>
+    <string name="account_or_pwd_error">L\'identifiant ou le mot de passe n\'est pas correct</string>
+    <string name="login_faild">L\'identifiant ou le mot de passe n\'est pas correct</string>
+    <string name="air_fryer">AIR FRYER</string>
+    <string name="meat">MEAT</string>
+    <string name="fish">FISH</string>
+    <string name="bakc">BAKC</string>
+    <string name="drumsticks">DRUMSTICKS</string>
+    <string name="chicken_wing">CHICKEN WING</string>
+    <string name="vegetable">VEGETABLE</string>
+    <string name="shrimp">SHRIMP</string>
+    <string name="pizza">PIZZA</string>
+    <string name="dehydrate">DEHYDRATE</string>
+    <string name="confirm_change_dev_mode">Confirmez-vous vouloir changer de mode?</string>
+    <string name="water_spary">WATER SPARY</string>
+    <string name="error_pot_clover_tips">The current cooking mode is not consistent with the type of pot cover. Do you want to switch to the corresponding cooking mode?</string>
+    <string name="cook_eggs">COOK EGGS</string>
+    <string name="cook_rice">COOK RICE</string>
+    <string name="mulsify">MULSIFY</string>
+    <string name="puree">PUREE</string>
+    <string name="roast">ROAST</string>
+    <string name="smoothie">SMOOTHIE</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">AUTO CLEAN</string>
 </resources>

BusinessMain/src/main/java/com/develop/main/ui/ModeEntranceActivity.kt

@@ -122,7 +122,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                         }
                     }
                 }
-            }.models = DataFactory.getEntranceData()
+            }.models = DataFactory.getNightEntranceData()
         } else {
             binding.entranceRecycle.apply {
                 grid(2)

BusinessSetting/src/main/java/com/develop/setting/ui/LanguageActivity.kt

@@ -11,6 +11,7 @@ import androidx.appcompat.widget.AppCompatTextView
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.LanguageUtils
+import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.updateText
@@ -104,7 +105,12 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             object : CancelConfirmDialog.OnDialogClickListener {
                 override fun onConfirm() {
                     if (isLanguageTip) {
-                        updateLanguage()
+                        if (isNightTheme()) {
+                            MMkvUtils.save(CURRENT_LANGUAGE, FR)
+                            LanguageUtils.applyLanguage(Locale.FRANCE)
+                        } else {
+                            updateLanguage()
+                        }
 //                        navigateTo(Screens.Main.ENTRANCE_CHOSEN)
 //                        finish()
                         val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
@@ -129,16 +135,29 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 return@setOnClickListener
             }
             if (isFromSetting) {
-                if(binding.languageRecycle.models?.size!! > 1){
+                if (isNightTheme()) {
                     isLanguageTip = true
-                    cancelConfirmDialog.title = getString(com.develop.common.R.string.change_lang_tips2)
+                    cancelConfirmDialog.title =
+                        getString(com.develop.common.R.string.change_lang_tips2)
                     cancelConfirmDialog.showDialog(supportFragmentManager, "tips2")
-                }else{
-                    finish()
+                } else {
+                    if (binding.languageRecycle.models?.size!! > 1) {
+                        isLanguageTip = true
+                        cancelConfirmDialog.title =
+                            getString(com.develop.common.R.string.change_lang_tips2)
+                        cancelConfirmDialog.showDialog(supportFragmentManager, "tips2")
+                    } else {
+                        finish()
+                    }
                 }
 
             } else {
-                updateLanguage()
+                if (isNightTheme()) {
+                    MMkvUtils.save(CURRENT_LANGUAGE, FR)
+                    LanguageUtils.applyLanguage(Locale.FRANCE)
+                } else {
+                    updateLanguage()
+                }
                 navigateTo(Screens.Setting.POLICY)
             }
         }
@@ -160,15 +179,18 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 MMkvUtils.save(CURRENT_LANGUAGE, EN)
                 LanguageUtils.applyLanguage(Locale.ENGLISH)
             }
+
             1 -> {
                 MMkvUtils.save(CURRENT_LANGUAGE, FR)
                 LanguageUtils.applyLanguage(Locale.FRANCE)
 
             }
+
             2 -> {
                 MMkvUtils.save(CURRENT_LANGUAGE, ZH)
                 LanguageUtils.applyLanguage(Locale.CHINESE)
             }
+
             3 -> {
                 MMkvUtils.save(CURRENT_LANGUAGE, JA)
                 LanguageUtils.applyLanguage(Locale.JAPAN)
@@ -182,6 +204,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 updateSelectionPos(0)
                 0
             }
+
             ZH -> {
                 updateSelectionPos(1)
                 1
@@ -196,6 +219,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 updateSelectionPos(3)
                 3
             }
+
             else -> {
                 updateSelectionPos(0)
                 0

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -172,19 +172,15 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             it.add(binding.tvEasy)
             it.add(binding.startLayout)
         }
-        if (!isNightTheme()) {
-            allTabViews.add(binding.ivTab1)
-        } else {
-            binding.ivTab1.setGone()
-        }
         allTabViews.add(binding.ivTab2)
         allTabViews.add(binding.ivTab3)
         allTabViews.add(binding.ivTab4)
-        if (isNightTheme()) {
-            selectTab(TAB_DESC)
+        if (!isNightTheme()) {
+            allTabViews.add(binding.ivTab4)
         } else {
-            selectTab(TAB_SOURCE)
+            binding.ivTab4.setGone()
         }
+        selectTab(TAB_SOURCE)
 
     }
 

BusinessStep/src/main/res/layout/item_cook_controller.xml

@@ -159,7 +159,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingStart="@dimen/convert_60px"
-                android:text="@string/turn_left"
+                android:text="@string/turn_right"
                 android:textColor="@color/color_E60012"
                 android:textSize="@dimen/convert_20px" />
 
@@ -170,7 +170,7 @@
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingEnd="@dimen/convert_60px"
-                android:text="@string/turn_right"
+                android:text="@string/turn_left"
                 android:textColor="@color/color_E5E5E5"
                 android:textSize="@dimen/convert_20px" />
         </LinearLayout>

app/src/main/java/com/develop/foodcooking/MainActivity.kt

@@ -16,8 +16,8 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val isNight = !isNightTheme()
-        ThemeSkinService.getInstance().switchThemeSkin(if (isNight) 1 else 0)
-        setNightTheme(isNight)
+        ThemeSkinService.getInstance().switchThemeSkin(1)
+        setNightTheme(true)
         if (MMkvUtils.getBool(FIRST_IN)) {
             navigateTo(Screens.Main.ENTRANCE_CHOSEN)
         } else {