Proyectos de Subversion Iphone Microlearning - Nuevo Interface

Rev

Rev 33 | Rev 35 | Ir a la última revisión | Mostrar el archivo completo | | | Autoría | Ultima modificación | Ver Log |

Rev 33 Rev 34
Línea 115... Línea 115...
115 
                .background(networkMonitor.status == .disconnected ? Color("color_network_disconnected_background") : Color("color_app_bar_background"))
 115 
                .background(networkMonitor.status == .disconnected ? Color("color_network_disconnected_background") : Color("color_app_bar_background"))
Línea 116... Línea 116...
116
116
Línea -... Línea 117...
- 
 
 117
117
118 
                Divider().background(networkMonitor.status == .disconnected ? Color("color_network_disconnected_background") : Color("color_app_bar_background"))
118 
                Divider().background(networkMonitor.status == .disconnected ? Color("color_network_disconnected_background") : Color("color_app_bar_background"))
 119
119
120 
                /*
120 
                CardGalleryView(
 121 
                CardGalleryView(
121 
                    slideUuid:  self.viewModel.slides[self.viewModel.slideActiveIndex].uuid
 122 
                    slideUuid:  self.viewModel.slides[self.viewModel.slideActiveIndex].uuid
- 
 
 123 
                )
- 
 
 124 
                .environmentObject(appNavigation)
- 
 
 125 
                Text("slideActive : \(viewModel.slideActiveIndex)")
- 
 
 126 
 */
- 
 
 127
- 
 
 128 
                GeometryReader { geometry in
- 
 
 129 
                    let checkMarkX = (geometry.size.width - 50) / 2
- 
 
 130 
                    let checkMarkY = -1 * ((geometry.size.height - 50) / 2)
- 
 
 131
- 
 
 132 
                    let buttonX = (geometry.size.width - 180) / 2
- 
 
 133 
                   // let buttonY = (geometry.size.height - 80) / 2
- 
 
 134
- 
 
 135 
                    let buttonY = (geometry.size.height - 100) / 2
- 
 
 136
- 
 
 137 
                    ZStack {
- 
 
 138 
 
- 
 
 139
- 
 
 140 
                        if self.viewModel.slides[self.viewModel.slideActiveIndex].completed == 1  {
- 
 
 141 
                            Image(uiImage: UIImage(named: "ic_slide_completado_checkmark") ?? UIImage()).offset(x: checkMarkX, y: checkMarkY).zIndex(10000)
- 
 
 142 
                        }
- 
 
 143 
                        /*
- 
 
 144 
                        if self.buttonShow {
- 
 
 145
- 
 
 146 
                            Button(action: {
- 
 
 147 
                                btnPlay()
- 
 
 148 
                            }, label: {
- 
 
 149 
                                Text(self.buttonTitle)
- 
 
 150 
                                    .font(Font.custom(Config.FONT_NAME_BOLD, size: Config.FONT_SIZE_BUTTONS))
- 
 
 151 
                                .foregroundColor(Color("color_button_gallery_foreground"))
- 
 
 152
- 
 
 153 
                            })
- 
 
 154
- 
 
 155 
                            .padding(.vertical, 15)
- 
 
 156 
                            .padding(.horizontal, 10)
- 
 
 157 
                            .background(Color("color_button_gallery_background"))
- 
 
 158 
                            .cornerRadius(/*@START_MENU_TOKEN@*/3.0/*@END_MENU_TOKEN@*/)
- 
 
 159 
                            .offset(x: buttonX, y: buttonY)
- 
 
 160 
                            .zIndex(10000)
- 
 
 161 
                        }
- 
 
 162
- 
 
 163 
                        if (self.viewModel.progressCapsule >= 100 && self.viewModel.completedCapsule == 0)
- 
 
 164 
                            || (self.viewModel.progressTopic >= 100 && self.viewModel.completedTopic == 0) {
- 
 
 165 
                            Button(action: {
- 
 
 166 
                                if self.viewModel.progressTopic >= 100 && self.viewModel.completedTopic == 0 {
- 
 
 167
- 
 
 168 
                                    appNavigation.subpageActive = .finishtopic
- 
 
 169
- 
 
 170 
                                } else {
- 
 
 171 
                                    if self.viewModel.progressCapsule >= 100 && self.viewModel.completedCapsule == 0 {
- 
 
 172 
                                        appNavigation.subpageActive = .finishcapsule
- 
 
 173 
                                    }
- 
 
 174 
                                }
- 
 
 175 
                            }, label: {
- 
 
 176 
                                Text(Config.LANG_BUTTON_FINISH_CAPSULE_OR_TOPIC)
- 
 
 177 
                                .font(.callout)
- 
 
 178 
                                .foregroundColor(.black)
- 
 
 179 
                            })
- 
 
 180 
                            .padding()
- 
 
 181 
                            .background(Color("color_button_gallery_background"))
- 
 
 182 
                            .cornerRadius(/*@START_MENU_TOKEN@*/3.0/*@END_MENU_TOKEN@*/)
- 
 
 183 
                            .zIndex(10000)
- 
 
 184 
                        }
- 
 
 185 
                         */
- 
 
 186
- 
 
 187 
                        VStack {
- 
 
 188
- 
 
 189
- 
 
 190
- 
 
 191 
                            Spacer()
- 
 
 192 
                            HStack {
- 
 
 193 
                                if self.viewModel.slides[self.viewModel.slideActiveIndex].background.isEmpty && self.viewModel.slides[self.viewModel.slideActiveIndex].file.isEmpty {
- 
 
 194 
                                    Image(uiImage: UIImage(named: "logo") ?? UIImage())
- 
 
 195 
                                    .resizable()
- 
 
 196 
                                    .aspectRatio(contentMode: .fit)
- 
 
 197 
                                } else {
- 
 
 198 
                                    CustomAsyncImage(
- 
 
 199 
                                        url: URL(string: self.viewModel.slides[self.viewModel.slideActiveIndex].type == Constants.SLIDE_TYPE_IMAGE ? self.viewModel.slides[self.viewModel.slideActiveIndex].file : self.viewModel.slides[self.viewModel.slideActiveIndex].background)!,
- 
 
 200 
                                        placeholder: {
- 
 
 201 
                                            Spacer()
- 
 
 202 
                                            Text(Config.LANG_COMMON_LOADING).font(.footnote).foregroundColor(.black)
- 
 
 203 
                                            Spacer()
- 
 
 204 
                                        },
- 
 
 205 
                                        image: {
- 
 
 206 
                                            Image(uiImage: $0).resizable()
- 
 
 207 
                                        }
- 
 
 208 
                                    )
- 
 
 209 
                                }
- 
 
 210 
                            }.padding(.horizontal, 5)
- 
 
 211 
 
- 
 
 212 
                            Spacer()
- 
 
 213 
                        }
- 
 
 214 
                       // .zIndex(500)
122 
                )
 215
123 
                .environmentObject(appNavigation)
 216 
                    }
124 
                Text("slideActive : \(viewModel.slideActiveIndex)")
 217 
                }
125 
                .transition(.slide)
 218 
                .transition(.slide)
126 
                .gesture(
 219 
                .gesture(
Línea 153... Línea 246...
153
246
- 
 
 247
Línea 154... Línea 248...
154
248
155
249