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

Merge pull request 'refactor/refactor' (#152) from refactor/refactor into main

Browse Source 
Reviewed-on: #152
This commit is contained in:
Fujimatsu 2024-07-08 15:18:43 +00:00
commit 45321ebdc3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
feature/common/src/main/java/one/nem/kidshift/feature/common/CommonHomeFragment.java
View File

@ -81,6 +81,12 @@ public class CommonHomeFragment extends Fragment {
childId = getArguments().getString(ARG_CHILD_ID); childId = getArguments().getString(ARG_CHILD_ID);
} }
logger = ksLoggerFactory.create("CommonHomeFragment"); logger = ksLoggerFactory.create("CommonHomeFragment");
if (isChildMode) {
logger.info("Child mode, childId: " + childId);
} else {
logger.info("Parent mode");
}
} }
@Override @Override
@ -243,7 +249,7 @@ public class CommonHomeFragment extends Fragment {
try { try {
Thread.sleep(500); Thread.sleep(500);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); // do nothing
} }
swipeRefreshLayout.setRefreshing(false); swipeRefreshLayout.setRefreshing(false);
}); });

3
feature/common/src/main/res/layout/list_item_task_completion_child.xml
View File

@ -24,11 +24,12 @@
android:text="PLACEHOLDER" android:text="PLACEHOLDER"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<!-- ImageButtonに変更? -->
<Button <Button
android:id="@+id/completeButton" android:id="@+id/completeButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Button" /> android:text="完了" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>