From 4c2baae53b1e87dde4dc3882cdbd7c4f7b3ccd85 Mon Sep 17 00:00:00 2001
From: Nutcake <Nusskuchen95@hotmail.de>
Date: Fri, 5 May 2023 18:01:46 +0200
Subject: [PATCH] Adjust build settings

---
 .gitignore                                    |  1 +
 android/app/build.gradle                      | 20 +++++++++++++++----
 android/app/src/debug/AndroidManifest.xml     |  2 +-
 android/app/src/main/AndroidManifest.xml      |  2 +-
 .../voidspace/contacts_plus/MainActivity.kt   |  2 +-
 android/app/src/profile/AndroidManifest.xml   |  2 +-
 linux/CMakeLists.txt                          |  4 ++--
 linux/my_application.cc                       |  4 ++--
 8 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 24476c5..f8d19d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/key.properties
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8b846a4..4e03ad1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
@@ -44,7 +50,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "de.voidspace.contacts_plus"
+        applicationId "me.voidspace.contacts_plus_plus"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
@@ -53,11 +59,17 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 02fb6ac..1de31db 100644
--- 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="de.voidspace.contacts_plus">
+    package="de.voidspace.contacts_plus_plus">
     <!-- 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
index d95b8a4..d0ce8d4 100644
--- 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="de.voidspace.contacts_plus">
+    package="de.voidspace.contacts_plus_plus">
 
     <!-- Required to fetch data from the internet. -->
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/android/app/src/main/kotlin/de/voidspace/contacts_plus/MainActivity.kt b/android/app/src/main/kotlin/de/voidspace/contacts_plus/MainActivity.kt
index ccc1548..1982fd6 100644
--- a/android/app/src/main/kotlin/de/voidspace/contacts_plus/MainActivity.kt
+++ b/android/app/src/main/kotlin/de/voidspace/contacts_plus/MainActivity.kt
@@ -1,4 +1,4 @@
-package de.voidspace.contacts_plus
+package de.voidspace.contacts_plus_plus
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 02fb6ac..1de31db 100644
--- 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="de.voidspace.contacts_plus">
+    package="de.voidspace.contacts_plus_plus">
     <!-- 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/linux/CMakeLists.txt b/linux/CMakeLists.txt
index afb4391..aeb671a 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -4,10 +4,10 @@ project(runner LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "contacts_plus")
+set(BINARY_NAME "contacts_plus_plus")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "de.voidspace.contacts_plus")
+set(APPLICATION_ID "de.voidspace.contacts_plus_plus")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/linux/my_application.cc b/linux/my_application.cc
index a5ce971..1a679fb 100644
--- a/linux/my_application.cc
+++ b/linux/my_application.cc
@@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {
   if (use_header_bar) {
     GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
     gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "contacts_plus");
+    gtk_header_bar_set_title(header_bar, "contacts_plus_plus");
     gtk_header_bar_set_show_close_button(header_bar, TRUE);
     gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
   } else {
-    gtk_window_set_title(window, "contacts_plus");
+    gtk_window_set_title(window, "contacts_plus_plus");
   }
 
   gtk_window_set_default_size(window, 1280, 720);