From 116a1f7108ebc544fc60908292cbaaebb11e350f Mon Sep 17 00:00:00 2001 From: Mango-Juice Date: Sat, 12 Mar 2022 21:17:01 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore=20:=20=EB=B2=84=EC=A0=84=20=EB=8F=99?= =?UTF-8?q?=EA=B8=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 플레이 스토어의 출시 버전과 맞춰 gradle의 버전을 올림. --- app/build.gradle | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 81c2444..4a29eee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.friday.plandial" minSdk 26 targetSdk 31 - versionCode 1 - versionName "1.0" + versionCode 7 + versionName "1.0.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -36,9 +36,10 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.room:room-runtime:2.4.1' - testImplementation 'junit:junit:4.+' + implementation 'androidx.room:room-runtime:2.4.2' + implementation 'com.github.flarelane:FlareLane-Android-SDK:1.0.11' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - annotationProcessor 'androidx.room:room-compiler:2.4.1' + annotationProcessor 'androidx.room:room-compiler:2.4.2' } \ No newline at end of file From 941a18a8313d9b877037f0d2df3b04356abfd8b8 Mon Sep 17 00:00:00 2001 From: Mango-Juice Date: Sat, 12 Mar 2022 21:28:24 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20=EC=A3=BC=EA=B8=B0=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EB=B2=84=ED=8A=BC=20=EA=B4=80=EB=A0=A8=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 주기 선택 버튼을 꾹 눌렀다 스크롤을 한 후 떼면 제대로 숫자가 멈추지 않는 현상을 발견하여 수정함. --- .../java/com/friday/plandial/EditDialActivity.java | 10 ++++++++++ .../java/com/friday/plandial/PlusDialActivity.java | 10 ++++++++++ app/src/main/res/layout/activity_edit_dial.xml | 1 + app/src/main/res/layout/activity_plus_dial.xml | 1 + 4 files changed, 22 insertions(+) diff --git a/app/src/main/java/com/friday/plandial/EditDialActivity.java b/app/src/main/java/com/friday/plandial/EditDialActivity.java index b3e64be..002f46c 100644 --- a/app/src/main/java/com/friday/plandial/EditDialActivity.java +++ b/app/src/main/java/com/friday/plandial/EditDialActivity.java @@ -14,6 +14,7 @@ import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.ScrollView; import android.widget.Switch; import android.widget.TextView; @@ -136,6 +137,15 @@ protected void onCreate(Bundle savedInstanceState) { } + ScrollView scrollView = findViewById(R.id.ScrollView); + scrollView.setOnTouchListener((v, event) -> { + if (event.getAction() == MotionEvent.ACTION_UP) { //뗐을 때 동작 + handler_up.removeCallbacks(runnable_up); + handler_down.removeCallbacks(runnable_down); + } + return false; + }); + periodPlus.setOnLongClickListener(v -> { handler_up.post(runnable_up); return false; diff --git a/app/src/main/java/com/friday/plandial/PlusDialActivity.java b/app/src/main/java/com/friday/plandial/PlusDialActivity.java index 4440bd8..6c8c309 100644 --- a/app/src/main/java/com/friday/plandial/PlusDialActivity.java +++ b/app/src/main/java/com/friday/plandial/PlusDialActivity.java @@ -12,6 +12,7 @@ import android.widget.EditText; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.ScrollView; import android.widget.TextView; import androidx.annotation.Nullable; @@ -85,6 +86,15 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } //endregion + ScrollView scrollView = findViewById(R.id.ScrollView); + scrollView.setOnTouchListener((v, event) -> { + if (event.getAction() == MotionEvent.ACTION_UP) { //뗐을 때 동작 + handler_up.removeCallbacks(runnable_up); + handler_down.removeCallbacks(runnable_down); + } + return false; + }); + periodPlus.setOnLongClickListener(v -> { handler_up.post(runnable_up); return false; diff --git a/app/src/main/res/layout/activity_edit_dial.xml b/app/src/main/res/layout/activity_edit_dial.xml index 0427353..537d65d 100644 --- a/app/src/main/res/layout/activity_edit_dial.xml +++ b/app/src/main/res/layout/activity_edit_dial.xml @@ -2,6 +2,7 @@ diff --git a/app/src/main/res/layout/activity_plus_dial.xml b/app/src/main/res/layout/activity_plus_dial.xml index 2715d46..1609b29 100644 --- a/app/src/main/res/layout/activity_plus_dial.xml +++ b/app/src/main/res/layout/activity_plus_dial.xml @@ -11,6 +11,7 @@ android:layout_height="match_parent"> From ab7517102db4b7db47d2029103c5f4ffdb9794ae Mon Sep 17 00:00:00 2001 From: Mango-Juice Date: Sat, 12 Mar 2022 22:01:48 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20=EC=9C=84=EC=A0=AF=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20=EB=B0=8F=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 푸시 알림 이후에도 다이얼이 위젯에 남아있는 문제를 해결함. 위젯의 UI 크기를 조절함. --- .../com/friday/plandial/PlanDialWidget.java | 15 +-- .../com/friday/plandial/PushReceiver.java | 2 + app/src/main/res/layout/plan_dial_widget.xml | 93 +++++++++++-------- .../res/xml-v31/plan_dial_widget_info.xml | 14 +++ .../main/res/xml/plan_dial_widget_info.xml | 9 +- 5 files changed, 76 insertions(+), 57 deletions(-) create mode 100644 app/src/main/res/xml-v31/plan_dial_widget_info.xml diff --git a/app/src/main/java/com/friday/plandial/PlanDialWidget.java b/app/src/main/java/com/friday/plandial/PlanDialWidget.java index 3afa679..1bb8d32 100644 --- a/app/src/main/java/com/friday/plandial/PlanDialWidget.java +++ b/app/src/main/java/com/friday/plandial/PlanDialWidget.java @@ -19,7 +19,7 @@ public class PlanDialWidget extends AppWidgetProvider { private static final String TAG = "WIDGET"; private static final int MAX_ITEM_CNT = 5; - private static final int WIDGET_UPDATE_INTERVAL = (int) (10 * UnitOfTime.MINUTE.getMillis()); // 단위: ms + private static final int WIDGET_UPDATE_INTERVAL = (int) (5 * UnitOfTime.MINUTE.getMillis()); // 단위: ms private static final String ITEM_SEPARATOR = ","; private static final String FIELD_SEPARATOR = ":"; @@ -35,12 +35,7 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.plan_dial_widget); Intent intent = new Intent(context, SplashActivity.class); - PendingIntent pe; - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) { - pe = PendingIntent.getActivity(context, PI_ID, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); - } else { - pe = PendingIntent.getActivity(context, PI_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT); - } + PendingIntent pe = PendingIntent.getActivity(context, PI_ID, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); views.setOnClickPendingIntent(R.id.appwidget_layout, pe); // 클릭시 SplashActivity 실행 int num = 1, visibleItemCnt = 0; @@ -146,11 +141,7 @@ private void alarmCancel() { private void alarmUpdate(Context context) { Intent intent = getForceUpdateIntent(context); - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) { - mPendingIntent = PendingIntent.getBroadcast(context, PI_ID, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); - } else { - mPendingIntent = PendingIntent.getBroadcast(context, PI_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT); - } + mPendingIntent = PendingIntent.getBroadcast(context, PI_ID, intent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); mAlarmManager.setAndAllowWhileIdle(AlarmManager.RTC, System.currentTimeMillis() + WIDGET_UPDATE_INTERVAL, mPendingIntent); } diff --git a/app/src/main/java/com/friday/plandial/PushReceiver.java b/app/src/main/java/com/friday/plandial/PushReceiver.java index 22fde7e..16d321f 100644 --- a/app/src/main/java/com/friday/plandial/PushReceiver.java +++ b/app/src/main/java/com/friday/plandial/PushReceiver.java @@ -42,6 +42,8 @@ public void onReceive(Context context, Intent intent) { Notification notification = builder.build(); manager.notify(1, notification); + + PlanDialWidget.Update(context); // widget update } } diff --git a/app/src/main/res/layout/plan_dial_widget.xml b/app/src/main/res/layout/plan_dial_widget.xml index 391e770..637d5f1 100644 --- a/app/src/main/res/layout/plan_dial_widget.xml +++ b/app/src/main/res/layout/plan_dial_widget.xml @@ -59,122 +59,137 @@ + android:textAlignment="center" + android:textColor="#000000" /> + android:textAlignment="center" + android:textColor="#000000" /> + android:textAlignment="center" + android:textColor="#000000" /> + android:textAlignment="center" + android:textColor="#000000" /> + android:textAlignment="center" + android:textColor="#000000" /> diff --git a/app/src/main/res/xml-v31/plan_dial_widget_info.xml b/app/src/main/res/xml-v31/plan_dial_widget_info.xml new file mode 100644 index 0000000..bcf8540 --- /dev/null +++ b/app/src/main/res/xml-v31/plan_dial_widget_info.xml @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/app/src/main/res/xml/plan_dial_widget_info.xml b/app/src/main/res/xml/plan_dial_widget_info.xml index c8af515..622a936 100644 --- a/app/src/main/res/xml/plan_dial_widget_info.xml +++ b/app/src/main/res/xml/plan_dial_widget_info.xml @@ -4,11 +4,8 @@ android:initialKeyguardLayout="@layout/plan_dial_widget" android:initialLayout="@layout/plan_dial_widget" android:minWidth="180dp" - android:minHeight="40dp" + android:minHeight="60dp" android:previewImage="@drawable/ic_logo" - android:previewLayout="@layout/plan_dial_widget" - android:resizeMode="none" - android:targetCellWidth="3" - android:targetCellHeight="1" - android:updatePeriodMillis="1800000" + android:resizeMode="horizontal" + android:updatePeriodMillis="300000" android:widgetCategory="home_screen" /> \ No newline at end of file From fd4a282f107e93d8b75c32b9eafb1345380ca9f1 Mon Sep 17 00:00:00 2001 From: Mango-Juice Date: Sat, 12 Mar 2022 22:22:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore=20:=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EB=8B=A4=ED=81=AC=20=EB=AA=A8=EB=93=9C?= =?UTF-8?q?=20=EB=AC=B4=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 프리셋 설명에서의 오타를 수정함. 다크 모드에서도 흰 배경의 앱을 사용하도록 강제함. (추후 다크모드 대응 필요) --- app/src/main/assets/datas/PresetData.csv | 4 ++-- app/src/main/res/values-night-v31/themes.xml | 10 --------- app/src/main/res/values-night/themes.xml | 22 -------------------- app/src/main/res/values/themes.xml | 2 +- 4 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/res/values-night-v31/themes.xml delete mode 100644 app/src/main/res/values-night/themes.xml diff --git a/app/src/main/assets/datas/PresetData.csv b/app/src/main/assets/datas/PresetData.csv index 6576504..04ecc48 100644 --- a/app/src/main/assets/datas/PresetData.csv +++ b/app/src/main/assets/datas/PresetData.csv @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:243b6d47c62503f756bbbbac0ac5811a5cfcca39f589daa0697e07f34da6c5b8 -size 3361 +oid sha256:d69ead17cd7db6977578ce64d1fcdee40374b9c6c9779a430a175bc1d03431e8 +size 3340 diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml deleted file mode 100644 index ab53e19..0000000 --- a/app/src/main/res/values-night-v31/themes.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 5483319..0000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index de2d4b5..791ffb1 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,6 +1,6 @@ -