parent
2360930176
commit
7e7d93e3f4
Binary file not shown.
@ -0,0 +1,62 @@
|
||||
Index: app/src/main/java/com/diary/showme/diary/ui/CardActivity.java
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
|
||||
<+>package com.diary.showme.diary.ui;\r\n\r\nimport android.app.Activity;\r\nimport android.content.Intent;\r\nimport android.os.Bundle;\r\nimport android.view.View;\r\nimport android.widget.Button;\r\nimport android.content.Context;\r\nimport android.graphics.Color;\r\nimport android.os.Environment;\r\nimport android.widget.EditText;\r\nimport android.widget.Toast;\r\n\r\nimport androidx.annotation.Nullable;\r\nimport androidx.appcompat.app.AppCompatActivity;\r\n\r\nimport com.diary.showme.Course.AddCourseActivity;\r\nimport com.diary.showme.Course.Course;\r\nimport com.diary.showme.Course.CourseActivity;\r\nimport com.diary.showme.R;\r\n\r\n\r\npublic class CardActivity extends AppCompatActivity {\r\n\r\n private Button card1;\r\n\r\n private Button card2;\r\n\r\n private Button card3;\r\n\r\n @Override\r\n protected void onCreate(Bundle savedInstanceState) {\r\n super.onCreate(savedInstanceState);\r\n setContentView(R.layout.card);\r\n\r\n card1 = findViewById(R.id.card1);\r\n card2 = findViewById(R.id.card2);\r\n card3 = findViewById(R.id.card3);\r\n card1.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n card2.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n card3.setOnClickListener(new View.OnClickListener() {\r\n @Override\r\n public void onClick(View v) {\r\n startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);\r\n }\r\n });\r\n }\r\n\r\n public static void startActivity(Context context) {\r\n Intent intent = new Intent(context, CardActivity.class);\r\n context.startActivity(intent);\r\n }\r\n\r\n\r\n}\r\n
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
--- app/src/main/java/com/diary/showme/diary/ui/CardActivity.java (revision c7e2ad49109864f6c4a19759f6af43db764bb204)
|
||||
+++ app/src/main/java/com/diary/showme/diary/ui/CardActivity.java (date 1626049324133)
|
||||
@@ -39,19 +39,22 @@
|
||||
card1.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);
|
||||
+ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class);
|
||||
+ startActivity(intent);
|
||||
}
|
||||
});
|
||||
card2.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);
|
||||
+ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class);
|
||||
+ startActivity(intent);
|
||||
}
|
||||
});
|
||||
card3.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
- startActivityForResult(new Intent(CardActivity.this, AddDiaryActivity.class), 0);
|
||||
+ Intent intent = new Intent(CardActivity.this, AddDiaryActivity.class);
|
||||
+ startActivity(intent);
|
||||
}
|
||||
});
|
||||
}
|
||||
Index: app/src/main/res/layout/question_item.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
|
||||
<+><?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"wrap_content\">\r\n\r\n <LinearLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"horizontal\">\r\n\r\n <TextView\r\n android:id=\"@+id/question_content\"\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"wrap_content\"\r\n android:gravity=\"center\"\r\n android:textSize=\"24sp\"/>\r\n\r\n </LinearLayout>\r\n\r\n</FrameLayout>
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
--- app/src/main/res/layout/question_item.xml (revision c7e2ad49109864f6c4a19759f6af43db764bb204)
|
||||
+++ app/src/main/res/layout/question_item.xml (date 1626048966859)
|
||||
@@ -8,12 +8,14 @@
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
- <TextView
|
||||
+ <Button
|
||||
android:id="@+id/question_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
- android:gravity="center"
|
||||
- android:textSize="24sp"/>
|
||||
+ android:layout_weight="1"
|
||||
+ android:background="#A4CF2626"
|
||||
+ android:text="今天有遇到什么开心的事情吗？"
|
||||
+ />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
<changelist name="Uncommitted_changes_before_Update_at_2021_7_12_8_40_[Default_Changelist]" date="1626050458233" recycled="true" deleted="true">
|
||||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_8_40_[Default_Changelist]/shelved.patch" />
|
||||
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2021/7/12 8:40 [Default Changelist]" />
|
||||
</changelist>
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -0,0 +1,14 @@
|
||||
<changelist name="Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]" date="1626051883392" recycled="true" deleted="true">
|
||||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/shelved.patch" />
|
||||
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2021/7/12 9:04 [Default Changelist]" />
|
||||
<binary>
|
||||
<option name="BEFORE_PATH" value="../app-release.apk" />
|
||||
<option name="AFTER_PATH" value="../app-release.apk" />
|
||||
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2021_7_12_9_04_[Default_Changelist]/app-release.apk" />
|
||||
</binary>
|
||||
<binary>
|
||||
<option name="BEFORE_PATH" value="app/release/app-release.apk" />
|
||||
<option name="AFTER_PATH" />
|
||||
<option name="SHELVED_PATH" />
|
||||
</binary>
|
||||
</changelist>
|
||||
Binary file not shown.
Loading…
Reference in new issue