Changed colors of buttons in feedback popup.

Author: Chris Bellew

build.gradle

@@ -3,11 +3,17 @@ buildscript {
     repositories {
         mavenCentral()
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
+plugins {
+    id "com.jfrog.bintray" version "1.6"
+}
+
 allprojects {
     repositories {
         mavenCentral()

mobile/build.gradle

@@ -138,9 +138,10 @@ dependencies {
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile files('libs/commons-io-2.4.jar')
     compile project(':shared')
+    compile project(':multistatetogglebutton')
     compile files('libs/org.apache.http.legacy.jar')
     compile 'de.hdodenhof:circleimageview:2.0.0'
-    compile 'org.honorato.multistatetogglebutton:multistatetogglebutton:0.2.0'
+//    compile 'org.honorato.multistatetogglebutton:multistatetogglebutton:0.2.0'
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.google.android.libraries.cast.companionlibrary:ccl:2.8.2'
 }

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -511,8 +511,7 @@ protected void onStop() {
     handler.removeCallbacks(refreshServers);
     handler.removeCallbacks(refreshClients);
     plexSubscription.removeListener(plexSubscriptionListener);
-
-    // TODO: Remove castplayermanager listener
+    mMediaRouter.removeCallback(mMediaRouterCallback);
   }
 
   @Override
@@ -1675,6 +1674,13 @@ public void onValueChanged(int value) {
         }
       }
     });
+    Button popupFeedbackOKButton = (Button)view.findViewById(R.id.popupFeedbackOKButton);
+    popupFeedbackOKButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        dialog.dismiss();
+      }
+    });
     dialog.show();
   }
 

mobile/src/main/res/drawable/feedback_button_not_pressed.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/settings_popup_background" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/white" />
+</shape>

mobile/src/main/res/drawable/feedback_button_pressed.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/primary_600" />
+</shape>

mobile/src/main/res/layout/popup_feedback.xml

@@ -13,28 +13,7 @@
         android:text="@string/help_feedback"
         android:id="@+id/textView18"
         android:textColor="@color/white"/>
-<!--
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
-            android:id="@+id/textView21"/>
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="New Button"
-            android:id="@+id/button2"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"/>
-    </RelativeLayout>
--->
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -56,6 +35,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             mstb:values="@array/feedback_options"
+            mstb:mstbColorPressedBackgroundResource="@drawable/feedback_button_pressed"
+            mstb:mstbColorPressedForeground="@color/white"
+            mstb:mstbColorNotPressedBackgroundResource="@drawable/feedback_button_not_pressed"
+            mstb:mstbColorNotPressedForeground="@color/white"
             android:id="@+id/feedbackToggleButton"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
@@ -83,10 +66,31 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             mstb:values="@array/feedback_options"
+            mstb:mstbColorPressedBackgroundResource="@drawable/feedback_button_pressed"
+            mstb:mstbColorPressedForeground="@color/white"
+            mstb:mstbColorNotPressedBackgroundResource="@drawable/feedback_button_not_pressed"
+            mstb:mstbColorNotPressedForeground="@color/white"
             android:id="@+id/errorsToggleButton"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"/>
 
     </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="20dp">
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ok"
+            android:id="@+id/popupFeedbackOKButton"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:textColor="@color/white"/>
+    </RelativeLayout>
+
 </LinearLayout>

settings.gradle

@@ -1,2 +1,5 @@
 include ':wear', ':shared'
 include ':mobile'
+include ':multistatetogglebutton'
+project(':multistatetogglebutton').projectDir = new File('multistatetogglebutton/multistatetogglebutton')
+