Revert "changed package name"

This reverts commit 79e3831.
simonoppowa · Dec 18, 2024 · 00fa35c · 00fa35c
1 parent f7ab290
commit 00fa35c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ OpenNutriTracker is an open-source mobile application designed to simplify nutri
 
 ## Install
 [<img src="fastlane/metadata/android/en-US/images/appstore_banner.png" width="30%">](https://testflight.apple.com/join/j7uKoEDl)
-[<img src="fastlane/metadata/android/en-US/images/playstore_banner.png" width="30%">](https://play.google.com/store/apps/details?id=com.doktormerlin.ont.opennutritracker)
+[<img src="fastlane/metadata/android/en-US/images/playstore_banner.png" width="30%">](https://play.google.com/store/apps/details?id=com.opennutritracker.ont.opennutritracker)
 
 ## Key Features
 - **🍎 Nutritional Tracking:** Easily log your meals and snacks, and access a vast database of food items and ingredients to get detailed nutritional information.

diff --git a/android/.gitignore b/android/.gitignore
@@ -11,7 +11,3 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
-
-# Adding gradle.properties because of changes regarding the JDK version.
-# Android Studio 2024.3 ships with JDK 21, which is incompatible with the required gradle 7.6.1
-gradle.properties
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.doktormerlin.ont.opennutritracker"
+        applicationId "com.opennutritracker.ont.opennutritracker"
         minSdkVersion 21
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.doktormerlin.ont.opennutritracker">
+    package="com.opennutritracker.ont.opennutritracker">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.doktormerlin.ont.opennutritracker">
+    package="com.opennutritracker.ont.opennutritracker">
 
     <uses-permission android:name="android.permission.INTERNET" />
 

diff --git a/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt b/android/app/src/main/kotlin/com/opennutritracker/ont/opennutritracker/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.doktormerlin.ont.opennutritracker
+package com.opennutritracker.ont.opennutritracker
 
 import io.flutter.embedding.android.FlutterActivity
 

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.doktormerlin.ont.opennutritracker">
+    package="com.opennutritracker.ont.opennutritracker">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.java.home=C:\\Program Files\\Microsoft\\jdk-17.0.13.11-hotspot
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -505,7 +505,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -536,7 +536,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doktormerlin.ont.opennutritracker;
+				PRODUCT_BUNDLE_IDENTIFIER = com.opennutritracker.ont.opennutritracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";