Toggle navigation
Toggle navigation
This project
Loading...
Sign in
장연우
/
WELLO
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
신기성
2019-11-07 00:56:47 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e1679624fbf5f4c7d0bb5bfac9eacb15e66a1f70
e1679624
1 parent
1e2d13c5
refactor activity name
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
19 deletions
vip/app/src/main/AndroidManifest.xml
vip/app/src/main/java/com/example/vip/InfoActivity.kt
vip/app/src/main/java/com/example/vip/InputProfilActivity.kt
vip/app/src/main/java/com/example/vip/PushingActivity.kt → vip/app/src/main/java/com/example/vip/SettingActivity.kt
vip/app/src/main/res/layout/activity_input_profil.xml
vip/app/src/main/res/layout/activity_pushing.xml → vip/app/src/main/res/layout/activity_setting.xml
vip/app/src/main/AndroidManifest.xml
View file @
e167962
...
...
@@ -9,14 +9,13 @@
android:roundIcon=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:theme=
"@style/NoActionBar"
>
<activity
android:name=
".
Welcome
Activity"
></activity>
<activity
android:name=
".
Onboarding
Activity"
/>
<activity
android:name=
".
Push
ingActivity"
/>
<activity
android:name=
".
InputProfil
Activity"
></activity>
<activity
android:name=
".
Welcome
Activity"
/>
<activity
android:name=
".
Sett
ingActivity"
/>
<activity
android:name=
".DetailActivity"
/>
<activity
android:name=
".InfoActivity"
/>
<activity
android:name=
".FavoritesActivity"
/>
<activity
android:name=
".RecommendActivity"
/>
<activity
android:name=
".WelcomeActivity"
/>
<activity
android:name=
".SignInActivity"
/>
<activity
android:name=
".SignUpActivity"
/>
<activity
android:name=
".MainActivity"
/>
...
...
vip/app/src/main/java/com/example/vip/InfoActivity.kt
View file @
e167962
...
...
@@ -28,7 +28,7 @@ class InfoActivity : AppCompatActivity() {
//pushing test start
InfoButtonSettings
.
setOnClickListener
{
var
intent
=
Intent
(
this
,
Push
ingActivity
::
class
.
java
)
var
intent
=
Intent
(
this
,
Sett
ingActivity
::
class
.
java
)
startActivity
(
intent
)
}
//pushing test end
...
...
vip/app/src/main/java/com/example/vip/InputProfilActivity.kt
0 → 100644
View file @
e167962
package
com.example.vip
import
androidx.appcompat.app.AppCompatActivity
import
android.os.Bundle
class
InputProfilActivity
:
AppCompatActivity
()
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
setContentView
(
R
.
layout
.
activity_input_profil
)
}
}
vip/app/src/main/java/com/example/vip/
Push
ingActivity.kt
→
vip/app/src/main/java/com/example/vip/
Sett
ingActivity.kt
View file @
e167962
package
com.example.vip
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.TransitionDrawable
import
androidx.appcompat.app.AppCompatActivity
import
android.os.Bundle
import
android.util.Log
import
android.widget.Button
import
android.widget.ImageButton
import
android.widget.Toast
import
com.google.firebase.messaging.FirebaseMessaging
import
kotlinx.android.synthetic.main.activity_
push
ing.*
import
kotlinx.android.synthetic.main.activity_
sett
ing.*
class
Push
ingActivity
:
AppCompatActivity
()
{
class
Sett
ingActivity
:
AppCompatActivity
()
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
setContentView
(
R
.
layout
.
activity_
push
ing
)
setContentView
(
R
.
layout
.
activity_
sett
ing
)
subscribeButton
.
setOnClickListener
{
Log
.
d
(
TAG
,
"Subscribing to weather topic"
)
...
...
@@ -35,6 +31,6 @@ class PushingActivity : AppCompatActivity() {
}
companion
object
{
private
const
val
TAG
=
"
Push
ingActivity"
private
const
val
TAG
=
"
Sett
ingActivity"
}
}
...
...
vip/app/src/main/res/layout/activity_input_profil.xml
0 → 100644
View file @
e167962
<?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=
".InputProfilActivity"
>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
vip/app/src/main/res/layout/activity_
push
ing.xml
→
vip/app/src/main/res/layout/activity_
sett
ing.xml
View file @
e167962
...
...
@@ -4,7 +4,7 @@
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
".
Push
ingActivity"
>
tools:context=
".
Sett
ingActivity"
>
<Button
android:id=
"@+id/subscribeButton"
...
...
@@ -17,19 +17,21 @@
android:text=
"Button"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"1.0"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0.0"
/>
<ToggleButton
android:id=
"@+id/toggleButton"
android:layout_width=
"30dp"
android:layout_height=
"30dp"
android:layout_marginEnd=
"126dp"
android:layout_marginBottom=
"98dp"
android:layout_marginEnd=
"72dp"
android:layout_marginBottom=
"620dp"
android:background=
"@drawable/toggle_selector"
android:text=
"ToggleButton"
android:textOn=
""
android:textOff=
""
android:
background=
"@drawable/toggle_selector
"
android:
textOn=
"
"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
/>
...
...
Please
register
or
login
to post a comment