Skip to content
This repository was archived by the owner on Sep 8, 2023. It is now read-only.

Commit 167e04c

Browse files
CorvetteColeCorvetteCole
committed
Release 1.5.5
- changed package name to ui - edited some text in the phone app - fixed animation bug in the phone app - fixed order of settings in the phone app
1 parent a75ea11 commit 167e04c

File tree

9 files changed

+27
-28
lines changed

9 files changed

+27
-28
lines changed

‎phoneApp/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "com.corvettecole.pixelwatchface"
1010
minSdkVersion 21
1111
targetSdkVersion 29
12-
versionCode 33
13-
versionName "1.5.5-RC4"
12+
versionCode 34
13+
versionName "1.5.5"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616

‎phoneApp/src/main/res/layout/activity_main.xml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<LinearLayout
1818
android:layout_width="match_parent"
1919
android:layout_height="wrap_content"
20-
android:orientation="vertical"
21-
android:animateLayoutChanges="true">
20+
android:orientation="vertical">
2221

2322
<TextView
2423
android:id="@+id/advancedPurchaseText"
@@ -212,18 +211,6 @@
212211
app:layout_constraintStart_toStartOf="parent"
213212
app:layout_constraintTop_toBottomOf="@+id/dateFormatSwitch" />
214213

215-
<Switch
216-
android:id="@+id/useDarkSkySwitch"
217-
android:layout_width="match_parent"
218-
android:layout_height="48dp"
219-
android:layout_marginTop="8dp"
220-
android:layout_marginStart="8dp"
221-
android:layout_marginEnd="8dp"
222-
android:text="@string/dark_sky_toggle"
223-
app:layout_constraintEnd_toEndOf="parent"
224-
app:layout_constraintStart_toStartOf="parent"
225-
app:layout_constraintTop_toBottomOf="@+id/darkSkyExplanation" />
226-
227214
<TextView
228215
android:id="@+id/darkSkyExplanation"
229216
android:layout_width="wrap_content"
@@ -236,6 +223,18 @@
236223
app:layout_constraintStart_toStartOf="parent"
237224
app:layout_constraintTop_toBottomOf="@+id/infoBarAmbientSwitch" />
238225

226+
<Switch
227+
android:id="@+id/useDarkSkySwitch"
228+
android:layout_width="match_parent"
229+
android:layout_height="48dp"
230+
android:layout_marginTop="8dp"
231+
android:layout_marginStart="8dp"
232+
android:layout_marginEnd="8dp"
233+
android:text="@string/dark_sky_toggle"
234+
app:layout_constraintEnd_toEndOf="parent"
235+
app:layout_constraintStart_toStartOf="parent"
236+
app:layout_constraintTop_toBottomOf="@+id/darkSkyExplanation" />
237+
239238
<EditText
240239
android:id="@+id/darkSkyEditText"
241240
android:layout_width="match_parent"

‎phoneApp/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<string name="app_name">Pixel Watch Face</string>
33
<string name="title_activity_debug">DebugActivity</string>
44
<string name="dark_sky_api_key_hint">API key from your Dark Sky developer account</string>
5-
<string name="purchase_prompt">After the free weather APIs previously used hit their limit, I spent several months writing my own weather service so that I could keep this app subscription free.
5+
<string name="purchase_prompt">After the free weather APIs I used hit their limit, I spent several months writing my own weather service so that I could keep this app subscription free.
66
Weather can now be activated with a small one-time purchase below. This money will support current and future development of the app, with many exciting updates planned.
77
If you cannot afford to support development or don\'t want to, you can request an unlock code for free. Thanks for using my app :)</string>
88
<string name="purchase_button">Support now (%s)</string>
@@ -24,5 +24,5 @@
2424
<string name="weather_icon">Show the current weather as an icon</string>
2525
<string name="temperature_fractional">Show temperature to 1 decimal place</string>
2626
<string name="dark_sky_blurb">Dark Sky support has been discontinued. These options are only present if you have previously entered a Dark Sky key.</string>
27-
<string name="dark_sky_toggle">Use Dark Sky to provide weather data</string>
27+
<string name="dark_sky_toggle">Use Dark Sky as a weather provider. The default providers will still be used as fallbacks</string>
2828
</resources>

‎wearApp/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "com.corvettecole.pixelwatchface"
88
minSdkVersion 23
99
targetSdkVersion 29
10-
versionCode 1067
11-
versionName "1.5.5-RC4"
10+
versionCode 1068
11+
versionName "1.5.5"
1212
multiDexEnabled true
1313
}
1414
compileOptions {

‎wearApp/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424

2525
<activity
2626
android:launchMode="singleInstance"
27-
android:name=".watchface.WeatherUpdateActivity" />
27+
android:name=".ui.WeatherUpdateActivity" />
2828

2929
<activity
3030
android:launchMode="singleInstance"
31-
android:name=".watchface.CompanionNotifyActivity" />
31+
android:name=".ui.CompanionNotifyActivity" />
3232

3333
<activity
3434
android:launchMode="singleInstance"
35-
android:name=".watchface.WatchPermissionRequestActivity" />
35+
android:name=".ui.WatchPermissionRequestActivity" />
3636

3737
<meta-data
3838
android:name="com.google.android.gms.version"
@@ -44,7 +44,7 @@
4444

4545
<service
4646
android:label="@string/my_digital_name"
47-
android:name=".watchface.PixelWatchFace"
47+
android:name=".ui.PixelWatchFace"
4848
android:permission="android.permission.BIND_WALLPAPER">
4949
<intent-filter>
5050
<action android:name="android.service.wallpaper.WallpaperService" />

wearApp/src/main/java/com/corvettecole/pixelwatchface/watchface/CompanionNotifyActivity.java renamed to wearApp/src/main/java/com/corvettecole/pixelwatchface/ui/CompanionNotifyActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.corvettecole.pixelwatchface.watchface;
1+
package com.corvettecole.pixelwatchface.ui;
22

33
import android.content.Intent;
44
import android.content.res.ColorStateList;

wearApp/src/main/java/com/corvettecole/pixelwatchface/watchface/PixelWatchFace.java renamed to wearApp/src/main/java/com/corvettecole/pixelwatchface/ui/PixelWatchFace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.corvettecole.pixelwatchface.watchface;
1+
package com.corvettecole.pixelwatchface.ui;
22

33
import static com.corvettecole.pixelwatchface.util.Constants.INFO_BAR_Y_SPACING_RATIO;
44
import static com.corvettecole.pixelwatchface.util.Constants.KEY_WEATHER_JSON;

wearApp/src/main/java/com/corvettecole/pixelwatchface/watchface/WatchPermissionRequestActivity.java renamed to wearApp/src/main/java/com/corvettecole/pixelwatchface/ui/WatchPermissionRequestActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.corvettecole.pixelwatchface.watchface;
1+
package com.corvettecole.pixelwatchface.ui;
22

33
import android.annotation.SuppressLint;
44
import android.content.pm.PackageManager;

wearApp/src/main/java/com/corvettecole/pixelwatchface/watchface/WeatherUpdateActivity.java renamed to wearApp/src/main/java/com/corvettecole/pixelwatchface/ui/WeatherUpdateActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.corvettecole.pixelwatchface.watchface;
1+
package com.corvettecole.pixelwatchface.ui;
22

33
import android.content.Intent;
44
import android.content.res.ColorStateList;

0 commit comments

Comments
 (0)