Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 250da848 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch '5162_wodring_style' into 'main' 

5162 wording style, 4907 fix toast widget not resizable, 5179 hide icon

See merge request e/privacy-central/privacycentralapp!37
parents 881713a4 9eb2eb9d

app/src/main/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ 
            </intent-filter>

        </receiver>



        <activity android:name=".main.MainActivity">

        <activity android:name=".main.MainActivity"

            android:launchMode="singleTask">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />



                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.INFO"/>

            </intent-filter>

        </activity>

    </application>

app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt

+4 −5
Original line number Diff line number Diff line
@@ -54,12 +54,11 @@ fun render( 
) {

    val views = RemoteViews(context.packageName, R.layout.widget)

    views.apply {

        setOnClickPendingIntent(

            R.id.settings_btn,

            PendingIntent.getActivity(

        val openPIntent = PendingIntent.getActivity(

            context, 0, Intent(context, MainActivity::class.java), FLAG_UPDATE_CURRENT

        )

        )

        setOnClickPendingIntent(R.id.settings_btn, openPIntent)

        setOnClickPendingIntent(R.id.widget_container, openPIntent)



        setImageViewResource(

            R.id.state_icon,

app/src/main/res/layout/fragment_dashboard.xml

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
                        android:textSize="12sp"

                        android:textColor="@color/secondary_text"

                        android:layout_marginBottom="8dp"

                        android:textAllCaps="true"

                        />

                    <TextView

                        android:id="@+id/state_trackers"
@@ -104,6 +105,7 @@ 
                        android:textSize="12sp"

                        android:textColor="@color/secondary_text"

                        android:layout_marginBottom="8dp"

                        android:textAllCaps="true"

                        />

                    <TextView

                        android:id="@+id/state_geolocation"
@@ -129,6 +131,7 @@ 
                        android:textSize="12sp"

                        android:textColor="@color/secondary_text"

                        android:layout_marginBottom="8dp"

                        android:textAllCaps="true"

                        />

                    <TextView

                        android:id="@+id/state_ip_address"

app/src/main/res/layout/widget.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:layout_width="match_parent"

    android:orientation="vertical"

    android:background="@drawable/bg_widget"

    android:id="@+id/widget_container"

    >

    <LinearLayout

        android:layout_width="match_parent"

app/src/main/res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <string name="dashboard_internet_activity_privacy_subtitle_on">Echte IP-Adresse versteckt</string>

    <string name="ipscrambling_title">Verwalte meine Internet-Adressen</string>

    <string name="dashboard_state_title_on">Dein Online-Datenschutz ist gewährleistet</string>

    <string name="dashboard_title">Datenschutz im Überblick</string>

    <string name="dashboard_title">@string/app_name</string>

    <string name="dashboard_internet_activity_privacy_subtitle_off">Echte IP-Adresse aufgedeckt</string>

    <string name="dashboard_state_geolocation_off">Aufgedeckt</string>

    <string name="dashboard_state_ipaddress_off">Aufgedeckt</string>