Skip to content

Commit

Permalink
Fix AndroidManifest.xml namespace deprecation warning
Browse files Browse the repository at this point in the history
  • Loading branch information
zoontek committed Jan 7, 2024
1 parent 0a51161 commit c09f788
Show file tree
Hide file tree
Showing 27 changed files with 397 additions and 668 deletions.
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
const path = require("path");

module.exports = {
root: true,
ignorePatterns: ["dist", "example", ".eslintrc.js", "react-native.config.js"],
parser: "@typescript-eslint/parser",
plugins: ["@typescript-eslint", "react-hooks"],

Expand Down
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# Windows files should use crlf line endings
# https://help.github.com/articles/dealing-with-line-endings/
*.bat text eol=crlf
*.pbxproj -text
21 changes: 21 additions & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Verify

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
prepack:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: lts/*

- run: yarn install --frozen-lockfile
- run: yarn prepack
21 changes: 3 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,18 @@ node_modules/
npm-debug.log
yarn-error.log

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/

**/fastlane/report.xml
**/fastlane/Preview.html
**/fastlane/screenshots
**/fastlane/test_output

# Bundle artifact
*.jsbundle

# Ruby / CocoaPods
example/ios/Pods/
example/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# testing
/coverage

# Bob
dist/

# CLI paid addon
src/addon

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*
4 changes: 0 additions & 4 deletions .hooks/pre-commit

This file was deleted.

6 changes: 6 additions & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,15 @@ android {

if (project.android.hasProperty("namespace")) {
namespace "com.zoontek.rnbootsplash"

buildFeatures {
buildConfig true
}
sourceSets {
main {
manifest.srcFile "src/main/AndroidManifestNew.xml"
}
}
}
defaultConfig {
buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
Expand Down
3 changes: 3 additions & 0 deletions android/src/main/AndroidManifestNew.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
1 change: 0 additions & 1 deletion android/src/main/res/anim/bootsplash_fade_out.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:interpolator/accelerate_quad"
android:fromAlpha="1.0"
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/drawable-v23/compat_splash_screen.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
<item android:gravity="fill">
<color android:color="?attr/bootSplashBackground" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
<item android:gravity="fill">
<color android:color="?attr/bootSplashBackground" />
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/drawable/compat_splash_screen.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
<item android:gravity="fill">
<color android:color="?attr/bootSplashBackground" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
<item android:gravity="fill">
<color android:color="?attr/bootSplashBackground" />
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="Theme.BootSplash.EdgeToEdge.DayNight" parent="Theme.BootSplash.EdgeToEdge.Common">
<item name="darkContentBarsStyle">false</item>
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values-v23/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.DayNight">
<item name="android:windowTranslucentNavigation">true</item>
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values-v27/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.DayNight">
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values-v29/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="Theme.BootSplash.DayNight" parent="Theme.BootSplash.Common">
<item name="android:forceDarkAllowed">false</item>
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values-v30/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="Theme.BootSplash.EdgeToEdge" parent="Theme.BootSplash.EdgeToEdge.DayNight">
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values-v31/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="Theme.BootSplash" parent="Theme.BootSplash.DayNight">
<item name="android:windowSplashScreenBackground">?bootSplashBackground</item>
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values/attrs.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<attr name="bootSplashBackground" format="color" />
<attr name="bootSplashLogo" format="reference" />
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values/public.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<public name="bootSplashBackground" type="attr" />
<public name="bootSplashLogo" type="attr" />
Expand Down
1 change: 0 additions & 1 deletion android/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>

<resources>
<style name="BootSplashNoAnimation">
<item name="android:windowEnterAnimation">@null</item>
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
boost: 26fad476bfa736552bbfa698a06cc530475c1505
boost: 69c3d61aee7f5f7facabe24312f0302003b5af29
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
FBLazyVector: 2296bacb2fa157a43991048b0a9d71c1c8b65083
Expand Down
4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.73.1",
"react-native-bars": "2.4.2",
"react-native-bars": "2.4.3",
"react-native-bootsplash": "link:../",
"react-native-web": "0.19.10"
},
Expand All @@ -27,7 +27,7 @@
"@babel/runtime": "^7.20.0",
"@react-native/babel-preset": "^0.73.18",
"@react-native/metro-config": "^0.73.2",
"@types/react": "^18.2.46",
"@types/react": "^18.2.47",
"babel-loader": "^9.1.3",
"babel-plugin-module-resolver": "^5.0.0",
"html-webpack-plugin": "^5.6.0",
Expand Down
Loading

0 comments on commit c09f788

Please sign in to comment.