Build: Android-Signierung hinzugefügt

.gitea/workflows/android.yaml

@@ -0,0 +1,106 @@
+name: Android Build Final Fixed
+on:
+  push:
+    branches: [main]
+    tags: ["v*"] # Triggert bei v0.1.0, v1.0, etc.
+
+jobs:
+  build-android:
+    runs-on: ubuntu-latest
+    container:
+      image: node:20-bookworm
+
+    steps:
+      - name: Checkout Main Project
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Manual Clone easy-nostr
+        run: |
+          git clone https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@gitea.malxte.de/Bytemalte/easy-nostr.git src-tauri/easy-nostr
+
+      - name: Install System Dependencies
+        run: |
+          apt-get update
+          apt-get install -y build-essential curl wget file libssl-dev pkg-config openjdk-17-jdk git unzip libgtk-3-dev webkit2gtk-4.1 libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev python3
+
+      - name: Install Rust & Targets
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+          export PATH="$HOME/.cargo/bin:$PATH"
+          rustup target add aarch64-linux-android wasm32-unknown-unknown
+
+      - name: Install Trunk & Tauri-CLI
+        run: |
+          wget -qO- https://github.com/trunk-rs/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C /usr/local/bin
+          wget -qO- https://github.com/tauri-apps/tauri/releases/latest/download/cargo-tauri-x86_64-unknown-linux-gnu.tgz | tar -xzf- -C /usr/local/bin
+          chmod +x /usr/local/bin/trunk /usr/local/bin/cargo-tauri
+
+      - name: Setup Android SDK
+        run: |
+          export ANDROID_HOME=$HOME/android-sdk
+          mkdir -p $ANDROID_HOME/cmdline-tools
+          cd $ANDROID_HOME/cmdline-tools
+          wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
+          unzip -q commandlinetools-linux-9477386_latest.zip
+          mv cmdline-tools latest
+          yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME "platform-tools" "platforms;android-33" "build-tools;33.0.1" "ndk;25.1.8937393"
+          echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
+          echo "NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393" >> $GITHUB_ENV
+
+      - name: Build and Compile
+        run: |
+          export PATH="$HOME/.cargo/bin:$PATH"
+          export ANDROID_HOME=$HOME/android-sdk
+          export NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393
+          export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+
+          # 1. Frontend bauen
+          trunk build --release
+
+          # 2. Android Build
+          if [ ! -d "src-tauri/gen/android" ]; then
+            cargo-tauri android init
+          fi
+          cargo-tauri android build --target aarch64 --apk true
+
+          # 3. APK manuell signieren
+          echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | tr -d '[:space:]' > keystore.b64
+          base64 -d keystore.b64 > release.keystore
+
+          UNSIGNED_APK=$(find src-tauri/gen/android/app/build/outputs/apk/universal/release -name "*-unsigned.apk" | head -n 1)
+          APKSIGNER=$(find $ANDROID_HOME/build-tools -name apksigner | sort -r | head -n 1)
+
+          $APKSIGNER sign --ks release.keystore \
+            --ks-type PKCS12 \
+            --ks-key-alias "${{ secrets.ANDROID_KEY_ALIAS }}" \
+            --ks-pass pass:"${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" \
+            --key-pass pass:"${{ secrets.ANDROID_KEY_PASSWORD }}" \
+            --v4-signing-enabled true \
+            --out Marstemedia-Signed.apk \
+            "$UNSIGNED_APK"
+
+          echo "Signierung erfolgreich!"
+        env:
+          JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Marstemedia-Signed
+          path: Marstemedia-Signed.apk
+
+      - name: Create Gitea Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: softprops/action-gh-release@v1
+        with:
+          files: Marstemedia-Signed.apk
+          # Gitea braucht manchmal explizit den Namen/Body
+          name: "Release ${{ github.ref_name }}"
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,3 +2,4 @@
 /target/
 /Cargo.lock
 /.jj/
+my-release-key.keystore

src-tauri/src/lib.rs

