Skip to content

Commit

Permalink
chore: upgrade full project
Browse files Browse the repository at this point in the history
  • Loading branch information
vijaygojiya committed Sep 17, 2024
1 parent 0d4a4b9 commit 201ae2e
Show file tree
Hide file tree
Showing 56 changed files with 9,755 additions and 12,171 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,5 @@ yarn-error.log

#firebase config
GoogleService-Info.plist
google-services.json
google-services.json
.env
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
25 changes: 13 additions & 12 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.grad
*/
react {
/* Folders */
// The root of your project, i.e. where "package.json" lives. Default is '..'
// root = file("../")
// The folder where the react-native NPM package is. Default is ../node_modules/react-native
// reactNativeDir = file("../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
// codegenDir = file("../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
// cliFile = file("../node_modules/react-native/cli.js")
// The root of your project, i.e. where "package.json" lives. Default is '../..'
// root = file("../../")
// The folder where the react-native NPM package is. Default is ../../node_modules/react-native
// reactNativeDir = file("../../node_modules/react-native")
// The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
// codegenDir = file("../../node_modules/@react-native/codegen")
// The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
// cliFile = file("../../node_modules/react-native/cli.js")

/* Variants */
// The list of variants to that are debuggable. For those we're going to
Expand Down Expand Up @@ -51,6 +51,9 @@ react {
//
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
// hermesFlags = ["-O", "-output-source-map"]

/* Autolinking */
autolinkLibrariesWithApp()
}

/**
Expand Down Expand Up @@ -91,7 +94,7 @@ android {
keyAlias 'androiddebugkey'
keyPassword 'android'
}

release {
storeFile file("keystore.jks")
storePassword System.getenv("SIGNING_STORE_PASSWORD")
Expand All @@ -103,7 +106,7 @@ android {
debug {
signingConfig signingConfigs.debug
}

release {
// Caution! In production, you need to generate your own keystore file.
// see https://reactnative.dev/docs/signed-apk-android.
Expand All @@ -124,5 +127,3 @@ dependencies {
implementation jscFlavor
}
}

apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
70 changes: 37 additions & 33 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />

<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".MainApplication"
<application
android:name=".MainApplication"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme"
android:supportsRtl="true">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:exported="true"
android:theme="@style/BootTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize"
android:exported="true"
android:theme="@style/BootTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />
<activity
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/FB_LOGIN_PROTOCOL" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/FB_LOGIN_PROTOCOL" />
</intent-filter>
</activity>
<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/FB_APP_ID"/>
<meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/FB_CLIENT_TOKEN"/>
</application>
</activity>
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/FB_APP_ID" />
<meta-data
android:name="com.facebook.sdk.ClientToken"
android:value="@string/FB_CLIENT_TOKEN" />
</application>
</manifest>
Binary file modified android/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions android/app/src/main/java/com/coursify/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import com.zoontek.rnbootsplash.RNBootSplash;
class MainActivity : ReactActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
RNBootSplash.init(this, R.style.BootTheme);
super.onCreate(savedInstanceState); // super.onCreate(null) with react-native-screens
RNBootSplash.init(this, R.style.BootTheme);
super.onCreate(savedInstanceState);
}
/**
* Returns the name of the main component registered from JavaScript. This is used to schedule
Expand Down
Binary file modified android/app/src/main/res/drawable-hdpi/bootsplash_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-mdpi/bootsplash_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xhdpi/bootsplash_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/drawable-xxxhdpi/bootsplash_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 16 additions & 9 deletions android/app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="123"
android:viewportHeight="140">
<group android:scaleX="0.4305"
android:scaleY="0.49"
android:translateX="35.02425"
android:translateY="35.7">
<path
android:pathData="M122.82,49.61H93.73C93.2,45.85 92.11,42.51 90.48,39.59C88.84,36.62 86.74,34.1 84.17,32.02C81.6,29.93 78.63,28.34 75.27,27.23C71.95,26.13 68.34,25.57 64.45,25.57C57.41,25.57 51.27,27.32 46.05,30.82C40.83,34.27 36.78,39.32 33.9,45.96C31.02,52.56 29.58,60.57 29.58,70C29.58,79.7 31.02,87.84 33.9,94.44C36.82,101.03 40.89,106.01 46.12,109.38C51.34,112.74 57.38,114.43 64.25,114.43C68.1,114.43 71.66,113.92 74.94,112.9C78.26,111.88 81.2,110.4 83.77,108.45C86.34,106.46 88.46,104.04 90.14,101.21C91.87,98.38 93.07,95.15 93.73,91.52L122.82,91.65C122.06,97.89 120.18,103.91 117.17,109.71C114.21,115.47 110.2,120.62 105.15,125.18C100.15,129.7 94.17,133.29 87.22,135.94C80.32,138.55 72.5,139.86 63.78,139.86C51.65,139.86 40.8,137.12 31.24,131.63C21.72,126.14 14.2,118.19 8.66,107.79C3.17,97.38 0.43,84.79 0.43,70C0.43,55.17 3.22,42.55 8.8,32.15C14.38,21.74 21.95,13.82 31.51,8.38C41.07,2.89 51.83,0.14 63.78,0.14C71.66,0.14 78.97,1.25 85.7,3.46C92.47,5.67 98.47,8.91 103.69,13.16C108.92,17.36 113.17,22.52 116.44,28.63C119.76,34.74 121.89,41.73 122.82,49.61Z"
android:fillColor="#ffffff"/>
android:viewportWidth="512"
android:viewportHeight="512">
<group android:scaleX="0.69"
android:scaleY="0.69"
android:translateX="79.36"
android:translateY="79.36">
<group>
<clip-path
android:pathData="M8,0L504,0A8,8 0,0 1,512 8L512,504A8,8 0,0 1,504 512L8,512A8,8 0,0 1,0 504L0,8A8,8 0,0 1,8 0z"/>
<path
android:pathData="M8,0L504,0A8,8 0,0 1,512 8L512,504A8,8 0,0 1,504 512L8,512A8,8 0,0 1,0 504L0,8A8,8 0,0 1,8 0z"
android:fillColor="#0CA190"/>
<path
android:pathData="M415.99,202.34H340.09C338.7,192.52 335.87,183.8 331.6,176.18C327.32,168.44 321.83,161.85 315.13,156.42C308.43,150.99 300.69,146.83 291.91,143.94C283.25,141.05 273.83,139.61 263.67,139.61C245.29,139.61 229.29,144.17 215.66,153.3C202.03,162.31 191.46,175.48 183.95,192.81C176.44,210.03 172.68,230.94 172.68,255.54C172.68,280.85 176.44,302.1 183.95,319.32C191.57,336.53 202.2,349.53 215.84,358.31C229.47,367.09 245.24,371.48 263.14,371.48C273.2,371.48 282.5,370.15 291.05,367.49C299.71,364.84 307.39,360.97 314.09,355.88C320.8,350.68 326.34,344.39 330.73,336.99C335.24,329.6 338.36,321.17 340.09,311.69L415.99,312.04C414.03,328.33 409.12,344.04 401.26,359.18C393.52,374.2 383.07,387.65 369.89,399.55C356.84,411.34 341.24,420.7 323.11,427.63C305.08,434.44 284.69,437.85 261.93,437.85C230.28,437.85 201.97,430.69 177.02,416.36C152.18,402.04 132.54,381.3 118.1,354.15C103.77,327 96.61,294.13 96.61,255.54C96.61,216.84 103.89,183.92 118.44,156.77C133,129.62 152.76,108.94 177.71,94.73C202.66,80.4 230.74,73.24 261.93,73.24C282.5,73.24 301.56,76.13 319.12,81.9C336.8,87.68 352.45,96.11 366.08,107.21C379.71,118.18 390.81,131.64 399.36,147.58C408.02,163.53 413.57,181.78 415.99,202.34Z"
android:fillColor="#ffffff"/>
</group>
</group>
</vector>
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Binary file not shown.
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<color name="bootsplash_background">#FFFFFF</color>
<color name="bootsplash_background">#ffffff</color>
</resources>
14 changes: 6 additions & 8 deletions android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
</style>
<!-- BootTheme should inherit from Theme.BootSplash or Theme.BootSplash.EdgeToEdge -->
<style name="BootTheme" parent="Theme.BootSplash">
<item name="bootSplashBackground">@color/bootsplash_background</item>
<item name="bootSplashLogo">@drawable/bootsplash_logo</item>
<item name="postBootSplashTheme">@style/AppTheme</item>
</style>

<style name="BootTheme" parent="Theme.BootSplash">
<item name="bootSplashBackground">@color/bootsplash_background</item>
<item name="bootSplashLogo">@drawable/bootsplash_logo</item>
<item name="postBootSplashTheme">@style/AppTheme</item>
</style>
</resources>
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
compileSdkVersion = 34
targetSdkVersion = 34
ndkVersion = "26.1.10909125"
kotlinVersion = "1.9.22"
kotlinVersion = "1.9.24"
googlePlayServicesAuthVersion = "21.2.0"
}
repositories {
Expand All @@ -16,7 +16,7 @@ buildscript {
classpath("com.android.tools.build:gradle")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
classpath 'com.google.gms:google-services:4.4.1'
classpath("com.google.gms:google-services:4.4.2")
}
}

Expand Down
2 changes: 0 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

# Use this property to specify which architecture you want to build.
# You can also override it from the CLI using
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
4 changes: 3 additions & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
plugins { id("com.facebook.react.settings") }
extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
rootProject.name = 'Coursify'
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':app'
includeBuild('../node_modules/@react-native/gradle-plugin')
Binary file added assets/bootsplash/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bootsplash/logo@1,5x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bootsplash/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bootsplash/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/bootsplash/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/bootsplash/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"background": "#ffffff",
"logo": {
"width": 100,
"height": 100
}
}
18 changes: 8 additions & 10 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ module.exports = {
presets: ['module:@react-native/babel-preset'],
plugins: [
[
'module-resolver',
{
root: ['./src'],
extensions: ['.js', '.json'],
alias: {
'@': './src',
},
'module-resolver',
{
root: ['./src'],
extensions: ['.js', '.json'],
alias: {
'@': './src',
},
],
'inline-dotenv',
'react-native-reanimated/plugin',
},
],
'react-native-reanimated/plugin'],
};
Loading

0 comments on commit 201ae2e

Please sign in to comment.