신기성

modifying conflict

Showing 62 changed files with 1119 additions and 119 deletions
No preview for this file type

298 Bytes

1 from firebase_admin import messaging 1 from firebase_admin import messaging
2 from firebase_admin import credentials 2 from firebase_admin import credentials
3 +from firebase_admin import datetime
4 +from firebase_admin import db
3 import firebase_admin 5 import firebase_admin
6 +import json
7 +import re
8 +
4 9
5 cred = credentials.Certificate('wello_firebase_SDKKey.json') 10 cred = credentials.Certificate('wello_firebase_SDKKey.json')
6 -default_app = firebase_admin.initialize_app(cred) 11 +firebase_admin.initialize_app(cred, {'databaseURL': 'https://wello-topic.firebaseio.com/'})
12 +ref = db.reference()
13 +topics = list(ref.get())
14 +pre_topic = list()
7 15
8 -def send_to_topic():
9 - # [START send_to_topic]
10 - # The topic name can be optionally prefixed with "/topics/".
11 - topic = 'c1_1'
12 16
13 - # See documentation on defining a message payload. 17 +def send_to_topic(policy, topic):
14 message = messaging.Message( 18 message = messaging.Message(
15 - title = 'wef', 19 + android=messaging.AndroidConfig(
20 + ttl=datetime.timedelta(seconds=3600),
21 + priority='normal',
22 + notification=messaging.AndroidNotification(
23 + title='새 정책 알람',
24 + body=policy,
25 + icon='@drawable/mini',
26 + color='#29ABE2',
27 + sound='default'
28 + ),
29 + ),
16 data={ 30 data={
17 'score': '850', 31 'score': '850',
18 'time': '2:45', 32 'time': '2:45',
19 }, 33 },
34 + webpush=messaging.WebpushConfig(
35 + notification=messaging.WebpushNotification(
36 + title='웹 알림',
37 + body='TEST',
38 + icon='',
39 + ),
40 + ),
20 topic=topic, 41 topic=topic,
21 ) 42 )
22 -
23 - # Send a message to the devices subscribed to the provided topic.
24 response = messaging.send(message) 43 response = messaging.send(message)
25 - # Response is a message ID string.
26 -
27 print('Successfully sent message:', response) 44 print('Successfully sent message:', response)
28 45
29 -send_to_topic() 46 +
47 +for topic in topics:
48 + categorys = re.findall('c[0-9]+[_][0-9]+', topic)
49 + for i in range(len(categorys) - 1, -1, -1):
50 + if '1' == categorys[i].split('_')[-1]:
51 + categorys.pop(i)
52 + pre_topic.append(categorys)
53 +
54 +
55 +print('new policy category : ', end = '')
56 +policy = input()
57 +policy_category = re.findall('c[0-9]+[_][0-9]+', policy)
58 +policy_category_list = re.findall('c[0-9]+', policy)
59 +push_index = list()
60 +flag = True
61 +
62 +
63 +for i, categorys in enumerate(pre_topic):
64 + for category in categorys:
65 + if category.split('_')[0] in policy_category_list:
66 + if category not in policy_category:
67 + flag = False
68 + break
69 + if flag: push_index.append(i)
70 + flag = True
71 +
72 +
73 +for push in push_index:
74 + send_to_topic('[가정복지부] 기성이를 보유하신 가정에 지원금을 드립니다.', topics[push])
......
...@@ -17,7 +17,9 @@ import com.google.firebase.database.DataSnapshot ...@@ -17,7 +17,9 @@ import com.google.firebase.database.DataSnapshot
17 import com.google.firebase.database.DatabaseError 17 import com.google.firebase.database.DatabaseError
18 import com.google.firebase.database.FirebaseDatabase 18 import com.google.firebase.database.FirebaseDatabase
19 import com.google.firebase.database.ValueEventListener 19 import com.google.firebase.database.ValueEventListener
20 +import kotlinx.android.synthetic.main.activity_favorites.*
20 import kotlinx.android.synthetic.main.activity_recommend.* 21 import kotlinx.android.synthetic.main.activity_recommend.*
22 +import kotlinx.android.synthetic.main.activity_recommend.policyRecyclerView
21 import kotlinx.android.synthetic.main.activity_recommend.toolbar 23 import kotlinx.android.synthetic.main.activity_recommend.toolbar
22 import kotlinx.android.synthetic.main.activity_signin.* 24 import kotlinx.android.synthetic.main.activity_signin.*
23 25
...@@ -37,6 +39,12 @@ class FavoritesActivity : AppCompatActivity() { ...@@ -37,6 +39,12 @@ class FavoritesActivity : AppCompatActivity() {
37 super.onCreate(savedInstanceState) 39 super.onCreate(savedInstanceState)
38 setContentView(R.layout.activity_favorites) 40 setContentView(R.layout.activity_favorites)
39 41
42 + // 네비게이션 뷰 포커스 맞추는 코드
43 + val bottomNavigationView: BottomNavigationView = findViewById(R.id.bottomNavigation3) as BottomNavigationView
44 + bottomNavigationView.selectedItemId = R.id.bottomFavorites
45 + bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
46 +
47 +
40 val policyList = ArrayList<PolicyItem>() 48 val policyList = ArrayList<PolicyItem>()
41 var favordatabase = FirebaseDatabase.getInstance().reference 49 var favordatabase = FirebaseDatabase.getInstance().reference
42 50
...@@ -67,41 +75,39 @@ class FavoritesActivity : AppCompatActivity() { ...@@ -67,41 +75,39 @@ class FavoritesActivity : AppCompatActivity() {
67 memo!!.Policy, 75 memo!!.Policy,
68 4.toFloat(), 76 4.toFloat(),
69 " " 77 " "
70 -
71 ) 78 )
72 ) 79 )
73 } 80 }
74 81
75 val adapter = PolicyAdapter(policyList) 82 val adapter = PolicyAdapter(policyList)
76 policyRecyclerView.adapter = adapter 83 policyRecyclerView.adapter = adapter
77 -
78 } 84 }
79 -
80 }) 85 })
81 -
82 } 86 }
83 87
84 - if (intent.hasExtra("key")) { 88 + /* if (intent.hasExtra("key")) {
85 //textView.text = intent.getStringExtra("key") 텍뷰추가하면 인텐트로 값넘기는거 보임 89 //textView.text = intent.getStringExtra("key") 텍뷰추가하면 인텐트로 값넘기는거 보임
86 90
87 } else { 91 } else {
88 Toast.makeText(this, "putExtra value not found", Toast.LENGTH_SHORT).show() 92 Toast.makeText(this, "putExtra value not found", Toast.LENGTH_SHORT).show()
89 } 93 }
90 94
95 + */
96 +
91 97
92 98
93 // 1. 툴바 사용 설정 99 // 1. 툴바 사용 설정
94 setSupportActionBar(toolbar) 100 setSupportActionBar(toolbar)
95 101
96 // 2. 툴바 왼쪽 버튼 설정 102 // 2. 툴바 왼쪽 버튼 설정
97 - supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 왼쪽 버튼 사용 여부 true 103 + supportActionBar!!.setDisplayHomeAsUpEnabled(false) // 왼쪽 버튼 사용 여부 true
98 supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정 104 supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정
99 supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기 105 supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기
100 106
101 ////bottom navigation view operation start 2 107 ////bottom navigation view operation start 2
102 bottomBar=supportActionBar!! 108 bottomBar=supportActionBar!!
103 - val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation) 109 + //val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation)
104 - bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) 110 + //bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
105 ////bottom navigation view operation end 2 111 ////bottom navigation view operation end 2
106 112
107 } 113 }
...@@ -116,6 +122,7 @@ class FavoritesActivity : AppCompatActivity() { ...@@ -116,6 +122,7 @@ class FavoritesActivity : AppCompatActivity() {
116 // 클릭된 메뉴 아이템의 아이디 마다 when 구절로 클릭시 동작을 설정한다. 122 // 클릭된 메뉴 아이템의 아이디 마다 when 구절로 클릭시 동작을 설정한다.
117 when(item!!.itemId){ 123 when(item!!.itemId){
118 android.R.id.home->{ // 메뉴 버튼 124 android.R.id.home->{ // 메뉴 버튼
125 + bottomNavigation3.selectedItemId = R.id.bottomFavorites
119 Snackbar.make(toolbar,"Menu pressed", Snackbar.LENGTH_SHORT).show() 126 Snackbar.make(toolbar,"Menu pressed", Snackbar.LENGTH_SHORT).show()
120 } 127 }
121 R.id.menu_search->{ // 검색 버튼 128 R.id.menu_search->{ // 검색 버튼
...@@ -127,27 +134,45 @@ class FavoritesActivity : AppCompatActivity() { ...@@ -127,27 +134,45 @@ class FavoritesActivity : AppCompatActivity() {
127 return super.onOptionsItemSelected(item) 134 return super.onOptionsItemSelected(item)
128 } 135 }
129 136
137 + var back_pressed: Long = 0 // 뒤로가기 종료
138 +
139 + override fun onBackPressed() {
140 + if (back_pressed + 2000 > System.currentTimeMillis()) {
141 + finishAffinity()
142 + System.runFinalization()
143 + System.exit(0)
144 + }
145 + //super.onBackPressed()
146 + else
147 + Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
148 + back_pressed = System.currentTimeMillis()
149 + }
150 +
151 +
130 //bottom navigation view operation start 3 152 //bottom navigation view operation start 3
131 private val mOnNavigationItemSelectedListener= 153 private val mOnNavigationItemSelectedListener=
132 BottomNavigationView.OnNavigationItemSelectedListener{ item-> 154 BottomNavigationView.OnNavigationItemSelectedListener{ item->
133 when (item.itemId){ 155 when (item.itemId){
134 156
135 R.id.bottomHome ->{ 157 R.id.bottomHome ->{
158 + //bottomNavigation3.selectedItemId = R.id.bottomFavorites
136 val intent = Intent(this, SignInActivity::class.java) 159 val intent = Intent(this, SignInActivity::class.java)
137 startActivity(intent) 160 startActivity(intent)
138 return@OnNavigationItemSelectedListener true 161 return@OnNavigationItemSelectedListener true
139 } 162 }
140 R.id.bottomRecommend ->{ 163 R.id.bottomRecommend ->{
164 + //bottomNavigation3.selectedItemId = R.id.bottomFavorites
141 val intent = Intent(this, RecommendActivity::class.java) 165 val intent = Intent(this, RecommendActivity::class.java)
142 startActivity(intent) 166 startActivity(intent)
143 return@OnNavigationItemSelectedListener true 167 return@OnNavigationItemSelectedListener true
144 } 168 }
145 R.id.bottomFavorites ->{ 169 R.id.bottomFavorites ->{
146 - val intent = Intent(this, FavoritesActivity::class.java) 170 + //val intent = Intent(this, FavoritesActivity::class.java)
147 - startActivity(intent) 171 + //startActivity(intent)
148 - return@OnNavigationItemSelectedListener true 172 + //return@OnNavigationItemSelectedListener true
149 } 173 }
150 R.id.bottomInfo ->{ 174 R.id.bottomInfo ->{
175 + //bottomNavigation3.selectedItemId = R.id.bottomFavorites
151 val intent = Intent(this, InfoActivity::class.java) 176 val intent = Intent(this, InfoActivity::class.java)
152 startActivity(intent) 177 startActivity(intent)
153 return@OnNavigationItemSelectedListener true 178 return@OnNavigationItemSelectedListener true
......
...@@ -14,6 +14,8 @@ import android.widget.Toast ...@@ -14,6 +14,8 @@ import android.widget.Toast
14 import kotlinx.android.synthetic.main.activity_info.* 14 import kotlinx.android.synthetic.main.activity_info.*
15 import android.graphics.drawable.ColorDrawable 15 import android.graphics.drawable.ColorDrawable
16 import androidx.core.content.ContextCompat 16 import androidx.core.content.ContextCompat
17 +import com.google.android.material.bottomnavigation.BottomNavigationView
18 +import kotlinx.android.synthetic.main.activity_favorites.*
17 import kotlinx.android.synthetic.main.activity_settings_in_form.* 19 import kotlinx.android.synthetic.main.activity_settings_in_form.*
18 20
19 class InfoActivity : AppCompatActivity() { 21 class InfoActivity : AppCompatActivity() {
...@@ -22,6 +24,12 @@ class InfoActivity : AppCompatActivity() { ...@@ -22,6 +24,12 @@ class InfoActivity : AppCompatActivity() {
22 super.onCreate(savedInstanceState) 24 super.onCreate(savedInstanceState)
23 setContentView(R.layout.activity_info) 25 setContentView(R.layout.activity_info)
24 26
27 + // 네비게이션 뷰 포커스 맞추는 코드
28 + val bottomNavigationView: BottomNavigationView = findViewById(R.id.bottomNavigation4) as BottomNavigationView
29 + bottomNavigationView.selectedItemId = R.id.bottomInfo
30 + bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
31 +
32 +
25 // statusbar color chacnge 33 // statusbar color chacnge
26 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { 34 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
27 getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); 35 getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
...@@ -31,8 +39,7 @@ class InfoActivity : AppCompatActivity() { ...@@ -31,8 +39,7 @@ class InfoActivity : AppCompatActivity() {
31 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 39 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
32 val editor: SharedPreferences.Editor=prof.edit() 40 val editor: SharedPreferences.Editor=prof.edit()
33 41
34 - Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"), 42 + //Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"), Toast.LENGTH_SHORT).show()
35 - Toast.LENGTH_SHORT).show()
36 43
37 InfoProfilModify.setOnClickListener { 44 InfoProfilModify.setOnClickListener {
38 45
...@@ -54,15 +61,50 @@ class InfoActivity : AppCompatActivity() { ...@@ -54,15 +61,50 @@ class InfoActivity : AppCompatActivity() {
54 var intent = Intent(this, QuestionsActivity::class.java) 61 var intent = Intent(this, QuestionsActivity::class.java)
55 startActivity(intent) 62 startActivity(intent)
56 } 63 }
64 + }
65 +
66 + var back_pressed: Long = 0 // 뒤로가기 종료
57 67
58 - //pushing test start 68 + override fun onBackPressed() {
59 - // InfoButtonSettings.setOnClickListener { 69 + if (back_pressed + 2000 > System.currentTimeMillis()) {
60 - // //var intent = Intent(this, SettingActivity::class.java) 70 + finishAffinity()
61 - //test start 71 + System.runFinalization()
62 - // var intent = Intent(this, InputProfilFirstOneActivity::class.java) 72 + System.exit(0)
63 - //test end 73 + }
64 - // startActivity(intent) 74 + //super.onBackPressed()
65 - // } 75 + else
66 - //pushing test end 76 + Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
77 + back_pressed = System.currentTimeMillis()
67 } 78 }
79 +
80 +
81 + private val mOnNavigationItemSelectedListener=
82 + BottomNavigationView.OnNavigationItemSelectedListener{ item->
83 + when (item.itemId){
84 + R.id.bottomHome ->{
85 + //bottomNavigation4.selectedItemId = R.id.bottomInfo
86 + val intent = Intent(this, SignInActivity::class.java)
87 + startActivity(intent)
88 + return@OnNavigationItemSelectedListener true
89 + }
90 + R.id.bottomRecommend ->{
91 + //bottomNavigation4.selectedItemId = R.id.bottomInfo
92 + val intent = Intent(this, RecommendActivity::class.java)
93 + startActivity(intent)
94 + return@OnNavigationItemSelectedListener true
95 + }
96 + R.id.bottomFavorites ->{
97 + //bottomNavigation4.selectedItemId = R.id.bottomInfo
98 + val intent = Intent(this, FavoritesActivity::class.java)
99 + startActivity(intent)
100 + return@OnNavigationItemSelectedListener true
101 + }
102 + R.id.bottomInfo ->{
103 + //val intent = Intent(this, InfoActivity::class.java)
104 + //startActivity(intent)
105 + //return@OnNavigationItemSelectedListener true
106 + }
107 + }
108 + false
109 + }
68 } 110 }
......
...@@ -38,10 +38,8 @@ class MainActivity : AppCompatActivity() { ...@@ -38,10 +38,8 @@ class MainActivity : AppCompatActivity() {
38 } 38 }
39 39
40 textview2.setOnClickListener{ 40 textview2.setOnClickListener{
41 -
42 } 41 }
43 textview3.setOnClickListener{ 42 textview3.setOnClickListener{
44 -
45 } 43 }
46 44
47 emailSignupBtn.setOnClickListener { 45 emailSignupBtn.setOnClickListener {
...@@ -56,7 +54,7 @@ class MainActivity : AppCompatActivity() { ...@@ -56,7 +54,7 @@ class MainActivity : AppCompatActivity() {
56 .addOnCompleteListener(this) { 54 .addOnCompleteListener(this) {
57 if (it.isSuccessful) { 55 if (it.isSuccessful) {
58 // Sign in success, update UI with the signed-in user's information 56 // Sign in success, update UI with the signed-in user's information
59 - Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show() 57 + //Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show()
60 val user = firebaseAuth?.currentUser 58 val user = firebaseAuth?.currentUser
61 59
62 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) 60 val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
...@@ -83,22 +81,12 @@ class MainActivity : AppCompatActivity() { ...@@ -83,22 +81,12 @@ class MainActivity : AppCompatActivity() {
83 81
84 var intent = Intent(this, SignInActivity::class.java) 82 var intent = Intent(this, SignInActivity::class.java)
85 startActivity(intent) 83 startActivity(intent)
86 -
87 } 84 }
88 85
89 } else { 86 } else {
90 // If sign in fails, display a message to the user. 87 // If sign in fails, display a message to the user.
91 - Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show() 88 + //Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show()
92 -
93 } 89 }
94 -
95 -
96 } 90 }
97 } 91 }
98 -
99 -
100 -
101 -
102 -
103 -
104 } 92 }
......
...@@ -7,6 +7,4 @@ class PolicyItem(val policyItemImage: Drawable, ...@@ -7,6 +7,4 @@ class PolicyItem(val policyItemImage: Drawable,
7 val policyItemHost: String, 7 val policyItemHost: String,
8 val policyItemTitle: String, 8 val policyItemTitle: String,
9 val policyItemScore: Float, 9 val policyItemScore: Float,
10 - val policyItemFavor: String) {
11 -
12 -}
...\ No newline at end of file ...\ No newline at end of file
10 + val policyItemFavor: String)
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.example.vip 1 package com.example.vip
2 2
3 import android.app.Activity 3 import android.app.Activity
4 +import android.content.ClipData
4 import android.content.Context 5 import android.content.Context
5 import android.content.Intent 6 import android.content.Intent
6 import android.content.SharedPreferences 7 import android.content.SharedPreferences
...@@ -8,6 +9,7 @@ import android.os.Bundle ...@@ -8,6 +9,7 @@ import android.os.Bundle
8 import android.util.Half.toFloat 9 import android.util.Half.toFloat
9 import android.view.Menu 10 import android.view.Menu
10 import android.view.MenuItem 11 import android.view.MenuItem
12 +import android.widget.Button
11 import android.widget.Toast 13 import android.widget.Toast
12 import androidx.appcompat.app.ActionBar 14 import androidx.appcompat.app.ActionBar
13 import androidx.appcompat.app.AppCompatActivity 15 import androidx.appcompat.app.AppCompatActivity
...@@ -26,6 +28,11 @@ import kotlinx.android.synthetic.main.activity_signin.toolbar ...@@ -26,6 +28,11 @@ import kotlinx.android.synthetic.main.activity_signin.toolbar
26 import kotlinx.android.synthetic.main.item_policy.* 28 import kotlinx.android.synthetic.main.item_policy.*
27 import kotlinx.android.synthetic.main.item_policy.view.* 29 import kotlinx.android.synthetic.main.item_policy.view.*
28 import kotlinx.android.synthetic.main.search.* 30 import kotlinx.android.synthetic.main.search.*
31 +import androidx.core.app.ComponentActivity.ExtraData
32 +import androidx.core.content.ContextCompat.getSystemService
33 +import android.icu.lang.UCharacter.GraphemeClusterBreak.T
34 +import androidx.core.view.size
35 +
29 36
30 data class MemoItemRecom( 37 data class MemoItemRecom(
31 val Target : String = "", 38 val Target : String = "",
...@@ -36,6 +43,8 @@ data class MemoItemRecom( ...@@ -36,6 +43,8 @@ data class MemoItemRecom(
36 43
37 class RecommendActivity : AppCompatActivity() { 44 class RecommendActivity : AppCompatActivity() {
38 45
46 + var recomdatabase = FirebaseDatabase.getInstance().reference
47 +
39 ////bottom navigation view operation start 1 48 ////bottom navigation view operation start 1
40 lateinit var bottomBar: ActionBar 49 lateinit var bottomBar: ActionBar
41 ////bottom navigation view operation end 1 50 ////bottom navigation view operation end 1
...@@ -43,14 +52,18 @@ class RecommendActivity : AppCompatActivity() { ...@@ -43,14 +52,18 @@ class RecommendActivity : AppCompatActivity() {
43 super.onCreate(savedInstanceState) 52 super.onCreate(savedInstanceState)
44 setContentView(R.layout.activity_recommend) 53 setContentView(R.layout.activity_recommend)
45 54
55 + // 네비게이션 뷰 포커스 맞추는 코드
56 + val bottomNavigationView: BottomNavigationView = findViewById(R.id.bottomNavigation2) as BottomNavigationView
57 + bottomNavigationView.selectedItemId = R.id.bottomRecommend
58 + bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
59 +
46 val policyList = ArrayList<PolicyItem>() 60 val policyList = ArrayList<PolicyItem>()
47 - var recomdatabase = FirebaseDatabase.getInstance().reference
48 61
49 if (intent.hasExtra("key")) { 62 if (intent.hasExtra("key")) {
50 //textView.text = intent.getStringExtra("key") 텍뷰추가하면 인텐트로 값넘기는거 보임 63 //textView.text = intent.getStringExtra("key") 텍뷰추가하면 인텐트로 값넘기는거 보임
51 64
52 - recomdatabase.orderByChild("Policy").startAt(intent.getStringExtra("key")).endAt(intent.getStringExtra("key")+"\uf8ff").addListenerForSingleValueEvent(object : 65 + // startAt(intent.getStringExtra("key")).endAt(intent.getStringExtra("key")+"\uf8ff")
53 - ValueEventListener { 66 + recomdatabase.orderByChild("View").addListenerForSingleValueEvent(object : ValueEventListener {
54 override fun onCancelled(p0: DatabaseError) { 67 override fun onCancelled(p0: DatabaseError) {
55 Toast.makeText(this@RecommendActivity, "실패부분", Toast.LENGTH_SHORT).show() 68 Toast.makeText(this@RecommendActivity, "실패부분", Toast.LENGTH_SHORT).show()
56 } 69 }
...@@ -63,7 +76,7 @@ class RecommendActivity : AppCompatActivity() { ...@@ -63,7 +76,7 @@ class RecommendActivity : AppCompatActivity() {
63 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, 76 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!,
64 "상시", 77 "상시",
65 memo!!.Policy, 78 memo!!.Policy,
66 - memo!!.Policy, 79 + memo.Policy,
67 4.toFloat(), 80 4.toFloat(),
68 "" 81 ""
69 ) 82 )
...@@ -75,9 +88,9 @@ class RecommendActivity : AppCompatActivity() { ...@@ -75,9 +88,9 @@ class RecommendActivity : AppCompatActivity() {
75 }) 88 })
76 89
77 } else { 90 } else {
78 - Toast.makeText(this, "putExtra value not found", Toast.LENGTH_SHORT).show() 91 + //Toast.makeText(this, "putExtra value not found", Toast.LENGTH_SHORT).show()
79 92
80 - recomdatabase.orderByChild("Policy").startAt(intent.getStringExtra("\uf8ff")).addListenerForSingleValueEvent(object : 93 + recomdatabase.orderByChild("View").addListenerForSingleValueEvent(object :
81 ValueEventListener { 94 ValueEventListener {
82 override fun onCancelled(p0: DatabaseError) { 95 override fun onCancelled(p0: DatabaseError) {
83 Toast.makeText(this@RecommendActivity, "실패부분", Toast.LENGTH_SHORT).show() 96 Toast.makeText(this@RecommendActivity, "실패부분", Toast.LENGTH_SHORT).show()
...@@ -91,12 +104,12 @@ class RecommendActivity : AppCompatActivity() { ...@@ -91,12 +104,12 @@ class RecommendActivity : AppCompatActivity() {
91 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, 104 ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!,
92 "상시", 105 "상시",
93 memo!!.Policy, 106 memo!!.Policy,
94 - memo!!.Policy, 107 + memo.Policy,
95 4.toFloat(), 108 4.toFloat(),
96 "" 109 ""
97 -
98 ) 110 )
99 ) 111 )
112 + //Toast.makeText(this@RecommendActivity, memo.View.toString(), Toast.LENGTH_SHORT).show()
100 } 113 }
101 val adapter = PolicyAdapter(policyList) 114 val adapter = PolicyAdapter(policyList)
102 policyRecyclerView.adapter = adapter 115 policyRecyclerView.adapter = adapter
...@@ -106,13 +119,13 @@ class RecommendActivity : AppCompatActivity() { ...@@ -106,13 +119,13 @@ class RecommendActivity : AppCompatActivity() {
106 // 1. 툴바 사용 설정 119 // 1. 툴바 사용 설정
107 setSupportActionBar(toolbar) 120 setSupportActionBar(toolbar)
108 // 2. 툴바 왼쪽 버튼 설정 121 // 2. 툴바 왼쪽 버튼 설정
109 - supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 왼쪽 버튼 사용 여부 true 122 + supportActionBar!!.setDisplayHomeAsUpEnabled(false) // 왼쪽 버튼 사용 여부 true
110 supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정 123 supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정
111 supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기 124 supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기
112 ////bottom navigation view operation start 2 125 ////bottom navigation view operation start 2
113 bottomBar=supportActionBar!! 126 bottomBar=supportActionBar!!
114 - val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation) 127 + //val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation)
115 - bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) 128 + //bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
116 ////bottom navigation view operation end 2 129 ////bottom navigation view operation end 2
117 } 130 }
118 // 3.툴바 메뉴 버튼을 설정 131 // 3.툴바 메뉴 버튼을 설정
...@@ -136,26 +149,47 @@ class RecommendActivity : AppCompatActivity() { ...@@ -136,26 +149,47 @@ class RecommendActivity : AppCompatActivity() {
136 return super.onOptionsItemSelected(item) 149 return super.onOptionsItemSelected(item)
137 } 150 }
138 151
152 + var back_pressed: Long = 0 // 뒤로가기 종료
153 +
154 + override fun onBackPressed() {
155 + if (back_pressed + 2000 > System.currentTimeMillis()) {
156 + finishAffinity()
157 + System.runFinalization()
158 + System.exit(0)
159 + }
160 + //super.onBackPressed()
161 + else
162 + Toast.makeText(getBaseContext(), "\'뒤로\' 버튼을 한번 더 누르시면 종료됩니다.", Toast.LENGTH_SHORT).show()
163 + back_pressed = System.currentTimeMillis()
164 + }
165 +
166 + private fun update_policy_view(policy_id: String, View_count: Int) {
167 + recomdatabase.child(policy_id).child("View").setValue(View_count-1)/// .setValue(user)
168 + }
169 +
139 //bottom navigation view operation start 3 170 //bottom navigation view operation start 3
140 private val mOnNavigationItemSelectedListener=BottomNavigationView.OnNavigationItemSelectedListener{item-> 171 private val mOnNavigationItemSelectedListener=BottomNavigationView.OnNavigationItemSelectedListener{item->
141 when (item.itemId){ 172 when (item.itemId){
142 173
143 R.id.bottomHome ->{ 174 R.id.bottomHome ->{
175 + //bottomNavigation2.selectedItemId = R.id.bottomRecommend
144 val intent = Intent(this, SignInActivity::class.java) 176 val intent = Intent(this, SignInActivity::class.java)
145 startActivity(intent) 177 startActivity(intent)
146 return@OnNavigationItemSelectedListener true 178 return@OnNavigationItemSelectedListener true
147 } 179 }
148 R.id.bottomRecommend ->{ 180 R.id.bottomRecommend ->{
149 - val intent = Intent(this, RecommendActivity::class.java) 181 + //val intent = Intent(this, RecommendActivity::class.java)
150 - startActivity(intent) 182 + //startActivity(intent)
151 - return@OnNavigationItemSelectedListener true 183 + //return@OnNavigationItemSelectedListener true
152 } 184 }
153 R.id.bottomFavorites ->{ 185 R.id.bottomFavorites ->{
186 + //bottomNavigation2.selectedItemId = R.id.bottomRecommend
154 val intent = Intent(this, FavoritesActivity::class.java) 187 val intent = Intent(this, FavoritesActivity::class.java)
155 startActivity(intent) 188 startActivity(intent)
156 return@OnNavigationItemSelectedListener true 189 return@OnNavigationItemSelectedListener true
157 } 190 }
158 R.id.bottomInfo ->{ 191 R.id.bottomInfo ->{
192 + //bottomNavigation2.selectedItemId = R.id.bottomRecommend
159 val intent = Intent(this, InfoActivity::class.java) 193 val intent = Intent(this, InfoActivity::class.java)
160 startActivity(intent) 194 startActivity(intent)
161 return@OnNavigationItemSelectedListener true 195 return@OnNavigationItemSelectedListener true
......
...@@ -27,6 +27,12 @@ class SignInActivity : AppCompatActivity() { ...@@ -27,6 +27,12 @@ class SignInActivity : AppCompatActivity() {
27 super.onCreate(savedInstanceState) 27 super.onCreate(savedInstanceState)
28 setContentView(R.layout.activity_signin) 28 setContentView(R.layout.activity_signin)
29 29
30 + // 네비게이션 뷰 포커스 맞추는 코드
31 + val bottomNavigationView: BottomNavigationView = findViewById(R.id.bottomNavigation) as BottomNavigationView
32 + bottomNavigationView.selectedItemId = R.id.bottomHome
33 + bottomNavigationView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
34 +
35 +
30 val builder = AlertDialog.Builder(this) 36 val builder = AlertDialog.Builder(this)
31 val dialogView = layoutInflater.inflate(R.layout.dialog_example, null) 37 val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
32 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) 38 //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
...@@ -103,14 +109,14 @@ class SignInActivity : AppCompatActivity() { ...@@ -103,14 +109,14 @@ class SignInActivity : AppCompatActivity() {
103 setSupportActionBar(toolbar) 109 setSupportActionBar(toolbar)
104 110
105 // 2. 툴바 왼쪽 버튼 설정 111 // 2. 툴바 왼쪽 버튼 설정
106 - supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 왼쪽 버튼 사용 여부 true 112 + //supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 왼쪽 버튼 사용 여부 true
107 - supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정 113 + //supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정
108 - supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기 114 + //supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기
109 115
110 ////bottom navigation view operation start 2 116 ////bottom navigation view operation start 2
111 bottomBar=supportActionBar!! 117 bottomBar=supportActionBar!!
112 - val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation) 118 + //val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation)
113 - bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) 119 + //bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
114 ////bottom navigation view operation end 2 120 ////bottom navigation view operation end 2
115 121
116 } 122 }
...@@ -153,23 +159,25 @@ class SignInActivity : AppCompatActivity() { ...@@ -153,23 +159,25 @@ class SignInActivity : AppCompatActivity() {
153 //bottom navigation view operation start 3 159 //bottom navigation view operation start 3
154 private val mOnNavigationItemSelectedListener=BottomNavigationView.OnNavigationItemSelectedListener{item-> 160 private val mOnNavigationItemSelectedListener=BottomNavigationView.OnNavigationItemSelectedListener{item->
155 when (item.itemId){ 161 when (item.itemId){
156 -
157 R.id.bottomHome ->{ 162 R.id.bottomHome ->{
158 - val intent = Intent(this, SignInActivity::class.java) 163 + // val intent = Intent(this, SignInActivity::class.java)
159 - startActivity(intent) 164 + // startActivity(intent)
160 - return@OnNavigationItemSelectedListener true 165 + // return@OnNavigationItemSelectedListener true
161 } 166 }
162 R.id.bottomRecommend ->{ 167 R.id.bottomRecommend ->{
168 + //bottomNavigation.selectedItemId = R.id.bottomHome
163 val intent = Intent(this, RecommendActivity::class.java) 169 val intent = Intent(this, RecommendActivity::class.java)
164 startActivity(intent) 170 startActivity(intent)
165 return@OnNavigationItemSelectedListener true 171 return@OnNavigationItemSelectedListener true
166 } 172 }
167 R.id.bottomFavorites ->{ 173 R.id.bottomFavorites ->{
174 + //bottomNavigation.selectedItemId = R.id.bottomHome
168 val intent = Intent(this, FavoritesActivity::class.java) 175 val intent = Intent(this, FavoritesActivity::class.java)
169 startActivity(intent) 176 startActivity(intent)
170 return@OnNavigationItemSelectedListener true 177 return@OnNavigationItemSelectedListener true
171 } 178 }
172 R.id.bottomInfo ->{ 179 R.id.bottomInfo ->{
180 + //bottomNavigation.selectedItemId = R.id.bottomHome
173 val intent = Intent(this, InfoActivity::class.java) 181 val intent = Intent(this, InfoActivity::class.java)
174 startActivity(intent) 182 startActivity(intent)
175 return@OnNavigationItemSelectedListener true 183 return@OnNavigationItemSelectedListener true
......
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillColor="#008577"
9 + android:pathData="M0,0h108v108h-108z" />
10 + <path
11 + android:fillColor="#00000000"
12 + android:pathData="M9,0L9,108"
13 + android:strokeWidth="0.8"
14 + android:strokeColor="#33FFFFFF" />
15 + <path
16 + android:fillColor="#00000000"
17 + android:pathData="M19,0L19,108"
18 + android:strokeWidth="0.8"
19 + android:strokeColor="#33FFFFFF" />
20 + <path
21 + android:fillColor="#00000000"
22 + android:pathData="M29,0L29,108"
23 + android:strokeWidth="0.8"
24 + android:strokeColor="#33FFFFFF" />
25 + <path
26 + android:fillColor="#00000000"
27 + android:pathData="M39,0L39,108"
28 + android:strokeWidth="0.8"
29 + android:strokeColor="#33FFFFFF" />
30 + <path
31 + android:fillColor="#00000000"
32 + android:pathData="M49,0L49,108"
33 + android:strokeWidth="0.8"
34 + android:strokeColor="#33FFFFFF" />
35 + <path
36 + android:fillColor="#00000000"
37 + android:pathData="M59,0L59,108"
38 + android:strokeWidth="0.8"
39 + android:strokeColor="#33FFFFFF" />
40 + <path
41 + android:fillColor="#00000000"
42 + android:pathData="M69,0L69,108"
43 + android:strokeWidth="0.8"
44 + android:strokeColor="#33FFFFFF" />
45 + <path
46 + android:fillColor="#00000000"
47 + android:pathData="M79,0L79,108"
48 + android:strokeWidth="0.8"
49 + android:strokeColor="#33FFFFFF" />
50 + <path
51 + android:fillColor="#00000000"
52 + android:pathData="M89,0L89,108"
53 + android:strokeWidth="0.8"
54 + android:strokeColor="#33FFFFFF" />
55 + <path
56 + android:fillColor="#00000000"
57 + android:pathData="M99,0L99,108"
58 + android:strokeWidth="0.8"
59 + android:strokeColor="#33FFFFFF" />
60 + <path
61 + android:fillColor="#00000000"
62 + android:pathData="M0,9L108,9"
63 + android:strokeWidth="0.8"
64 + android:strokeColor="#33FFFFFF" />
65 + <path
66 + android:fillColor="#00000000"
67 + android:pathData="M0,19L108,19"
68 + android:strokeWidth="0.8"
69 + android:strokeColor="#33FFFFFF" />
70 + <path
71 + android:fillColor="#00000000"
72 + android:pathData="M0,29L108,29"
73 + android:strokeWidth="0.8"
74 + android:strokeColor="#33FFFFFF" />
75 + <path
76 + android:fillColor="#00000000"
77 + android:pathData="M0,39L108,39"
78 + android:strokeWidth="0.8"
79 + android:strokeColor="#33FFFFFF" />
80 + <path
81 + android:fillColor="#00000000"
82 + android:pathData="M0,49L108,49"
83 + android:strokeWidth="0.8"
84 + android:strokeColor="#33FFFFFF" />
85 + <path
86 + android:fillColor="#00000000"
87 + android:pathData="M0,59L108,59"
88 + android:strokeWidth="0.8"
89 + android:strokeColor="#33FFFFFF" />
90 + <path
91 + android:fillColor="#00000000"
92 + android:pathData="M0,69L108,69"
93 + android:strokeWidth="0.8"
94 + android:strokeColor="#33FFFFFF" />
95 + <path
96 + android:fillColor="#00000000"
97 + android:pathData="M0,79L108,79"
98 + android:strokeWidth="0.8"
99 + android:strokeColor="#33FFFFFF" />
100 + <path
101 + android:fillColor="#00000000"
102 + android:pathData="M0,89L108,89"
103 + android:strokeWidth="0.8"
104 + android:strokeColor="#33FFFFFF" />
105 + <path
106 + android:fillColor="#00000000"
107 + android:pathData="M0,99L108,99"
108 + android:strokeWidth="0.8"
109 + android:strokeColor="#33FFFFFF" />
110 + <path
111 + android:fillColor="#00000000"
112 + android:pathData="M19,29L89,29"
113 + android:strokeWidth="0.8"
114 + android:strokeColor="#33FFFFFF" />
115 + <path
116 + android:fillColor="#00000000"
117 + android:pathData="M19,39L89,39"
118 + android:strokeWidth="0.8"
119 + android:strokeColor="#33FFFFFF" />
120 + <path
121 + android:fillColor="#00000000"
122 + android:pathData="M19,49L89,49"
123 + android:strokeWidth="0.8"
124 + android:strokeColor="#33FFFFFF" />
125 + <path
126 + android:fillColor="#00000000"
127 + android:pathData="M19,59L89,59"
128 + android:strokeWidth="0.8"
129 + android:strokeColor="#33FFFFFF" />
130 + <path
131 + android:fillColor="#00000000"
132 + android:pathData="M19,69L89,69"
133 + android:strokeWidth="0.8"
134 + android:strokeColor="#33FFFFFF" />
135 + <path
136 + android:fillColor="#00000000"
137 + android:pathData="M19,79L89,79"
138 + android:strokeWidth="0.8"
139 + android:strokeColor="#33FFFFFF" />
140 + <path
141 + android:fillColor="#00000000"
142 + android:pathData="M29,19L29,89"
143 + android:strokeWidth="0.8"
144 + android:strokeColor="#33FFFFFF" />
145 + <path
146 + android:fillColor="#00000000"
147 + android:pathData="M39,19L39,89"
148 + android:strokeWidth="0.8"
149 + android:strokeColor="#33FFFFFF" />
150 + <path
151 + android:fillColor="#00000000"
152 + android:pathData="M49,19L49,89"
153 + android:strokeWidth="0.8"
154 + android:strokeColor="#33FFFFFF" />
155 + <path
156 + android:fillColor="#00000000"
157 + android:pathData="M59,19L59,89"
158 + android:strokeWidth="0.8"
159 + android:strokeColor="#33FFFFFF" />
160 + <path
161 + android:fillColor="#00000000"
162 + android:pathData="M69,19L69,89"
163 + android:strokeWidth="0.8"
164 + android:strokeColor="#33FFFFFF" />
165 + <path
166 + android:fillColor="#00000000"
167 + android:pathData="M79,19L79,89"
168 + android:strokeWidth="0.8"
169 + android:strokeColor="#33FFFFFF" />
170 +</vector>

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

639 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillColor="#008577"
9 + android:pathData="M0,0h108v108h-108z" />
10 + <path
11 + android:fillColor="#00000000"
12 + android:pathData="M9,0L9,108"
13 + android:strokeWidth="0.8"
14 + android:strokeColor="#33FFFFFF" />
15 + <path
16 + android:fillColor="#00000000"
17 + android:pathData="M19,0L19,108"
18 + android:strokeWidth="0.8"
19 + android:strokeColor="#33FFFFFF" />
20 + <path
21 + android:fillColor="#00000000"
22 + android:pathData="M29,0L29,108"
23 + android:strokeWidth="0.8"
24 + android:strokeColor="#33FFFFFF" />
25 + <path
26 + android:fillColor="#00000000"
27 + android:pathData="M39,0L39,108"
28 + android:strokeWidth="0.8"
29 + android:strokeColor="#33FFFFFF" />
30 + <path
31 + android:fillColor="#00000000"
32 + android:pathData="M49,0L49,108"
33 + android:strokeWidth="0.8"
34 + android:strokeColor="#33FFFFFF" />
35 + <path
36 + android:fillColor="#00000000"
37 + android:pathData="M59,0L59,108"
38 + android:strokeWidth="0.8"
39 + android:strokeColor="#33FFFFFF" />
40 + <path
41 + android:fillColor="#00000000"
42 + android:pathData="M69,0L69,108"
43 + android:strokeWidth="0.8"
44 + android:strokeColor="#33FFFFFF" />
45 + <path
46 + android:fillColor="#00000000"
47 + android:pathData="M79,0L79,108"
48 + android:strokeWidth="0.8"
49 + android:strokeColor="#33FFFFFF" />
50 + <path
51 + android:fillColor="#00000000"
52 + android:pathData="M89,0L89,108"
53 + android:strokeWidth="0.8"
54 + android:strokeColor="#33FFFFFF" />
55 + <path
56 + android:fillColor="#00000000"
57 + android:pathData="M99,0L99,108"
58 + android:strokeWidth="0.8"
59 + android:strokeColor="#33FFFFFF" />
60 + <path
61 + android:fillColor="#00000000"
62 + android:pathData="M0,9L108,9"
63 + android:strokeWidth="0.8"
64 + android:strokeColor="#33FFFFFF" />
65 + <path
66 + android:fillColor="#00000000"
67 + android:pathData="M0,19L108,19"
68 + android:strokeWidth="0.8"
69 + android:strokeColor="#33FFFFFF" />
70 + <path
71 + android:fillColor="#00000000"
72 + android:pathData="M0,29L108,29"
73 + android:strokeWidth="0.8"
74 + android:strokeColor="#33FFFFFF" />
75 + <path
76 + android:fillColor="#00000000"
77 + android:pathData="M0,39L108,39"
78 + android:strokeWidth="0.8"
79 + android:strokeColor="#33FFFFFF" />
80 + <path
81 + android:fillColor="#00000000"
82 + android:pathData="M0,49L108,49"
83 + android:strokeWidth="0.8"
84 + android:strokeColor="#33FFFFFF" />
85 + <path
86 + android:fillColor="#00000000"
87 + android:pathData="M0,59L108,59"
88 + android:strokeWidth="0.8"
89 + android:strokeColor="#33FFFFFF" />
90 + <path
91 + android:fillColor="#00000000"
92 + android:pathData="M0,69L108,69"
93 + android:strokeWidth="0.8"
94 + android:strokeColor="#33FFFFFF" />
95 + <path
96 + android:fillColor="#00000000"
97 + android:pathData="M0,79L108,79"
98 + android:strokeWidth="0.8"
99 + android:strokeColor="#33FFFFFF" />
100 + <path
101 + android:fillColor="#00000000"
102 + android:pathData="M0,89L108,89"
103 + android:strokeWidth="0.8"
104 + android:strokeColor="#33FFFFFF" />
105 + <path
106 + android:fillColor="#00000000"
107 + android:pathData="M0,99L108,99"
108 + android:strokeWidth="0.8"
109 + android:strokeColor="#33FFFFFF" />
110 + <path
111 + android:fillColor="#00000000"
112 + android:pathData="M19,29L89,29"
113 + android:strokeWidth="0.8"
114 + android:strokeColor="#33FFFFFF" />
115 + <path
116 + android:fillColor="#00000000"
117 + android:pathData="M19,39L89,39"
118 + android:strokeWidth="0.8"
119 + android:strokeColor="#33FFFFFF" />
120 + <path
121 + android:fillColor="#00000000"
122 + android:pathData="M19,49L89,49"
123 + android:strokeWidth="0.8"
124 + android:strokeColor="#33FFFFFF" />
125 + <path
126 + android:fillColor="#00000000"
127 + android:pathData="M19,59L89,59"
128 + android:strokeWidth="0.8"
129 + android:strokeColor="#33FFFFFF" />
130 + <path
131 + android:fillColor="#00000000"
132 + android:pathData="M19,69L89,69"
133 + android:strokeWidth="0.8"
134 + android:strokeColor="#33FFFFFF" />
135 + <path
136 + android:fillColor="#00000000"
137 + android:pathData="M19,79L89,79"
138 + android:strokeWidth="0.8"
139 + android:strokeColor="#33FFFFFF" />
140 + <path
141 + android:fillColor="#00000000"
142 + android:pathData="M29,19L29,89"
143 + android:strokeWidth="0.8"
144 + android:strokeColor="#33FFFFFF" />
145 + <path
146 + android:fillColor="#00000000"
147 + android:pathData="M39,19L39,89"
148 + android:strokeWidth="0.8"
149 + android:strokeColor="#33FFFFFF" />
150 + <path
151 + android:fillColor="#00000000"
152 + android:pathData="M49,19L49,89"
153 + android:strokeWidth="0.8"
154 + android:strokeColor="#33FFFFFF" />
155 + <path
156 + android:fillColor="#00000000"
157 + android:pathData="M59,19L59,89"
158 + android:strokeWidth="0.8"
159 + android:strokeColor="#33FFFFFF" />
160 + <path
161 + android:fillColor="#00000000"
162 + android:pathData="M69,19L69,89"
163 + android:strokeWidth="0.8"
164 + android:strokeColor="#33FFFFFF" />
165 + <path
166 + android:fillColor="#00000000"
167 + android:pathData="M79,19L79,89"
168 + android:strokeWidth="0.8"
169 + android:strokeColor="#33FFFFFF" />
170 +</vector>

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

405 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillColor="#008577"
9 + android:pathData="M0,0h108v108h-108z" />
10 + <path
11 + android:fillColor="#00000000"
12 + android:pathData="M9,0L9,108"
13 + android:strokeWidth="0.8"
14 + android:strokeColor="#33FFFFFF" />
15 + <path
16 + android:fillColor="#00000000"
17 + android:pathData="M19,0L19,108"
18 + android:strokeWidth="0.8"
19 + android:strokeColor="#33FFFFFF" />
20 + <path
21 + android:fillColor="#00000000"
22 + android:pathData="M29,0L29,108"
23 + android:strokeWidth="0.8"
24 + android:strokeColor="#33FFFFFF" />
25 + <path
26 + android:fillColor="#00000000"
27 + android:pathData="M39,0L39,108"
28 + android:strokeWidth="0.8"
29 + android:strokeColor="#33FFFFFF" />
30 + <path
31 + android:fillColor="#00000000"
32 + android:pathData="M49,0L49,108"
33 + android:strokeWidth="0.8"
34 + android:strokeColor="#33FFFFFF" />
35 + <path
36 + android:fillColor="#00000000"
37 + android:pathData="M59,0L59,108"
38 + android:strokeWidth="0.8"
39 + android:strokeColor="#33FFFFFF" />
40 + <path
41 + android:fillColor="#00000000"
42 + android:pathData="M69,0L69,108"
43 + android:strokeWidth="0.8"
44 + android:strokeColor="#33FFFFFF" />
45 + <path
46 + android:fillColor="#00000000"
47 + android:pathData="M79,0L79,108"
48 + android:strokeWidth="0.8"
49 + android:strokeColor="#33FFFFFF" />
50 + <path
51 + android:fillColor="#00000000"
52 + android:pathData="M89,0L89,108"
53 + android:strokeWidth="0.8"
54 + android:strokeColor="#33FFFFFF" />
55 + <path
56 + android:fillColor="#00000000"
57 + android:pathData="M99,0L99,108"
58 + android:strokeWidth="0.8"
59 + android:strokeColor="#33FFFFFF" />
60 + <path
61 + android:fillColor="#00000000"
62 + android:pathData="M0,9L108,9"
63 + android:strokeWidth="0.8"
64 + android:strokeColor="#33FFFFFF" />
65 + <path
66 + android:fillColor="#00000000"
67 + android:pathData="M0,19L108,19"
68 + android:strokeWidth="0.8"
69 + android:strokeColor="#33FFFFFF" />
70 + <path
71 + android:fillColor="#00000000"
72 + android:pathData="M0,29L108,29"
73 + android:strokeWidth="0.8"
74 + android:strokeColor="#33FFFFFF" />
75 + <path
76 + android:fillColor="#00000000"
77 + android:pathData="M0,39L108,39"
78 + android:strokeWidth="0.8"
79 + android:strokeColor="#33FFFFFF" />
80 + <path
81 + android:fillColor="#00000000"
82 + android:pathData="M0,49L108,49"
83 + android:strokeWidth="0.8"
84 + android:strokeColor="#33FFFFFF" />
85 + <path
86 + android:fillColor="#00000000"
87 + android:pathData="M0,59L108,59"
88 + android:strokeWidth="0.8"
89 + android:strokeColor="#33FFFFFF" />
90 + <path
91 + android:fillColor="#00000000"
92 + android:pathData="M0,69L108,69"
93 + android:strokeWidth="0.8"
94 + android:strokeColor="#33FFFFFF" />
95 + <path
96 + android:fillColor="#00000000"
97 + android:pathData="M0,79L108,79"
98 + android:strokeWidth="0.8"
99 + android:strokeColor="#33FFFFFF" />
100 + <path
101 + android:fillColor="#00000000"
102 + android:pathData="M0,89L108,89"
103 + android:strokeWidth="0.8"
104 + android:strokeColor="#33FFFFFF" />
105 + <path
106 + android:fillColor="#00000000"
107 + android:pathData="M0,99L108,99"
108 + android:strokeWidth="0.8"
109 + android:strokeColor="#33FFFFFF" />
110 + <path
111 + android:fillColor="#00000000"
112 + android:pathData="M19,29L89,29"
113 + android:strokeWidth="0.8"
114 + android:strokeColor="#33FFFFFF" />
115 + <path
116 + android:fillColor="#00000000"
117 + android:pathData="M19,39L89,39"
118 + android:strokeWidth="0.8"
119 + android:strokeColor="#33FFFFFF" />
120 + <path
121 + android:fillColor="#00000000"
122 + android:pathData="M19,49L89,49"
123 + android:strokeWidth="0.8"
124 + android:strokeColor="#33FFFFFF" />
125 + <path
126 + android:fillColor="#00000000"
127 + android:pathData="M19,59L89,59"
128 + android:strokeWidth="0.8"
129 + android:strokeColor="#33FFFFFF" />
130 + <path
131 + android:fillColor="#00000000"
132 + android:pathData="M19,69L89,69"
133 + android:strokeWidth="0.8"
134 + android:strokeColor="#33FFFFFF" />
135 + <path
136 + android:fillColor="#00000000"
137 + android:pathData="M19,79L89,79"
138 + android:strokeWidth="0.8"
139 + android:strokeColor="#33FFFFFF" />
140 + <path
141 + android:fillColor="#00000000"
142 + android:pathData="M29,19L29,89"
143 + android:strokeWidth="0.8"
144 + android:strokeColor="#33FFFFFF" />
145 + <path
146 + android:fillColor="#00000000"
147 + android:pathData="M39,19L39,89"
148 + android:strokeWidth="0.8"
149 + android:strokeColor="#33FFFFFF" />
150 + <path
151 + android:fillColor="#00000000"
152 + android:pathData="M49,19L49,89"
153 + android:strokeWidth="0.8"
154 + android:strokeColor="#33FFFFFF" />
155 + <path
156 + android:fillColor="#00000000"
157 + android:pathData="M59,19L59,89"
158 + android:strokeWidth="0.8"
159 + android:strokeColor="#33FFFFFF" />
160 + <path
161 + android:fillColor="#00000000"
162 + android:pathData="M69,19L69,89"
163 + android:strokeWidth="0.8"
164 + android:strokeColor="#33FFFFFF" />
165 + <path
166 + android:fillColor="#00000000"
167 + android:pathData="M79,19L79,89"
168 + android:strokeWidth="0.8"
169 + android:strokeColor="#33FFFFFF" />
170 +</vector>

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

448 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillColor="#008577"
9 + android:pathData="M0,0h108v108h-108z" />
10 + <path
11 + android:fillColor="#00000000"
12 + android:pathData="M9,0L9,108"
13 + android:strokeWidth="0.8"
14 + android:strokeColor="#33FFFFFF" />
15 + <path
16 + android:fillColor="#00000000"
17 + android:pathData="M19,0L19,108"
18 + android:strokeWidth="0.8"
19 + android:strokeColor="#33FFFFFF" />
20 + <path
21 + android:fillColor="#00000000"
22 + android:pathData="M29,0L29,108"
23 + android:strokeWidth="0.8"
24 + android:strokeColor="#33FFFFFF" />
25 + <path
26 + android:fillColor="#00000000"
27 + android:pathData="M39,0L39,108"
28 + android:strokeWidth="0.8"
29 + android:strokeColor="#33FFFFFF" />
30 + <path
31 + android:fillColor="#00000000"
32 + android:pathData="M49,0L49,108"
33 + android:strokeWidth="0.8"
34 + android:strokeColor="#33FFFFFF" />
35 + <path
36 + android:fillColor="#00000000"
37 + android:pathData="M59,0L59,108"
38 + android:strokeWidth="0.8"
39 + android:strokeColor="#33FFFFFF" />
40 + <path
41 + android:fillColor="#00000000"
42 + android:pathData="M69,0L69,108"
43 + android:strokeWidth="0.8"
44 + android:strokeColor="#33FFFFFF" />
45 + <path
46 + android:fillColor="#00000000"
47 + android:pathData="M79,0L79,108"
48 + android:strokeWidth="0.8"
49 + android:strokeColor="#33FFFFFF" />
50 + <path
51 + android:fillColor="#00000000"
52 + android:pathData="M89,0L89,108"
53 + android:strokeWidth="0.8"
54 + android:strokeColor="#33FFFFFF" />
55 + <path
56 + android:fillColor="#00000000"
57 + android:pathData="M99,0L99,108"
58 + android:strokeWidth="0.8"
59 + android:strokeColor="#33FFFFFF" />
60 + <path
61 + android:fillColor="#00000000"
62 + android:pathData="M0,9L108,9"
63 + android:strokeWidth="0.8"
64 + android:strokeColor="#33FFFFFF" />
65 + <path
66 + android:fillColor="#00000000"
67 + android:pathData="M0,19L108,19"
68 + android:strokeWidth="0.8"
69 + android:strokeColor="#33FFFFFF" />
70 + <path
71 + android:fillColor="#00000000"
72 + android:pathData="M0,29L108,29"
73 + android:strokeWidth="0.8"
74 + android:strokeColor="#33FFFFFF" />
75 + <path
76 + android:fillColor="#00000000"
77 + android:pathData="M0,39L108,39"
78 + android:strokeWidth="0.8"
79 + android:strokeColor="#33FFFFFF" />
80 + <path
81 + android:fillColor="#00000000"
82 + android:pathData="M0,49L108,49"
83 + android:strokeWidth="0.8"
84 + android:strokeColor="#33FFFFFF" />
85 + <path
86 + android:fillColor="#00000000"
87 + android:pathData="M0,59L108,59"
88 + android:strokeWidth="0.8"
89 + android:strokeColor="#33FFFFFF" />
90 + <path
91 + android:fillColor="#00000000"
92 + android:pathData="M0,69L108,69"
93 + android:strokeWidth="0.8"
94 + android:strokeColor="#33FFFFFF" />
95 + <path
96 + android:fillColor="#00000000"
97 + android:pathData="M0,79L108,79"
98 + android:strokeWidth="0.8"
99 + android:strokeColor="#33FFFFFF" />
100 + <path
101 + android:fillColor="#00000000"
102 + android:pathData="M0,89L108,89"
103 + android:strokeWidth="0.8"
104 + android:strokeColor="#33FFFFFF" />
105 + <path
106 + android:fillColor="#00000000"
107 + android:pathData="M0,99L108,99"
108 + android:strokeWidth="0.8"
109 + android:strokeColor="#33FFFFFF" />
110 + <path
111 + android:fillColor="#00000000"
112 + android:pathData="M19,29L89,29"
113 + android:strokeWidth="0.8"
114 + android:strokeColor="#33FFFFFF" />
115 + <path
116 + android:fillColor="#00000000"
117 + android:pathData="M19,39L89,39"
118 + android:strokeWidth="0.8"
119 + android:strokeColor="#33FFFFFF" />
120 + <path
121 + android:fillColor="#00000000"
122 + android:pathData="M19,49L89,49"
123 + android:strokeWidth="0.8"
124 + android:strokeColor="#33FFFFFF" />
125 + <path
126 + android:fillColor="#00000000"
127 + android:pathData="M19,59L89,59"
128 + android:strokeWidth="0.8"
129 + android:strokeColor="#33FFFFFF" />
130 + <path
131 + android:fillColor="#00000000"
132 + android:pathData="M19,69L89,69"
133 + android:strokeWidth="0.8"
134 + android:strokeColor="#33FFFFFF" />
135 + <path
136 + android:fillColor="#00000000"
137 + android:pathData="M19,79L89,79"
138 + android:strokeWidth="0.8"
139 + android:strokeColor="#33FFFFFF" />
140 + <path
141 + android:fillColor="#00000000"
142 + android:pathData="M29,19L29,89"
143 + android:strokeWidth="0.8"
144 + android:strokeColor="#33FFFFFF" />
145 + <path
146 + android:fillColor="#00000000"
147 + android:pathData="M39,19L39,89"
148 + android:strokeWidth="0.8"
149 + android:strokeColor="#33FFFFFF" />
150 + <path
151 + android:fillColor="#00000000"
152 + android:pathData="M49,19L49,89"
153 + android:strokeWidth="0.8"
154 + android:strokeColor="#33FFFFFF" />
155 + <path
156 + android:fillColor="#00000000"
157 + android:pathData="M59,19L59,89"
158 + android:strokeWidth="0.8"
159 + android:strokeColor="#33FFFFFF" />
160 + <path
161 + android:fillColor="#00000000"
162 + android:pathData="M69,19L69,89"
163 + android:strokeWidth="0.8"
164 + android:strokeColor="#33FFFFFF" />
165 + <path
166 + android:fillColor="#00000000"
167 + android:pathData="M79,19L79,89"
168 + android:strokeWidth="0.8"
169 + android:strokeColor="#33FFFFFF" />
170 +</vector>

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

764 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
3 + android:width="108dp"
4 + android:height="108dp"
5 + android:viewportWidth="108"
6 + android:viewportHeight="108">
7 + <path
8 + android:fillColor="#008577"
9 + android:pathData="M0,0h108v108h-108z" />
10 + <path
11 + android:fillColor="#00000000"
12 + android:pathData="M9,0L9,108"
13 + android:strokeWidth="0.8"
14 + android:strokeColor="#33FFFFFF" />
15 + <path
16 + android:fillColor="#00000000"
17 + android:pathData="M19,0L19,108"
18 + android:strokeWidth="0.8"
19 + android:strokeColor="#33FFFFFF" />
20 + <path
21 + android:fillColor="#00000000"
22 + android:pathData="M29,0L29,108"
23 + android:strokeWidth="0.8"
24 + android:strokeColor="#33FFFFFF" />
25 + <path
26 + android:fillColor="#00000000"
27 + android:pathData="M39,0L39,108"
28 + android:strokeWidth="0.8"
29 + android:strokeColor="#33FFFFFF" />
30 + <path
31 + android:fillColor="#00000000"
32 + android:pathData="M49,0L49,108"
33 + android:strokeWidth="0.8"
34 + android:strokeColor="#33FFFFFF" />
35 + <path
36 + android:fillColor="#00000000"
37 + android:pathData="M59,0L59,108"
38 + android:strokeWidth="0.8"
39 + android:strokeColor="#33FFFFFF" />
40 + <path
41 + android:fillColor="#00000000"
42 + android:pathData="M69,0L69,108"
43 + android:strokeWidth="0.8"
44 + android:strokeColor="#33FFFFFF" />
45 + <path
46 + android:fillColor="#00000000"
47 + android:pathData="M79,0L79,108"
48 + android:strokeWidth="0.8"
49 + android:strokeColor="#33FFFFFF" />
50 + <path
51 + android:fillColor="#00000000"
52 + android:pathData="M89,0L89,108"
53 + android:strokeWidth="0.8"
54 + android:strokeColor="#33FFFFFF" />
55 + <path
56 + android:fillColor="#00000000"
57 + android:pathData="M99,0L99,108"
58 + android:strokeWidth="0.8"
59 + android:strokeColor="#33FFFFFF" />
60 + <path
61 + android:fillColor="#00000000"
62 + android:pathData="M0,9L108,9"
63 + android:strokeWidth="0.8"
64 + android:strokeColor="#33FFFFFF" />
65 + <path
66 + android:fillColor="#00000000"
67 + android:pathData="M0,19L108,19"
68 + android:strokeWidth="0.8"
69 + android:strokeColor="#33FFFFFF" />
70 + <path
71 + android:fillColor="#00000000"
72 + android:pathData="M0,29L108,29"
73 + android:strokeWidth="0.8"
74 + android:strokeColor="#33FFFFFF" />
75 + <path
76 + android:fillColor="#00000000"
77 + android:pathData="M0,39L108,39"
78 + android:strokeWidth="0.8"
79 + android:strokeColor="#33FFFFFF" />
80 + <path
81 + android:fillColor="#00000000"
82 + android:pathData="M0,49L108,49"
83 + android:strokeWidth="0.8"
84 + android:strokeColor="#33FFFFFF" />
85 + <path
86 + android:fillColor="#00000000"
87 + android:pathData="M0,59L108,59"
88 + android:strokeWidth="0.8"
89 + android:strokeColor="#33FFFFFF" />
90 + <path
91 + android:fillColor="#00000000"
92 + android:pathData="M0,69L108,69"
93 + android:strokeWidth="0.8"
94 + android:strokeColor="#33FFFFFF" />
95 + <path
96 + android:fillColor="#00000000"
97 + android:pathData="M0,79L108,79"
98 + android:strokeWidth="0.8"
99 + android:strokeColor="#33FFFFFF" />
100 + <path
101 + android:fillColor="#00000000"
102 + android:pathData="M0,89L108,89"
103 + android:strokeWidth="0.8"
104 + android:strokeColor="#33FFFFFF" />
105 + <path
106 + android:fillColor="#00000000"
107 + android:pathData="M0,99L108,99"
108 + android:strokeWidth="0.8"
109 + android:strokeColor="#33FFFFFF" />
110 + <path
111 + android:fillColor="#00000000"
112 + android:pathData="M19,29L89,29"
113 + android:strokeWidth="0.8"
114 + android:strokeColor="#33FFFFFF" />
115 + <path
116 + android:fillColor="#00000000"
117 + android:pathData="M19,39L89,39"
118 + android:strokeWidth="0.8"
119 + android:strokeColor="#33FFFFFF" />
120 + <path
121 + android:fillColor="#00000000"
122 + android:pathData="M19,49L89,49"
123 + android:strokeWidth="0.8"
124 + android:strokeColor="#33FFFFFF" />
125 + <path
126 + android:fillColor="#00000000"
127 + android:pathData="M19,59L89,59"
128 + android:strokeWidth="0.8"
129 + android:strokeColor="#33FFFFFF" />
130 + <path
131 + android:fillColor="#00000000"
132 + android:pathData="M19,69L89,69"
133 + android:strokeWidth="0.8"
134 + android:strokeColor="#33FFFFFF" />
135 + <path
136 + android:fillColor="#00000000"
137 + android:pathData="M19,79L89,79"
138 + android:strokeWidth="0.8"
139 + android:strokeColor="#33FFFFFF" />
140 + <path
141 + android:fillColor="#00000000"
142 + android:pathData="M29,19L29,89"
143 + android:strokeWidth="0.8"
144 + android:strokeColor="#33FFFFFF" />
145 + <path
146 + android:fillColor="#00000000"
147 + android:pathData="M39,19L39,89"
148 + android:strokeWidth="0.8"
149 + android:strokeColor="#33FFFFFF" />
150 + <path
151 + android:fillColor="#00000000"
152 + android:pathData="M49,19L49,89"
153 + android:strokeWidth="0.8"
154 + android:strokeColor="#33FFFFFF" />
155 + <path
156 + android:fillColor="#00000000"
157 + android:pathData="M59,19L59,89"
158 + android:strokeWidth="0.8"
159 + android:strokeColor="#33FFFFFF" />
160 + <path
161 + android:fillColor="#00000000"
162 + android:pathData="M69,19L69,89"
163 + android:strokeWidth="0.8"
164 + android:strokeColor="#33FFFFFF" />
165 + <path
166 + android:fillColor="#00000000"
167 + android:pathData="M79,19L79,89"
168 + android:strokeWidth="0.8"
169 + android:strokeColor="#33FFFFFF" />
170 +</vector>

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

1.12 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

1.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 +<?xml version="1.0" encoding="utf-8"?>
2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
3 + <item android:state_checked="true" android:color="#29ABE2" />
4 + <item android:color="#DDDDDD" />
5 +</selector>
...\ No newline at end of file ...\ No newline at end of file

208 Bytes | W: | H:

409 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

480 Bytes | W: | H:

557 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

179 Bytes | W: | H:

659 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

235 Bytes | W: | H:

387 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
92 android:layout_height="wrap_content" 92 android:layout_height="wrap_content"
93 android:layout_gravity="bottom" 93 android:layout_gravity="bottom"
94 android:background="#FFF" 94 android:background="#FFF"
95 - app:itemIconTint="#29ABE2" 95 + app:itemIconTint="@drawable/bottom_selector"
96 - app:itemTextColor="#29ABE2" 96 + app:itemTextColor="@drawable/bottom_selector"
97 app:labelVisibilityMode="labeled" 97 app:labelVisibilityMode="labeled"
98 app:menu="@menu/bottom_nav_menu" /> 98 app:menu="@menu/bottom_nav_menu" />
99 99
......
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
50 > 50 >
51 51
52 <com.google.android.material.bottomnavigation.BottomNavigationView 52 <com.google.android.material.bottomnavigation.BottomNavigationView
53 - android:id="@+id/bottomNavigation" 53 + android:id="@+id/bottomNavigation3"
54 android:layout_width="match_parent" 54 android:layout_width="match_parent"
55 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
56 android:layout_gravity="bottom" 56 android:layout_gravity="bottom"
57 android:background="#FFF" 57 android:background="#FFF"
58 - app:itemIconTint="#29ABE2" 58 + app:itemIconTint="@drawable/bottom_selector"
59 - app:itemTextColor="#29ABE2" 59 + app:itemTextColor="@drawable/bottom_selector"
60 app:labelVisibilityMode="labeled" 60 app:labelVisibilityMode="labeled"
61 app:menu="@menu/bottom_nav_menu" /> 61 app:menu="@menu/bottom_nav_menu" />
62 </FrameLayout> 62 </FrameLayout>
......
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
57 <LinearLayout 57 <LinearLayout
58 android:layout_width="match_parent" 58 android:layout_width="match_parent"
59 android:layout_height="match_parent" 59 android:layout_height="match_parent"
60 + android:layout_marginTop="20dp"
61 + android:layout_marginBottom="20dp"
60 android:layout_weight="1" 62 android:layout_weight="1"
61 android:orientation="horizontal"> 63 android:orientation="horizontal">
62 64
...@@ -198,13 +200,13 @@ ...@@ -198,13 +200,13 @@
198 > 200 >
199 201
200 <com.google.android.material.bottomnavigation.BottomNavigationView 202 <com.google.android.material.bottomnavigation.BottomNavigationView
201 - android:id="@+id/bottomNavigation" 203 + android:id="@+id/bottomNavigation4"
202 android:layout_width="match_parent" 204 android:layout_width="match_parent"
203 android:layout_height="wrap_content" 205 android:layout_height="wrap_content"
204 android:layout_gravity="bottom" 206 android:layout_gravity="bottom"
205 android:background="#FFF" 207 android:background="#FFF"
206 - app:itemIconTint="#29ABE2" 208 + app:itemIconTint="@drawable/bottom_selector"
207 - app:itemTextColor="#29ABE2" 209 + app:itemTextColor="@drawable/bottom_selector"
208 app:labelVisibilityMode="labeled" 210 app:labelVisibilityMode="labeled"
209 app:menu="@menu/bottom_nav_menu" /> 211 app:menu="@menu/bottom_nav_menu" />
210 </FrameLayout> 212 </FrameLayout>
......
...@@ -20,25 +20,19 @@ ...@@ -20,25 +20,19 @@
20 android:orientation="vertical"> 20 android:orientation="vertical">
21 21
22 <LinearLayout 22 <LinearLayout
23 + android:id="@+id/sagin"
23 android:layout_width="wrap_content" 24 android:layout_width="wrap_content"
24 android:layout_height="wrap_content" 25 android:layout_height="wrap_content"
25 android:layout_gravity="center" 26 android:layout_gravity="center"
26 android:gravity="center" 27 android:gravity="center"
27 android:orientation="vertical"> 28 android:orientation="vertical">
28 29
29 - <TextView
30 - android:id="@+id/textView6"
31 - android:layout_width="match_parent"
32 - android:layout_height="wrap_content"
33 - android:text="복지야, 안녕!"
34 - android:textSize="15dp" />
35 -
36 <ImageView 30 <ImageView
37 android:id="@+id/imageView2" 31 android:id="@+id/imageView2"
38 android:layout_width="wrap_content" 32 android:layout_width="wrap_content"
39 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
40 - tools:srcCompat="@tools:sample/avatars" 34 + android:src="@drawable/final_logo1"
41 - android:src="@drawable/final_logo"/> 35 + tools:srcCompat="@tools:sample/avatars" />
42 </LinearLayout> 36 </LinearLayout>
43 37
44 </LinearLayout> 38 </LinearLayout>
...@@ -62,7 +56,9 @@ ...@@ -62,7 +56,9 @@
62 android:id="@+id/edit_email" 56 android:id="@+id/edit_email"
63 android:layout_width="350dp" 57 android:layout_width="350dp"
64 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
65 - 59 + android:drawableLeft="@drawable/profile"
60 + android:drawablePadding="11dp"
61 + android:paddingLeft="5dp"
66 android:inputType="textEmailAddress" 62 android:inputType="textEmailAddress"
67 android:theme="@style/EditTheme" /> 63 android:theme="@style/EditTheme" />
68 64
...@@ -70,15 +66,18 @@ ...@@ -70,15 +66,18 @@
70 android:id="@+id/textView5" 66 android:id="@+id/textView5"
71 android:layout_width="350dp" 67 android:layout_width="350dp"
72 android:layout_height="wrap_content" 68 android:layout_height="wrap_content"
69 + android:layout_marginTop="10dp"
73 android:text="비밀번호" 70 android:text="비밀번호"
74 android:textColor="#29ABE2" 71 android:textColor="#29ABE2"
75 android:textSize="13dp" /> 72 android:textSize="13dp" />
76 73
77 <EditText 74 <EditText
78 android:id="@+id/edit_password" 75 android:id="@+id/edit_password"
76 + android:drawableLeft="@drawable/lock"
79 android:layout_width="350dp" 77 android:layout_width="350dp"
80 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
81 - 79 + android:drawablePadding="11dp"
80 + android:paddingLeft="5dp"
82 android:inputType="textPassword" 81 android:inputType="textPassword"
83 android:theme="@style/EditTheme" /> 82 android:theme="@style/EditTheme" />
84 83
......
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,8 @@
159 android:layout_height="wrap_content" 159 android:layout_height="wrap_content"
160 android:layout_gravity="bottom" 160 android:layout_gravity="bottom"
161 android:background="#FFF" 161 android:background="#FFF"
162 - app:itemIconTint="#29ABE2" 162 + app:itemIconTint="@drawable/bottom_selector"
163 - app:itemTextColor="#29ABE2" 163 + app:itemTextColor="@drawable/bottom_selector"
164 app:labelVisibilityMode="labeled" 164 app:labelVisibilityMode="labeled"
165 app:menu="@menu/bottom_nav_menu" /> 165 app:menu="@menu/bottom_nav_menu" />
166 166
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
45 android:layout_height="wrap_content" 45 android:layout_height="wrap_content"
46 android:layout_gravity="bottom" 46 android:layout_gravity="bottom"
47 android:background="#FFF" 47 android:background="#FFF"
48 - app:itemIconTint="#29ABE2" 48 + app:itemIconTint="@drawable/bottom_selector"
49 - app:itemTextColor="#29ABE2" 49 + app:itemTextColor="@drawable/bottom_selector"
50 app:labelVisibilityMode="labeled" 50 app:labelVisibilityMode="labeled"
51 app:menu="@menu/bottom_nav_menu" /> 51 app:menu="@menu/bottom_nav_menu" />
52 52
......
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
85 android:layout_height="wrap_content" 85 android:layout_height="wrap_content"
86 android:layout_gravity="bottom" 86 android:layout_gravity="bottom"
87 android:background="#FFF" 87 android:background="#FFF"
88 - app:itemIconTint="#29ABE2" 88 + app:itemIconTint="@drawable/bottom_selector"
89 - app:itemTextColor="#29ABE2" 89 + app:itemTextColor="@drawable/bottom_selector"
90 app:labelVisibilityMode="labeled" 90 app:labelVisibilityMode="labeled"
91 app:menu="@menu/bottom_nav_menu" /> 91 app:menu="@menu/bottom_nav_menu" />
92 92
......
...@@ -85,10 +85,10 @@ ...@@ -85,10 +85,10 @@
85 android:layout_height="wrap_content" 85 android:layout_height="wrap_content"
86 android:layout_gravity="bottom" 86 android:layout_gravity="bottom"
87 android:background="#FFF" 87 android:background="#FFF"
88 - app:itemIconTint="#29ABE2" 88 + app:itemIconTint="@drawable/bottom_selector"
89 - app:itemTextColor="#29ABE2" 89 + app:itemTextColor="@drawable/bottom_selector"
90 app:labelVisibilityMode="labeled" 90 app:labelVisibilityMode="labeled"
91 - app:menu="@menu/bottom_nav_menu" > 91 + app:menu="@menu/bottom_nav_menu">
92 92
93 </com.google.android.material.bottomnavigation.BottomNavigationView> 93 </com.google.android.material.bottomnavigation.BottomNavigationView>
94 94
......
...@@ -51,13 +51,13 @@ ...@@ -51,13 +51,13 @@
51 > 51 >
52 52
53 <com.google.android.material.bottomnavigation.BottomNavigationView 53 <com.google.android.material.bottomnavigation.BottomNavigationView
54 - android:id="@+id/bottomNavigation" 54 + android:id="@+id/bottomNavigation2"
55 android:layout_width="match_parent" 55 android:layout_width="match_parent"
56 android:layout_height="wrap_content" 56 android:layout_height="wrap_content"
57 android:layout_gravity="bottom" 57 android:layout_gravity="bottom"
58 android:background="#FFF" 58 android:background="#FFF"
59 - app:itemIconTint="#29ABE2" 59 + app:itemIconTint="@drawable/bottom_selector"
60 - app:itemTextColor="#29ABE2" 60 + app:itemTextColor="@drawable/bottom_selector"
61 app:labelVisibilityMode="labeled" 61 app:labelVisibilityMode="labeled"
62 app:menu="@menu/bottom_nav_menu" /> 62 app:menu="@menu/bottom_nav_menu" />
63 </FrameLayout> 63 </FrameLayout>
......
...@@ -129,8 +129,8 @@ ...@@ -129,8 +129,8 @@
129 android:layout_height="wrap_content" 129 android:layout_height="wrap_content"
130 android:layout_gravity="bottom" 130 android:layout_gravity="bottom"
131 android:background="#FFF" 131 android:background="#FFF"
132 - app:itemIconTint="#29ABE2" 132 + app:itemIconTint="@drawable/bottom_selector"
133 - app:itemTextColor="#29ABE2" 133 + app:itemTextColor="@drawable/bottom_selector"
134 app:labelVisibilityMode="labeled" 134 app:labelVisibilityMode="labeled"
135 app:menu="@menu/bottom_nav_menu" /> 135 app:menu="@menu/bottom_nav_menu" />
136 136
......
...@@ -58,15 +58,19 @@ ...@@ -58,15 +58,19 @@
58 58
59 <androidx.recyclerview.widget.RecyclerView 59 <androidx.recyclerview.widget.RecyclerView
60 android:id="@+id/policyFieldRecyclerView" 60 android:id="@+id/policyFieldRecyclerView"
61 - android:layout_width="match_parent" 61 + android:layout_width="wrap_content"
62 android:layout_height="wrap_content" 62 android:layout_height="wrap_content"
63 63
64 - android:layout_gravity="center|center_horizontal" 64 + android:layout_gravity="center_horizontal"
65 - android:layout_marginTop="11dp" 65 + android:layout_marginTop="7dp"
66 - android:layout_marginBottom="11dp" 66 + android:layout_marginBottom="18dp"
67 android:layout_weight="1" 67 android:layout_weight="1"
68 android:background="@drawable/round_ractagle_solid" 68 android:background="@drawable/round_ractagle_solid"
69 android:foregroundGravity="center" 69 android:foregroundGravity="center"
70 + android:paddingLeft="16dp"
71 + android:paddingTop="20dp"
72 + android:paddingRight="16dp"
73 + android:paddingBottom="20dp"
70 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" 74 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
71 app:layout_constraintBottom_toBottomOf="@id/bottomNavigation" 75 app:layout_constraintBottom_toBottomOf="@id/bottomNavigation"
72 app:spanCount="3" 76 app:spanCount="3"
...@@ -80,8 +84,8 @@ ...@@ -80,8 +84,8 @@
80 android:layout_gravity="bottom" 84 android:layout_gravity="bottom"
81 android:background="#FFF" 85 android:background="#FFF"
82 android:elevation="8dp" 86 android:elevation="8dp"
83 - app:itemIconTint="#29ABE2" 87 + app:itemIconTint="@drawable/bottom_selector"
84 - app:itemTextColor="#29ABE2" 88 + app:itemTextColor="@drawable/bottom_selector"
85 app:labelVisibilityMode="labeled" 89 app:labelVisibilityMode="labeled"
86 app:menu="@menu/bottom_nav_menu" /> 90 app:menu="@menu/bottom_nav_menu" />
87 91
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
45 android:layout_height="wrap_content" 45 android:layout_height="wrap_content"
46 android:layout_gravity="bottom" 46 android:layout_gravity="bottom"
47 android:background="#FFF" 47 android:background="#FFF"
48 - app:itemIconTint="#29ABE2" 48 + app:itemIconTint="@drawable/bottom_selector"
49 - app:itemTextColor="#29ABE2" 49 + app:itemTextColor="@drawable/bottom_selector"
50 app:labelVisibilityMode="labeled" 50 app:labelVisibilityMode="labeled"
51 app:menu="@menu/bottom_nav_menu" /> 51 app:menu="@menu/bottom_nav_menu" />
52 52
......
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
105 android:layout_height="wrap_content" 105 android:layout_height="wrap_content"
106 android:layout_gravity="bottom" 106 android:layout_gravity="bottom"
107 android:background="#FFF" 107 android:background="#FFF"
108 - app:itemIconTint="#29ABE2" 108 + app:itemIconTint="@drawable/bottom_selector"
109 - app:itemTextColor="#29ABE2" 109 + app:itemTextColor="@drawable/bottom_selector"
110 app:labelVisibilityMode="labeled" 110 app:labelVisibilityMode="labeled"
111 app:menu="@menu/bottom_nav_menu" /> 111 app:menu="@menu/bottom_nav_menu" />
112 112
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 android:layout_width="100dp" 4 android:layout_width="100dp"
5 android:layout_height="100dp" 5 android:layout_height="100dp"
6 android:layout_gravity="center" 6 android:layout_gravity="center"
7 - android:layout_margin="10dp" 7 + android:layout_margin="11dp"
8 android:gravity="center" 8 android:gravity="center"
9 android:orientation="vertical" 9 android:orientation="vertical"
10 android:padding="3dp"> 10 android:padding="3dp">
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 android:id="@+id/bottomFavorites" 17 android:id="@+id/bottomFavorites"
18 android:enabled="true" 18 android:enabled="true"
19 android:icon="@drawable/instagram" 19 android:icon="@drawable/instagram"
20 - android:title="찜 목록" 20 + android:title="찜목록"
21 app:showAsAction="ifRoom" /> 21 app:showAsAction="ifRoom" />
22 <item 22 <item
23 android:id="@+id/bottomInfo" 23 android:id="@+id/bottomInfo"
......