kidshift/KidShift
3
0
Fork 0
Code Issues 9 Pull Requests Wiki Activity

Merge remote-tracking branch 'origin/feature/add_task_menu' into feature/add_task_menu

Browse Source 
# Conflicts:
#	feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java
This commit is contained in:
ろむねこ 2024-07-02 14:04:40 +09:00
commit d5ce31a58e
Signed by: Fujimatsu
GPG Key ID: FA1F39A1BA37D168
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
feature/setting/src/main/res/layout/fragment_setting_main.xml
View File

@ -57,14 +57,6 @@
android:text="兼松空摩"
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>

10
feature/setting/src/main/res/layout/list_item_child_name_list.xml
View File

@ -21,12 +21,12 @@
android:id="@+id/loginButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="120dp"
android:text="ログイン"
app:layout_constraintStart_toEndOf="@+id/childname"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginEnd="40dp"
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>