Merge remote-tracking branch 'origin/feature/add_task_menu' into feature/add_task_menu
# Conflicts: # feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
This commit is contained in:
commit
d5ce31a58e
|
@ -57,14 +57,6 @@
|
||||||
android:text="兼松空摩"
|
android:text="兼松空摩"
|
||||||
android:textSize="25dp" />
|
android:textSize="25dp" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/userid"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:text="kukuku_kane"
|
|
||||||
android:textSize="16dp" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,12 +21,12 @@
|
||||||
android:id="@+id/loginButton"
|
android:id="@+id/loginButton"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginStart="120dp"
|
android:layout_marginEnd="40dp"
|
||||||
android:text="ログイン"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/childname"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
android:backgroundTint="#884899"
|
android:backgroundTint="#884899"
|
||||||
android:textColor="#fff"/>
|
android:text="ログイン"
|
||||||
|
android:textColor="#fff"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
Loading…
Reference in New Issue
Block a user