diff --git a/.idea/misc.xml b/.idea/misc.xml index 63646c6..c3cbe87 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,14 @@ + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle index b361bc7..ccb56ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ defaultConfig { applicationId "org.ntlab.acanthus_client" - minSdkVersion 22 + minSdkVersion 21 targetSdkVersion 30 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java index cbb2429..c627496 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java @@ -66,10 +66,10 @@ buttonPlayback.setOnClickListener(new View.OnClickListener(){ public void onClick(View v) { if(animationCanvas.onClickPlayback() == 0){ - buttonPlayback.setText("start"); + buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_play_arrow)); } else { - buttonPlayback.setText("stop"); + buttonPlayback.setBackgroundDrawable(getResources().getDrawable(R.drawable.ic_baseline_pause)); } } }); diff --git a/app/src/main/res/drawable/ic_baseline_fast_forward.xml b/app/src/main/res/drawable/ic_baseline_fast_forward.xml new file mode 100644 index 0000000..cbce5f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_fast_forward.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_fast_rewind.xml b/app/src/main/res/drawable/ic_baseline_fast_rewind.xml new file mode 100644 index 0000000..71964b2 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_fast_rewind.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_pause.xml b/app/src/main/res/drawable/ic_baseline_pause.xml new file mode 100644 index 0000000..44d6b0b --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_pause.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_pending.xml b/app/src/main/res/drawable/ic_baseline_pending.xml new file mode 100644 index 0000000..832ccf3 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_pending.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 new file mode 100644 index 0000000..e529c59 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_play_arrow.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_refresh.xml b/app/src/main/res/drawable/ic_baseline_refresh.xml new file mode 100644 index 0000000..fcb5fcc --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_refresh.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 new file mode 100644 index 0000000..5427d83 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_west.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/activity_animation.xml b/app/src/main/res/layout/activity_animation.xml index a389cfc..9e28390 100644 --- a/app/src/main/res/layout/activity_animation.xml +++ b/app/src/main/res/layout/activity_animation.xml @@ -6,6 +6,17 @@ android:layout_height="match_parent" tools:context=".views.animation.AnimationActivity"> + + + + - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89a98a2..b8e6aa3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,4 +15,10 @@ Password must be >5 characters "Login failed" Icon + play_arrow + 2s_skip + 2s_back + detail + reset + close \ No newline at end of file