Skip to content

Commit 9f138fa

Browse files
Jeremy SilverAsser
authored andcommitted
Fix lesson 11 main activity bug
1 parent 6cf73d3 commit 9f138fa

File tree

18 files changed

+44
-29
lines changed

18 files changed

+44
-29
lines changed

Lesson11-Completeing-The-UI/T11.01-Exercise-ConstraintLayout/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion "25.0.0"
5+
buildToolsVersion "25.0.1"
66

77
defaultConfig {
88
applicationId "com.example.android.boardingpass"
@@ -22,6 +22,6 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:25.0.0'
25+
compile 'com.android.support:appcompat-v7:25.0.1'
2626
// TODO (1) Add the compile dependency for the constraint layout support library
2727
}

Lesson11-Completeing-The-UI/T11.01-Exercise-ConstraintLayout/app/src/main/java/com/example/android/boardingpass/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class MainActivity extends AppCompatActivity {
2424
@Override
2525
protected void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
27+
setContentView(R.layout.activity_main);
2728
}
2829

29-
}
30+
}

Lesson11-Completeing-The-UI/T11.01-Exercise-ConstraintLayout/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.2'
8+
classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

Lesson11-Completeing-The-UI/T11.01-Solution-ConstraintLayout/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion "25.0.0"
5+
buildToolsVersion "25.0.1"
66

77
defaultConfig {
88
applicationId "com.example.android.boardingpass"
@@ -22,7 +22,7 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:25.0.0'
25+
compile 'com.android.support:appcompat-v7:25.0.1'
2626
// COMPLETED (1) Add the compile dependency for the constraint layout support library
27-
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3'
27+
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
2828
}

Lesson11-Completeing-The-UI/T11.01-Solution-ConstraintLayout/app/src/main/java/com/example/android/boardingpass/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class MainActivity extends AppCompatActivity {
2424
@Override
2525
protected void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
27+
setContentView(R.layout.activity_main);
2728
}
2829

29-
}
30+
}

Lesson11-Completeing-The-UI/T11.01-Solution-ConstraintLayout/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.2'
8+
classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

Lesson11-Completeing-The-UI/T11.02-Exercise-DataBinding/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion "25.0.0"
5+
buildToolsVersion "25.0.1"
66

77
defaultConfig {
88
applicationId "com.example.android.boardingpass"
@@ -22,7 +22,8 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:25.0.0'
26-
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3'
25+
compile 'com.android.support:appcompat-v7:25.0.1'
26+
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
2727
// TODO (1) Enable Data Binding in your application
28+
2829
}

Lesson11-Completeing-The-UI/T11.02-Exercise-DataBinding/app/src/main/java/com/example/android/boardingpass/MainActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ public class MainActivity extends AppCompatActivity {
2626
@Override
2727
protected void onCreate(Bundle savedInstanceState) {
2828
super.onCreate(savedInstanceState);
29+
setContentView(R.layout.activity_main);
30+
2931

3032
// TODO (4) Set the Content View using DataBindingUtil to the activity_main layout
3133

@@ -44,4 +46,5 @@ private void displayBoardingPassInfo(BoardingPassInfo info) {
4446
// TODO (8) Use TimeUnit methods to format the total minutes until boarding
4547

4648
}
47-
}
49+
}
50+

Lesson11-Completeing-The-UI/T11.02-Exercise-DataBinding/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.2'
8+
classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

Lesson11-Completeing-The-UI/T11.02-Solution-DataBinding/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 25
5-
buildToolsVersion "25.0.0"
5+
buildToolsVersion "25.0.1"
66

77
defaultConfig {
88
applicationId "com.example.android.boardingpass"
@@ -24,6 +24,6 @@ android {
2424

2525
dependencies {
2626
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
compile 'com.android.support:appcompat-v7:25.0.0'
28-
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3'
27+
compile 'com.android.support:appcompat-v7:25.0.1'
28+
compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
2929
}

0 commit comments

Comments
 (0)