Merge pull request #34 from ProjectFRIDAY/hotfix

[Hotfix] 주기 선택 버튼 오류 해결 및 위젯 표시 오류 해결
ProjectFRIDAY · Mar 12, 2022 · 952e0dc · 952e0dc
2 parents 8212aea + fd4a282
commit 952e0dc
Show file tree

Hide file tree

Showing 14 changed files with 107 additions and 97 deletions.
diff --git 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'
 }
diff --git a/app/src/main/assets/datas/PresetData.csv b/app/src/main/assets/datas/PresetData.csv
diff --git 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/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/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/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/activity_edit_dial.xml b/app/src/main/res/layout/activity_edit_dial.xml
@@ -2,6 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:custom="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/ScrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

diff --git 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">
 
         <ScrollView
+            android:id="@+id/ScrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 

diff --git a/app/src/main/res/layout/plan_dial_widget.xml b/app/src/main/res/layout/plan_dial_widget.xml
@@ -59,122 +59,137 @@
 
             <LinearLayout
                 android:id="@+id/widget_item1_layout"
-                android:layout_width="30dp"
+                android:layout_width="40dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="1dp"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/widget_item1_img"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
 
                 <TextView
                     android:id="@+id/widget_item1_text"
-                    android:layout_width="wrap_content"
+                    android:layout_width="40dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:autoSizeMinTextSize="5sp"
+                    android:autoSizeTextType="uniform"
+                    android:maxLines="2"
                     android:text=""
-                    android:textColor="#000000"
-                    android:textSize="11sp" />
+                    android:textAlignment="center"
+                    android:textColor="#000000" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/widget_item2_layout"
-                android:layout_width="30dp"
+                android:layout_width="40dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
+                android:layout_marginStart="1dp"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/widget_item2_img"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
 
                 <TextView
                     android:id="@+id/widget_item2_text"
-                    android:layout_width="wrap_content"
+                    android:layout_width="40dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:autoSizeMinTextSize="5sp"
+                    android:autoSizeTextType="uniform"
+                    android:maxLines="2"
                     android:text=""
-                    android:textColor="#000000"
-                    android:textSize="11sp" />
+                    android:textAlignment="center"
+                    android:textColor="#000000" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/widget_item3_layout"
-                android:layout_width="30dp"
+                android:layout_width="40dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
+                android:layout_marginStart="1dp"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/widget_item3_img"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
 
                 <TextView
                     android:id="@+id/widget_item3_text"
-                    android:layout_width="wrap_content"
+                    android:layout_width="40dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:autoSizeMinTextSize="5sp"
+                    android:autoSizeTextType="uniform"
+                    android:maxLines="2"
                     android:text=""
-                    android:textColor="#000000"
-                    android:textSize="11sp" />
+                    android:textAlignment="center"
+                    android:textColor="#000000" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/widget_item4_layout"
-                android:layout_width="30dp"
+                android:layout_width="40dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
+                android:layout_marginStart="1dp"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/widget_item4_img"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
 
                 <TextView
                     android:id="@+id/widget_item4_text"
-                    android:layout_width="wrap_content"
+                    android:layout_width="40dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:autoSizeMinTextSize="5sp"
+                    android:autoSizeTextType="uniform"
+                    android:maxLines="2"
                     android:text=""
-                    android:textColor="#000000"
-                    android:textSize="11sp" />
+                    android:textAlignment="center"
+                    android:textColor="#000000" />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/widget_item5_layout"
-                android:layout_width="30dp"
+                android:layout_width="40dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
+                android:layout_marginStart="1dp"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/widget_item5_img"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
                     android:layout_gravity="center_horizontal" />
 
                 <TextView
                     android:id="@+id/widget_item5_text"
-                    android:layout_width="wrap_content"
+                    android:layout_width="40dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
+                    android:autoSizeMinTextSize="5sp"
+                    android:autoSizeTextType="uniform"
+                    android:maxLines="2"
                     android:text=""
-                    android:textColor="#000000"
-                    android:textSize="11sp" />
+                    android:textAlignment="center"
+                    android:textColor="#000000" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.PlanDial" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.PlanDial" parent="Theme.MaterialComponents.Light">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

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
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/app_widget_description"
+    android:initialKeyguardLayout="@layout/plan_dial_widget"
+    android:initialLayout="@layout/plan_dial_widget"
+    android:minWidth="180dp"
+    android:minHeight="60dp"
+    android:previewImage="@drawable/ic_logo"
+    android:previewLayout="@layout/plan_dial_widget"
+    android:resizeMode="horizontal"
+    android:targetCellWidth="3"
+    android:targetCellHeight="1"
+    android:updatePeriodMillis="300000"
+    android:widgetCategory="home_screen" />
diff --git 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" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,8 @@ public void onReceive(Context context, Intent intent) { @@
                 Notification notification = builder.build();
                 manager.notify(1, notification);
+                PlanDialWidget.Update(context); // widget update
             }
         }
@@ Expand Down @@