sort pokemons, fix imageview, fix detailview

xramos · May 30, 2022 · 4e1f14f · 4e1f14f
1 parent 2f14324
commit 4e1f14f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/Pokemon/Pokemon/Scenes/Backpack/BackpackViewModel.swift b/Pokemon/Pokemon/Scenes/Backpack/BackpackViewModel.swift
@@ -26,14 +26,10 @@ class BackpackViewModel: ObservableObject {
         state = .loading
 
         pokemons = GetPokemonsUseCase().execute()
+
+        // Sort by id
+        pokemons = pokemons.sorted(by: { $0.id < $1.id })
 
-        if pokemons.isEmpty {
-
-            state = .empty
-
-        } else {
-
-            state = .loaded
-        }
+        state = pokemons.isEmpty ? .empty : .loaded
     }
 }
diff --git a/Pokemon/Pokemon/Scenes/PokemonDetail/PokemonDetailView.swift b/Pokemon/Pokemon/Scenes/PokemonDetail/PokemonDetailView.swift
@@ -13,32 +13,37 @@ struct PokemonDetailView: View {
 
     var body: some View {
 
-        VStack {
+        GeometryReader { proxy in
 
-            VStack(alignment: .center) {
+            HStack(alignment: .center) {
 
-                ImageView(withURL: viewModel.pokemon.url)
+                Spacer()
 
-                VStack(alignment: .leading, spacing: 4) {
+                VStack {
 
-                    TitleView(title: viewModel.pokemon.name)
+                    ImageView(withURL: viewModel.pokemon.url)
+                        .frame(width: proxy.size.width * 0.7)
 
-                    TitleValueView(title: "Weight:", value: "\(viewModel.pokemon.weight)")
-
-                    TitleValueView(title: "Height: ", value: "\(viewModel.pokemon.height)")
-
-                    TitleValueView(title: "Experience:", value: "\(viewModel.pokemon.experience)")
-
-                    TitleValueView(title: "Caught on:", value: "\(viewModel.pokemon.date)")
-
-                    TitleValueView(title: "Types:", value: "\(viewModel.pokemon.types)")
-
-                    Spacer().frame(height: 10)
+                    VStack(alignment: .leading, spacing: 4) {
+
+                        TitleView(title: viewModel.pokemon.name)
+
+                        TitleValueView(title: "Weight:", value: "\(viewModel.pokemon.weight)")
+
+                        TitleValueView(title: "Height: ", value: "\(viewModel.pokemon.height)")
+
+                        TitleValueView(title: "Experience:", value: "\(viewModel.pokemon.experience)")
+
+                        TitleValueView(title: "Caught on:", value: "\(viewModel.pokemon.date)")
+
+                        TitleValueView(title: "Types:", value: "\(viewModel.pokemon.types)")
+                    }
+                    .padding(20)
                 }
-                .padding([.leading, .trailing, .bottom], 10)
+                .pokemonBackground()
+
+                Spacer()
             }
-            .pokemonBackground()
-            .padding(.bottom, 20)
         }
     }
 }

diff --git a/Pokemon/Pokemon/Views/ImageView/ImageView.swift b/Pokemon/Pokemon/Views/ImageView/ImageView.swift
@@ -22,7 +22,7 @@ struct ImageView: View {
 
             Image(uiImage: image)
                 .resizable()
-                .aspectRatio(contentMode: .fill)
+                .aspectRatio(contentMode: .fit)
 
         }.onReceive(imageLoader.didChange) { data in