Browse Source

Andr0id appy: renamed esp8266_ac to esp12e_ac cuz esp8266 is the actual microchip but we designed that shit with the ESP-12E module in mind

Wazakindjes 1 year ago
parent
commit
775da1afc8

BIN
app/rem0t0.apk


+ 1 - 1
app/src/app_rem0t0/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	package="com.jemoeder.lief.rem0t0"
-	android:versionName="1.1.3">
+	android:versionName="1.1.4">
 
 	<!-- Need an internet connection to work 0bv lol -->
 	<uses-permission android:name="android.permission.INTERNET" />

+ 16 - 16
app/src/app_rem0t0/src/main/java/com/jemoeder/lief/rem0t0/MainActivity.java

@@ -71,7 +71,7 @@ public class MainActivity extends AppCompatActivity {
 	private boolean lastpref_rem0t0_hdmiswitch = false;
 	private boolean lastpref_rem0t0_stereo = false;
 	private boolean lastpref_rem0t0_tv = false;
-	private boolean lastpref_rem0t0_esp8266_ac = false;
+	private boolean lastpref_rem0t0_esp12e_ac = false;
 
 	// Socket shit fam
 	private boolean coldstart = true;
@@ -100,13 +100,13 @@ public class MainActivity extends AppCompatActivity {
 	private static String txt_hdmiswitch = null;
 	private static String txt_stereo = null;
 	private static String txt_tv = null;
-	private static String txt_esp8266_ac = null;
+	private static String txt_esp12e_ac = null;
 	private static String cmdsign = null;
 	private static String cmdprefix_ledstrip = null;
 	private static String cmdprefix_hdmiswitch = null;
 	private static String cmdprefix_stereo = null;
 	private static String cmdprefix_tv = null;
-	private static String cmdprefix_esp8266_ac = null;
+	private static String cmdprefix_esp12e_ac = null;
 	private static String cmdsuffix_hold = null;
 	private static String cmdsuffix_holdstop = null;
 	private static final int vibems_tap = 50;
@@ -154,13 +154,13 @@ public class MainActivity extends AppCompatActivity {
 		txt_hdmiswitch = muhres.getString(R.string.prefs_rem0t0_hdmiswitch);
 		txt_stereo = muhres.getString(R.string.prefs_rem0t0_stereo);
 		txt_tv = muhres.getString(R.string.prefs_rem0t0_tv);
-		txt_esp8266_ac = muhres.getString(R.string.prefs_rem0t0_esp8266_ac);
+		txt_esp12e_ac = muhres.getString(R.string.prefs_rem0t0_esp12e_ac);
 		cmdsign = muhres.getString(R.string.rem0t0_cmdsign);
 		cmdprefix_ledstrip = muhres.getString(R.string.rem0t0_cmdprefix_led);
 		cmdprefix_hdmiswitch = muhres.getString(R.string.rem0t0_cmdprefix_hdmi);
 		cmdprefix_stereo = muhres.getString(R.string.rem0t0_cmdprefix_stereo);
 		cmdprefix_tv = muhres.getString(R.string.rem0t0_cmdprefix_tv);
-		cmdprefix_esp8266_ac = muhres.getString(R.string.rem0t0_cmdprefix_esp8266_ac);
+		cmdprefix_esp12e_ac = muhres.getString(R.string.rem0t0_cmdprefix_esp12e_ac);
 		cmdsuffix_hold = muhres.getString(R.string.rem0t0_cmdsuffix_hold);
 		cmdsuffix_holdstop = muhres.getString(R.string.rem0t0_cmdsuffix_holdstop);
 		ab_col_rip = ContextCompat.getColor(muhctx, R.color.RIP);
@@ -394,17 +394,17 @@ public class MainActivity extends AppCompatActivity {
 		boolean curpref_rem0t0_hdmiswitch = wrapass.muhprefs.getBoolean("prefs_rem0t0_hdmiswitch", true);
 		boolean curpref_rem0t0_stereo = wrapass.muhprefs.getBoolean("prefs_rem0t0_stereo", true);
 		boolean curpref_rem0t0_tv = wrapass.muhprefs.getBoolean("prefs_rem0t0_tv", true);
-		boolean curpref_rem0t0_esp8266_ac = wrapass.muhprefs.getBoolean("prefs_rem0t0_esp8266_ac", true);
+		boolean curpref_rem0t0_esp12e_ac = wrapass.muhprefs.getBoolean("prefs_rem0t0_esp12e_ac", true);
 		if(lastpref_rem0t0_ledstrip == curpref_rem0t0_ledstrip && lastpref_rem0t0_hdmiswitch == curpref_rem0t0_hdmiswitch &&
 				lastpref_rem0t0_stereo == curpref_rem0t0_stereo && lastpref_rem0t0_tv == curpref_rem0t0_tv &&
-				lastpref_rem0t0_esp8266_ac == curpref_rem0t0_esp8266_ac)
+				lastpref_rem0t0_esp12e_ac == curpref_rem0t0_esp12e_ac)
 			return;
 
 		lastpref_rem0t0_ledstrip = curpref_rem0t0_ledstrip;
 		lastpref_rem0t0_hdmiswitch = curpref_rem0t0_hdmiswitch;
 		lastpref_rem0t0_stereo = curpref_rem0t0_stereo;
 		lastpref_rem0t0_tv = curpref_rem0t0_tv;
-		lastpref_rem0t0_esp8266_ac = curpref_rem0t0_esp8266_ac;
+		lastpref_rem0t0_esp12e_ac = curpref_rem0t0_esp12e_ac;
 
 		int tabnum = 0;
 		tabberin0.removeAllTabs();
@@ -425,9 +425,9 @@ public class MainActivity extends AppCompatActivity {
 			tabberin0.addTab(tabberin0.newTab().setText(txt_tv));
 			demtabs.put(tabnum++, txt_tv);
 		}
-		if(lastpref_rem0t0_esp8266_ac) {
-			tabberin0.addTab(tabberin0.newTab().setText(txt_esp8266_ac));
-			demtabs.put(tabnum++, txt_esp8266_ac);
+		if(lastpref_rem0t0_esp12e_ac) {
+			tabberin0.addTab(tabberin0.newTab().setText(txt_esp12e_ac));
+			demtabs.put(tabnum++, txt_esp12e_ac);
 		}
 		final PagerAdapter adapter = new rem0t0PagerAdapter(getSupportFragmentManager(), tabnum);
 		viewPager.setAdapter(adapter);
@@ -549,9 +549,9 @@ public class MainActivity extends AppCompatActivity {
 					layout_id = R.layout.rem0t0_tv;
 					cmdbase = cmdprefix_tv;
 				}
-				else if(txt.equals(txt_esp8266_ac)) {
-					layout_id = R.layout.rem0t0_esp8266_ac;
-					cmdbase = cmdprefix_esp8266_ac;
+				else if(txt.equals(txt_esp12e_ac)) {
+					layout_id = R.layout.rem0t0_esp12e_ac;
+					cmdbase = cmdprefix_esp12e_ac;
 				}
 			} catch(Exception fuckoff) { /* No flying fucks given */ }
 
@@ -791,7 +791,7 @@ public class MainActivity extends AppCompatActivity {
 				cmdbase = cb;
 				sb_label = (TextView)sl;
 
-				sb_pos = sb_last = wrapass.muhprefs.getInt("lastval_esp8266_ac_servo_rotate", 1500);
+				sb_pos = sb_last = wrapass.muhprefs.getInt("lastval_esp12e_ac_servo_rotate", 1500);
 				sb.setProgress(sb_pos);
 				sb_label.setText(String.valueOf(sb_last));
 			}
@@ -804,7 +804,7 @@ public class MainActivity extends AppCompatActivity {
 				progress *= seekbar_stepsize;
 				final String rotatem = String.valueOf(progress);
 				if(sb_pos != sb_last) {
-					wrapass.muhprefs_ed.putInt("lastval_esp8266_ac_servo_rotate", progress);
+					wrapass.muhprefs_ed.putInt("lastval_esp12e_ac_servo_rotate", progress);
 					wrapass.muhprefs_ed.commit();
 
 					if(vib0 != null && wrapass.muhprefs.getBoolean("prefs_rem0t0_haptic", true))

+ 35 - 35
app/src/app_rem0t0/src/main/res/layout/rem0t0_esp8266_ac.xml

@@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:id="@+id/muhparent_esp8266_ac">
+	android:id="@+id/muhparent_esp12e_ac">
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -22,8 +22,8 @@
 				android:layout_height="wrap_content"
 				android:foreground="@drawable/roundcorners"
 				android:background="@drawable/roundcorners"
-				android:backgroundTint="@color/rem0t0_esp8266_ac_btngroup"
-				android:layout_marginTop="@dimen/rem0t0_esp8266_ac_read_temp_offset_top"
+				android:backgroundTint="@color/rem0t0_esp12e_ac_btngroup"
+				android:layout_marginTop="@dimen/rem0t0_esp12e_ac_read_temp_offset_top"
 				app:layout_constraintTop_toTopOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintEnd_toEndOf="@id/btngroup_servo"
@@ -37,7 +37,7 @@
 					android:textColor="@color/rem0t0_grouplabel_txt"
 					android:textSize="@dimen/rem0t0_grouplabel_txtsize"
 					android:textStyle="bold"
-					android:text="@string/rem0t0btn_esp8266_ac_grouplabel_read_temp"
+					android:text="@string/rem0t0btn_esp12e_ac_grouplabel_read_temp"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent"
 					app:layout_constraintEnd_toEndOf="parent" />
@@ -48,13 +48,13 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
 					android:padding="@dimen/rem0t0_btn_txtpadding"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_read_temp"
+					android:text="@string/rem0t0btn_esp12e_ac_read_temp"
 					android:layout_marginTop="@dimen/rem0t0_grouplabel_margin"
 					app:layout_constraintTop_toBottomOf="@id/grouplabel_read_temp"
 					app:layout_constraintStart_toStartOf="parent" />
@@ -65,7 +65,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textColor="@color/rem0t0_grouplabel_txt"
-					android:textSize="@dimen/rem0t0_esp8266_ac_servo_rotate_labeltxt"
+					android:textSize="@dimen/rem0t0_esp12e_ac_servo_rotate_labeltxt"
 					android:text="0.00"
 					android:layout_marginTop="@dimen/rem0t0_btn_margin"
 					android:layout_marginStart="@dimen/rem0t0_btn_margin"
@@ -81,7 +81,7 @@
 				android:layout_height="wrap_content"
 				android:foreground="@drawable/roundcorners"
 				android:background="@drawable/roundcorners"
-				android:backgroundTint="@color/rem0t0_esp8266_ac_btngroup"
+				android:backgroundTint="@color/rem0t0_esp12e_ac_btngroup"
 				android:layout_marginTop="@dimen/rem0t0_btn_margin"
 				app:layout_constraintTop_toBottomOf="@id/btngroup_read_temp"
 				app:layout_constraintStart_toStartOf="@id/btngroup_read_temp"
@@ -95,7 +95,7 @@
 					android:textColor="@color/rem0t0_grouplabel_txt"
 					android:textSize="@dimen/rem0t0_grouplabel_txtsize"
 					android:textStyle="bold"
-					android:text="@string/rem0t0btn_esp8266_ac_grouplabel_servo"
+					android:text="@string/rem0t0btn_esp12e_ac_grouplabel_servo"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent"
 					app:layout_constraintEnd_toEndOf="parent" />
@@ -128,7 +128,7 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:textColor="@color/rem0t0_grouplabel_txt"
-					android:textSize="@dimen/rem0t0_esp8266_ac_servo_rotate_labeltxt"
+					android:textSize="@dimen/rem0t0_esp12e_ac_servo_rotate_labeltxt"
 					android:text="1500"
 					app:layout_constraintTop_toBottomOf="@id/sb_servo_rotate_container"
 					app:layout_constraintStart_toStartOf="@id/sb_servo_rotate_container"
@@ -141,13 +141,13 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
 					android:padding="@dimen/rem0t0_btn_txtpadding"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_servo_reset"
+					android:text="@string/rem0t0btn_esp12e_ac_servo_reset"
 					android:layout_marginTop="@dimen/rem0t0_btngroup_margin"
 					app:layout_constraintTop_toBottomOf="@id/sb_label_servo_rotate"
 					app:layout_constraintStart_toStartOf="parent" />
@@ -158,13 +158,13 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
 					android:padding="@dimen/rem0t0_btn_txtpadding"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_servo_acbutton"
+					android:text="@string/rem0t0btn_esp12e_ac_servo_acbutton"
 					android:layout_marginStart="@dimen/rem0t0_btn_margin"
 					app:layout_constraintTop_toTopOf="@id/btn_servo_reset"
 					app:layout_constraintStart_toEndOf="@id/btn_servo_reset" />
@@ -180,7 +180,7 @@
 				android:drawablePadding="@dimen/rem0t0_btn_iconpadding"
 				android:paddingStart="@dimen/rem0t0_btn_iconpadding"
 				android:background="@drawable/roundcorners"
-				android:backgroundTint="@color/rem0t0_esp8266_ac_power"
+				android:backgroundTint="@color/rem0t0_esp12e_ac_power"
 				android:foreground="@drawable/roundcorners"
 				android:layout_marginStart="@dimen/rem0t0_btn_margin"
 				app:layout_constraintTop_toTopOf="parent"
@@ -196,7 +196,7 @@
 				android:drawablePadding="@dimen/rem0t0_btn_iconpadding"
 				android:paddingStart="@dimen/rem0t0_btn_iconpadding"
 				android:background="@drawable/roundcorners"
-				android:backgroundTint="@color/rem0t0_esp8266_ac_power"
+				android:backgroundTint="@color/rem0t0_esp12e_ac_power"
 				android:foreground="@drawable/roundcorners"
 				android:layout_marginStart="@dimen/rem0t0_btn_margin"
 				app:layout_constraintTop_toTopOf="@id/btn_deepsleep"
@@ -218,7 +218,7 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_led_onboard"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_led_onboard"
 					android:foreground="@drawable/roundcorners"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent" />
@@ -229,12 +229,12 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_led_off"
+					android:text="@string/rem0t0btn_esp12e_ac_led_off"
 					android:layout_marginStart="@dimen/rem0t0_btn_margin"
 					app:layout_constraintTop_toTopOf="@id/btn_led_onboard"
 					app:layout_constraintStart_toEndOf="@id/btn_led_onboard" />
@@ -255,7 +255,7 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_led_flasher"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_led_flasher"
 					android:foreground="@drawable/roundcorners"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent" />
@@ -266,12 +266,12 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_led_off"
+					android:text="@string/rem0t0btn_esp12e_ac_led_off"
 					android:layout_marginStart="@dimen/rem0t0_btn_margin"
 					app:layout_constraintTop_toTopOf="@id/btn_led_flasher"
 					app:layout_constraintStart_toEndOf="@id/btn_led_flasher" />
@@ -292,7 +292,7 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_led_error"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_led_error"
 					android:foreground="@drawable/roundcorners"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent" />
@@ -303,12 +303,12 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_led_off"
+					android:text="@string/rem0t0btn_esp12e_ac_led_off"
 					android:layout_marginStart="@dimen/rem0t0_btn_margin"
 					app:layout_constraintTop_toTopOf="@id/btn_led_error"
 					app:layout_constraintStart_toEndOf="@id/btn_led_error" />
@@ -329,7 +329,7 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_led_http"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_led_http"
 					android:foreground="@drawable/roundcorners"
 					app:layout_constraintTop_toTopOf="parent"
 					app:layout_constraintStart_toStartOf="parent" />
@@ -340,12 +340,12 @@
 					android:layout_width="@dimen/rem0t0_btn_size"
 					android:layout_height="@dimen/rem0t0_btn_size"
 					android:background="@drawable/roundcorners"
-					android:backgroundTint="@color/rem0t0_esp8266_ac_btn"
+					android:backgroundTint="@color/rem0t0_esp12e_ac_btn"
 					android:foreground="@drawable/roundcorners"
-					android:textColor="@color/rem0t0_esp8266_ac_btntxt"
+					android:textColor="@color/rem0t0_esp12e_ac_btntxt"
 					android:textAllCaps="false"
 					android:textSize="@dimen/rem0t0_btn_txtsize"
-					android:text="@string/rem0t0btn_esp8266_ac_led_off"
+					android:text="@string/rem0t0btn_esp12e_ac_led_off"
 					android:layout_marginStart="@dimen/rem0t0_btn_margin"
 					app:layout_constraintTop_toTopOf="@id/btn_led_http"
 					app:layout_constraintStart_toEndOf="@id/btn_led_http" />

+ 9 - 9
app/src/app_rem0t0/src/main/res/values/colors.xml

@@ -96,13 +96,13 @@
 	<color name="rem0t0_tv_c">@color/rem0t0_led_red2</color>
 	<color name="rem0t0_tv_d">@color/rem0t0_led_blue</color>
 
-	<!-- esp8266-ac imo tbh -->
-	<color name="rem0t0_esp8266_ac_btngroup">@color/rem0t0_led_btngroup</color>
-	<color name="rem0t0_esp8266_ac_btn">@color/rem0t0_btn</color>
-	<color name="rem0t0_esp8266_ac_btntxt">@color/rem0t0_led_btntxt</color>
-	<color name="rem0t0_esp8266_ac_power">@color/rem0t0_led_poweron</color>
-	<color name="rem0t0_esp8266_ac_led_onboard">@color/rem0t0_led_blue</color>
-	<color name="rem0t0_esp8266_ac_led_flasher">@color/rem0t0_led_green</color>
-	<color name="rem0t0_esp8266_ac_led_error">@color/rem0t0_led_red</color>
-	<color name="rem0t0_esp8266_ac_led_http">@color/rem0t0_led_red5</color>
+	<!-- esp12e-ac imo tbh -->
+	<color name="rem0t0_esp12e_ac_btngroup">@color/rem0t0_led_btngroup</color>
+	<color name="rem0t0_esp12e_ac_btn">@color/rem0t0_btn</color>
+	<color name="rem0t0_esp12e_ac_btntxt">@color/rem0t0_led_btntxt</color>
+	<color name="rem0t0_esp12e_ac_power">@color/rem0t0_led_poweron</color>
+	<color name="rem0t0_esp12e_ac_led_onboard">@color/rem0t0_led_blue</color>
+	<color name="rem0t0_esp12e_ac_led_flasher">@color/rem0t0_led_green</color>
+	<color name="rem0t0_esp12e_ac_led_error">@color/rem0t0_led_red</color>
+	<color name="rem0t0_esp12e_ac_led_http">@color/rem0t0_led_red5</color>
 </resources>

+ 3 - 3
app/src/app_rem0t0/src/main/res/values/dimens.xml

@@ -58,7 +58,7 @@
 	<!-- TV lol -->
 	<dimen name="rem0t0_tv_menu_margin">50dp</dimen>
 
-	<!-- esp8266-ac imo tbh -->
-	<dimen name="rem0t0_esp8266_ac_read_temp_offset_top">48dp</dimen>
-	<dimen name="rem0t0_esp8266_ac_servo_rotate_labeltxt">12sp</dimen>
+	<!-- esp12e-ac imo tbh -->
+	<dimen name="rem0t0_esp12e_ac_read_temp_offset_top">48dp</dimen>
+	<dimen name="rem0t0_esp12e_ac_servo_rotate_labeltxt">12sp</dimen>
 </resources>

+ 9 - 9
app/src/app_rem0t0/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
 	<string name="prefs_rem0t0_hdmiswitch">HDMI Switch</string>
 	<string name="prefs_rem0t0_stereo">Stereo t0wer</string>
 	<string name="prefs_rem0t0_tv">TV</string>
-	<string name="prefs_rem0t0_esp8266_ac">ESP8266-AC</string>
+	<string name="prefs_rem0t0_esp12e_ac">esp12e-ac</string>
 
 	<!-- (Error) description texts for snackbars yo -->
 	<string name="main_status_errtxt_key">Invalid key length</string>
@@ -56,7 +56,7 @@
 	<string name="rem0t0_cmdprefix_hdmi">hdmi</string>
 	<string name="rem0t0_cmdprefix_stereo">stereo</string>
 	<string name="rem0t0_cmdprefix_tv">tv</string>
-	<string name="rem0t0_cmdprefix_esp8266_ac">esp8266_ac</string>
+	<string name="rem0t0_cmdprefix_esp12e_ac">esp12e_ac</string>
 
 	<!-- Button/view texts for em rem0tes -->
 	<!-- LED y0 -->
@@ -152,11 +152,11 @@
 	<string name="rem0t0btn_tv_psize">Picture Size</string>
 	<string name="rem0t0btn_tv_ad_subt">Ad/Subtitle</string>
 
-	<!-- esp8266-ac imo tbh -->
-	<string name="rem0t0btn_esp8266_ac_grouplabel_read_temp">Temperature</string>
-	<string name="rem0t0btn_esp8266_ac_read_temp">Read Current</string>
-	<string name="rem0t0btn_esp8266_ac_led_off">Off</string>
-	<string name="rem0t0btn_esp8266_ac_servo_reset">Reset</string>
-	<string name="rem0t0btn_esp8266_ac_servo_acbutton">AC Button</string>
-	<string name="rem0t0btn_esp8266_ac_grouplabel_servo">Rotate Serv0</string>
+	<!-- esp12e-ac imo tbh -->
+	<string name="rem0t0btn_esp12e_ac_grouplabel_read_temp">Temperature</string>
+	<string name="rem0t0btn_esp12e_ac_read_temp">Read Current</string>
+	<string name="rem0t0btn_esp12e_ac_led_off">Off</string>
+	<string name="rem0t0btn_esp12e_ac_servo_reset">Reset</string>
+	<string name="rem0t0btn_esp12e_ac_servo_acbutton">AC Button</string>
+	<string name="rem0t0btn_esp12e_ac_grouplabel_servo">Rotate Serv0</string>
 </resources>

+ 2 - 2
app/src/app_rem0t0/src/main/res/xml/preferences.xml

@@ -95,8 +95,8 @@
 			android:defaultValue="true" />
 
 		<CheckBoxPreference
-			android:key="prefs_rem0t0_esp8266_ac"
-			android:title="@string/prefs_rem0t0_esp8266_ac"
+			android:key="prefs_rem0t0_esp12e_ac"
+			android:title="@string/prefs_rem0t0_esp12e_ac"
 			android:defaultValue="true" />
 	</PreferenceCategory>
 

+ 2 - 2
app/src/app_rem0t0/version.properties

@@ -1,2 +1,2 @@
-#Thu Aug 13 19:43:48 CEST 2020
-VERSION_CODE=363
+#Sat Aug 15 18:17:31 CEST 2020
+VERSION_CODE=364