Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-tooltip-background' into 'master'

Browse Source 
fix tooltip background in actionbar

Closes #1094

See merge request fdroid/fdroidclient!681
This commit is contained in:
Hans-Christoph Steiner 2018-05-03 08:09:47 +00:00
commit 63812715aa
6 changed files with 89 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/activity_calculator.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -11,10 +10,10 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:popupTheme="?attr/actionBarPopupTheme"
app:theme="?attr/actionBarTheme" /> app:theme="?attr/actionBarTheme" />
<TextView <TextView

12
app/src/main/res/layout/activity_panic_settings.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -10,14 +9,13 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:popupTheme="?attr/actionBarPopupTheme" android:background="?attr/colorPrimary"
app:theme="?attr/actionBarTheme"/> app:theme="?attr/actionBarTheme" />
<fragment <fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_container" android:id="@+id/fragment_container"
class="org.fdroid.fdroid.views.panic.PanicPreferencesFragment" class="org.fdroid.fdroid.views.panic.PanicPreferencesFragment"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</LinearLayout> </LinearLayout>

29
app/src/main/res/layout/installed_apps_layout.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -10,34 +9,34 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" android:background="?attr/colorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:theme="?attr/actionBarTheme" app:layout_constraintStart_toStartOf="parent"
app:popupTheme="?attr/actionBarPopupTheme" /> app:layout_constraintTop_toTopOf="parent"
app:theme="?attr/actionBarTheme" />
<TextView <TextView
android:id="@+id/empty_state" android:id="@+id/empty_state"
style="@style/AppListEmptyText"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" android:text="@string/empty_installed_app_list"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar"
style="@style/AppListEmptyText"
android:visibility="gone" android:visibility="gone"
android:text="@string/empty_installed_app_list" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/app_list" android:id="@+id/app_list"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
tools:listitem="@layout/installed_app_list_item" android:scrollbars="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" app:layout_constraintTop_toBottomOf="@+id/toolbar"
android:scrollbars="vertical" /> tools:listitem="@layout/installed_app_list_item" />
<!-- <!--
Commented out until the long press functionality is implemented. Commented out until the long press functionality is implemented.

16
app/src/main/res/layout/repo_list_activity.xml
View File

@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:title="@string/menu_manage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:theme="?attr/actionBarTheme" android:background="?attr/colorPrimary"
app:popupTheme="?attr/actionBarPopupTheme" /> android:title="@string/menu_manage"
app:theme="?attr/actionBarTheme" />
<ListView <ListView
android:id="@+id/list" android:id="@+id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:listitem="@layout/repo_item" android:scrollbars="vertical"
android:scrollbars="vertical" /> tools:listitem="@layout/repo_item" />
</LinearLayout> </LinearLayout>

