添加颜色

Author: cht

README.md

@@ -10,7 +10,8 @@ tui界面的v2ray
 	* 按h出设置界面，设置界面里面有两个设置
 		* v2raycore 
 		* 订阅，当在第二个设置里面添加了订阅后按下键可以选中订阅，d键删除
-		* s 回到popup的只读界面后按下s进行设置更新和订阅同步，同步失败后不会回退，应该需要做个提示
+		* s 回到popup的只读界面后按下s进行设置更新
+		* r 进行订阅同步，同步失败后不会回退，应该需要做个提示
 * e
 	* TODO, 计划作为设置
 * s

src/subscribe/appsub.rs

@@ -5,6 +5,7 @@ use crate::spider;
 use crate::state::{MyBackend, IFEXIT};
 use std::io;
 use tokio::sync::mpsc::Receiver;
+use tui::style::Color;
 use tui::widgets::ListState;
 use tui::Terminal;
 pub(super) enum InputMode {
@@ -38,6 +39,7 @@ pub struct AppSub {
     pub subscription: Vec<String>,
     pub receiver: Option<Receiver<reqwest::Result<Vec<Vec<String>>>>>,
     pub popinfomation: String,
+    pub(super) popupcolor: Color,
 }
 impl AppSub {
     pub fn next(&mut self) {
@@ -143,6 +145,7 @@ impl Default for AppSub {
             subscription: Vec::new(),
             receiver: None,
             popinfomation: "Settings, e to edit, s to save".to_string(),
+            popupcolor: Color::LightBlue,
         }
     }
 }

src/subscribe/render.rs

@@ -149,8 +149,10 @@ pub(super) fn ui<B: Backend>(f: &mut Frame<B>, app: &mut AppSub) {
                 .as_ref(),
             )
             .split(area);
+        let block = Block::default().style(Style::default().bg(app.popupcolor).fg(Color::Black));
 
         f.render_widget(Clear, area); //this clears out the background
+        f.render_widget(block, area); //this clears out the background
         let (msg, style) = (vec![Span::raw(app.popinfomation.clone())], Style::default());
         let mut text = Text::from(Spans::from(msg));
         text.patch_style(style);
@@ -183,7 +185,7 @@ pub(super) fn ui<B: Backend>(f: &mut Frame<B>, app: &mut AppSub) {
             .block(Block::default().borders(Borders::ALL).title("List"))
             .highlight_style(
                 Style::default()
-                    .bg(Color::LightBlue)
+                    .bg(Color::LightGreen)
                     .add_modifier(Modifier::BOLD),
             )
             .highlight_symbol(">> ");

src/subscribe/state.rs

@@ -5,6 +5,7 @@ use super::{Page, IFEXIT};
 use crossterm::event::{self, Event, KeyCode};
 use serde_json::json;
 use std::{env, io, process::Command};
+use tui::style::Color;
 use tui::widgets::ListState;
 pub(super) async fn subscribe_state(app: &mut AppSub) -> io::Result<IFEXIT> {
     if app.receiver.is_some() {
@@ -50,6 +51,7 @@ pub(super) async fn subscribe_state(app: &mut AppSub) -> io::Result<IFEXIT> {
             app.receiver = None;
             app.popinfomation = "Settings, e to edit, s to save".to_string();
             app.input_mode = InputMode::Popup;
+            app.popupcolor = Color::LightBlue;
         }
     } else if let Event::Key(key) = event::read()? {
         match app.input_mode {
@@ -165,12 +167,16 @@ pub(super) async fn subscribe_state(app: &mut AppSub) -> io::Result<IFEXIT> {
                     subscribe_json.push_str("\n]");
                     utils::create_json_file(utils::Save::Subscribes, subscribe_json)
                         .unwrap_or_else(|err| panic!("{}", err));
+                    app.popinfomation = "Have saved".to_string();
                     //    .collect();
+                }
+                KeyCode::Char('r') => {
                     let (sync_io_tx, sync_io_rx) =
                         tokio::sync::mpsc::channel::<reqwest::Result<Vec<Vec<String>>>>(100);
                     app.receiver = Some(sync_io_rx);
                     let input = app.subscription.clone();
                     app.popinfomation = "Waiting for a moment".to_string();
+                    app.popupcolor = Color::LightYellow;
                     tokio::spawn(async move {
                         let get_list = spider::get_the_key(input).await;
                         sync_io_tx.send(get_list).await.unwrap();