Merge pull request #202 from Wolfteam/feature/ios

feature/ios

README.md

@@ -6,13 +6,26 @@
 
 > A Genshin Impact database kinda app
 
-> This app is not affiliated with or endorsed by miHoYo. Shiori is just a database app for the Genshin Impact game
+> This app is not affiliated with or endorsed by miHoYo. Shiori is just a database app for the
+> Genshin Impact game
 
 ![Tests](https://github.com/Wolfteam/Shiori/actions/workflows/tests.yml/badge.svg)
 <p align="center">
   <img src="images/banner.png">
 </p>
 
+<p align="center" width="100%">
+    <a href="https://play.google.com/store/apps/details?id=com.miraisoft.shiori">
+      <img style="height:100px;width:30%;max-width:250px;transform: scale(1.25);margin-right:20px" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" />
+    </a>
+    <a href="https://apps.apple.com/us/app/shiori-for-genshin-unofficial/id6448140103">
+      <img style="height:100px;width:30%;max-width:250px" src="https://developer.apple.com/assets/elements/badges/download-on-the-app-store.svg" />
+    </a>
+    <a href="https://apps.microsoft.com/store/detail/shiori-for-genshin-unofficial/9PH29FZMQK7T">
+      <img style="height:100px;width:35%;max-width:250px" src="https://www.nexiahome.com/wp-content/uploads/2016/03/windows-store-button.png" />
+    </a>
+</p>
+
 ### Features
 
 * Artifacts
@@ -21,15 +34,17 @@
 * Materials
 * And many more to come
 
-[<img height="100" width="250" src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" />](https://play.google.com/store/apps/details?id=com.miraisoft.shiori)
-
-[<img height="100" width="300" src="https://www.nexiahome.com/wp-content/uploads/2016/03/windows-store-button.png" />]([https://play.google.com/store/apps/details?id=com.miraisoft.shiori](https://apps.microsoft.com/store/detail/shiori-for-genshin-unofficial/9PH29FZMQK7T))
-
-[<img height="100" width="100" src="https://sparkcdnwus2.azureedge.net/sparkimageassets/XPDC2RH70K22MN-08afd558-a61c-4a63-9171-d3f199738e9f" />](https://discord.gg/A8SgudQMwP)
+### Discord
+<p align="left">
+    <a href="https://discord.gg/A8SgudQMwP">
+      <img height="100" width="100" src="https://sparkcdnwus2.azureedge.net/sparkimageassets/XPDC2RH70K22MN-08afd558-a61c-4a63-9171-d3f199738e9f" />
+    </a>
+</p>
 
 ### Contributing
 
-> Before contributing, please ask me if whatever you are planning to do / add / improve is valid for this project.
+> Before contributing, please ask me if whatever you are planning to do / add / improve is valid for
+> this project.
 
 #### To run the server:
 
@@ -64,7 +79,10 @@ Hosting environment: Production
 
 ```
 ANDROID_APP_CENTER_KEY = xxxx
+IOS_APP_CENTER_KEY = xxxx
+MACOS_APP_CENTER_KEY = xxxx
 ANDROID_PURCHASES_KEY = yyyyy
+IOS_PURCHASES_KEY = yyyyy
 COMMON_HEADER_NAME = header
 API_HEADER_NAME = key
 PUBLIC_KEY = xxxzzzzz

android/.gitignore

@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks

android/app/build.gradle

@@ -32,20 +32,34 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion localProperties.getProperty('flutter.compileSdkVersion').toInteger()
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
+    // Temporary workaround as per https://issuetracker.google.com/issues/158060799
     lintOptions {
         disable 'InvalidPackage'
+        checkReleaseBuilds false
     }
 
+
     defaultConfig {
         applicationId "com.miraisoft.shiori"
-        minSdkVersion 23
-        targetSdkVersion 33
+        // 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 localProperties.getProperty('flutter.minSdkVersion').toInteger()
+        targetSdkVersion localProperties.getProperty('flutter.targetSdkVersion').toInteger()
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -79,11 +93,6 @@ android {
                     'proguard-rules.pro'
         }
     }
-
-    // Temporary workaround as per https://issuetracker.google.com/issues/158060799
-    lintOptions {
-        checkReleaseBuilds false
-    }
 }
 
 flutter {

android/app/src/debug/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.miraisoft.shiori">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- 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.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

android/app/src/main/AndroidManifest.xml

@@ -34,31 +34,27 @@
         tools:replace="android:allowBackup">
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
-            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
-                       the Android process has started. This theme is visible to the user
-                       while the Flutter UI initializes. After that, this theme continues
-                       to determine the Window background behind the Flutter UI. -->
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
             <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
-            <!-- Displays an Android View that continues showing the launch screen
-                       Drawable until Flutter paints its first frame, then this splash
-                       screen fades out. A splash screen is useful to avoid any visual
-                       gap between the end of Android's launch screen and the painting of
-                       Flutter's first frame. -->
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
-        This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting -->
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>

android/app/src/profile/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.miraisoft.shiori">
-    <!-- Flutter needs it to communicate with the running application
+    <!-- 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.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>

android/build.gradle

@@ -2,19 +2,19 @@ buildscript {
     ext.kotlin_version = '1.7.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -39,3 +39,5 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
   end
 end
+
+pod 'AppCenter'