diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e5a5c72..e95e14b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
android:supportsRtl="true"
android:theme="@style/Theme.Android101"
tools:targetApi="31">
+
@@ -19,8 +22,9 @@
android:name=".MainActivity"
android:exported="true">
-
-
+
+
+
diff --git a/app/src/main/java/uk/kagurach/android101/MainActivity2.java b/app/src/main/java/uk/kagurach/android101/MainActivity2.java
index 6563fa4..46355e4 100644
--- a/app/src/main/java/uk/kagurach/android101/MainActivity2.java
+++ b/app/src/main/java/uk/kagurach/android101/MainActivity2.java
@@ -1,10 +1,12 @@
package uk.kagurach.android101;
+import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import android.util.TypedValue;
import android.view.View;
+import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
@@ -29,6 +31,14 @@ public class MainActivity2 extends AppCompatActivity {
Log.d("K","2");
}
+ @Override
+ protected void onResume(){
+ super.onResume();
+ Button button = findViewById(R.id.next_page_nav_2);
+ button.setOnClickListener(new PageButtonHandler());
+ button.setOnLongClickListener(new LongClickHandler());
+ }
+
public void set70sp(View view) {
TextView t = findViewById(R.id.test2strview);
@@ -67,4 +77,31 @@ public class MainActivity2 extends AppCompatActivity {
}
}
-}
\ No newline at end of file
+ public void goNext() {
+ Intent myIntent = new Intent(this, Page3.class);
+ startActivity(myIntent);
+ };
+
+ public void goPrev() {
+ Intent myIntent = new Intent(this, MainActivity.class);
+ startActivity(myIntent);
+ };
+
+ final class PageButtonHandler implements View.OnClickListener
+ {
+ @Override
+ public void onClick(View v){
+ goNext();
+ }
+ }
+
+ final class LongClickHandler implements View.OnLongClickListener
+ {
+ @Override
+ public boolean onLongClick(View v){
+ goPrev();
+ return false;
+ }
+ }
+}
+
diff --git a/app/src/main/java/uk/kagurach/android101/Page3.java b/app/src/main/java/uk/kagurach/android101/Page3.java
new file mode 100644
index 0000000..9f38ab0
--- /dev/null
+++ b/app/src/main/java/uk/kagurach/android101/Page3.java
@@ -0,0 +1,24 @@
+package uk.kagurach.android101;
+
+import android.os.Bundle;
+
+import androidx.activity.EdgeToEdge;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
+
+public class Page3 extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ EdgeToEdge.enable(this);
+ setContentView(R.layout.activity_page3);
+ ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
+ Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+ v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
+ return insets;
+ });
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml
index 89129fb..3ee2e3e 100644
--- a/app/src/main/res/layout/activity_main2.xml
+++ b/app/src/main/res/layout/activity_main2.xml
@@ -101,11 +101,12 @@
android:onClick="setColor"/>
+ android:text="@string/two_way_page"
+ />
diff --git a/app/src/main/res/layout/activity_page3.xml b/app/src/main/res/layout/activity_page3.xml
new file mode 100644
index 0000000..3b64a03
--- /dev/null
+++ b/app/src/main/res/layout/activity_page3.xml
@@ -0,0 +1,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6af0e59..dbd0648 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
Android101
你好,世界!
下一页
+ 单击下一页,长桉上一页
测试文本
设置颜色
\ No newline at end of file