Skip to content

Commit

Permalink
Changements de l'interface, amélioration de la présentation, et tradu…
Browse files Browse the repository at this point in the history 
…ction en anglais.
  • Loading branch information
@Celestial04
Celestial04 committed Sep 3, 2024
1 parent 45a5f5f commit 7fbb0ab
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 63 deletions.
52 changes: 35 additions & 17 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="false"
tools:context=".MainActivity">
android:fitsSystemWindows="false">

<FrameLayout
style="@style/Theme.Material3.DynamicColors.DayNight"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:background="?attr/colorOnPrimaryContainer"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<LinearLayout
android:id="@+id/scrollvv"
Expand All @@ -24,20 +28,26 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorErrorContainer"
android:orientation="horizontal"
tools:visibility="visible">

<ImageView
android:id="@+id/SecureImage"
android:layout_width="35dp"
android:layout_height="35dp"
app:srcCompat="@android:drawable/ic_menu_info_details" />
android:importantForAccessibility="no"
app:srcCompat="@android:drawable/ic_menu_info_details"
tools:ignore="ImageContrastCheck" />

<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="TextView" />
android:text="TextView"
android:textColor="?attr/colorPrimary"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
tools:ignore="HardcodedText" />

</LinearLayout>

Expand Down Expand Up @@ -68,98 +78,106 @@
android:layout_weight="4"
android:background="#00000000"
android:fadeScrollbars="true"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
tools:ignore="UselessParent">

<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="bottom|end"
android:orientation="horizontal">

<Button
android:id="@+id/changeUrlButton"
style="@style/Widget.Material3.Button"
android:layout_width="wrap_content"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:text="Changer l'URL"
android:text="@string/change_url_btn"
app:icon="@android:drawable/ic_menu_preferences" />

<Button
android:id="@+id/button"
style="@style/Widget.Material3.Button"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:layout_marginEnd="10dp"
android:contentDescription="@string/forward_button"
android:text="Page précédente"
android:text="@string/previous_page"
app:icon="@drawable/baseline_arrow_circle_right_24"
app:iconGravity="textEnd"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />

<Button
android:id="@+id/button8"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:layout_marginEnd="10dp"
android:contentDescription="@string/refresh_button"
android:text="Recharger la page"
android:text="@string/reload_page_btn"
app:icon="@drawable/baseline_refresh_24"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />

<Button
android:id="@+id/button6"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:layout_marginEnd="10dp"
android:text="Favoris enregistrés"
android:text="@string/saved_pages_btn"
app:icon="@drawable/baseline_bookmarks_24"
app:iconGravity="textEnd"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />

<Button
android:id="@+id/button5"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:layout_marginEnd="10dp"
android:contentDescription="@string/favorite_button_add"
android:text="Ajouter un favoris"
android:text="@string/add_fav_btn"
app:icon="@drawable/baseline_bookmark_add_24"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />

<Button
android:id="@+id/button7"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:layout_marginEnd="10dp"
android:contentDescription="@string/delete_fav_button"
android:text="Supprimer un favoris"
android:text="@string/delete_fav_btn"
app:icon="@drawable/baseline_bookmark_remove_24"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />

<Button
android:id="@+id/soundButton"
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:layout_marginEnd="10dp"
android:contentDescription="@string/changer_la_couleur"
android:text="Changer le thème (INSTABLE)"
android:text="@string/change_theme_btn"
app:icon="@drawable/baseline_palette_24"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />

