Skip to content

Commit b45defd

Browse files
committed
Merge branch 'release/1.2' into main
2 parents 0c99b5f + 6c9321e commit b45defd

40 files changed

+829
-242
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Twitimer es una App gratuita para **[iOS](https://apps.apple.com/us/app/twitimer
1313

1414
* Por razones de seguridad debes añadir tu propio fichero de configuración de Firebase `GoogleService-Info.plist` con Realtime Database activo y las claves de acceso al API de Twitch en Remote Config con los valores `TwitchClientID` y `TwitchClientSecret`.
1515
* Es suficiente con ejecutar el archivo `Twitimer.xcodeproj` en Xcode.
16+
* [Puedes ver todo el proceso en este tutorial en YouTube](https://youtu.be/_FLHGY_ATWA)
17+
18+
<a href="https://youtu.be/_FLHGY_ATWA"><img src="http://i3.ytimg.com/vi/_FLHGY_ATWA/maxresdefault.jpg" style="height: 50%; width:50%;"/></a>
1619

1720
### ¿De qué forma utilizamos Twitimer para aprender programación?
1821
* Puedes acceder a su código fuente libremente.

Twitimer.xcodeproj/project.pbxproj

Lines changed: 116 additions & 71 deletions
Large diffs are not rendered by default.

Twitimer/AppDelegate.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import UIKit
99
import SwiftUI
1010
import Firebase
11+
import FirebaseMessaging
1112
import IQKeyboardManagerSwift
1213
import UserNotifications
1314

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "settings.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "settings@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "settings@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}
2.59 KB
Loading
3.35 KB
Loading
4.92 KB
Loading
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "tiktok.svg",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
},
12+
"properties" : {
13+
"preserves-vector-representation" : true
14+
}
15+
}
Lines changed: 2 additions & 0 deletions
Loading

Twitimer/Model/Domain/DatabaseUser.swift

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ struct DatabaseUser: Codable {
1919
let streamer: Int?
2020
let schedule: [DatabaseUserSchedule]?
2121
let followedUsers: [String]?
22+
let settings: DatabaseUserSettings?
2223

2324
func toUser() -> User {
2425

2526
let schedule = self.schedule?.map({ (dbSchedule) -> UserSchedule in
2627
return dbSchedule.toUserSchedule()
2728
})
2829

29-
return User(id: id, login: login, displayName: displayName, broadcasterType: BroadcasterType(rawValue: broadcasterType ?? ""), descr: descr, profileImageUrl: profileImageUrl, offlineImageUrl: offlineImageUrl, streamer: streamer == 1,schedule: schedule, followedUsers: followedUsers ?? [])
30+
return User(id: id, login: login, displayName: displayName, broadcasterType: BroadcasterType(rawValue: broadcasterType ?? ""), descr: descr, profileImageUrl: profileImageUrl, offlineImageUrl: offlineImageUrl, streamer: streamer == 1,schedule: schedule, followedUsers: followedUsers ?? [], settings: settings?.toUserSettings())
3031
}
3132

3233
}
@@ -46,3 +47,18 @@ struct DatabaseUserSchedule: Codable {
4647
}
4748

4849
}
50+
51+
struct DatabaseUserSettings: Codable {
52+
53+
var discord: String?
54+
var youtube: String?
55+
var twitter: String?
56+
var instagram: String?
57+
var tiktok: String?
58+
59+
func toUserSettings() -> UserSettings {
60+
61+
return UserSettings(discord: discord ?? "", youtube: youtube ?? "", twitter: twitter ?? "", instagram: instagram ?? "", tiktok: tiktok ?? "")
62+
}
63+
64+
}

0 commit comments

Comments
 (0)