Skip to content

Commit

Permalink
Merge pull request #993 from 1714080902306/master
Browse files Browse the repository at this point in the history 
#4 提交实验四代码
  • Loading branch information
@zengsn
zengsn authored Mar 26, 2019
2 parents 0f5c4b8 + a969a51 commit 86b582d
Show file tree
Hide file tree
Showing 6 changed files with 235 additions and 40 deletions.
35 changes: 35 additions & 0 deletions students/soft1714080902306/ShiYan03/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.hzuapps.androidlabs">

<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=".soft1714080902306.Soft1714080902306Activity02"
android:label="购买火车票">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".soft1714080902306.Soft1714080902306Activity01"
android:label="火车订票APP"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

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

</application>

</manifest>
2 changes: 1 addition & 1 deletion .../src/main/java/edu/hzuapps/androidlabs/soft1714080902306/Soft1714080902306Activity01.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.soft_1714080902306_activity01);

TextView btnOpen = (TextView) findViewById(R.id.textview_01);
TextView btnOpen = findViewById(R.id.Button_1);
btnOpen.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down
Binary file added students/soft1714080902306/ShiYan03/app/src/main/res/drawable/tubiao.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.
72 changes: 54 additions & 18 deletions ...ents/soft1714080902306/ShiYan03/app/src/main/res/layout/soft_1714080902306_activity01.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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=".soft1714080902306.Soft1714080902306Activity01"
>
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView
android:id="@+id/textview_01"

<ImageButton
android:id="@+id/imageButton"
android:layout_width="match_parent"
android:layout_height="218dp"
app:srcCompat="@drawable/tubiao" />
<Button
android:id="@+id/Button_1"
android:layout_width="match_parent"
android:layout_height="60dp"
android:text="购买火车票"
android:textSize="30sp"
android:layout_marginTop="30dp"
/>
<Button
android:id="@+id/Button_2"
android:layout_width="match_parent"
android:layout_height="60dp"
android:text="退票"
android:textSize="30sp"
android:layout_marginTop="30dp"
/>
<Button
android:id="@+id/Button_3"
android:layout_width="match_parent"
android:layout_height="60dp"
android:text="查看已购票信息"
android:textSize="30sp"
android:layout_marginTop="30dp"
/>
<Button
android:id="@+id/Button_4"
android:layout_width="match_parent"
android:layout_height="60dp"
android:text="投诉"
android:textSize="30sp"
android:layout_marginTop="30dp"
/>
<Button
android:id="@+id/Button_5"
android:layout_width="match_parent"
android:layout_height="385dp"
android:clickable="true"
android:drawableTop="@drawable/huochepiao"
android:gravity="center"
android:text="火车票"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="59dp" />
</android.support.constraint.ConstraintLayout>
android:layout_height="60dp"
android:text="帮助"
android:textSize="30sp"
android:layout_marginTop="30dp"
/>





</LinearLayout>
64 changes: 48 additions & 16 deletions ...ents/soft1714080902306/ShiYan03/app/src/main/res/layout/soft_1714080902306_activity02.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<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=".soft1714080902306.Soft1714080902306Activity02">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">

<TextView
android:id="@+id/textView1"
<EditText
android:id="@+id/editText_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
tools:layout_editor_absoluteX="50dp"
tools:layout_editor_absoluteY="100dp"
android:text="出发地点：太原 目的地：大同"
/>

android:layout_height="wrap_content"
android:ems="10"
android:inputType="textMultiLine"
android:text="出发地点："
android:layout_marginTop="100dp"
android:textSize="25sp"/>
<EditText
android:id="@+id/editText_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textMultiLine"
android:text="到达地点："
android:layout_marginTop="30dp"
android:textSize="25sp"/>

<EditText
android:id="@+id/editText_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textMultiLine"
android:text="用户名："
android:layout_marginTop="30dp"
android:textSize="25sp"/>

<EditText
android:id="@+id/editText_4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textMultiLine"
android:text="身份证号码："
android:layout_marginTop="30dp"
android:textSize="25sp"/>

</android.support.constraint.ConstraintLayout>
<EditText
android:id="@+id/editText_5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textMultiLine"
android:text="乘坐人数："
android:layout_marginTop="30dp"
android:textSize="25sp"/>
</LinearLayout>
102 changes: 97 additions & 5 deletions students/soft1714080902306/ShiYan03/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<resources>
<string name="app_name">ShiYan03</string>
<string name="app_name">火车订票APP</string>
<string name="title_activity_soft171408090230602">Settings</string>