@@ -14,6 +14,7 @@ pub fn run() {
             news::save_rss_urls, // Geändert von save_rss_url zu save_rss_urls
             news::fetch_ai_news,
             news::fetch_rss_news,
+            news::save_groq_key,
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/src/news.rs

@@ -12,6 +12,7 @@ pub struct RssConfig {
 #[derive(Default)]
 pub struct NewsState {
     pub openrouter_key: Mutex<String>,
+    pub groq_key: Mutex<String>,
     pub rss_config: Mutex<RssConfig>,
 }
 
@@ -37,40 +38,38 @@ pub async fn save_openrouter_key(key: String, state: State<'_, NewsState>) -> Re
     Ok(())
 }
 
+#[tauri::command]
+pub async fn save_groq_key(key: String, state: State<'_, NewsState>) -> Result<(), String> {
+    let mut lock = state.groq_key.lock().map_err(|_| "Lock failed")?;
+    *lock = key.trim().to_string();
+    Ok(())
+}
+
 #[tauri::command]
 pub async fn load_rss_config(
     app: AppHandle,
     state: State<'_, NewsState>,
 ) -> Result<Vec<String>, String> {
     let path = get_config_path(&app);
-
-    // Initialisierung mit Standard-Feeds, falls Datei nicht existiert
     if !path.exists() {
         let default_urls = vec![
             "https://www.nasa.gov/news-release/feed/".to_string(),
             "https://www.heise.de/rss/heise-atom.xml".to_string(),
         ];
-
         let config = RssConfig {
             urls: default_urls.clone(),
         };
-
         if let Some(parent) = path.parent() {
             fs::create_dir_all(parent).map_err(|e| e.to_string())?;
         }
-
         let ron_str = ron::to_string(&config).map_err(|e| e.to_string())?;
         fs::write(&path, ron_str).map_err(|e| e.to_string())?;
-
         let mut lock = state.rss_config.lock().unwrap();
         lock.urls = default_urls.clone();
-
         return Ok(default_urls);
     }
-
     let content = fs::read_to_string(path).map_err(|e| e.to_string())?;
     let config: RssConfig = ron::from_str(&content).map_err(|e| e.to_string())?;
-
     let mut lock = state.rss_config.lock().unwrap();
     *lock = config.clone();
     Ok(config.urls)
@@ -84,40 +83,59 @@ pub async fn save_rss_urls(
 ) -> Result<(), String> {
     let config = RssConfig { urls };
     let path = get_config_path(&app);
-
     if let Some(parent) = path.parent() {
         fs::create_dir_all(parent).map_err(|e| e.to_string())?;
     }
-
     let ron_str = ron::to_string(&config).map_err(|e| e.to_string())?;
     fs::write(path, ron_str).map_err(|e| e.to_string())?;
-
     let mut lock = state.rss_config.lock().unwrap();
     *lock = config;
     Ok(())
 }
 
 #[tauri::command]
-pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticle>, String> {
-    let key = state
+pub async fn fetch_ai_news(
+    provider: String,
+    state: State<'_, NewsState>,
+) -> Result<Vec<NewsArticle>, String> {
+    let (key, url, model, author) = match provider.as_str() {
+        "groq" => {
+            let k = state.groq_key.lock().map_err(|_| "Lock failed")?.clone();
+            (
+                k,
+                "https://api.groq.com/openai/v1/chat/completions",
+                "llama-3.1-8b-instant",
+                "Groq AI",
+            )
+        }
+        _ => {
+            let k = state
                 .openrouter_key
                 .lock()
                 .map_err(|_| "Lock failed")?
                 .clone();
+            (
+                k,
+                "https://openrouter.ai/api/v1/chat/completions",
+                "openai/gpt-oss-20b:free:online",
+                "OpenRouter AI",
+            )
+        }
+    };
 
     if key.is_empty() {
-        return Err("API Key fehlt.".into());
+        return Err(format!("API Key für {} fehlt.", author));
     }
 
     let client = reqwest::Client::new();
     let response = client
-        .post("https://openrouter.ai/api/v1/chat/completions")
+        .post(url)
         .header("Authorization", format!("Bearer {}", key))
         .json(&serde_json::json!({
-            "model": "minimax/minimax-m2.1",
+            "model": model,
             "messages": [
-                {"role": "system", "content": "Kurze News, 1-2 Sätze, Deutsch."},
-                {"role": "user", "content": "Tech-News."}
+                {"role": "system", "content": "Kurze Tech-News, 1-2 Sätze, Deutsch. Nutze Markdown."},
+                {"role": "user", "content": "Was gibt es neues in der Tech-Welt?"}
             ]
         }))
         .send()
@@ -127,12 +145,12 @@ pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticl
     let json: serde_json::Value = response.json().await.map_err(|e| e.to_string())?;
     let content = json["choices"][0]["message"]["content"]
         .as_str()
-        .unwrap_or("Fehler")
+        .unwrap_or("Fehler beim Abrufen der Inhalte")
         .to_string();
 
     Ok(vec![NewsArticle {
         content,
-        author: "OpenRouter AI".into(),
+        author: author.into(),
         created_at: "Gerade eben".into(),
     }])
 }
@@ -151,7 +169,6 @@ pub async fn fetch_rss_news(state: State<'_, NewsState>) -> Result<Vec<NewsArtic
                         .title
                         .map(|t| t.content)
                         .unwrap_or_else(|| "RSS".into());
-
                     for entry in feed.entries.into_iter().take(3) {
                         let date = entry
                             .published

src/pages/news.rs

@@ -33,6 +33,10 @@ struct StringArgs {
 struct UrlsArgs {
     urls: Vec<String>,
 }
+#[derive(Serialize)]
+struct AiArgs {
+    provider: String,
+}
 
 #[function_component(News)]
 pub fn news() -> Html {
@@ -40,12 +44,14 @@ pub fn news() -> Html {
     let error_msg = use_state(|| None::<String>);
     let show_config = use_state(|| false);
     let current_mode = use_state(|| NewsMode::Ai);
+    let ai_provider = use_state(|| "openrouter".to_string());
     let rss_urls = use_state(Vec::<String>::new);
 
-    let api_key_ref = use_node_ref();
+    let or_key_ref = use_node_ref();
+    let groq_key_ref = use_node_ref();
     let new_url_ref = use_node_ref();
 
-    // Init: Konfiguration laden
+    // Init: RSS laden
     {
         let rss_urls = rss_urls.clone();
         use_effect_with((), move |_| {
@@ -60,23 +66,27 @@ pub fn news() -> Html {
         });
     }
 
-    // News laden Funktion
     let load_news = {
         let articles = articles.clone();
         let error_msg = error_msg.clone();
         let mode = *current_mode;
+        let provider = (*ai_provider).clone();
         Callback::from(move |_| {
             let articles = articles.clone();
             let error_msg = error_msg.clone();
+            let provider = provider.clone();
             articles.set(None);
             error_msg.set(None);
             spawn_local(async move {
-                let cmd = if mode == NewsMode::Ai {
-                    "fetch_ai_news"
+                let (cmd, args) = if mode == NewsMode::Ai {
+                    (
+                        "fetch_ai_news",
+                        serde_wasm_bindgen::to_value(&AiArgs { provider }).unwrap(),
+                    )
                 } else {
-                    "fetch_rss_news"
+                    ("fetch_rss_news", JsValue::NULL)
                 };
-                match invoke(cmd, JsValue::NULL).await {
+                match invoke(cmd, args).await {
                     Ok(res) => {
                         let data = serde_wasm_bindgen::from_value::<Vec<NewsArticle>>(res)
                             .unwrap_or_default();
@@ -88,22 +98,30 @@ pub fn news() -> Html {
         })
     };
 
-    // Automatisches Laden bei Modus-Wechsel
+    // Auto-Reload bei Switch
     {
         let load_news = load_news.clone();
-        use_effect_with((*current_mode).clone(), move |_| {
+        use_effect_with(
+            ((*current_mode).clone(), (*ai_provider).clone()),
+            move |_| {
                 load_news.emit(MouseEvent::new("click").unwrap());
                 || ()
-        });
+            },
+        );
     }
 
     let save_settings = {
         let rss_urls = rss_urls.clone();
-        let api_key_ref = api_key_ref.clone();
+        let or_ref = or_key_ref.clone();
+        let groq_ref = groq_key_ref.clone();
         let show_config = show_config.clone();
         let load_news = load_news.clone();
         Callback::from(move |_| {
-            let key = api_key_ref
+            let or_key = or_ref
+                .cast::<HtmlInputElement>()
+                .map(|i| i.value())
+                .unwrap_or_default();
+            let groq_key = groq_ref
                 .cast::<HtmlInputElement>()
                 .map(|i| i.value())
                 .unwrap_or_default();
@@ -113,7 +131,12 @@ pub fn news() -> Html {
             spawn_local(async move {
                 let _ = invoke(
                     "save_openrouter_key",
-                    serde_wasm_bindgen::to_value(&StringArgs { key }).unwrap(),
+                    serde_wasm_bindgen::to_value(&StringArgs { key: or_key }).unwrap(),
+                )
+                .await;
+                let _ = invoke(
+                    "save_groq_key",
+                    serde_wasm_bindgen::to_value(&StringArgs { key: groq_key }).unwrap(),
                 )
                 .await;
                 let _ = invoke(
@@ -131,20 +154,24 @@ pub fn news() -> Html {
         <div class="feed-container">
             <div class="feed-header">
                 <div class="header-main">
-                    <h1>{ if *current_mode == NewsMode::Ai { "📰 KI News" } else { "📻 RSS Feeds" } }</h1>
+                    <h1>{ if *current_mode == NewsMode::Ai { "📰 KI News" } else { "📻 RSS" } }</h1>
                     <div class="mode-toggle">
-                        <button
-                            class={if *current_mode == NewsMode::Ai { "toggle-btn active" } else { "toggle-btn" }}
-                            onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Ai)}>
-                            {"KI"}
-                        </button>
-                        <button
-                            class={if *current_mode == NewsMode::Rss { "toggle-btn active" } else { "toggle-btn" }}
-                            onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Rss)}>
-                            {"RSS"}
-                        </button>
+                        <button class={if *current_mode == NewsMode::Ai { "toggle-btn active" } else { "toggle-btn" }}
+                                onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Ai)}>{"KI"}</button>
+                        <button class={if *current_mode == NewsMode::Rss { "toggle-btn active" } else { "toggle-btn" }}
+                                onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Rss)}>{"RSS"}</button>
                     </div>
                 </div>
+
+                if *current_mode == NewsMode::Ai {
+                    <div class="provider-switch">
+                        <button class={if *ai_provider == "openrouter" { "prov-btn active" } else { "prov-btn" }}
+                                onclick={let p = ai_provider.clone(); move |_| p.set("openrouter".into())}>{"OR"}</button>
+                        <button class={if *ai_provider == "groq" { "prov-btn active" } else { "prov-btn" }}
+                                onclick={let p = ai_provider.clone(); move |_| p.set("groq".into())}>{"Groq"}</button>
+                    </div>
+                }
+
                 <div class="header-actions">
                     <button class="action-btn" onclick={let sc = show_config.clone(); move |_| sc.set(!*sc)}>{"⚙️"}</button>
                     <button class="action-btn" onclick={load_news.clone()}>{"🔄"}</button>
@@ -154,14 +181,17 @@ pub fn news() -> Html {
             if *show_config {
                 <div class="config-panel">
                     <div class="config-section">
-                        <label>{"OPENROUTER API KEY"}</label>
-                        <input ref={api_key_ref} type="password" class="config-input" placeholder="sk-..." />
+                        <label>{"OpenRouter Key"}</label>
+                        <input ref={or_key_ref} type="password" class="config-input" placeholder="sk-or-..." />
+                    </div>
+                    <div class="config-section">
+                        <label>{"Groq Key"}</label>
+                        <input ref={groq_key_ref} type="password" class="config-input" placeholder="gsk-..." />
                     </div>
-
                     <div class="config-section">
                         <label>{"RSS FEEDS"}</label>
                         <div class="rss-input-row">
-                            <input ref={new_url_ref.clone()} type="text" class="config-input" placeholder="URL hinzufügen..." />
+                            <input ref={new_url_ref.clone()} type="text" class="config-input" placeholder="URL..." />
                             <button class="add-btn" onclick={
                                 let rss_urls = rss_urls.clone();
                                 let new_url_ref = new_url_ref.clone();
@@ -178,21 +208,6 @@ pub fn news() -> Html {
                                 }
                             }>{"+"}</button>
                         </div>
-                        <div class="rss-list-scroll">
-                            { for (*rss_urls).iter().enumerate().map(|(i, url)| html! {
-                                <div class="rss-url-entry" key={i}>
-                                    <span class="url-text">{url}</span>
-                                    <button class="delete-btn" onclick={
-                                        let rss_urls = rss_urls.clone();
-                                        move |_| {
-                                            let mut list = (*rss_urls).clone();
-                                            list.remove(i);
-                                            rss_urls.set(list);
-                                        }
-                                    }>{"✕"}</button>
-                                </div>
-                            }) }
-                        </div>
                     </div>
                     <button class="save-master-btn" onclick={save_settings}>{"Alles Speichern"}</button>
                 </div>
@@ -202,11 +217,7 @@ pub fn news() -> Html {
                 { if let Some(msg) = (*error_msg).clone() {
                     html! { <div class="error-box">{ format!("⚠️ Error: {}", msg) }</div> }
                 } else if let Some(list) = (*articles).clone() {
-                    if list.is_empty() {
-                        html! { <p class="empty-msg">{"Keine Nachrichten gefunden. Überprüfe deine Feeds."}</p> }
-                    } else {
                     html! { for list.iter().map(|a| html! { <NewsCard article={a.clone()} /> }) }
-                    }
                 } else {
                     html! { <div class="loading-spinner">{"Lade Nachrichten..."}</div> }
                 } }
@@ -231,7 +242,6 @@ pub fn news_card(props: &NewsCardProps) -> Html {
         md_html::push_html(&mut out, parser);
         out
     };
-
     html! {
         <div class="post-card">
             <div class="post-header">

styles.css

@@ -434,3 +434,88 @@ html {
     border-radius: 12px;
     text-align: center;
 }
+
+/* --- AI Provider Switch (Neu) --- */
+.provider-switch {
+    display: flex;
+    background: rgba(255, 255, 255, 0.05);
+    border-radius: 12px;
+    padding: 3px;
+    border: 1px solid rgba(255, 255, 255, 0.08);
+    /* Zwischen h1 und den Icons positionieren */
+    margin: 0 10px;
+}
+
+.prov-btn {
+    border: none;
+    background: transparent;
+    color: var(--text-secondary);
+    padding: 6px 14px;
+    border-radius: 9px;
+    cursor: pointer;
+    font-size: 0.75rem;
+    font-weight: 700;
+    transition: all 0.2s ease;
+}
+
+.prov-btn.active {
+    background: var(--accent-color);
+    color: white;
+}
+
+/* --- Config Section Refinement --- */
+.config-section {
+    margin-bottom: 20px;
+}
+
+.config-section label {
+    display: block;
+    font-size: 0.7rem;
+    color: var(--text-secondary);
+    margin-bottom: 6px;
+    text-transform: uppercase;
+    letter-spacing: 0.5px;
+}
+
+/* --- Markdown Content Styling --- */
+.markdown-body {
+    font-size: 0.95rem;
+    color: var(--text-primary);
+    line-height: 1.6;
+}
+
+.markdown-body h3 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    font-size: 1.15rem;
+    color: #ffffff;
+    font-weight: 700;
+}
+
+.markdown-body p {
+    margin: 0;
+}
+
+/* --- Status Indicators --- */
+.loading-spinner {
+    text-align: center;
+    padding: 40px;
+    color: var(--text-secondary);
+    font-style: italic;
+    animation: pulse-subtle 2s infinite;
+}
+
+.empty-msg {
+    text-align: center;
+    color: var(--text-secondary);
+    margin-top: 40px;
+    font-size: 0.9rem;
+    opacity: 0.8;
+}
+
+/* --- Layout Adjustment für Provider Switch --- */
+.header-main {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}