fix: not centered buttons (#510)

SocialGouv · Dec 21, 2023 · 86cb740 · 86cb740
1 parent c31373d
commit 86cb740
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 14 deletions.
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -99,7 +99,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 227
+        versionCode 228
         versionName "1.23.0"
     }
 

diff --git a/app/app.json b/app/app.json
@@ -2,7 +2,9 @@
   "name": "oz_ensemble",
   "displayName": "Oz Ensemble",
   "version": {
-    "buildNumber": 227,
+    "buildNumber": 228,
+
     "buildName": "1.23.0"
+
   }
 }
diff --git a/app/ios/oz_ensemble.xcodeproj/project.pbxproj b/app/ios/oz_ensemble.xcodeproj/project.pbxproj
@@ -503,7 +503,7 @@
 				CODE_SIGN_ENTITLEMENTS = oz_ensemble/oz_ensemble.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 228;
 				DEVELOPMENT_TEAM = 76GBKHVK25;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = oz_ensemble/Info.plist;
@@ -512,7 +512,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.22.2;
+				MARKETING_VERSION = 1.23.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -537,7 +537,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 226;
+				CURRENT_PROJECT_VERSION = 228;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 76GBKHVK25;
 				INFOPLIST_FILE = oz_ensemble/Info.plist;
@@ -546,7 +546,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.22.2;
+				MARKETING_VERSION = 1.23.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/app/src/components/Calendar.js b/app/src/components/Calendar.js
@@ -326,7 +326,7 @@ const Calendar = ({ onScrollToDate, selectedMonth }) => {
         </View>
       </View>
       {isAbstinent && (
-        <View className="flex flex-row justify-start bg-[#FEF0D6] py-3 mx-8 rounded-lg">
+        <View className="flex flex-row justify-start bg-[#FEF0D6] py-2 mx-8 rounded-lg">
           <View className="ml-2">
             <LegendStar size={fontSize * 1.5} />
           </View>

diff --git a/app/src/scenes/Gains/AbstinenceSelection.js b/app/src/scenes/Gains/AbstinenceSelection.js
@@ -3,7 +3,8 @@ import { View, Text, SafeAreaView, TouchableOpacity, Dimensions } from 'react-na
 
 import { storage } from '../../services/storage';
 
-const AbstinenceSelection = ({ navigation }) => {
+const AbstinenceSelection = ({ navigation, route }) => {
+  const isFromInfo = route?.name.includes('ABSTINENCE_SELECTION');
   const onClose = () => {
     navigation.goBack();
   };
@@ -17,24 +18,32 @@ const AbstinenceSelection = ({ navigation }) => {
       <View className="bg-white rounded-xl mx-5">
         <View className=" flex w-full mb-2 px-2">
           <Text className="text-center mb-3 text-xl mt-8 px-2 font-extrabold">Compteur d'abstinence</Text>
-          <Text className="line text-lg text-justify  color-black mb-5 mx-6 mt-2">
-            Il sera affiché sous votre calendrier et vous permettra de suivre vos jours consécutifs sans consommation
-            d'alcool si vous avez fait le choix d'être abstinent.
-          </Text>
+          {isFromInfo && (
+            <Text className="line text-lg text-justify  color-black mb-5 mx-6 mt-2">
+              Il sera affiché sous votre calendrier et vous permettra de suivre vos jours consécutifs sans consommation
+              d'alcool si vous avez fait le choix d'être abstinent.
+            </Text>
+          )}
+          {!isFromInfo && (
+            <Text className="line text-lg text-justify  color-black mb-5 mx-6 mt-2">
+              Il vous permettra de suivre vos jours consécutifs sans consommation d’alcool si vous avez fait le choix
+              d’être abstinent. Vous pourrez toujours modifier ce choix dans l’onglet Infos.
+            </Text>
+          )}
           <Text className=" text-center mb-1 text-xl px-2 font-bold">
             Voulez-vous activer le compteur d'abstinence ?
           </Text>
           <View className="flex flex-row justify-center p-2 mb-6 mt-2">
             <TouchableOpacity
-              className="justify-center  items-center rounded-3xl h-12 w-24 bg-[#DE285E] mr-6"
+              className="justify-center  items-center rounded-3xl h-12 w-24 bg-[#4030A5] "
               onPress={() => {
                 onClose();
                 storage.set('@isAbstinent', true);
               }}>
               <Text className="text-xl color-white font-extrabold">Oui</Text>
             </TouchableOpacity>
             <TouchableOpacity
-              className="justify-center  items-center rounded-3xl h-12 w-24 bg-[#4030A5] mr-6"
+              className="justify-center  items-center rounded-3xl h-12 w-24 bg-[#DE285E] ml-7"
               onPress={() => {
                 onClose();
                 storage.set('@isAbstinent', false);