Showing
6 changed files
with
37 additions
and
19 deletions
... | @@ -9,14 +9,13 @@ | ... | @@ -9,14 +9,13 @@ |
9 | android:roundIcon="@mipmap/ic_launcher_round" | 9 | android:roundIcon="@mipmap/ic_launcher_round" |
10 | android:supportsRtl="true" | 10 | android:supportsRtl="true" |
11 | android:theme="@style/NoActionBar"> | 11 | android:theme="@style/NoActionBar"> |
12 | - <activity android:name=".WelcomeActivity"></activity> | 12 | + <activity android:name=".InputProfilActivity"></activity> |
13 | - <activity android:name=".OnboardingActivity" /> | 13 | + <activity android:name=".WelcomeActivity" /> |
14 | - <activity android:name=".PushingActivity" /> | 14 | + <activity android:name=".SettingActivity" /> |
15 | <activity android:name=".DetailActivity" /> | 15 | <activity android:name=".DetailActivity" /> |
16 | <activity android:name=".InfoActivity" /> | 16 | <activity android:name=".InfoActivity" /> |
17 | <activity android:name=".FavoritesActivity" /> | 17 | <activity android:name=".FavoritesActivity" /> |
18 | <activity android:name=".RecommendActivity" /> | 18 | <activity android:name=".RecommendActivity" /> |
19 | - <activity android:name=".WelcomeActivity" /> | ||
20 | <activity android:name=".SignInActivity" /> | 19 | <activity android:name=".SignInActivity" /> |
21 | <activity android:name=".SignUpActivity" /> | 20 | <activity android:name=".SignUpActivity" /> |
22 | <activity android:name=".MainActivity" /> | 21 | <activity android:name=".MainActivity" /> | ... | ... |
... | @@ -28,7 +28,7 @@ class InfoActivity : AppCompatActivity() { | ... | @@ -28,7 +28,7 @@ class InfoActivity : AppCompatActivity() { |
28 | 28 | ||
29 | //pushing test start | 29 | //pushing test start |
30 | InfoButtonSettings.setOnClickListener { | 30 | InfoButtonSettings.setOnClickListener { |
31 | - var intent = Intent(this, PushingActivity::class.java) | 31 | + var intent = Intent(this, SettingActivity::class.java) |
32 | startActivity(intent) | 32 | startActivity(intent) |
33 | } | 33 | } |
34 | //pushing test end | 34 | //pushing test end | ... | ... |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import androidx.appcompat.app.AppCompatActivity | ||
4 | +import android.os.Bundle | ||
5 | + | ||
6 | +class InputProfilActivity : AppCompatActivity() { | ||
7 | + | ||
8 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
9 | + super.onCreate(savedInstanceState) | ||
10 | + setContentView(R.layout.activity_input_profil) | ||
11 | + } | ||
12 | +} |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.graphics.drawable.Drawable | ||
4 | -import android.graphics.drawable.TransitionDrawable | ||
5 | import androidx.appcompat.app.AppCompatActivity | 3 | import androidx.appcompat.app.AppCompatActivity |
6 | import android.os.Bundle | 4 | import android.os.Bundle |
7 | import android.util.Log | 5 | import android.util.Log |
8 | -import android.widget.Button | ||
9 | -import android.widget.ImageButton | ||
10 | import android.widget.Toast | 6 | import android.widget.Toast |
11 | import com.google.firebase.messaging.FirebaseMessaging | 7 | import com.google.firebase.messaging.FirebaseMessaging |
12 | -import kotlinx.android.synthetic.main.activity_pushing.* | 8 | +import kotlinx.android.synthetic.main.activity_setting.* |
13 | 9 | ||
14 | -class PushingActivity : AppCompatActivity() { | 10 | +class SettingActivity : AppCompatActivity() { |
15 | 11 | ||
16 | override fun onCreate(savedInstanceState: Bundle?) { | 12 | override fun onCreate(savedInstanceState: Bundle?) { |
17 | super.onCreate(savedInstanceState) | 13 | super.onCreate(savedInstanceState) |
18 | - setContentView(R.layout.activity_pushing) | 14 | + setContentView(R.layout.activity_setting) |
19 | 15 | ||
20 | subscribeButton.setOnClickListener { | 16 | subscribeButton.setOnClickListener { |
21 | Log.d(TAG, "Subscribing to weather topic") | 17 | Log.d(TAG, "Subscribing to weather topic") |
... | @@ -35,6 +31,6 @@ class PushingActivity : AppCompatActivity() { | ... | @@ -35,6 +31,6 @@ class PushingActivity : AppCompatActivity() { |
35 | } | 31 | } |
36 | companion object { | 32 | companion object { |
37 | 33 | ||
38 | - private const val TAG = "PushingActivity" | 34 | + private const val TAG = "SettingActivity" |
39 | } | 35 | } |
40 | } | 36 | } | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
4 | + xmlns:tools="http://schemas.android.com/tools" | ||
5 | + android:layout_width="match_parent" | ||
6 | + android:layout_height="match_parent" | ||
7 | + tools:context=".InputProfilActivity"> | ||
8 | + | ||
9 | +</androidx.constraintlayout.widget.ConstraintLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
4 | xmlns:tools="http://schemas.android.com/tools" | 4 | xmlns:tools="http://schemas.android.com/tools" |
5 | android:layout_width="match_parent" | 5 | android:layout_width="match_parent" |
6 | android:layout_height="match_parent" | 6 | android:layout_height="match_parent" |
7 | - tools:context=".PushingActivity"> | 7 | + tools:context=".SettingActivity"> |
8 | 8 | ||
9 | <Button | 9 | <Button |
10 | android:id="@+id/subscribeButton" | 10 | android:id="@+id/subscribeButton" |
... | @@ -17,19 +17,21 @@ | ... | @@ -17,19 +17,21 @@ |
17 | android:text="Button" | 17 | android:text="Button" |
18 | app:layout_constraintBottom_toBottomOf="parent" | 18 | app:layout_constraintBottom_toBottomOf="parent" |
19 | app:layout_constraintEnd_toEndOf="parent" | 19 | app:layout_constraintEnd_toEndOf="parent" |
20 | + app:layout_constraintHorizontal_bias="1.0" | ||
20 | app:layout_constraintStart_toStartOf="parent" | 21 | app:layout_constraintStart_toStartOf="parent" |
21 | - app:layout_constraintTop_toTopOf="parent" /> | 22 | + app:layout_constraintTop_toTopOf="parent" |
23 | + app:layout_constraintVertical_bias="0.0" /> | ||
22 | 24 | ||
23 | <ToggleButton | 25 | <ToggleButton |
24 | android:id="@+id/toggleButton" | 26 | android:id="@+id/toggleButton" |
25 | android:layout_width="30dp" | 27 | android:layout_width="30dp" |
26 | android:layout_height="30dp" | 28 | android:layout_height="30dp" |
27 | - android:layout_marginEnd="126dp" | 29 | + android:layout_marginEnd="72dp" |
28 | - android:layout_marginBottom="98dp" | 30 | + android:layout_marginBottom="620dp" |
31 | + android:background="@drawable/toggle_selector" | ||
29 | android:text="ToggleButton" | 32 | android:text="ToggleButton" |
30 | - android:textOn="" | ||
31 | android:textOff="" | 33 | android:textOff="" |
32 | - android:background="@drawable/toggle_selector" | 34 | + android:textOn="" |
33 | app:layout_constraintBottom_toBottomOf="parent" | 35 | app:layout_constraintBottom_toBottomOf="parent" |
34 | app:layout_constraintEnd_toEndOf="parent" /> | 36 | app:layout_constraintEnd_toEndOf="parent" /> |
35 | 37 | ... | ... |
-
Please register or login to post a comment