diff --git a/.idea/misc.xml b/.idea/misc.xml index 2980051..3f8399f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,16 +6,27 @@ + + + + + + + + + + + diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/button/AlphaButton.java b/app/src/main/java/org/ntlab/acanthus_client/views/button/AlphaButton.java new file mode 100644 index 0000000..33c146b --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/button/AlphaButton.java @@ -0,0 +1,27 @@ +package org.ntlab.acanthus_client.views.button; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.Button; +import androidx.appcompat.widget.AppCompatButton; + +/*** 半透明になるエフェクトのボタン ***/ +public class AlphaButton extends AppCompatButton { + public AlphaButton(Context context) { + super(context); + } + + public AlphaButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public void setPressed(boolean pressed) { + if(pressed){ + this.setAlpha(0.75f); + }else{ + this.setAlpha(1.0f); + } + super.setPressed(pressed); + } +} diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/button/PushButton.java b/app/src/main/java/org/ntlab/acanthus_client/views/button/PushButton.java new file mode 100644 index 0000000..afd1a03 --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/button/PushButton.java @@ -0,0 +1,30 @@ +package org.ntlab.acanthus_client.views.button; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.Button; +import androidx.appcompat.widget.AppCompatButton; + +/*** プッシュするエフェクトのボタン ***/ +public class PushButton extends AppCompatButton { + public PushButton(Context context) { + super(context); + } + + public PushButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public void setPressed(boolean pressed) { + if(pressed){ + this.setScaleY(0.85f); + this.setScaleX(0.85f); + }else{ + this.setScaleY(1.0f); + this.setScaleX(1.0f); + } + super.setPressed(pressed); + } + +} diff --git a/app/src/main/res/drawable/ic_baseline_fast_forward.xml b/app/src/main/res/drawable/ic_baseline_fast_forward.xml index cbce5f9..434728f 100644 --- a/app/src/main/res/drawable/ic_baseline_fast_forward.xml +++ b/app/src/main/res/drawable/ic_baseline_fast_forward.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/drawable/ic_baseline_fast_rewind.xml b/app/src/main/res/drawable/ic_baseline_fast_rewind.xml index 71964b2..fade3d1 100644 --- a/app/src/main/res/drawable/ic_baseline_fast_rewind.xml +++ b/app/src/main/res/drawable/ic_baseline_fast_rewind.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/drawable/ic_baseline_library_add.xml b/app/src/main/res/drawable/ic_baseline_library_add.xml index 2f49a21..a65f07b 100644 --- a/app/src/main/res/drawable/ic_baseline_library_add.xml +++ b/app/src/main/res/drawable/ic_baseline_library_add.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/drawable/ic_baseline_pause.xml b/app/src/main/res/drawable/ic_baseline_pause.xml index 44d6b0b..c5bc87c 100644 --- a/app/src/main/res/drawable/ic_baseline_pause.xml +++ b/app/src/main/res/drawable/ic_baseline_pause.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/drawable/ic_baseline_pending.xml b/app/src/main/res/drawable/ic_baseline_pending.xml index 832ccf3..14b5625 100644 --- a/app/src/main/res/drawable/ic_baseline_pending.xml +++ b/app/src/main/res/drawable/ic_baseline_pending.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/drawable/ic_baseline_person_add_alt_1.xml b/app/src/main/res/drawable/ic_baseline_person_add_alt_1.xml new file mode 100644 index 0000000..dbf9979 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_person_add_alt_1.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_play_arrow.xml b/app/src/main/res/drawable/ic_baseline_play_arrow.xml index e529c59..d4d0755 100644 --- a/app/src/main/res/drawable/ic_baseline_play_arrow.xml +++ b/app/src/main/res/drawable/ic_baseline_play_arrow.xml @@ -4,6 +4,6 @@ android:viewportWidth="25" android:viewportHeight="25"> diff --git a/app/src/main/res/drawable/ic_baseline_refresh.xml b/app/src/main/res/drawable/ic_baseline_refresh.xml index fcb5fcc..d460479 100644 --- a/app/src/main/res/drawable/ic_baseline_refresh.xml +++ b/app/src/main/res/drawable/ic_baseline_refresh.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/drawable/ic_baseline_video_library.xml b/app/src/main/res/drawable/ic_baseline_video_library.xml new file mode 100644 index 0000000..b1e8f24 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_video_library.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_west.xml b/app/src/main/res/drawable/ic_baseline_west.xml index 5427d83..d77e877 100644 --- a/app/src/main/res/drawable/ic_baseline_west.xml +++ b/app/src/main/res/drawable/ic_baseline_west.xml @@ -5,6 +5,6 @@ android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/app/src/main/res/layout/activity_animation.xml b/app/src/main/res/layout/activity_animation.xml index 70be5e9..c325be8 100644 --- a/app/src/main/res/layout/activity_animation.xml +++ b/app/src/main/res/layout/activity_animation.xml @@ -17,7 +17,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.0" /> -