Merge branch 'main' into feat/track-drafts-persistence

digidem · May 8, 2024 · a7dddd1 · a7dddd1
2 parents 9947e50 + f95d361
commit a7dddd1
Show file tree

Hide file tree

Showing 76 changed files with 718 additions and 2,413 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 #
 build/
 .idea
+.vscode
 .gradle
 local.properties
 *.iml
@@ -80,3 +81,7 @@ ios/*.env*.local
 *.p12
 *.key
 *.mobileprovision
+
+# Expo
+android/
+ios/
diff --git a/android/app/build.gradle b/android/app/build.gradle
diff --git a/android/app/debug.keystore b/android/app/debug.keystore
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
diff --git a/android/app/src/main/java/com/comapeo/MainActivity.kt b/android/app/src/main/java/com/comapeo/MainActivity.kt
diff --git a/android/app/src/main/java/com/comapeo/MainApplication.kt b/android/app/src/main/java/com/comapeo/MainApplication.kt
diff --git a/android/app/src/main/res/drawable-hdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-hdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/drawable-mdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-mdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/drawable-xhdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-xhdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png b/android/app/src/main/res/drawable-xxhdpi/bootsplash_logo.png
diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml
diff --git a/android/app/src/main/res/ic_launcher.xml b/android/app/src/main/res/ic_launcher.xml
diff --git a/android/app/src/main/res/ic_launcher_round.xml b/android/app/src/main/res/ic_launcher_round.xml
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     #
     build/
     .idea
+    .vscode
     .gradle
     local.properties
     *.iml
@@ Expand Down Expand Up / @@ -80,3 +81,7 @@ ios/*.env*.local @@
     *.p12
     *.key
     *.mobileprovision
+    # Expo
+    android/
+    ios/