Skip to content

Commit

Permalink
[Feat] 설정창 UI 구현 #9
Browse files Browse the repository at this point in the history
  • Loading branch information
hmkim68512 committed Jul 31, 2023
1 parent 18d6d74 commit 6a571d7
Show file tree
Hide file tree
Showing 18 changed files with 519 additions and 6 deletions.
10 changes: 5 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" >
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand All @@ -18,9 +18,9 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/Theme.PINPLE_AOS"
tools:targetApi="31" >
tools:targetApi="31">
<activity
android:name=".SettingTabActivity"
android:name=".PreferenceActivity"
android:label="설정"
android:parentActivityName=".MainActivity" />
<activity
Expand All @@ -34,7 +34,7 @@
android:exported="false" />
<activity
android:name=".SplashActivity"
android:exported="true" >
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -52,7 +52,7 @@
android:exported="true" />
<activity
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
android:exported="true" >
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class AccessRequestActivity : AppCompatActivity() {
val moveButton = findViewById<ImageButton>(R.id.button_check)

fun moveToAnotherPage(){
val intent = Intent(this, LandingActivity::class.java)
val intent = Intent(this, PreferenceActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
startActivity(intent)
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/example/pinple_aos/PreferenceActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example.pinple_aos

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity


class PreferenceActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_preference)
}
}
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/button_switch_off.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp"
android:height="24dp"
android:viewportWidth="48"
android:viewportHeight="24">
<path
android:pathData="M12,0L36,0A12,12 0,0 1,48 12L48,12A12,12 0,0 1,36 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"
android:fillColor="#E3E3E3"/>
<path
android:pathData="M12,12m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
android:fillColor="#ffffff"/>
</vector>
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/button_switch_on.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="47dp"
android:height="24dp"
android:viewportWidth="47"
android:viewportHeight="24">
<path
android:pathData="M12,0L35,0A12,12 0,0 1,47 12L47,12A12,12 0,0 1,35 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"
android:fillColor="#222222"/>
<path
android:pathData="M35,12m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
android:fillColor="#ffffff"/>
</vector>
18 changes: 18 additions & 0 deletions app/src/main/res/drawable/icon_app_info.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M10.221,2.813H4.221C3.668,2.813 3.221,3.261 3.221,3.813V9.813C3.221,10.366 3.668,10.814 4.221,10.814H10.221C10.773,10.814 11.221,10.366 11.221,9.813V3.813C11.221,3.261 10.773,2.813 10.221,2.813Z"
android:fillColor="#484848"/>
<path
android:pathData="M20.221,2.813H14.221C13.668,2.813 13.221,3.261 13.221,3.813V9.813C13.221,10.366 13.668,10.814 14.221,10.814H20.221C20.773,10.814 21.221,10.366 21.221,9.813V3.813C21.221,3.261 20.773,2.813 20.221,2.813Z"
android:fillColor="#484848"/>
<path
android:pathData="M20.221,12.814H14.221C13.668,12.814 13.221,13.261 13.221,13.814V19.813C13.221,20.366 13.668,20.813 14.221,20.813H20.221C20.773,20.813 21.221,20.366 21.221,19.813V13.814C21.221,13.261 20.773,12.814 20.221,12.814Z"
android:fillColor="#484848"/>
<path
android:pathData="M10.221,12.814H4.221C3.668,12.814 3.221,13.261 3.221,13.814V19.813C3.221,20.366 3.668,20.813 4.221,20.813H10.221C10.773,20.813 11.221,20.366 11.221,19.813V13.814C11.221,13.261 10.773,12.814 10.221,12.814Z"
android:fillColor="#484848"/>
</vector>
20 changes: 20 additions & 0 deletions app/src/main/res/drawable/icon_arrow_next.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:strokeWidth="1"
android:pathData="M3.529,12H21.265"
android:strokeLineJoin="round"
android:fillColor="#00000000"
android:strokeColor="#999999"
android:strokeLineCap="round"/>
<path
android:strokeWidth="1"
android:pathData="M21.265,12L15.64,6.375"
android:strokeLineJoin="round"
android:fillColor="#00000000"
android:strokeColor="#999999"
android:strokeLineCap="round"/>
</vector>
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/icon_notification_black.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19,8.229C19,6.501 18.308,4.844 17.075,3.622C15.843,2.401 14.171,1.714 12.428,1.714C10.686,1.714 9.014,2.401 7.782,3.622C6.549,4.844 5.857,6.501 5.857,8.229C5.857,15.829 2.571,18 2.571,18H22.286C22.286,18 19,15.829 19,8.229Z"
android:fillColor="#484848"/>
<path
android:pathData="M15.429,19.714C15.124,20.497 14.686,21.146 14.16,21.597C13.633,22.048 13.036,22.286 12.429,22.286C11.821,22.286 11.224,22.048 10.698,21.597C10.171,21.146 9.734,20.497 9.429,19.714"
android:fillColor="#484848"/>
</vector>
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/icon_user_small.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20,21V18.333C20,16.919 19.579,15.562 18.828,14.562C18.078,13.562 17.061,13 16,13H8C6.939,13 5.922,13.562 5.172,14.562C4.421,15.562 4,16.919 4,18.333V21"
android:fillColor="#484848"/>
<path
android:pathData="M12,11C14.209,11 16,9.209 16,7C16,4.791 14.209,3 12,3C9.791,3 8,4.791 8,7C8,9.209 9.791,11 12,11Z"
android:fillColor="#484848"/>
</vector>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/preferences_line.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >

<solid
android:color="@color/color_background" />

</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/switch_thumb.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/switch_thumb_on" android:state_checked="true" />
<item android:drawable="@drawable/switch_thumb_off" />
</selector>
17 changes: 17 additions & 0 deletions app/src/main/res/drawable/switch_thumb_off.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<size
android:width="18dp"
android:height="18dp" />

<solid
android:color="#FFFFFF" />

<stroke
android:width="3dp"
android:color="@color/color_gray_light" />

</shape>
17 changes: 17 additions & 0 deletions app/src/main/res/drawable/switch_thumb_on.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">

<size
android:width="18dp"
android:height="18dp" />

<solid
android:color="#FFFFFF" />

<stroke
android:width="3dp"
android:color="@color/color_main_black" />

</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/switch_track.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/switch_track_on" android:state_checked="true" />
<item android:drawable="@drawable/switch_track_off" />
</selector>
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/switch_track_off.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >

<corners
android:radius="14dp" />

<size
android:width="47dp"
android:height="24dp" />

<solid
android:color="@color/color_gray_light" />

</shape>
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/switch_track_on.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >

<corners
android:radius="14dp" />

<size
android:width="47dp"
android:height="24dp" />

<solid
android:color="@color/color_main_black" />

</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/tab_bar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >

<solid
android:color="@color/color_main_black" />

</shape>
Loading

0 comments on commit 6a571d7

Please sign in to comment.