apps/skolplattformen-app-new/Gemfile

@@ -6,4 +6,4 @@ ruby ">= 3.2.2"
 gem 'bundler'
 gem 'cocoapods', '~> 1.12'
 gem 'fastlane'
-gem 'dotenv'
+gem 'dotenv'

apps/skolplattformen-app-new/android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity

apps/skolplattformen-app-new/android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
-</resources>

apps/skolplattformen-app-new/android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Öppna Skolplattformen NEW</string>
+    <string name="app_name">app</string>
 </resources>

apps/skolplattformen-app-new/android/app/src/main/res/values/styles.xml

@@ -1,7 +1,9 @@
 <resources>
+
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:textColor">#000000</item>
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     </style>
+
 </resources>

apps/skolplattformen-app-new/android/fastlane/Fastfile

@@ -23,9 +23,9 @@ platform :android do
     #    versionNameOverride = "1.9.0"
     if versionNameOverride.nil?
       releaseNameSemVerArr = google_play_track_release_names(track: 'internal').max.split('.')
+      puts "releaseNameSemVerArr: #{releaseNameSemVerArr}"
       releaseNameSemVerArr[2] = (releaseNameSemVerArr.last.to_i + 1).to_s
       ENV['VERSION_NAME'] = releaseNameSemVerArr.join('.')
-      ENV['GITTAGNAME'] = ENV['VERSION_NAME'].gsub(/\s+/, '').match(/\((.*?)\)/)[1] + '.' + ENV['VERSION_CODE']
       ENV['SUPPLY_VERSION_NAME'] = ENV['VERSION_NAME']
       versionFile = File.join(Dir.pwd, '..', 'version', 'version.properties').to_s
       commandargs = "-n \"VERSION=#{ENV['VERSION_NAME']}\" > #{versionFile}".to_s
@@ -36,6 +36,7 @@ platform :android do
     end
     puts "Compiling #{ENV['VERSION_NAME']} (#{ENV['VERSION_CODE']}) "
 
+
     # Dir.pwd when running through Fastlane is app/android/fastlane
     releaseFilePath = File.join(Dir.pwd, '..', 'app', "release.jks")
     mappingFilePath = File.join(
@@ -48,7 +49,7 @@ platform :android do
       "release",
       "mapping.txt"
     )
-    puts "Hello there - #{ENV['VERSION_CODE']}"
+
 
     gradle(task: 'clean')
     gradle(
@@ -94,13 +95,14 @@ platform :android do
     system('git config user.email "leesheppard2404@gmail.com"')
     system('git config user.name "Github Actions Android Pipeline"')
     
+    gitTagName = releaseNameSemVerArr.join('.').gsub(/[\s()]/, '')
     
     add_git_tag(
       grouping: "builds",
       includes_lane: true,
       # prefix: "v#{ENV['VERSION_NAME']}-",
       # build_number: ENV['VERSION_CODE'],
-      tag: "v#{ENV['GITTAGNAME']}"
+      tag: gitTagName
     )
     push_to_git_remote(
       tags: true