Skip to content

Commit

Permalink
主页加入横屏布局
Browse files Browse the repository at this point in the history 
优化布局
  • Loading branch information
@Moeyuuko
Moeyuuko committed May 14, 2020
1 parent e5d5502 commit 4aaecec
Show file tree
Hide file tree
Showing 13 changed files with 284 additions and 96 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
minSdkVersion 16
targetSdkVersion 28
versionCode 1
versionName '1.6'
versionName '1.7-beta1'

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<activity android:name=".Main4Activity" android:screenOrientation="portrait" />
<activity android:name=".Main3Activity" android:screenOrientation="portrait" />
<activity android:name=".Main2Activity" android:screenOrientation="portrait" />
<activity android:name=".MainActivity" android:screenOrientation="portrait"> <!-- activity1 竖屏 -->
<activity android:name=".MainActivity"> <!-- activity1 竖屏 -->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/example/helloandroid/ViewPagerActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -14,6 +15,7 @@ public class ViewPagerActivity extends AppCompatActivity {
private ViewPager viewPager;
private List<View> views;
private MyNewAdapter myNewAdapter; //重写 继承 ViewPagerAdapter
private Button button11;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -33,5 +35,13 @@ protected void onCreate(Bundle savedInstanceState) {

myNewAdapter = new MyNewAdapter(views);
viewPager.setAdapter(myNewAdapter);

button11 = (Button)findViewById(R.id.button11);
button11.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
}
});
}
}
140 changes: 140 additions & 0 deletions app/src/main/res/layout-land/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.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=".MainActivity">


<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
android:textSize="36sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/scrollView2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.501" />

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:text="@string/moeyuuko"
android:textColor="@drawable/bg_tv_selector"
android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/scrollView2"
app:layout_constraintStart_toStartOf="parent" />

<ScrollView
android:id="@+id/scrollView2"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="32dp"
android:layout_marginBottom="32dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.89"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<Button
android:id="@+id/button"
android:layout_width="160dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:background="@drawable/bg_bt_selector"
android:text="切换文本"
android:textColor="#FFFFFF"
android:textSize="20sp" />

<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_marginStart="1dp"
android:layout_marginLeft="1dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="1dp"
android:layout_marginRight="1dp"
android:orientation="horizontal">

<Button
android:id="@+id/button2"
android:layout_width="150dp"
android:layout_height="50dp"
android:text="Activity2"
android:textSize="18sp" />

<Button
android:id="@+id/button4"
android:layout_width="150dp"
android:layout_height="50dp"
android:text="Activity3"
android:textSize="18sp" />
</LinearLayout>

<Button
android:id="@+id/button7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="活动的信息传递"
android:textSize="18sp" />

<Button
android:id="@+id/button9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="ViewPager滑动"
android:textSize="18sp" />

<Button
android:id="@+id/button10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="random随机数"
android:textSize="18sp" />

<Button
android:id="@+id/button14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="剪刀石头布"
android:textSize="18sp" />

<Button
android:id="@+id/button15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="访问摄像头"
android:textSize="18sp" />

</LinearLayout>


</ScrollView>


</androidx.constraintlayout.widget.ConstraintLayout>
175 changes: 100 additions & 75 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
android:layout_height="wrap_content"
android:text="Hello World!"
android:textSize="36sp"
app:layout_constraintBottom_toTopOf="@+id/button"
app:layout_constraintBottom_toTopOf="@+id/textView2"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.22000003" />


<TextView
Expand All @@ -32,83 +33,107 @@
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" />

<Button
android:id="@+id/button"
android:layout_width="160dp"
android:layout_height="50dp"
android:background="@drawable/bg_bt_selector"
android:text="切换文本"
android:textColor="#FFFFFF"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="100dp"
android:layout_marginBottom="32dp"
app:layout_constraintBottom_toTopOf="@+id/textView2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.32999998" />
app:layout_constraintTop_toBottomOf="@+id/textView">

<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginStart="1dp"
android:layout_marginLeft="1dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="1dp"
android:layout_marginRight="1dp"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.517"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button"
app:layout_constraintVertical_bias="0.0">

<Button
android:id="@+id/button2"
android:layout_width="150dp"
android:layout_height="50dp"
android:text="Activity2"
android:textSize="18sp" />

<Button
android:id="@+id/button4"
android:layout_width="150dp"
android:layout_height="50dp"
android:text="Activity3"
android:textSize="18sp" />
</LinearLayout>

<Button
android:id="@+id/button7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="活动的信息传递"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<Button
android:id="@+id/button9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="ViewPager滑动"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button7" />
<Button
android:id="@+id/button"
android:layout_width="160dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:background="@drawable/bg_bt_selector"
android:text="切换文本"
android:textColor="#FFFFFF"
android:textSize="20sp" />

<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_marginStart="1dp"
android:layout_marginLeft="1dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="1dp"
android:layout_marginRight="1dp"
android:orientation="horizontal">

<Button
android:id="@+id/button2"
android:layout_width="150dp"
android:layout_height="50dp"
android:text="Activity2"
android:textSize="18sp" />

<Button
android:id="@+id/button4"
android:layout_width="150dp"
android:layout_height="50dp"
android:text="Activity3"
android:textSize="18sp" />
</LinearLayout>

<Button
android:id="@+id/button7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="活动的信息传递"
android:textSize="18sp" />

<Button
android:id="@+id/button9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="ViewPager滑动"
android:textSize="18sp" />

<Button
android:id="@+id/button10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="random随机数"
android:textSize="18sp" />

<Button
android:id="@+id/button14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="剪刀石头布"
android:textSize="18sp" />

<Button
android:id="@+id/button15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="访问摄像头"
android:textSize="18sp" />

</LinearLayout>


</ScrollView>

<Button
android:id="@+id/button10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="random随机数"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button9" />

</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:id="@+id/button3"
android:layout_width="100dp"
android:layout_height="50dp"
android:text="关闭"
android:text="@string/back"
android:textSize="24sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Loading

0 comments on commit 4aaecec

Please sign in to comment.