Skip to content
Permalink
Browse files
week1 done
  • Loading branch information
Jianhua Yang committed Oct 3, 2017
1 parent 64dd31e commit e97805b93fd493e98dc69b1c03ef2111fc85cb08
Show file tree
Hide file tree
Showing 48 changed files with 97 additions and 684 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more.

@@ -4,7 +4,7 @@ android {
compileSdkVersion 26
buildToolsVersion "26.0.0"
defaultConfig {
applicationId "com.example.jianhuayang.hellome"
applicationId "com.example.yang.hellome"
minSdkVersion 15
targetSdkVersion 26
versionCode 1
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/jianhuayang/Library/Android/sdk/tools/proguard/proguard-android.txt
# in /home/yang/Android/Sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
@@ -1,4 +1,4 @@
package com.example.jianhuayang.hellome;
package com.example.yang.hellome;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.example.jianhuayang.hellome", appContext.getPackageName());
assertEquals("com.example.yang.hellome", appContext.getPackageName());
}
}
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.jianhuayang.hellome" >
package="com.example.yang.hellome">

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme" >
<activity android:name=".MainActivity" >
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

This file was deleted.

@@ -1,4 +1,4 @@
package com.example.jianhuayang.hellome;
package com.example.yang.hellome;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
@@ -24,4 +24,5 @@ public class MainActivity extends AppCompatActivity {
textDisplay.setText("Hello " + nameToDisplay);
Log.d(TAG, nameToDisplay + ", this is your system log!");
}

}
@@ -1,31 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.jianhuayang.hellome.MainActivity">
tools:context="com.example.yang.hellome.MainActivity">


<TextView
android:id="@+id/textViewDisplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginLeft="25dp"
android:layout_marginStart="25dp"
android:layout_marginTop="25dp"
android:text="Hello World"
android:textSize="24sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/textView2"
app:layout_constraintVertical_bias="0.502"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="56dp"
android:text="Name:"
app:layout_constraintLeft_toLeftOf="@+id/textViewDisplay"
app:layout_constraintTop_toBottomOf="@+id/textViewDisplay" />

<EditText
android:id="@+id/editText2"
android:id="@+id/editText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="36dp"
android:layout_marginStart="36dp"
android:ems="10"
android:hint="Type your name here"
android:inputType="textPersonName"
android:text="Name"
tools:layout_editor_absoluteY="325dp"
tools:layout_editor_absoluteX="85dp"/>
app:layout_constraintBaseline_toBaselineOf="@+id/textView2"
app:layout_constraintLeft_toRightOf="@+id/textView2" />

<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
android:onClick="onButtonClick"
android:text="Button"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/editText" />

</android.support.constraint.ConstraintLayout>

This file was deleted.

@@ -1,4 +1,4 @@
package com.example.jianhuayang.hellome;
package com.example.yang.hellome;

import org.junit.Test;

@@ -1,4 +1,4 @@
#Mon Oct 02 23:24:44 BST 2017
#Tue Oct 03 13:50:20 BST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit e97805b

Please sign in to comment.