Skip to content

Commit

Permalink
Merge pull request #406 from wanshanghong/master
Browse files Browse the repository at this point in the history 
#2 #324 第2次实验
  • Loading branch information
@zengsn
zengsn authored Mar 14, 2019
2 parents 1616f89 + 322c834 commit 45007fb
Show file tree
Hide file tree
Showing 10 changed files with 326 additions and 0 deletions.
22 changes: 22 additions & 0 deletions students/soft1714080902219/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.hzuapps.androidlabs.Soft1714080902219">

<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=".Soft1714080902219Activity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".Soft1714080902219Activity2"></activity>
</application>

</manifest>
24 changes: 24 additions & 0 deletions ...pp/src/main/java/edu/hzuapps/androidlabs/Soft1714080902219/Soft1714080902219Activity.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package edu.hzuapps.androidlabs.Soft1714080902219;

import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;

public class Soft1714080902219Activity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.soft_1714080902219_activity);
TextView registe=findViewById(R.id.registe);
registe.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent=new Intent(Soft1714080902219Activity.this,Soft1714080902219Activity2.class);
startActivity(intent);
}
});
}
}
13 changes: 13 additions & 0 deletions ...p/src/main/java/edu/hzuapps/androidlabs/Soft1714080902219/Soft1714080902219Activity2.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package edu.hzuapps.androidlabs.Soft1714080902219;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

public class Soft1714080902219Activity2 extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.soft_1714080902219_activity2);
}
}
34 changes: 34 additions & 0 deletions students/soft1714080902219/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeWidth="1"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
Binary file added students/soft1714080902219/app/src/main/res/drawable-v24/zzpic15650_s.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 101 additions & 0 deletions students/soft1714080902219/app/src/main/res/layout/soft_1714080902219_activity.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:background="@drawable/zzpic15650_s"
tools:context=".Soft1714080902219Activity">

<TextView
android:id="@+id/logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="49dp"
android:textSize="50dp"
android:text="新闻app"/>

<LinearLayout
android:id="@+id/user_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/logo"
android:layout_marginTop="50dp"
android:layout_centerHorizontal="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:textSize="23dp"
android:textColor="#060606"
android:text="账号"/>
<EditText
android:id="@+id/username"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:inputType="text"
android:textColor="#0a0909"
android:textColorHint="#f7f6f6"
android:textColorLink="#f7f5f5"
android:hint="手机号" />
</LinearLayout>
<LinearLayout
android:id="@+id/password_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/user_layout"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:textSize="23dp"
android:text="密码"
android:textColor="#080808"/>
<EditText
android:id="@+id/password"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:textColor="#050505"
android:textColorHint="#f1f1f1"
android:textColorLink="#faf8f8"
android:hint="6~16" />

</LinearLayout>
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/password_layout"
android:layout_centerHorizontal="true"
android:background="#cec66955"
android:layout_marginTop="20dp"
android:textSize="20dp"
android:textColor="#ce4d4442"
android:text="登 录"
android:width="257dp"/>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/button"
android:layout_marginTop="20dp">
<TextView
android:id="@+id/registe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20dp"
android:layout_marginLeft="60dp"
android:text="用户注册"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20dp"
android:layout_marginLeft="100dp"
android:text="忘记密码"/>
</LinearLayout>

</RelativeLayout>
112 changes: 112 additions & 0 deletions students/soft1714080902219/app/src/main/res/layout/soft_1714080902219_activity2.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:background="@drawable/zzpic15650_s"
tools:context=".Soft1714080902219Activity2">

<TextView
android:id="@+id/registe_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="25dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:text="用户注册"/>
<LinearLayout
android:id="@+id/registe_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_below="@+id/registe_title"
android:layout_marginTop="20dp">

<TextView

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20dp"
android:text="手机号"
/>
<EditText
android:id="@+id/phone"
android:layout_width="230dp"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/registe_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_below="@+id/registe_phone"
android:layout_marginTop="20dp">

<TextView

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="13dp"
android:textSize="20dp"
android:text="密码"
/>
<EditText
android:id="@+id/password"
android:layout_width="230dp"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:id="@+id/registe_password2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_below="@+id/registe_password"
android:layout_marginTop="20dp">

<TextView

android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20dp"
android:text="重复密码"
/>
<EditText
android:id="@+id/password2"
android:layout_width="230dp"
android:layout_height="wrap_content"
android:layout_marginRight="26dp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/test"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_below="@id/registe_password2">
<Button
android:layout_width="150dp"
android:layout_marginLeft="45dp"
android:layout_height="wrap_content"
android:textColor="#fffdfd"
android:textSize="20dp"
android:text="获取验证码"
android:background="#cec66955"
/>
<EditText
android:layout_width="120dp"
android:layout_marginLeft="20dp"
android:layout_height="wrap_content" />
</LinearLayout>
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/test"
android:layout_centerHorizontal="true"
android:background="#cec66955"
android:layout_marginTop="20dp"
android:textSize="20dp"
android:textColor="#ce4d4442"
android:text="登 录"
android:width="257dp"/>
</RelativeLayout>
6 changes: 6 additions & 0 deletions students/soft1714080902219/app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
</resources>
3 changes: 3 additions & 0 deletions students/soft1714080902219/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<resources>
<string name="app_name">newsAPP</string>
</resources>
11 changes: 11 additions & 0 deletions students/soft1714080902219/app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

</resources>

0 comments on commit 45007fb

Please sign in to comment.