chore: solve conflicts

Author: asdolo

.github/workflows/expo-doctor.yml

@@ -44,28 +44,14 @@ jobs:
       - name: 📦 Setup Node + PNPM + install deps
         uses: ./.github/actions/setup-node-pnpm-install
 
-<<<<<<< HEAD
       - name: 🚑 Run Doctor Checks
         run: |
           chmod +x .github/scripts/expo-doctor.sh
-=======
-      - name: Run prebuild
-        run: pnpm run prebuild
-
-      - name: 🚑 Run Doctor Checks
-        run: |
-          chmod +x .github/scripts/expo-doctor.sh
-          rm -rf ios android
->>>>>>> c7bb80d
           .github/scripts/expo-doctor.sh
 
       - name: Add doctor report as comment on PR
         if: github.event_name == 'pull_request' && always()
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           header: expo-doctor
-<<<<<<< HEAD
-          path: .expo/expo-doctor.md
-=======
           path: .expo/expo-doctor.md
->>>>>>> c7bb80d

.husky/pre-commit

@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> c7bb80d
 . "$(dirname "$0")/common.sh"
 
 

.prettierrc.js

@@ -2,10 +2,6 @@
 const config = {
   singleQuote: true,
   endOfLine: 'auto',
-<<<<<<< HEAD
-=======
-  trailingComma: 'es5',
->>>>>>> c7bb80d
 };
 
 module.exports = config;

README.md

@@ -39,7 +39,6 @@ This template brings several key advantages. It provides our team with a consist
 - 🎯 Localization with [i18next](https://www.i18next.com/), along with Eslint for validation.
 - Unit testing with [Jest](https://jestjs.io/) and [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/) setup to help you write tests for your app.
 
-<<<<<<< HEAD
 ## ✍️ Documentation 🚧 UNDER CONSTRUCTION 🚧
 
 - [Create new project ](https://rootstrap.github.io/react-native-template/getting-started/create-new-app/)
@@ -51,37 +50,6 @@ This template brings several key advantages. It provides our team with a consist
 - [Forms](https://rootstrap.github.io/react-native-template/ui-and-theme/forms/)
 - [Data fetching](https://rootstrap.github.io/react-native-template/guides/data-fetching/)
 - [Contribute to starter](https://rootstrap.github.io/react-native-template/how-to-contribute/)
-=======
-## Is this starter for me?
-
-Yes 😀
-
-This starter kit is designed to benefit a wide range of React Native developers, from beginners to experienced professionals. Here's why it might be a good fit for you:
-
-1. **For beginners:** It provides a solid foundation with best practices and common solutions, helping you learn industry-standard approaches to React Native development.
-
-2. **For experienced developers:** It offers a well-structured, production-ready setup that can save you time and effort in project initialization and configuration.
-
-3. **For teams:** It ensures consistency across projects and team members, making it easier to onboard new developers and maintain code quality.
-
-4. **For explorers:** Even if you prefer not to use starter kits, this project can serve as a valuable reference. You can explore the codebase, documentation, and architectural decisions to gain insights and potentially adopt specific solutions for your projects.
-
-5. **For learners:** The starter kit incorporates up-to-date libraries and patterns, allowing you to familiarize yourself with current best practices in the React Native ecosystem.
-
-6. **For AI-assisted development:** This starter kit works well with AI coding tools. It provides a solid structure and best practices that can guide AI-generated code. This helps ensure that AI assistance leads to high-quality, maintainable code that fits well within your project.
-
-Remember, you don't have to use the entire starter kit as-is. Feel free to cherry-pick ideas, configurations, or code snippets that align with your project needs. Whether you're building a new app from scratch or looking to improve your existing development process, this starter kit can provide valuable insights and practical solutions.
-
-## Why Expo and not React Native CLI?
-
-We have been using Expo as our main framework since the introduction of [Continuous Native Generation (CNG)](https://docs.expo.dev/workflow/continuous-native-generation/) concept and we are happy with the experience.
-
-I think this question is not valid anymore, especially after the last React conference when the core React native team recommended using Expo for new projects.
-
-> "As of today, the only recommended community framework for React Native is Expo. Folks at Expo have been investing in the React Native ecosystem since the early days of React Native and as of today, we believe the developer experience offered by Expo is best in class." React native core team
-
-Still hesitating? Check out this [article](https://reactnative.dev/blog/2024/06/25/use-a-framework-to-build-react-native-apps) or this [video](https://www.youtube.com/watch?v=lifGTznLBcw), maybe this one [video](https://www.youtube.com/watch?v=ek_IdGC0G80) too.
->>>>>>> c7bb80d
 
 ## 🧑‍💻 Stay up to date
 

__mocks__/expo-localization.ts

@@ -2,7 +2,6 @@ export const locale = 'en-US';
 export const locales = ['en-US'];
 export const timezone = 'UTC';
 export const isRTL = false;
-<<<<<<< HEAD
 
 export const getLocales = () => [
   {
@@ -17,5 +16,3 @@ export const getLocales = () => [
     regionCode: 'US',
   },
 ];
-=======
->>>>>>> c7bb80d

app.config.ts

@@ -42,13 +42,8 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   ios: {
     supportsTablet: true,
     bundleIdentifier: Env.BUNDLE_ID,
-<<<<<<< HEAD
     config: {
       usesNonExemptEncryption: false,
-=======
-    infoPlist: {
-      ITSAppUsesNonExemptEncryption: false,
->>>>>>> c7bb80d
     },
   },
   experiments: {
@@ -69,11 +64,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     [
       'expo-splash-screen',
       {
-<<<<<<< HEAD
         backgroundColor: '#000000',
-=======
-        backgroundColor: '#2E3C4B',
->>>>>>> c7bb80d
         image: './assets/splash-icon.png',
         imageWidth: 150,
       },

docs/astro.config.mjs

@@ -8,18 +8,11 @@ const base = 'react-native-template';
 
 // https://astro.build/config
 export default defineConfig({
-<<<<<<< HEAD
   site,
   base,
   integrations: [
     starlight({
       title: 'Rootstrap React Native Template',
-=======
-  site: 'https://starter.obytes.com/',
-  integrations: [
-    starlight({
-      title: 'Obytes Starter | React Native Template',
->>>>>>> c7bb80d
       plugins: [starlightLlmsTxt()],
       description: `Your All-in-One Solution for Building Outstanding React Native/Expo Apps. From editor setup to store submission, we've got you covered!`,
       expressiveCode: {