mirror of
https://github.com/gsantner/dandelion
synced 2025-12-09 13:51:18 +01:00
- Added AMOLED mode
- Use opoc/AdBlock - Improve NavDrawer
This commit is contained in:
Gregor Santner
parent
544e86073a
commit
2d7d898bfe
16 changed files with 2621 additions and 24 deletions
|
|
@ -6,7 +6,8 @@
|
|||
android:layout_height="110dp"
|
||||
android:gravity="bottom"
|
||||
android:orientation="vertical"
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark">
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark"
|
||||
tools:background="@color/primary">
|
||||
|
||||
<!--
|
||||
<ImageView
|
||||
|
|
@ -57,7 +58,8 @@
|
|||
android:text="@string/app_name"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp" />
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/podselection__podupti_notice"
|
||||
|
|
|
|||
|
|
@ -70,23 +70,21 @@
|
|||
android:visible="false" />
|
||||
</group>
|
||||
|
||||
<item android:title="@string/nav_menu_more">
|
||||
<menu>
|
||||
<item
|
||||
android:id="@+id/nav_toggle_desktop_page"
|
||||
android:icon="@drawable/ic_sync_white_48px"
|
||||
android:title="@string/action_toggle_desktop_page" />
|
||||
<group android:checkableBehavior="none">
|
||||
<item
|
||||
android:id="@+id/nav_toggle_desktop_page"
|
||||
android:icon="@drawable/ic_sync_white_48px"
|
||||
android:title="@string/action_toggle_desktop_page" />
|
||||
|
||||
<item
|
||||
android:id="@+id/nav_settings"
|
||||
android:icon="@drawable/ic_settings_black_48px"
|
||||
android:title="@string/settings" />
|
||||
<item
|
||||
android:id="@+id/nav_settings"
|
||||
android:icon="@drawable/ic_settings_black_48px"
|
||||
android:title="@string/settings" />
|
||||
|
||||
<item
|
||||
android:id="@+id/nav_about"
|
||||
android:icon="@drawable/ic_info_black_48px"
|
||||
android:title="@string/nav_help_license" />
|
||||
</menu>
|
||||
</item>
|
||||
<item
|
||||
android:id="@+id/nav_about"
|
||||
android:icon="@drawable/ic_info_black_48px"
|
||||
android:title="@string/nav_help_license" />
|
||||
</group>
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
2343
app/src/main/res/raw/adblock_domains__yoyo.txt
Executable file
2343
app/src/main/res/raw/adblock_domains__yoyo.txt
Executable file
File diff suppressed because it is too large
Load diff
|
|
@ -28,6 +28,8 @@
|
|||
<string name="pref_desc__primary_color">Färbung der Werkzeugleisten</string>
|
||||
<string name="pref_title__accent_color">Akzentfarbe</string>
|
||||
<string name="pref_desc__accent_color">Färbung der Details</string>
|
||||
<string name="pref_title__primary_color__amoled_mode">AMOLED Modus</string>
|
||||
<string name="pref_desc__primary_color__amoled_mode">Farben mit AMOLED-Display freundlichen Farben an vielen Orten der App überschreiben. Ein Neustart ist erforderlich um diese Einstellung zu ändern. Du kannst in deinen persönlichen diaspora* Einstellungen das dunkle Thema aktivieren, damit wird auch der Inhalt dunkler.</string>
|
||||
<!-- Notifications dropdown -->
|
||||
<string name="pref_title__extended_notifications">Erweiterte Benachrichtigungen</string>
|
||||
<string name="pref_desc__extended_notifications">Erweitere die Benachrichtigungsglocke um ein Ausklappmenü mit verschiedenen Benachrichtigungskategorien</string>
|
||||
|
|
@ -85,4 +87,6 @@
|
|||
<string name="dialog_content__wipe_settings">Dies wird alle geänderten Einstellungen der Anwendung auf die Standardwerte zurücksetzen und alle Konten abmelden. Deine heruntergeladenen Medien bleiben unberührt. Bist du sicher, dass du fortfahren willst?</string>
|
||||
<!-- Recently added - Please move to right section-->
|
||||
<!-- Sorry -->
|
||||
<string name="pref_desc__adblock_enable">Einfachen Werbeblocker aktivieren. Werbung könnte z.B. in eingebetteten Anzeigen enthalten sein</string>
|
||||
<string name="pref_title__adblock_enable">Werbung blockieren</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
<string name="pref_key__app_first_start_current_version" translatable="false">pref_key__app_first_start_current_version</string>
|
||||
|
||||
<!-- Themes -->
|
||||
<string name="pref_key__primary_color__amoled_mode" translatable="false">pref_key__primary_color__amoled_mode</string>
|
||||
<string name="pref_key__primary_color__preference_click" translatable="false">@string/pref_key__primary_color_shade</string>
|
||||
<string name="pref_key__primary_color_base" translatable="false">pref_key_primary_color_base</string>
|
||||
<string name="pref_key__primary_color_shade" translatable="false">pref_key_primary_color_shade</string>
|
||||
|
|
@ -92,6 +93,8 @@
|
|||
<string name="pref_desc__primary_color">Color of the toolbars</string>
|
||||
<string name="pref_title__accent_color">Accent Color</string>
|
||||
<string name="pref_desc__accent_color">Color of the progressbar</string>
|
||||
<string name="pref_title__primary_color__amoled_mode">AMOLED Mode</string>
|
||||
<string name="pref_desc__primary_color__amoled_mode">Override colors with AMOLED display friendly black at many parts of the app. You need to restart to toggle this setting. To browse diaspora* in dark you also need to activate the Dark theme, which can be found in your personal diaspora* account settings.</string>
|
||||
|
||||
<!-- Notifications dropdown -->
|
||||
<string name="pref_title__extended_notifications">Extended Notifications</string>
|
||||
|
|
@ -213,8 +216,13 @@
|
|||
<string name="pref_key__title__proxy" translatable="false">pref_key__title__proxy</string>
|
||||
<string name="pref_key__title__themes" translatable="false">pref_key__title__themes</string>
|
||||
|
||||
|
||||
<string name="pref_key__cat_themes" translatable="false">pref_key__cat_themes</string>
|
||||
<string name="pref_key__cat_nav_slider" translatable="false">pref_key__cat_nav_slider</string>
|
||||
<string name="pref_key__cat_proxy" translatable="false">pref_key__cat_proxy</string>
|
||||
<string name="pref_key__cat_debugging" translatable="false">pref_key__cat_debugging</string>
|
||||
|
||||
<string name="pref_key__adblock_enable" translatable="false">pref_key__adblock_enable</string>
|
||||
<string name="pref_desc__adblock_enable">Enable basic AdBlocker. Ads may be included e.g. in embedded views</string>
|
||||
<string name="pref_title__adblock_enable">Block advertisements</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<string name="diaspora" translatable="false">diaspora*</string>
|
||||
<string name="diaspora_for_android" translatable="false">Diaspora for Android</string>
|
||||
<string name="app_hashtag" translatable="false">#dandelion</string>
|
||||
<string name="app_subtitle" translatable="false">The community-run distributed social network</string>
|
||||
<string name="app_subtitle" translatable="false">Your companion app for browsing diaspora*</string>
|
||||
<string name="shared_via_app" translatable="false">
|
||||
\n\n\n_________________________\n
|
||||
*via [dandelion*](/people?q=dandelion00%40diasp.org) client / #dandelíon*</string>
|
||||
|
|
|
|||
|
|
@ -128,6 +128,13 @@
|
|||
android:summary="@string/pref_desc__load_images"
|
||||
android:title="@string/pref_title__load_images"/>
|
||||
|
||||
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
|
||||
android:defaultValue="true"
|
||||
android:icon="@drawable/ic_file_download_black_24px"
|
||||
android:key="@string/pref_key__adblock_enable"
|
||||
android:summary="@string/pref_desc__adblock_enable"
|
||||
android:title="@string/pref_title__adblock_enable"/>
|
||||
|
||||
<Preference
|
||||
android:icon="@drawable/ic_clear_black_24px"
|
||||
android:key="@string/pref_key__clear_cache"
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
android:title="@string/pref_cat__visibility_nav_items__general">
|
||||
|
||||
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
|
||||
android:defaultValue="false"
|
||||
android:defaultValue="true"
|
||||
android:key="@string/pref_key__visibility_nav__exit"
|
||||
android:title="@string/action_exit_app"/>
|
||||
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
|
||||
|
|
|
|||
|
|
@ -14,5 +14,12 @@
|
|||
android:summary="@string/pref_desc__accent_color"
|
||||
android:title="@string/pref_title__accent_color"
|
||||
android:icon="@drawable/circle" />
|
||||
|
||||
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/pref_key__primary_color__amoled_mode"
|
||||
android:summary="@string/pref_desc__primary_color__amoled_mode"
|
||||
android:title="@string/pref_title__primary_color__amoled_mode"
|
||||
android:icon="@drawable/ic_color_lens_black_24px" />
|
||||
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
Loading…
Add table
Add a link
Reference in a new issue