105
app/src/main/res/layout/repodetails.xml
View File

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:title="@string/repo_details"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:theme="?attr/actionBarTheme" android:background="?attr/colorPrimary"
app:popupTheme="?attr/actionBarPopupTheme" /> android:title="@string/repo_details"
app:theme="?attr/actionBarTheme" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -21,16 +21,17 @@
android:id="@+id/repoView" android:id="@+id/repoView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="?attr/listPreferredItemPaddingLeft" android:orientation="vertical"
android:paddingStart="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingEnd="?attr/listPreferredItemPaddingRight" android:paddingEnd="?attr/listPreferredItemPaddingRight"
android:orientation="vertical"> android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
android:paddingStart="?attr/listPreferredItemPaddingLeft">
<!-- URL of this repo --> <!-- URL of this repo -->
<TextView <TextView
android:text="@string/repo_url" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/repo_url" />
<TextView <TextView
android:id="@+id/input_repo_url" android:id="@+id/input_repo_url"
style="@style/BodyText" /> style="@style/BodyText" />
@ -38,8 +39,9 @@
<!-- Name of this repo --> <!-- Name of this repo -->
<TextView <TextView
android:id="@+id/label_repo_name" android:id="@+id/label_repo_name"
android:text="@string/repo_name" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/repo_name" />
<TextView <TextView
android:id="@+id/text_repo_name" android:id="@+id/text_repo_name"
style="@style/BodyText" /> style="@style/BodyText" />
@ -47,8 +49,9 @@
<!-- Description - as pulled from the index file during last update... --> <!-- Description - as pulled from the index file during last update... -->
<TextView <TextView
android:id="@+id/label_description" android:id="@+id/label_description"
android:text="@string/repo_description" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/repo_description" />
<TextView <TextView
android:id="@+id/text_description" android:id="@+id/text_description"
style="@style/BodyText" /> style="@style/BodyText" />
@ -56,8 +59,9 @@
<!-- Number of apps belonging to this repo --> <!-- Number of apps belonging to this repo -->
<TextView <TextView
android:id="@+id/label_num_apps" android:id="@+id/label_num_apps"
android:text="@string/repo_num_apps" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/repo_num_apps" />
<TextView <TextView
android:id="@+id/text_num_apps" android:id="@+id/text_num_apps"
style="@style/BodyText" /> style="@style/BodyText" />
@ -65,75 +69,82 @@
<!-- The last time this repo was updated --> <!-- The last time this repo was updated -->
<TextView <TextView
android:id="@+id/label_last_update" android:id="@+id/label_last_update"
android:text="@string/repo_last_update" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/repo_last_update" />
<TextView <TextView
android:id="@+id/text_last_update" android:id="@+id/text_last_update"
style="@style/BodyText" /> style="@style/BodyText" />
<!-- mirrors included in the index --> <!-- mirrors included in the index -->
<TextView <TextView
android:id="@+id/label_official_mirrors" android:id="@+id/label_official_mirrors"
android:visibility="gone" style="@style/CaptionText"
android:text="@string/repo_official_mirrors" android:text="@string/repo_official_mirrors"
style="@style/CaptionText" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/text_official_mirrors" android:id="@+id/text_official_mirrors"
android:visibility="gone" style="@style/CaptionText"
android:textColor="@android:color/black" android:textColor="@android:color/black"
style="@style/CaptionText" /> android:visibility="gone" />
<!-- mirrors added by the user --> <!-- mirrors added by the user -->
<TextView <TextView
android:id="@+id/label_user_mirrors" android:id="@+id/label_user_mirrors"
android:visibility="gone" style="@style/CaptionText"
android:text="@string/repo_user_mirrors" android:text="@string/repo_user_mirrors"
style="@style/CaptionText" /> android:visibility="gone" />
<TextView <TextView
android:id="@+id/text_user_mirrors" android:id="@+id/text_user_mirrors"
android:visibility="gone" style="@style/CaptionText"
android:textColor="@android:color/black" android:textColor="@android:color/black"
style="@style/CaptionText" /> android:visibility="gone" />
<!-- The credentials used to access this repo (optional) --> <!-- The credentials used to access this repo (optional) -->
<TextView <TextView
android:id="@+id/label_username" android:id="@+id/label_username"
android:text="@string/login_name" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/login_name" />
<TextView <TextView
android:id="@+id/text_username" android:id="@+id/text_username"
style="@style/BodyText" /> style="@style/BodyText" />
<Button <Button
android:id="@+id/button_edit_credentials" android:id="@+id/button_edit_credentials"
android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/repo_edit_credentials" android:layout_height="wrap_content"
android:onClick="showChangePasswordDialog" /> android:onClick="showChangePasswordDialog"
android:text="@string/repo_edit_credentials" />
<!-- Signature (or "unsigned" if none) --> <!-- Signature (or "unsigned" if none) -->
<TextView <TextView
android:id="@+id/label_repo_fingerprint" android:id="@+id/label_repo_fingerprint"
android:text="@string/repo_fingerprint" style="@style/CaptionText"
style="@style/CaptionText" /> android:text="@string/repo_fingerprint" />
<TextView <TextView
android:id="@+id/text_repo_fingerprint" android:id="@+id/text_repo_fingerprint"
android:typeface="monospace" style="@style/BodyText"
style="@style/BodyText" /> android:typeface="monospace" />
<TextView <TextView
android:id="@+id/text_repo_fingerprint_description" android:id="@+id/text_repo_fingerprint_description"
style="@style/BodyText" /> style="@style/BodyText" />
<TextView <TextView
android:id="@+id/text_not_yet_updated" android:id="@+id/text_not_yet_updated"
android:text="@string/repo_not_yet_updated" style="@style/BodyText"
style="@style/BodyText" /> android:text="@string/repo_not_yet_updated" />
<ImageView <ImageView
android:id="@+id/qr_code" android:id="@+id/qr_code"
android:src="@drawable/swap_qr_example"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp"/> android:paddingTop="16dp"
android:src="@drawable/swap_qr_example" />
</LinearLayout> </LinearLayout>

10
app/src/main/res/values/styles.xml
View File

@ -10,8 +10,7 @@
<item name="android:textColorLink">@color/fdroid_green</item> <item name="android:textColorLink">@color/fdroid_green</item>
<item name="alertDialogTheme">@style/AlertDialogThemeDark</item> <item name="alertDialogTheme">@style/AlertDialogThemeDark</item>
<item name="android:textViewStyle">@style/TextViewStyle</item> <item name="android:textViewStyle">@style/TextViewStyle</item>
<item name="actionBarTheme">@style/AppThemeLight.Toolbar</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@style/AppThemeLight.Toolbar</item>
<item name="appDetailsBackground">?android:windowBackground</item> <item name="appDetailsBackground">?android:windowBackground</item>
<item name="appDetailsCardBackground">#424242</item> <item name="appDetailsCardBackground">#424242</item>
<item name="categoryPreviewAppCardBackground">@drawable/category_preview_app_card_background_dark</item> <item name="categoryPreviewAppCardBackground">@drawable/category_preview_app_card_background_dark</item>
@ -37,8 +36,7 @@
<item name="android:textColorLink">@color/fdroid_green</item> <item name="android:textColorLink">@color/fdroid_green</item>
<item name="alertDialogTheme">@style/AlertDialogThemeLight</item> <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
<item name="android:textViewStyle">@style/TextViewStyle</item> <item name="android:textViewStyle">@style/TextViewStyle</item>
<item name="actionBarTheme">@style/AppThemeLight.Toolbar</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@style/AppThemeLight.Toolbar</item>
<item name="appDetailsBackground">#fcfcfc</item> <item name="appDetailsBackground">#fcfcfc</item>
<item name="appDetailsCardBackground">#ffffff</item> <item name="appDetailsCardBackground">#ffffff</item>
<item name="categoryPreviewAppCardBackground">@drawable/category_preview_app_card_background_light</item> <item name="categoryPreviewAppCardBackground">@drawable/category_preview_app_card_background_light</item>
@ -111,10 +109,6 @@
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
</style> </style>
<style name="AppThemeLight.Toolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:background">@color/fdroid_blue</item>
</style>
<style name="TextViewStyle" parent="android:Widget.TextView"> <style name="TextViewStyle" parent="android:Widget.TextView">
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
</style> </style>