Skip to content

Commit

Permalink
color code added,
Browse files Browse the repository at this point in the history
Manifest edit
버튼 화면전환 수리 및 깃허브 연동
  • Loading branch information
junseok0304 committed Nov 27, 2021
1 parent 7983bb9 commit 6536d62
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Wwmarket2">

<activity
android:name=".SubActivity2"
android:exported="false" />
<activity
android:name=".SubActivity"
android:exported="false" />
<activity
android:name=".Splashactivity"
android:exported="false"
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
android:id="@+id/mButton"
android:layout_width="66dp"
android:layout_height="64dp"
android:layout_marginStart="24dp"
android:layout_marginLeft="24dp"
android:layout_marginTop="68dp"
android:text="화면전환"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.046"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.098" />
</androidx.constraintlayout.widget.ConstraintLayout>
9 changes: 5 additions & 4 deletions app/src/main/res/layout/activity_sub.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
android:id="@+id/mButton"
android:layout_width="161dp"
android:layout_height="66dp"
android:layout_marginStart="196dp"
android:layout_marginLeft="196dp"
android:layout_marginTop="648dp"
android:text="화면전환"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.828"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.962" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="backgroundyellow">#FEA300</color>
</resources>

0 comments on commit 6536d62

Please sign in to comment.