Celestial04 · Celestial04 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025 · Apr 14, 2025
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
diff --git a/.github/workflows/build_and_sign_apk.yml b/.github/workflows/build_and_sign_apk.yml
@@ -0,0 +1,44 @@
+name: Build and Sign APK
+
+on:
+  push:
+    branches:
+      - main  # ou changez la branche selon vos besoins
+  pull_request:
+
+jobs:
+  build:
+    name: Build Signed APK
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 11
+
+      - name: Grant execute permission for Gradle
+        run: chmod +x ./gradlew
+
+      - name: Decode the keystore file
+        env:
+          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_FILE }}
+        run: |
+          echo "$KEYSTORE_BASE64" | base64 --decode > keystore.jks
+
+      - name: Build the signed APK
+        env:
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: ./gradlew assembleRelease
+
+      - name: Upload APK as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Signed-APK
+          path: app/build/outputs/apk/release/app-release.apk
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,10 +5,11 @@ plugins {
 android {
     signingConfigs {
         release {
-            storeFile file("app/webKeyRL.jks")
-            storePassword System.getenv("SIGNING_STORE_PASSWORD") ?: "password"
-            keyAlias System.getenv("SIGNING_KEY_ALIAS") ?: "alias"
-            keyPassword System.getenv("SIGNING_KEY_PASSWORD") ?: "password"
+            // Le keystore généré par GitHub Actions se trouve dans le répertoire racine de votre projet.
+            storeFile file("keystore.jks")
+            storePassword System.getenv("KEYSTORE_PASSWORD") ?: "default_password"
+            keyAlias System.getenv("KEY_ALIAS") ?: "default_alias"
+            keyPassword System.getenv("KEY_PASSWORD") ?: "default_key_password"
         }
     }
     namespace 'com.katsuu04.web'
@@ -26,7 +27,9 @@ android {
 
     buildTypes {
         release {
+            // Utiliser la configuration de signature pour la version release
             signingConfig signingConfigs.release
+            // Vous pouvez activer ou non la minification/proguard selon vos besoins
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -38,16 +41,16 @@ android {
 }
 
 dependencies {
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-beta01"
     implementation 'com.google.android.play:app-update:2.1.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation "com.github.skydoves:colorpickerview:2.2.4"
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,7 +22,8 @@
             android:fitsSystemWindows="true"
             android:orientation="vertical"
             tools:layout_editor_absoluteX="1dp"
-            tools:layout_editor_absoluteY="1dp">
+            tools:layout_editor_absoluteY="1dp"
+            tools:ignore="UselessParent">
 
             <LinearLayout
                 android:id="@+id/urlBarContainer"
@@ -37,6 +38,7 @@
                     android:layout_width="35dp"
                     android:layout_height="35dp"
                     android:importantForAccessibility="no"
+                    android:importantForAutofill="no"
                     app:srcCompat="@android:drawable/ic_menu_info_details"
                     tools:ignore="ImageContrastCheck" />
 
@@ -47,14 +49,16 @@
                     android:layout_weight="1"
                     android:hint="@string/search_or_enter_url"
                     android:inputType="textUri"
+                    android:minHeight="48dp"
                     android:padding="8dp"
-                    android:singleLine="true" />
+                    android:singleLine="true"
+                    android:textColorHint="#616161" />
 
                 <Button
                     android:id="@+id/infoButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Info"
+                    android:text="@string/aboutThisPageButton"
                     app:icon="@android:drawable/ic_menu_info_details" />
 
             </LinearLayout>
@@ -102,6 +106,7 @@
                                 android:layout_marginEnd="10dp"
                                 android:layout_weight="1"
                                 android:text="@string/change_url_btn"
+                                android:textColor="#9575CD"
                                 app:icon="@android:drawable/ic_menu_preferences" />
 
                             <Button
@@ -112,6 +117,7 @@
                                 android:layout_marginEnd="10dp"
                                 android:contentDescription="@string/forward_button"
                                 android:text="@string/previous_page"
+                                android:textColor="#9575CD"
                                 app:icon="@drawable/baseline_arrow_circle_right_24"
                                 app:iconGravity="textEnd"
                                 app:iconPadding="0dp"
@@ -125,6 +131,7 @@
                                 android:layout_marginEnd="10dp"
                                 android:contentDescription="@string/refresh_button"
                                 android:text="@string/reload_page_btn"
+                                android:textColor="#9575CD"
                                 app:icon="@drawable/baseline_refresh_24"
                                 app:iconPadding="0dp"
                                 app:iconSize="@dimen/SizeMenubtn" />

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -62,4 +62,5 @@
     <string name="eta">"ETA: "</string>
     <string name="securityTextSecure">Secure</string>
     <string name="securityTextNotSecure">Not Secure</string>
+    <string name="aboutThisPageButton">about this</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
@@ -33,12 +33,6 @@
     <string name="delete_fav_btn">Supprimer un favoris</string>
     <string name="change_theme_btn">Changer le thème</string>
     <dimen name="SizeMenubtn">35dp</dimen>
-    <string-array name="position_options">
-        <item>Top</item>
-        <item>Bottom</item>
-        <item>Left</item>
-        <item>Right</item>
-    </string-array>
     <dimen name="SizeMenu">45dp</dimen>
     <string name="DialHeadChangeURL">Changer l\'URL</string>
     <string name="CancelText">Annuler</string>