Showing
6 changed files
with
32 additions
and
4 deletions
| ... | @@ -4,7 +4,7 @@ | ... | @@ -4,7 +4,7 @@ |
| 4 | <option name="filePathToZoomLevelMap"> | 4 | <option name="filePathToZoomLevelMap"> |
| 5 | <map> | 5 | <map> |
| 6 | <entry key="..\:/Workspaces/teamPARK/holiday-counter-recommend-activity/android/app/src/main/res/drawable/circle.xml" value="0.2925" /> | 6 | <entry key="..\:/Workspaces/teamPARK/holiday-counter-recommend-activity/android/app/src/main/res/drawable/circle.xml" value="0.2925" /> |
| 7 | - <entry key="..\:/Workspaces/teamPARK/holiday-counter-recommend-activity/android/app/src/main/res/layout/activity_main.xml" value="3.0" /> | 7 | + <entry key="..\:/Workspaces/teamPARK/holiday-counter-recommend-activity/android/app/src/main/res/layout/activity_main.xml" value="0.33" /> |
| 8 | <entry key="..\:/Workspaces/teamPARK/holiday-counter-recommend-activity/android/app/src/main/res/layout/circle.xml" value="0.34782608695652173" /> | 8 | <entry key="..\:/Workspaces/teamPARK/holiday-counter-recommend-activity/android/app/src/main/res/layout/circle.xml" value="0.34782608695652173" /> |
| 9 | </map> | 9 | </map> |
| 10 | </option> | 10 | </option> | ... | ... |
android/app/release/app-release.apk
0 → 100644
No preview for this file type
android/app/release/output-metadata.json
0 → 100644
| 1 | +{ | ||
| 2 | + "version": 3, | ||
| 3 | + "artifactType": { | ||
| 4 | + "type": "APK", | ||
| 5 | + "kind": "Directory" | ||
| 6 | + }, | ||
| 7 | + "applicationId": "com.example.holidaycounter", | ||
| 8 | + "variantName": "release", | ||
| 9 | + "elements": [ | ||
| 10 | + { | ||
| 11 | + "type": "SINGLE", | ||
| 12 | + "filters": [], | ||
| 13 | + "attributes": [], | ||
| 14 | + "versionCode": 1, | ||
| 15 | + "versionName": "1.0", | ||
| 16 | + "outputFile": "app-release.apk" | ||
| 17 | + } | ||
| 18 | + ], | ||
| 19 | + "elementType": "File" | ||
| 20 | +} | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 1 | package com.example.holidaycounter; | 1 | package com.example.holidaycounter; |
| 2 | 2 | ||
| 3 | +import androidx.annotation.Dimension; | ||
| 3 | import androidx.appcompat.app.ActionBar; | 4 | import androidx.appcompat.app.ActionBar; |
| 4 | import androidx.appcompat.app.AppCompatActivity; | 5 | import androidx.appcompat.app.AppCompatActivity; |
| 5 | 6 | ||
| ... | @@ -23,7 +24,7 @@ public class MainActivity extends AppCompatActivity { | ... | @@ -23,7 +24,7 @@ public class MainActivity extends AppCompatActivity { |
| 23 | TextView locDate; | 24 | TextView locDate; |
| 24 | TextView leftDate; | 25 | TextView leftDate; |
| 25 | TextView title; | 26 | TextView title; |
| 26 | - String url = "http://www.holiday-counter.tk:8080/app"; | 27 | + String url = "http://www.holidaycounter.ml:8080/app"; |
| 27 | String msg; | 28 | String msg; |
| 28 | final Bundle bundle = new Bundle(); | 29 | final Bundle bundle = new Bundle(); |
| 29 | 30 | ||
| ... | @@ -56,7 +57,15 @@ public class MainActivity extends AppCompatActivity { | ... | @@ -56,7 +57,15 @@ public class MainActivity extends AppCompatActivity { |
| 56 | todayDate.setText(data[0]); | 57 | todayDate.setText(data[0]); |
| 57 | dateName.setText(data[1]); | 58 | dateName.setText(data[1]); |
| 58 | locDate.setText(data[2].substring(0, 4) + "년 " + data[2].substring(4, 6) + "월 " + data[2].substring(6) + "일"); | 59 | locDate.setText(data[2].substring(0, 4) + "년 " + data[2].substring(4, 6) + "월 " + data[2].substring(6) + "일"); |
| 59 | - leftDate.setText("D-" + data[3]); | 60 | + if(data[3].equals("0")) { |
| 61 | + leftDate.setTextSize(Dimension.SP, 70); | ||
| 62 | + leftDate.setText("D - DAY"); | ||
| 63 | + } | ||
| 64 | + else { | ||
| 65 | + leftDate.setTextSize(Dimension.SP, 90); | ||
| 66 | + leftDate.setText("D - " + data[3]); | ||
| 67 | + } | ||
| 68 | + | ||
| 60 | } | 69 | } |
| 61 | }; | 70 | }; |
| 62 | 71 | ... | ... |
| ... | @@ -23,7 +23,6 @@ | ... | @@ -23,7 +23,6 @@ |
| 23 | android:layout_height="104dp" | 23 | android:layout_height="104dp" |
| 24 | android:layout_marginTop="8dp" | 24 | android:layout_marginTop="8dp" |
| 25 | android:fontFamily="@font/gowundodum" | 25 | android:fontFamily="@font/gowundodum" |
| 26 | - android:letterSpacing="0.2" | ||
| 27 | android:text="D-0" | 26 | android:text="D-0" |
| 28 | android:textAlignment="center" | 27 | android:textAlignment="center" |
| 29 | android:textColor="@color/tomato" | 28 | android:textColor="@color/tomato" | ... | ... |
-
Please register or login to post a comment