<!-- Strings related to Settings -->

<!-- Example General settings -->

<string name="pref_header_general">General</string>

<string name="pref_title_social_recommendations">Enable social recommendations</string>
Expand Down Expand Up @@ -74,4 +71,99 @@

<string name="pref_title_vibrate">Vibrate</string>
<string name="title_activity_soft171408090230601">Soft1714080902306Activity01</string>

<string name="title_activity_fullscreen">FullscreenActivity</string>
<string name="dummy_button">Dummy Button</string>
<string name="dummy_content">DUMMY\nCONTENT</string>
<string name="title_activity_scrolling">ScrollingActivity</string>
<string name="large_text">
"Material is the metaphor.\n\n"

"A material metaphor is the unifying theory of a rationalized space and a system of motion."
"The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
"technologically advanced and open to imagination and magic.\n"
"Surfaces and edges of the material provide visual cues that are grounded in reality. The "
"use of familiar tactile attributes helps users quickly understand affordances. Yet the "
"flexibility of the material creates new affordances that supercede those in the physical "
"world, without breaking the rules of physics.\n"
"The fundamentals of light, surface, and movement are key to conveying how objects move, "
"interact, and exist in space and in relation to each other. Realistic lighting shows "
"seams, divides space, and indicates moving parts.\n\n"

"Bold, graphic, intentional.\n\n"

"The foundational elements of print based design typography, grids, space, scale, color, "
"and use of imagery guide visual treatments. These elements do far more than please the "
"eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
"imagery, large scale typography, and intentional white space create a bold and graphic "
"interface that immerse the user in the experience.\n"
"An emphasis on user actions makes core functionality immediately apparent and provides "
"waypoints for the user.\n\n"

"Motion provides meaning.\n\n"

"Motion respects and reinforces the user as the prime mover. Primary user actions are "
"inflection points that initiate motion, transforming the whole design.\n"
"All action takes place in a single environment. Objects are presented to the user without "
"breaking the continuity of experience even as they transform and reorganize.\n"
"Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
"Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"

"3D world.\n\n"

"The material environment is a 3D space, which means all objects have x, y, and z "
"dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
"positive z-axis extending towards the viewer. Every sheet of material occupies a single "
"position along the z-axis and has a standard 1dp thickness.\n"
"On the web, the z-axis is used for layering and not for perspective. The 3D world is "
"emulated by manipulating the y-axis.\n\n"

"Light and shadow.\n\n"

"Within the material environment, virtual lights illuminate the scene. Key lights create "
"directional shadows, while ambient light creates soft shadows from all angles.\n"
"Shadows in the material environment are cast by these two light sources. In Android "
"development, shadows occur when light sources are blocked by sheets of material at "
"various positions along the z-axis. On the web, shadows are depicted by manipulating the "
"y-axis only. The following example shows the card with a height of 6dp.\n\n"

"Resting elevation.\n\n"

"All material objects, regardless of size, have a resting elevation, or default elevation "
"that does not change. If an object changes elevation, it should return to its resting "
"elevation as soon as possible.\n\n"

"Component elevations.\n\n"

"The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
"does not vary from 6dp in one app to 16dp in another app).\n"
"Components may have different resting elevations across platforms, depending on the depth "
"of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"

"Responsive elevation and dynamic elevation offsets.\n\n"

"Some component types have responsive elevation, meaning they change elevation in response "
"to user input (e.g., normal, focused, and pressed) or system events. These elevation "
"changes are consistently implemented using dynamic elevation offsets.\n"
"Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
"to the component’s resting state. They ensure that elevation changes are consistent "
"across actions and component types. For example, all components that lift on press have "
"the same elevation change relative to their resting elevation.\n"
"Once the input event is completed or cancelled, the component will return to its resting "
"elevation.\n\n"

"Avoiding elevation interference.\n\n"

"Components with responsive elevations may encounter other components as they move between "
"their resting elevations and dynamic elevation offsets. Because material cannot pass "
"through other material, components avoid interfering with one another any number of ways, "
"whether on a per component basis or using the entire app layout.\n"
"On a component level, components can move or be removed before they cause interference. "
"For example, a floating action button (FAB) can disappear or move off screen before a "
"user picks up a card, or it can move if a snackbar appears.\n"
"On the layout level, design your app layout to minimize opportunities for interference. "
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
"when a user tries to pick up one of cards.\n\n"
</string>
<string name="action_settings">Settings</string>
</resources>

0 comments on commit 86b582d

Please sign in to comment.