Reskin

Reskin SDK with InMoment design Changes: - Update projects - Reskin
Wootric · Apr 19, 2021 · 740ce1c · 740ce1c
1 parent 250df8d
commit 740ce1c
Show file tree

Hide file tree

Showing 38 changed files with 117 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.19.0 (2021-04-19)
+
+- Reskin
+
 ## 2.18.2 (2021-03-01)
 
 - Fix currentEvent being null and crashing app

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center" >
-  <img src="https://cloud.githubusercontent.com/assets/1431421/16471739/4e28eec8-3e24-11e6-8ee1-39d36bbf679e.png" alt="Wootric" title="Wootric">
+  <img src="https://user-images.githubusercontent.com/1431421/114659755-ff80c500-9ca8-11eb-9960-8f55a18d03cb.png" alt="Wootric" title="Wootric">
 </p>
 
 <p align="center" >
@@ -28,14 +28,14 @@ If you use Maven, you can include this library as a dependency:
 <dependency>
     <groupId>com.wootric</groupId>
     <artifactId>wootric-sdk-android</artifactId>
-    <version>2.18.2</version>
+    <version>2.19.0</version>
 </dependency>
 ```
 
 ### Using Gradle
 
 ```xml
-implementation 'com.wootric:wootric-sdk-android:2.18.2'
+implementation 'com.wootric:wootric-sdk-android:2.19.0'
 ```
 
 ## Initializing Wootric

diff --git a/androidsdk/build.gradle b/androidsdk/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)
         buildConfigField 'String', 'VERSION_NAME', "\"" + project.VERSION_NAME + "\""

diff --git a/androidsdk/gradle.properties b/androidsdk/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=2.18.2
-VERSION_CODE=2182
+VERSION_NAME=2.19.0
+VERSION_CODE=2190
 GROUP=com.wootric
 
 POM_DESCRIPTION=WootricSDK Android

diff --git a/androidsdk/src/main/java/com/wootric/androidsdk/views/tablet/ScoreView.java b/androidsdk/src/main/java/com/wootric/androidsdk/views/tablet/ScoreView.java
@@ -42,8 +42,7 @@
  */
 public class ScoreView extends TextView implements View.OnClickListener{
 
-    private int mTextColorSelected;
-    private int mTextColorNotSelected;
+    private int mTextColor;
 
     private OnScoreClickListener onScoreClickListener;
 
@@ -68,8 +67,7 @@ private void init() {
         final Context context = getContext();
         final Resources res = context.getResources();
 
-        mTextColorSelected = res.getColor(android.R.color.white);
-        mTextColorNotSelected = res.getColor(android.R.color.black);
+        mTextColor = res.getColor(R.color.wootric_tablet_text_score_color);
 
         final Resources resources = getResources();
         Drawable drawable;
@@ -117,7 +115,6 @@ public void onClick(View v) {
     public void setSelected(boolean selected) {
         super.setSelected(selected);
 
-        setTextColor(isSelected() ? mTextColorSelected : mTextColorNotSelected);
         setTypeface(null, isSelected() ? Typeface.BOLD : Typeface.NORMAL);
     }
 

diff --git a/androidsdk/src/main/res/drawable-xxhdpi/tablet_thank_you_action_background.xml b/androidsdk/src/main/res/drawable-xxhdpi/tablet_thank_you_action_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="4dp"/>
-    <stroke android:width="1dp" android:color="@color/wootric_survey_layout_header_background" />
+    <stroke android:width="1dp" android:color="@color/wootric_tablet_cta_color" />
 </shape>
diff --git a/androidsdk/src/main/res/drawable/score_selected_background.xml b/androidsdk/src/main/res/drawable/score_selected_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/wootric_survey_layout_header_background"/>
+    <solid android:color="@color/wootric_tablet_score_color"/>
 </shape>
diff --git a/androidsdk/src/main/res/drawable/tablet_submit_background.xml b/androidsdk/src/main/res/drawable/tablet_submit_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:topRightRadius="4dp" android:bottomRightRadius="4dp"/>
-    <solid android:color="#78000000"/>
+    <solid android:color="@color/wootric_tablet_send_button_color"/>
 </shape>
diff --git a/androidsdk/src/main/res/font/ibmplexsans.xml b/androidsdk/src/main/res/font/ibmplexsans.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/ibmplexsans_regular"/>
+    <font
+        android:fontStyle="italic"
+        android:fontWeight="400"
+        android:font="@font/ibmplexsans_italic" />
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="700"
+        android:font="@font/ibmplexsans_bold" />
+</font-family>
diff --git a/androidsdk/src/main/res/font/ibmplexsans_bold.ttf b/androidsdk/src/main/res/font/ibmplexsans_bold.ttf
diff --git a/androidsdk/src/main/res/font/ibmplexsans_italic.ttf b/androidsdk/src/main/res/font/ibmplexsans_italic.ttf
diff --git a/androidsdk/src/main/res/font/ibmplexsans_medium.ttf b/androidsdk/src/main/res/font/ibmplexsans_medium.ttf
diff --git a/androidsdk/src/main/res/font/ibmplexsans_regular.ttf b/androidsdk/src/main/res/font/ibmplexsans_regular.ttf
diff --git a/androidsdk/src/main/res/layout-sw600dp/wootric_footer.xml b/androidsdk/src/main/res/layout-sw600dp/wootric_footer.xml
@@ -10,24 +10,25 @@
         android:id="@+id/wootric_tv_powered_by"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="@font/ibmplexsans"
         android:text="@string/wootric_powered_by"
-        android:textColor="@android:color/black"
-        android:alpha="0.3"/>
+        android:textColor="@color/wootric_tablet_text_score_color"/>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:fontFamily="@font/ibmplexsans"
         android:text="@string/wootric"
-        android:textColor="@color/wootric_survey_layout_header_background" />
+        android:textColor="@color/wootric_tablet_text_score_color" />
 
     <TextView
         android:id="@+id/footer_dot_separator"
         android:layout_width="@dimen/wootric_footer_layout_dot_separator_width"
         android:layout_height="@dimen/wootric_footer_layout_dot_separator_height"
         android:gravity="center"
+        android:fontFamily="@font/ibmplexsans"
         android:layout_margin="@dimen/wootric_footer_layout_dot_separator_margin"
         android:background="@drawable/footer_dot_separator"
-        android:alpha="0.3"
         android:visibility="gone"/>
 
     <TextView
@@ -36,7 +37,7 @@
         android:layout_height="wrap_content"
         android:text="@string/wootric_opt_out"
         android:clickable="true"
-        android:textColor="@android:color/black"
-        android:alpha="0.3"
+        android:fontFamily="@font/ibmplexsans"
+        android:textColor="@color/wootric_tablet_text_score_color"
         android:visibility="gone"/>
 </LinearLayout>
diff --git a/androidsdk/src/main/res/layout-sw600dp/wootric_nps_layout.xml b/androidsdk/src/main/res/layout-sw600dp/wootric_nps_layout.xml
@@ -10,12 +10,13 @@
         android:id="@+id/wootric_btn_dismiss"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:textColor="@color/wootric_dark_gray"
+        android:textColor="@color/wootric_tablet_text_score_color"
         android:background="@drawable/round"
         android:gravity="center"
         android:textSize="16sp"
         android:textStyle="bold"
         android:text="@string/x"
+        android:fontFamily="@font/ibmplexsans"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true" />
@@ -25,8 +26,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textColor="@android:color/black"
+        android:textColor="@color/wootric_tablet_text_score_color"
         android:textSize="16sp"
+        android:fontFamily="@font/ibmplexsans"
         android:layout_centerHorizontal="true"
         android:gravity="center"
         android:layout_marginTop="8dp"
@@ -46,6 +48,7 @@
             style="@style/TextViewGreen"
             android:layout_centerHorizontal="true"
             android:gravity="center"
+            android:fontFamily="@font/ibmplexsans"
             android:text="@string/wootric_feedback_question"/>
 
         <LinearLayout
@@ -65,6 +68,7 @@
                 android:layout_height="match_parent"
                 android:textCursorDrawable="@drawable/wootric_tablet_feedback_cursor"
                 android:textColor="#78000000"
+                android:fontFamily="@font/ibmplexsans"
                 android:background="@null"
                 android:imeOptions="actionDone"
                 android:inputType="text"
@@ -79,6 +83,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:textSize="16sp"
+                android:fontFamily="@font/ibmplexsans"
                 android:layout_gravity="right"
                 android:background="@drawable/tablet_submit_background"
                 android:textColor="@android:color/white"
@@ -100,6 +105,8 @@
             android:id="@+id/wootric_anchor_not_likely"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/wootric_anchors"
+            android:fontFamily="@font/ibmplexsans"
             android:textStyle="italic"
             android:text="@string/wootric_example_anchor_not_likely"/>
 
@@ -115,6 +122,8 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="6dp"
             android:layout_marginStart="6dp"
+            android:textColor="@color/wootric_anchors"
+            android:fontFamily="@font/ibmplexsans"
             android:textStyle="italic"
             android:text="@string/wootric_example_anchor_likely"/>
     </LinearLayout>

diff --git a/androidsdk/src/main/res/layout-sw600dp/wootric_thank_you_layout.xml b/androidsdk/src/main/res/layout-sw600dp/wootric_thank_you_layout.xml
@@ -16,6 +16,7 @@
         android:textSize="16sp"
         android:textStyle="bold"
         android:text="X"
+        android:fontFamily="@font/ibmplexsans"
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true" />
@@ -25,13 +26,15 @@
         style="@style/TextViewGreen"
         android:layout_marginBottom="@dimen/wootric_tv_thank_you_margin"
         android:layout_centerHorizontal="true"
+        android:fontFamily="@font/ibmplexsans"
         android:text="@string/wootric_thank_you" />
 
     <TextView
         android:id="@+id/wootric_tv_custom_thank_you"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="16sp"
+        android:fontFamily="@font/ibmplexsans"
         android:layout_marginBottom="@dimen/wootric_tv_thank_you_margin"
         android:layout_centerHorizontal="true"
         android:layout_below="@id/wootric_tv_thank_you"
@@ -53,6 +56,7 @@
             android:textSize="30sp"
             android:textColor="@color/wootric_social"
             android:text="@string/fa_thumbs_up"
+            android:fontFamily="@font/ibmplexsans"
             android:layout_margin="8dp"/>
 
         <Button
@@ -63,6 +67,7 @@
             android:textSize="30sp"
             android:textColor="@color/wootric_social"
             android:text="@string/fa_twitter"
+            android:fontFamily="@font/ibmplexsans"
             android:layout_margin="8dp"/>
 
         <Button
@@ -73,6 +78,7 @@
             android:textSize="30sp"
             android:textColor="@color/wootric_social"
             android:text="@string/fa_facebook"
+            android:fontFamily="@font/ibmplexsans"
             android:layout_margin="8dp"/>
 
         <Button
@@ -82,8 +88,9 @@
             android:padding="12dp"
             android:textSize="16sp"
             android:background="@drawable/tablet_thank_you_done_background"
-            android:textColor="@color/wootric_rating_bar"
+            android:textColor="@color/wootric_edit_text_border"
             android:text="@string/no_thanks"
+            android:fontFamily="@font/ibmplexsans"
             android:layout_margin="8dp"/>
 
         <Button
@@ -93,8 +100,9 @@
             android:padding="12dp"
             android:textSize="16sp"
             android:background="@drawable/tablet_thank_you_action_background"
-            android:textColor="@color/wootric_survey_layout_header_background"
+            android:textColor="@color/wootric_tablet_cta_color"
             android:text="@string/wootric_btn_thank_you_action"
+            android:fontFamily="@font/ibmplexsans"
             android:layout_margin="8dp"/>
     </LinearLayout>
 

diff --git a/androidsdk/src/main/res/layout/wootric_footer.xml b/androidsdk/src/main/res/layout/wootric_footer.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layoutDirection="ltr">
 
@@ -27,6 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/wootric_opt_out"
+            android:fontFamily="@font/ibmplexsans"
             android:textColor="@android:color/black"
             android:alpha="0.3"
             android:visibility="gone"/>
@@ -45,13 +46,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/wootric_powered_by"
+                android:fontFamily="@font/ibmplexsans"
                 android:textColor="@android:color/black"
                 android:alpha="0.3"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/wootric"
+                android:fontFamily="@font/ibmplexsans"
                 android:textColor="@color/wootric_brand_color" />
         </LinearLayout>
     </LinearLayout>