<Button
style="?android:attr/buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="@dimen/SizeMenu"
android:contentDescription="@string/delete_data_button"
android:onClick='onDeleteDataClick'
android:text="Supprimer toutes les données"
android:text="@string/reset_app"
app:icon="@drawable/baseline_delete_forever_24"
app:iconPadding="0dp"
app:iconSize="@dimen/SizeMenubtn" />
Expand Down
44 changes: 26 additions & 18 deletions app/src/main/res/values-en/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="head_title_tuto1">Bienvenue sur WebApper, le navigateur simple, et sécurisé.</string>
<string name="body_tuto1">Dans WebApper, toute l\'application est le plus simpliste possible, cela veux dire que vous n\'aurez pas besoin d\'aller chercher un paramètre dans menu spécifique auquel il est difficile d\'accès, tout est en haut. Faites defiler le menu en haut pour avoir accès à tout les paramètres, sans quitter l\'application !</string>
<string name="text_button_tuto1">Appuyez sur \"OK\" pour la suite.</string>
<string name="forward_button">Avancer</string>
<string name="head_title_tuto1">hi, welcome!</string>
<string name="body_tuto1">This app are Open Source, so you can propose your change into the Github repo. (</string>
<string name="text_button_tuto1">Press \"OK\" to continue.</string>
<string name="forward_button">Forwad</string>
<string name="google_button">Google</string>
<string name="delete_data_button">Supprimer les données</string>
<string name="delete_data_button">Delete all data</string>
<string name="next_button">OK</string>
<string name="text_example_tuto">Faites défiler ce texte pour comprendre comment fonctionne le menu puis une fois que vous êtes prêt appuyez sur \"OK\".</string>
<string name="body_tuto2">La sécurité, c\'est le plus important, et dans WebApper, vos activitées sur internet peuvent être effacé à tout moment et rapidement dans le menu.</string>
<string name="text_example_tuto2">Faites défiler ce texte pour appuyer sur le bouton qui vous permetra d\'accèder à la suite.</string>
<string name="head_title_tuto2">La sécurité, et la simplicité</string>
<string name="head_title_tuto3">Vous avez presque terminé</string>
<string name="body_tuto3">WebApper, c\'est un navigateur web concentré sur la simplicité, rapidité et sécurité.</string>
<string name="text_button_tuto3">Appuyez sur \"OK\" pour terminer.</string>
<string name="button_example_3">Appuyez ici pour faire apparaître le bouton \"OK\".</string>
<string name="favorite_button_add">Ajouter cette page aux favoris</string>
<string name="view_fav">Voir les favoris d\'enregistrées</string>
<string name="delete_fav_button">Supprimer un favori d\'enregistré</string>
<string name="refresh_button">Recharger</string>
<string name="text_example_tuto">Scroll this text, the menu will be like that.</string>
<string name="body_tuto2">This app is really fast.</string>
<string name="text_example_tuto2">"scroll this, please, do this. This is really important, please do it. Press this button: "</string>
<string name="head_title_tuto2">Time to fast.</string>
<string name="head_title_tuto3">wait, do this:</string>
<string name="body_tuto3">Press the button to finish the tutorial (wow)</string>
<string name="text_button_tuto3">Press \"OK\" to finish.</string>
<string name="button_example_3">Press. This. BUTTON.</string>
<string name="favorite_button_add">Add this page to favorite</string>
<string name="view_fav">See saved favorite</string>
<string name="delete_fav_button">Delete favorite</string>
<string name="refresh_button">Reload</string>
<string name="btn_chg_color">Change theme</string>
<string name="changer_la_couleur">Change color</string>
<string name="t_l_chargement_en_cours">Downloading...</string>
<string name="t_l_chargement_en_cours">Downloading…</string>
<string name="vitesse_du_tl_chargement">Download speed:</string>
<string name="le_tl_chargement_de">The download of</string>
<string name="reset_app">Reset the app</string>
<string name="previous_page">Previous</string>
<string name="change_url_btn">Change URL</string>
<string name="reload_page_btn">Reload</string>
<string name="saved_pages_btn">Saved favorite</string>
<string name="add_fav_btn">Add this page to favorite</string>
<string name="delete_fav_btn">Delete page from favorite</string>
<string name="change_theme_btn">Change theme (will be retired in the futur)</string>
</resources>
28 changes: 0 additions & 28 deletions app/src/main/res/values-fr/strings.xml
View file

This file was deleted.

8 changes: 8 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
<string name="t_l_chargement_en_cours">Téléchargement en cours…</string>
<string name="vitesse_du_tl_chargement">Vitesse du téléchargement :</string>
<string name="le_tl_chargement_de">"Le téléchargement de "</string>
<string name="reset_app">Supprimer toutes les données</string>
<string name="previous_page">Page précédente</string>
<string name="change_url_btn">Changer l\'URL</string>
<string name="reload_page_btn">Recharger la page</string>
<string name="saved_pages_btn">Favoris enregistrés</string>
<string name="add_fav_btn">Ajouter un favoris</string>
<string name="delete_fav_btn">Supprimer un favoris</string>
<string name="change_theme_btn">Changer le thème (INSTABLE)</string>
<dimen name="SizeMenubtn">35dp</dimen>
<string-array name="position_options">
<item>Top</item>
Expand Down

0 comments on commit 7fbb0ab

Please sign in to comment.