Created
October 9, 2018 21:02
-
-
Save dennda/7e9446da7bd2a5f1325a47b83da7535a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DuolingoMobile/Sources/Sessions/Controllers/DUOSessionViewController.m b/DuolingoMobile/Sources/Sessions/Controllers/DUOSessionViewController.m | |
index 0e59ddc20b..611228e206 100644 | |
--- a/DuolingoMobile/Sources/Sessions/Controllers/DUOSessionViewController.m | |
+++ b/DuolingoMobile/Sources/Sessions/Controllers/DUOSessionViewController.m | |
@@ -360,7 +360,8 @@ - (void)viewDidLoad | |
{ | |
[super viewDidLoad]; | |
- self.view.backgroundColor = [UIColor duolingoOffWhiteColor]; | |
+ // XXX | |
+ self.view.backgroundColor = [UIColor whiteColor]; | |
// The background should listen for tap events so we can dismiss the keyboard or any first responder with a background tap. | |
UITapGestureRecognizer *tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(backgroundWasTapped:)]; | |
diff --git a/DuolingoMobile/Sources/Sessions/DUOSessionManager.m b/DuolingoMobile/Sources/Sessions/DUOSessionManager.m | |
index 95da080125..cc84088363 100644 | |
--- a/DuolingoMobile/Sources/Sessions/DUOSessionManager.m | |
+++ b/DuolingoMobile/Sources/Sessions/DUOSessionManager.m | |
@@ -261,24 +261,28 @@ - (id)initWithNetworkClient:(DUONetworkClient *)client | |
_tutorsVideoPromoManager = tutorsVideoPromoManager; | |
_allElementTypes = @[ | |
@"translate", | |
- @"complete_reverse_translation", | |
- @"name", | |
- @"select", | |
- @"listen", | |
- @"listen_comprehension", | |
- @"listen_tap", | |
- @"judge", | |
- @"form", | |
- @"read_comprehension", | |
- @"speak", | |
- @"match", | |
- @"assist", | |
- @"character_intro", | |
- @"character_select", | |
- @"character_match", | |
- @"select_pronunciation", | |
- @"select_recording", | |
- @"select_transcription"]; | |
+// @"complete_reverse_translation", | |
+// @"name", | |
+// @"select", | |
+// @"listen", | |
+// @"listen_comprehension", | |
+// @"listen_tap", | |
+// @"judge", | |
+// @"form", | |
+// @"read_comprehension", | |
+// @"speak", | |
+// @"match", | |
+// @"assist", | |
+// @"character_intro", | |
+// @"character_select", | |
+// @"character_match", | |
+// @"select_pronunciation", | |
+// | |
+// // XXX we could remove this, right? | |
+// @"select_recording", | |
+// | |
+// @"select_transcription" | |
+ ]; | |
_listeningRequiredElementTypes = @[@"listen", | |
@"listen_comprehension", | |
@"listen_tap", | |
diff --git a/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/Contents.swift b/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/Contents.swift | |
index b3e4b65228..597ba5d5af 100644 | |
--- a/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/Contents.swift | |
+++ b/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/Contents.swift | |
@@ -1,4 +1,4 @@ | |
-import UIKit | |
+uimport UIKit | |
import Juicy | |
import PlaygroundSupport | |
diff --git a/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/timeline.xctimeline b/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/timeline.xctimeline | |
deleted file mode 100644 | |
index bf468afeca..0000000000 | |
--- a/Juicy/Juicy.playground/Pages/1. SCRATCH.xcplaygroundpage/timeline.xctimeline | |
+++ /dev/null | |
@@ -1,6 +0,0 @@ | |
-<?xml version="1.0" encoding="UTF-8"?> | |
-<Timeline | |
- version = "3.0"> | |
- <TimelineItems> | |
- </TimelineItems> | |
-</Timeline> | |
diff --git a/Juicy/JuicyModule.swift b/Juicy/JuicyModule.swift | |
index 37582c9a35..63250cd667 100644 | |
--- a/Juicy/JuicyModule.swift | |
+++ b/Juicy/JuicyModule.swift | |
@@ -46,7 +46,8 @@ public class JuicyModule: NSObject { | |
/// Whether or not Juicy design should be used. | |
@objc | |
public static var isJuicy: Bool { | |
- return status == .juicy | |
+ return true | |
+// return status == .juicy | |
} | |
/// The direction that the components should be rendered in. We don't use the system language because the user |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment