Revert "hzuapps#4 hzuapps#541 第四次实验"

kaluozi · Apr 11, 2019 · bb059fa · bb059fa
1 parent e4a2e10
commit bb059fa
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 265 deletions.
diff --git a/students/soft1714080902401/app/src/main/AndroidManifest.xml b/students/soft1714080902401/app/src/main/AndroidManifest.xml
@@ -5,12 +5,11 @@
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher_appico"
-        android:label="@string/app_name"
+        android:label="我的日记"
         android:roundIcon="@drawable/ic_launcher_appico"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".Soft1714080902401_newActivity"></activity>
-        <activity android:name=".Soft1714080902401_01Activity" />
+        <activity android:name=".Soft1714080902401_01Activity"></activity>
         <activity android:name=".Soft1714080902401Activity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...pp/src/main/java/edu/hzuapps/androidlabs/soft1714080902401/Soft1714080902401Activity.java b/...pp/src/main/java/edu/hzuapps/androidlabs/soft1714080902401/Soft1714080902401Activity.java
@@ -2,8 +2,8 @@
 
 
 import android.content.Intent;
-import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
@@ -15,14 +15,15 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_soft_1714080902401);
 
-        Button begin = (Button) findViewById(R.id.Begin);
+    Button begin = (Button) findViewById(R.id.Begin);
         begin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(Soft1714080902401Activity.this,Soft1714080902401_01Activity.class);
-                startActivity(intent);
-            }
-        });
-    }
+        @Override
+        public void onClick(View v) {
+            Intent intent = new Intent(Soft1714080902401Activity.this,Soft1714080902401_01Activity.class);
+            startActivity(intent);
+        }
+    });
+}
+
 }
 
diff --git a/...src/main/java/edu/hzuapps/androidlabs/soft1714080902401/Soft1714080902401_01Activity.java b/...src/main/java/edu/hzuapps/androidlabs/soft1714080902401/Soft1714080902401_01Activity.java
@@ -1,27 +1,13 @@
 package edu.hzuapps.androidlabs.soft1714080902401;
 
-import android.content.Intent;
-import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.Button;
+import android.os.Bundle;
 
 public class Soft1714080902401_01Activity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_soft_1714080902401_01);
-
-
-        Button NewD = (Button) findViewById(R.id.newD);
-        NewD.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(Soft1714080902401_01Activity.this, Soft1714080902401_newActivity.class);
-                startActivity(intent);
-            }
-        });
-
+        setContentView(R.layout.activity_soft1714080902401_01);
     }
 }
diff --git a/...rc/main/java/edu/hzuapps/androidlabs/soft1714080902401/Soft1714080902401_newActivity.java b/...rc/main/java/edu/hzuapps/androidlabs/soft1714080902401/Soft1714080902401_newActivity.java
diff --git a/students/soft1714080902401/app/src/main/res/layout/activity_soft1714080902401_01.xml b/students/soft1714080902401/app/src/main/res/layout/activity_soft1714080902401_01.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:background="@drawable/fbackgroud"
+    tools:context=".Soft1714080902401_01Activity">
+
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="该更新日记了！"
+        />
+
+
+</LinearLayout>
diff --git a/students/soft1714080902401/app/src/main/res/layout/activity_soft_1714080902401.xml b/students/soft1714080902401/app/src/main/res/layout/activity_soft_1714080902401.xml
@@ -7,53 +7,23 @@
     android:background="@drawable/fbackgroud"
     tools:context=".Soft1714080902401Activity">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:background="@color/colorblue">
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="222dp"
-            android:layout_height="36dp"
-            android:background="@android:color/transparent"
-            android:text="It’s time to updata your  diary!"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="MissingConstraints" />
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+    <Button
+        android:id="@+id/Begin"
+        android:layout_width="180dp"
+        android:layout_height="50dp"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal"
-        android:background="@color/colorwhite">
-
-        <Button
-            android:id="@+id/Begin1"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:text="日历"
-            android:layout_width="0dp" />
-
-        <Button
-            android:id="@+id/Begin"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:text="浏览"
-            android:layout_width="0dp" />
-
-        <Button
-            android:id="@+id/Begin2"
-            android:layout_height="50dp"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:text="我"
-            android:layout_width="0dp" />
-    </LinearLayout>
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="193dp"
+        android:background="@drawable/butbg"
+        android:text="我的日记" />
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="222dp"
+        android:layout_height="36dp"
+        android:text="It’s time to updata your  diary!"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="MissingConstraints" />
 </RelativeLayout>
diff --git a/students/soft1714080902401/app/src/main/res/layout/activity_soft_1714080902401_01.xml b/students/soft1714080902401/app/src/main/res/layout/activity_soft_1714080902401_01.xml
diff --git a/students/soft1714080902401/app/src/main/res/layout/activity_soft_1714080902401_new.xml b/students/soft1714080902401/app/src/main/res/layout/activity_soft_1714080902401_new.xml
diff --git a/students/soft1714080902401/app/src/main/res/values/colors.xml b/students/soft1714080902401/app/src/main/res/values/colors.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colornull">#00000000</color>
-    <color name="colorwhite">#FFFFFF</color>
-    <color name="colorliwhite">#8BFFFFFF</color>
-    <color name="colorbalck">#000000</color>
-    <color name="colorblue">#CD0C758C</color>
+    <color name="colorPrimary">#008577</color>
+    <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
 </resources>
diff --git a/students/soft1714080902401/app/src/main/res/values/strings.xml b/students/soft1714080902401/app/src/main/res/values/strings.xml
@@ -1,7 +1,3 @@
 <resources>
-    <string name="app_name">我的日记</string>
-    <string name="title_activity_main">MainActivity</string>
-    <string name="title_home">Home</string>
-    <string name="title_dashboard">Dashboard</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="app_name">Diary</string>
 </resources>
diff --git a/students/soft1714080902401/app/src/main/res/values/styles.xml b/students/soft1714080902401/app/src/main/res/values/styles.xml
@@ -3,10 +3,9 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorblue</item>
-        <item name="colorPrimaryDark">@color/colorwhite</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="windowNoTitle">true</item>
     </style>
 
 </resources>