Added themes to CommAndroid

chrisz99 · Jun 21, 2023 · a8099e3 · a8099e3
1 parent 9c7549a
commit a8099e3
Show file tree

Hide file tree

Showing 20 changed files with 751 additions and 498 deletions.
diff --git a/CommAndroid/CommAndroid.csproj b/CommAndroid/CommAndroid.csproj
@@ -82,13 +82,13 @@
     <AndroidResource Include="Resources\layout\listview_layout.xml" />
     <AndroidResource Include="Resources\layout\widget_input_layout.xml" />
     <AndroidResource Include="Resources\drawable\blinkanimation.xml" />
-    <AndroidResource Include="Resources\layout\splashPage.xml" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TerminalCommands.cs" />
     <Compile Include="WidgetDataManager.cs" />
     <Compile Include="WidgetProvider.cs" />
     <Compile Include="WidgetRemoteViewService.cs" />
+    <Compile Include="WidgetTheme.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
@@ -168,9 +168,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\roundedButton.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\inputLayoutBackground.xml" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\customcursor.xml" />
   </ItemGroup>
@@ -246,9 +243,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\mipmap-anydpi-v26\terminalappicon.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\splashBackground.xml" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\commandroid_small.png" />
   </ItemGroup>
@@ -300,6 +294,54 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\terminal_blink_animation.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundPurple.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\terminalViewDrawBlack.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundYellow.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundBlack.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundRed.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundGreen.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundPink.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\widgetbackGroundOrange.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>

diff --git a/CommAndroid/InputProvider.cs b/CommAndroid/InputProvider.cs
@@ -22,6 +22,12 @@ protected override void OnCreate(Bundle savedInstanceState)
             //Create a view for our input layout, find the EditText view
             View popupView = LayoutInflater.FromContext(this).Inflate(Resource.Layout.widget_input_layout, null);
             EditText cmdText = popupView.FindViewById<EditText>(Resource.Id.cmd_input);
+            WidgetDataManager widgetDataManager = new WidgetDataManager(this);
+            int appWidgetId = Intent.GetIntExtra("appWidgetId", AppWidgetManager.InvalidAppwidgetId);
+            string theme = widgetDataManager.getTheme(appWidgetId);
+            popupView.FindViewById<LinearLayout>(Resource.Id.inputlayout_background).SetBackgroundResource(int.Parse(theme.Split('_')[1]));
+            popupView.FindViewById<LinearLayout>(Resource.Id.input_background).SetBackgroundResource(int.Parse(theme.Split('_')[2]));
+            popupView.FindViewById<TextView>(Resource.Id.terminalinput_title).SetTextColor(Android.Graphics.Color.ParseColor(theme.Split('_')[3]));
 
             //Event for our EditText field, handles submitting input to the widget provider          
             cmdText.EditorAction += (sender, e) =>
@@ -33,7 +39,7 @@ protected override void OnCreate(Bundle savedInstanceState)
                     string userInput = cmdText.Text;
                     Intent intent = new Intent(this, typeof(WidgetProvider));
                     intent.SetAction("com.company.CommAndroid.USER_INPUT_SUBMITTED");
-                    int appWidgetId = Intent.GetIntExtra("appWidgetId", AppWidgetManager.InvalidAppwidgetId);
+
                     intent.PutExtra("user_input", userInput);
                     intent.PutExtra("appWidgetId", appWidgetId);
                     intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.NewTask); // Add the ClearTop and NewTask flags

diff --git a/CommAndroid/ListViewFactory.cs b/CommAndroid/ListViewFactory.cs
@@ -22,7 +22,7 @@ public class ListViewFactory : Java.Lang.Object, RemoteViewsService.IRemoteViews
         private List<string> results;
         private int appWidgetId;
         private WidgetDataManager widgetDataManager;
-        private Handler handler;
+        private Handler handler; 
 
 
         //Constructor to create list view factory
@@ -41,12 +41,6 @@ public ListViewFactory(Context context, Intent intent)
             widgetDataManager = new WidgetDataManager(context);
             items = widgetDataManager.getCommands(appWidgetId);
             results = widgetDataManager.getResults(appWidgetId);
-
-
-
-
-
-
 
         }