diff --git a/App/build.gradle b/App/build.gradle index 786fa43e..800808d0 100644 --- a/App/build.gradle +++ b/App/build.gradle @@ -39,7 +39,7 @@ dependencies { } // List of sites used to create signingConfigs, sourceSets, and productFlavors. -def sites = ["ifixit", "dozuki", "accustream", "dripassist", "magnoliamedical"] +def sites = ["ifixit", "dozuki", "accustream", "dripassist", "magnoliamedical", "pva"] android { compileSdkVersion 21 diff --git a/App/res/values/themes.xml b/App/res/values/themes.xml index bb72e3a1..1a70cf5d 100644 --- a/App/res/values/themes.xml +++ b/App/res/values/themes.xml @@ -49,7 +49,9 @@ - + + + diff --git a/App/sites/dripassist/res/values/themes.xml b/App/sites/dripassist/res/values/themes.xml index ab78205e..fed8f16a 100644 --- a/App/sites/dripassist/res/values/themes.xml +++ b/App/sites/dripassist/res/values/themes.xml @@ -3,14 +3,14 @@ - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/sites/pva/res/values-v11/themes.xml b/App/sites/pva/res/values-v11/themes.xml new file mode 100644 index 00000000..241b729a --- /dev/null +++ b/App/sites/pva/res/values-v11/themes.xml @@ -0,0 +1,67 @@ + + + + + + + + + + \ No newline at end of file diff --git a/App/sites/pva/res/values-v9/themes.xml b/App/sites/pva/res/values-v9/themes.xml new file mode 100644 index 00000000..6dc4e792 --- /dev/null +++ b/App/sites/pva/res/values-v9/themes.xml @@ -0,0 +1,14 @@ + + + + + + + + \ No newline at end of file diff --git a/App/sites/pva/res/values/colors.xml b/App/sites/pva/res/values/colors.xml new file mode 100644 index 00000000..f967d0bb --- /dev/null +++ b/App/sites/pva/res/values/colors.xml @@ -0,0 +1,12 @@ + + + #ed193f + @color/pva_color + @color/step_pager_previous_tab_color + + #ff144c6b + @color/pva_color + #ff19446f + #10000000 + + diff --git a/App/sites/pva/res/values/dimens.xml b/App/sites/pva/res/values/dimens.xml new file mode 100644 index 00000000..5a0fa8d0 --- /dev/null +++ b/App/sites/pva/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 48dp + \ No newline at end of file diff --git a/App/sites/pva/res/values/styles.xml b/App/sites/pva/res/values/styles.xml new file mode 100644 index 00000000..5cd891c7 --- /dev/null +++ b/App/sites/pva/res/values/styles.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/App/sites/pva/res/values/themes.xml b/App/sites/pva/res/values/themes.xml new file mode 100644 index 00000000..857bb148 --- /dev/null +++ b/App/sites/pva/res/values/themes.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + diff --git a/App/sites/pva/site-res/drawable-hdpi/ic_notification_icon.png b/App/sites/pva/site-res/drawable-hdpi/ic_notification_icon.png new file mode 100644 index 00000000..9241bc94 Binary files /dev/null and b/App/sites/pva/site-res/drawable-hdpi/ic_notification_icon.png differ diff --git a/App/sites/pva/site-res/drawable-hdpi/icon.png b/App/sites/pva/site-res/drawable-hdpi/icon.png new file mode 100644 index 00000000..974c1908 Binary files /dev/null and b/App/sites/pva/site-res/drawable-hdpi/icon.png differ diff --git a/App/sites/pva/site-res/drawable-mdpi/ic_notification_icon.png b/App/sites/pva/site-res/drawable-mdpi/ic_notification_icon.png new file mode 100644 index 00000000..78862d56 Binary files /dev/null and b/App/sites/pva/site-res/drawable-mdpi/ic_notification_icon.png differ diff --git a/App/sites/pva/site-res/drawable-mdpi/icon.png b/App/sites/pva/site-res/drawable-mdpi/icon.png new file mode 100644 index 00000000..76038f5c Binary files /dev/null and b/App/sites/pva/site-res/drawable-mdpi/icon.png differ diff --git a/App/sites/pva/site-res/drawable-xhdpi/ic_notification_icon.png b/App/sites/pva/site-res/drawable-xhdpi/ic_notification_icon.png new file mode 100644 index 00000000..33668223 Binary files /dev/null and b/App/sites/pva/site-res/drawable-xhdpi/ic_notification_icon.png differ diff --git a/App/sites/pva/site-res/drawable-xhdpi/icon.png b/App/sites/pva/site-res/drawable-xhdpi/icon.png new file mode 100644 index 00000000..1c1c3ddf Binary files /dev/null and b/App/sites/pva/site-res/drawable-xhdpi/icon.png differ diff --git a/App/sites/pva/site-res/drawable-xxhdpi/icon.png b/App/sites/pva/site-res/drawable-xxhdpi/icon.png new file mode 100644 index 00000000..f69f558c Binary files /dev/null and b/App/sites/pva/site-res/drawable-xxhdpi/icon.png differ diff --git a/App/sites/pva/site-res/drawable-xxxhdpi/icon.png b/App/sites/pva/site-res/drawable-xxxhdpi/icon.png new file mode 100644 index 00000000..33ce675d Binary files /dev/null and b/App/sites/pva/site-res/drawable-xxxhdpi/icon.png differ diff --git a/App/sites/pva/site-res/ic_notification_icon.png b/App/sites/pva/site-res/ic_notification_icon.png new file mode 100644 index 00000000..713c0a8e Binary files /dev/null and b/App/sites/pva/site-res/ic_notification_icon.png differ diff --git a/App/sites/pva/site-res/values/strings.xml b/App/sites/pva/site-res/values/strings.xml new file mode 100644 index 00000000..6e235678 --- /dev/null +++ b/App/sites/pva/site-res/values/strings.xml @@ -0,0 +1,4 @@ + + + PVA Support Hub + diff --git a/App/sites/pva/site-res/xml/api_sync_adapter.xml b/App/sites/pva/site-res/xml/api_sync_adapter.xml new file mode 100644 index 00000000..d65ea5dc --- /dev/null +++ b/App/sites/pva/site-res/xml/api_sync_adapter.xml @@ -0,0 +1,8 @@ + + diff --git a/App/sites/pva/site-res/xml/authenticator.xml b/App/sites/pva/site-res/xml/authenticator.xml new file mode 100644 index 00000000..b7ea5375 --- /dev/null +++ b/App/sites/pva/site-res/xml/authenticator.xml @@ -0,0 +1,8 @@ + + + diff --git a/App/src/com/dozuki/ifixit/model/dozuki/Site.java b/App/src/com/dozuki/ifixit/model/dozuki/Site.java index 7d0584d1..6c799da3 100644 --- a/App/src/com/dozuki/ifixit/model/dozuki/Site.java +++ b/App/src/com/dozuki/ifixit/model/dozuki/Site.java @@ -160,7 +160,9 @@ public int theme() { } else if (isMagnolia()) { return R.style.Theme_Magnolia; } else if (isDripAssist()) { - return R.style.DripAssist; + return R.style.Theme_DripAssist; + } else if (isPVA()) { + return R.style.Theme_PVA; } else { // We don't have a custom theme for the site - check for generic theme. if (mTheme.equals("custom")) { @@ -263,6 +265,20 @@ public static Site getSite(String siteName) { site.mPublicRegistration = false; site.mObjectNamePlural = res.getString(R.string.categories); site.mObjectNameSingular = res.getString(R.string.category); + } else if (siteName.equals("pva")) { + site = new Site(3366); + site.mName = "pva"; + site.mDomain = "pva.dozuki.com"; + site.mTitle = "PVA Support Hub"; + site.mTheme = "white"; + site.mPublic = true; + site.mAnswers = false; + site.mDescription = "Welcome to our electronic support portal. Below you will find an assortment of guides that will lead you step by step through various tasks associated with service, applications, maintenance, etc., for PVA equipment."; + site.mStandardAuth = true; + site.mSsoUrl = null; + site.mPublicRegistration = true; + site.mObjectNamePlural = res.getString(R.string.categories); + site.mObjectNameSingular = res.getString(R.string.category); } else if (siteName.equals("dripassist")) { site = new Site(3366); site.mName = "dripassist"; @@ -291,7 +307,11 @@ public String toString() { } public boolean actionBarUsesIcon() { - return isAccustream() || isIfixit() || isMagnolia() || isDripAssist(); + return isAccustream() || isIfixit() || isMagnolia() || isDripAssist() || isPVA(); + } + + public boolean isPVA() { + return mName.equals("pva"); } public boolean isDripAssist() {