Skip to content
This repository has been archived by the owner on May 3, 2021. It is now read-only.

Functional phone app #23

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f76b09e
Twelveish-10 Wrong capitalization in the German prefixes
augustuen Dec 30, 2019
768a242
Capitalized Viertel in the german translation and de-capitalized hours.
augustuen Jan 3, 2021
d96de1c
Fixes #10
augustuen Jan 3, 2021
cfcfa86
Merge remote-tracking branch 'remotes/LayoutXML/master' into Twelveis…
augustuen Jan 3, 2021
6aca461
Reverted gitignore to LayoutXML version
augustuen Jan 3, 2021
7c3e750
Reverted gitignore to LayoutXML version
augustuen Jan 3, 2021
dfb4c8a
Fixes issue where some words weren't properly capitalized in Title Case.
augustuen Jan 4, 2021
27e1b85
-Fixed: an issue with word alignment caused by the previous commit.
augustuen Jan 5, 2021
81d5938
Sorted issues with Dagger that stopped the companion app from functio…
augustuen Jan 5, 2021
34c988a
Updated ViewAdapters to use getBindingAdapterPosition() instead of de…
augustuen Jan 12, 2021
fceaf04
Added activity to choose the watch face language
augustuen Jan 13, 2021
e04ef53
Added TextSelectionActivity to replace LanguageSelectionActivity, whi…
augustuen Jan 18, 2021
49c4e1c
Added setting for main and most top text settings. - Text offset rema…
augustuen Jan 18, 2021
29186d1
Added Seekbars for Text size offset for the main and secondary texts …
augustuen Jan 18, 2021
96075d2
Moved some code around and tweaked the text size offset.
augustuen Jan 19, 2021
a8c0aeb
Updated dependencies for wearable support.wearable libraries - This f…
augustuen Jan 19, 2021
7af79d1
Added saving/loading of a single watch face configuration
augustuen Jan 20, 2021
34b310e
Added feature to transfer all preferences to the wearable. - Still ne…
augustuen Jan 22, 2021
ae21528
Modified .gitignore - removes .idea/misc.xml and .idea/modules.xml
augustuen Jan 22, 2021
a532701
Updated .gitignore
augustuen Jan 22, 2021
c89cd18
Add loading watch preferences on startup
augustuen Jan 24, 2021
9d68375
Fix a bug where 24h text format wouldn't update from handheld
augustuen Jan 26, 2021
fde7977
Fix a bug where the watch would show as connected even if it wasn't
augustuen Jan 27, 2021
6483899
Add checking if the watch has suddenly disconnected
augustuen Jan 27, 2021
b39206f
Fix Communicator.requestBooleanPreferences to Communicator.requestPre…
augustuen Jan 27, 2021
827e45d
Add switches for toggling showing complications
augustuen Jan 30, 2021
72d67f1
Implement picking font for secondary text
augustuen Jan 31, 2021
da2559b
Fix tablayout centering
augustuen Jan 31, 2021
7223ebc
Merge branch 'communicatorTest' into Companion-app
augustuen Jan 31, 2021
4b1864e
Cleanup setting typeface of watch preview
augustuen Jan 31, 2021
9dac74c
Cleanup some XML tags
augustuen Jan 31, 2021
26a0c6a
Remove options to start complication config activities (temporary)
augustuen Jan 31, 2021
6c7f9c1
Remove unused variables in TextSelectionActivity
augustuen Feb 7, 2021
2bbb303
Remove option to choose font for top text, awaiting implementation on…
augustuen Feb 7, 2021
8319da8
Fix phone app thinking the watch is disconnected when it isn't
augustuen Feb 7, 2021
813e8e5
Fix wrong namespace in layout files. Undoes 9dac74cc807facd8294c6f146…
augustuen Feb 7, 2021
4d7f4d6
Change text on home screen button to better reflect what it does
augustuen Feb 7, 2021
a538fc2
Add try/catch around Integer parsing when receiving preferences from …
augustuen Feb 7, 2021
083cf35
Fix german noun capitalisation not working with "First word title cas…
augustuen Feb 10, 2021
7be9a65
Merge branch 'Twelveish-10' into Companion-app
augustuen Feb 10, 2021
f955e03
Fix capitalisation of nouns in german prefixes in the phone app preview
augustuen Feb 12, 2021
8a9d1a8
Update version code and name to 358 and 2.4.0
augustuen Feb 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add try/catch around Integer parsing when receiving preferences from …
…companion app
augustuen committed Feb 7, 2021
commit a538fc21123309e445ee1c4483f2364437c23d71
8 changes: 6 additions & 2 deletions app/src/main/java/com/layoutxml/twelveish/MyWatchFace.java
Original file line number Diff line number Diff line change
@@ -1199,8 +1199,12 @@ private void processData(DataItem dataItem) {
prefs.edit().putString(array[i], array[i+1]).apply();
break;
case "Integer":
int newPref = Integer.parseInt(array[i+1]);
prefs.edit().putInt(array[i], newPref).apply();
try {
int newPref = Integer.parseInt(array[1]);
prefs.edit().putInt(array[i],newPref).apply();
} catch (NumberFormatException e) {
Toast.makeText(getApplicationContext(), "Preference error", Toast.LENGTH_SHORT).show();
}
break;
case "Boolean":
if (array[i + 1].equalsIgnoreCase("true") || array[i+1].equalsIgnoreCase("false")){