Rearrange Android payload keys

Author: AliSoftware

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_send_app_size_metrics.rb

@@ -17,28 +17,30 @@ def self.run(params)
           'App Name': params[:app_name],
           'App Version': params[:app_version_name],
           'Version Code': params[:app_version_code],
-          'Build Type': params[:build_type],
           'Product Flavor': params[:product_flavor],
+          'Build Type': params[:build_type],
           'Source': params[:source],
         )
-        payload.add_metric(name: 'File Size', value: File.size(params[:aab_path]), meta: { split: 'AAB' })
+        payload.add_metric(name: 'AAB File Size', value: File.size(params[:aab_path]))
 
         if params[:include_split_sizes]
           check_bundletool_installed!
           apkanalyzer_bin = find_apkanalyzer_binary!
+          UI.message("[App Size Metrics] Generating the various APK splits from #{params[:aab_path]}...")
           Dir.mktmpdir('release-toolkit-android-app-size-metrics') do |tmp_dir|
-            UI.message("[App Size Metrics] Generating the various APK splits from #{params[:aab_path]}...")
             Action.sh('bundletool', 'build-apks', '--bundle', params[:aab_path], '--output-format', 'DIRECTORY', '--output', tmp_dir)
             apks = Dir.glob('splits/*.apk', base: tmp_dir).map { |f| File.join(tmp_dir, f) }
             UI.message("[App Size Metrics] Generated #{apks.length} APKs.")
+
             apks.each do |apk|
-              split_name = File.basename(apk, '.apk').delete_prefix('base-')
               UI.message("[App Size Metrics] Computing file and download size of #{File.basename(apk)}...")
+              split_name = File.basename(apk, '.apk').delete_prefix('base-')
               file_size = Action.sh(apkanalyzer_bin, 'apk', 'file-size', apk, print_command: false, print_command_output: false).chomp.to_i
               download_size = Action.sh(apkanalyzer_bin, 'apk', 'download-size', apk, print_command: false, print_command_output: false).chomp.to_i
-              payload.add_metric(name: 'File Size', value: file_size, meta: { split: split_name })
+              payload.add_metric(name: 'APK File Size', value: file_size, meta: { split: split_name })
               payload.add_metric(name: 'Download Size', value: download_size, meta: { split: split_name })
             end
+
             UI.message('[App Size Metrics] Done computing splits sizes.')
           end
         end