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
CorvetteCole · Jun 8, 2020 · 167e04c · 167e04c
1 parent a75ea11
commit 167e04c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 28 deletions.
diff --git a/phoneApp/build.gradle b/phoneApp/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.corvettecole.pixelwatchface"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 33
-        versionName "1.5.5-RC4"
+        versionCode 34
+        versionName "1.5.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/phoneApp/src/main/res/layout/activity_main.xml b/phoneApp/src/main/res/layout/activity_main.xml
@@ -17,8 +17,7 @@
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:animateLayoutChanges="true">
+      android:orientation="vertical">
 
       <TextView
         android:id="@+id/advancedPurchaseText"
@@ -212,18 +211,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dateFormatSwitch" />
 
-      <Switch
-        android:id="@+id/useDarkSkySwitch"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:text="@string/dark_sky_toggle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/darkSkyExplanation" />
-
       <TextView
         android:id="@+id/darkSkyExplanation"
         android:layout_width="wrap_content"
@@ -236,6 +223,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/infoBarAmbientSwitch" />
 
+      <Switch
+        android:id="@+id/useDarkSkySwitch"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:text="@string/dark_sky_toggle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/darkSkyExplanation" />
+
       <EditText
         android:id="@+id/darkSkyEditText"
         android:layout_width="match_parent"

diff --git a/phoneApp/src/main/res/values/strings.xml b/phoneApp/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
   <string name="app_name">Pixel Watch Face</string>
   <string name="title_activity_debug">DebugActivity</string>
   <string name="dark_sky_api_key_hint">API key from your Dark Sky developer account</string>
-  <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.
+  <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.
     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.
     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>
   <string name="purchase_button">Support now (%s)</string>
@@ -24,5 +24,5 @@
   <string name="weather_icon">Show the current weather as an icon</string>
   <string name="temperature_fractional">Show temperature to 1 decimal place</string>
   <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>
-  <string name="dark_sky_toggle">Use Dark Sky to provide weather data</string>
+  <string name="dark_sky_toggle">Use Dark Sky as a weather provider. The default providers will still be used as fallbacks</string>
 </resources>
diff --git a/wearApp/build.gradle b/wearApp/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.corvettecole.pixelwatchface"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 1067
-        versionName "1.5.5-RC4"
+        versionCode 1068
+        versionName "1.5.5"
         multiDexEnabled true
     }
     compileOptions {

diff --git a/wearApp/src/main/AndroidManifest.xml b/wearApp/src/main/AndroidManifest.xml
@@ -24,15 +24,15 @@
 
     <activity
       android:launchMode="singleInstance"
-      android:name=".watchface.WeatherUpdateActivity" />
+      android:name=".ui.WeatherUpdateActivity" />
 
     <activity
       android:launchMode="singleInstance"
-      android:name=".watchface.CompanionNotifyActivity" />
+      android:name=".ui.CompanionNotifyActivity" />
 
     <activity
       android:launchMode="singleInstance"
-      android:name=".watchface.WatchPermissionRequestActivity" />
+      android:name=".ui.WatchPermissionRequestActivity" />
 
     <meta-data
       android:name="com.google.android.gms.version"
@@ -44,7 +44,7 @@
 
     <service
       android:label="@string/my_digital_name"
-      android:name=".watchface.PixelWatchFace"
+      android:name=".ui.PixelWatchFace"
       android:permission="android.permission.BIND_WALLPAPER">
       <intent-filter>
         <action android:name="android.service.wallpaper.WallpaperService" />

diff --git a/...ce/watchface/CompanionNotifyActivity.java → ...watchface/ui/CompanionNotifyActivity.java b/...ce/watchface/CompanionNotifyActivity.java → ...watchface/ui/CompanionNotifyActivity.java
@@ -1,4 +1,4 @@
-package com.corvettecole.pixelwatchface.watchface;
+package com.corvettecole.pixelwatchface.ui;
 
 import android.content.Intent;
 import android.content.res.ColorStateList;

diff --git a/...elwatchface/watchface/PixelWatchFace.java → ...ole/pixelwatchface/ui/PixelWatchFace.java b/...elwatchface/watchface/PixelWatchFace.java → ...ole/pixelwatchface/ui/PixelWatchFace.java
@@ -1,4 +1,4 @@
-package com.corvettecole.pixelwatchface.watchface;
+package com.corvettecole.pixelwatchface.ui;
 
 import static com.corvettecole.pixelwatchface.util.Constants.INFO_BAR_Y_SPACING_RATIO;
 import static com.corvettecole.pixelwatchface.util.Constants.KEY_WEATHER_JSON;

diff --git a/...hface/WatchPermissionRequestActivity.java → ...ce/ui/WatchPermissionRequestActivity.java b/...hface/WatchPermissionRequestActivity.java → ...ce/ui/WatchPermissionRequestActivity.java
@@ -1,4 +1,4 @@
-package com.corvettecole.pixelwatchface.watchface;
+package com.corvettecole.pixelwatchface.ui;
 
 import android.annotation.SuppressLint;
 import android.content.pm.PackageManager;

diff --git a/...face/watchface/WeatherUpdateActivity.java → ...elwatchface/ui/WeatherUpdateActivity.java b/...face/watchface/WeatherUpdateActivity.java → ...elwatchface/ui/WeatherUpdateActivity.java
@@ -1,4 +1,4 @@
-package com.corvettecole.pixelwatchface.watchface;
+package com.corvettecole.pixelwatchface.ui;
 
 import android.content.Intent;
 import android.content.res.ColorStateList;