Disroot/Nomad
Disroot
/
Nomad
Archived
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Solved menu visibility option for menu items

This commit is contained in:
Massimiliano Lentini 2018-09-03 16:12:28 +02:00
parent 6cf1df9c8d
commit ebffca1d26
17 changed files with 395 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
.gitignore vendored Executable file → Normal file
View File

@ -1,2 +1,56 @@
/.gradle/*
# Built application files
*.apk
*.ap_
# Files for the Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
# Gradle files
.gradle/
build/
# Local configuration file (sdk path, etc)
local.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
# User-specific configurations
.idea/libraries/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/vcs.xml
.idea/gradle.xml
*.iml
# Fucking crashlytics strings
app/src/main/res/values/com_crashlytics_export_strings.xml
app/src/main/assets/crashlytics-build.properties
app/app.iml

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

BIN
.idea/caches/build_file_checksums.ser Normal file
View File

Binary file not shown.

29
.idea/codeStyles/Project.xml Normal file
View File

@ -0,0 +1,29 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<Objective-C-extensions>
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
</file>
<class>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
</class>
<extensions>
<pair source="cpp" header="h" fileNamingConvention="NONE" />
<pair source="c" header="h" fileNamingConvention="NONE" />
</extensions>
</Objective-C-extensions>
</code_scheme>
</component>

12
.idea/runConfigurations.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>

19
AndHub.iml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="AndHub" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/Documenti/AndHub" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

191
app/app.iml Normal file
View File

@ -0,0 +1,191 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$USER_HOME$/Documenti/AndHub" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="flavorDefaultDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleFlavorDefaultDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileFlavorDefaultDebugSources" />
<afterSyncTasks>
<task>generateFlavorDefaultDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/build/intermediates/classes/flavorDefault/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/flavorDefault/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/flavorDefault/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/flavorDefault/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/flavorDefault/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/flavorDefault/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/flavorDefault/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/flavorDefault/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/flavorDefault/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefaultDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/flavorDefault/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/flavorDefault/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/flavorDefault/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/flavorDefault/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/flavorDefault/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/flavorDefault/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/flavorDefault/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefaultDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/flavorDefault/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefaultDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorDefault/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorDefault/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorDefault/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processing-tools" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.android.support:transition-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife-8.8.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:customtabs-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: info.guardianproject.netcipher:netcipher:2.0.0-alpha1@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:design-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.1" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: uz.shift:colorpicker-0.5" level="project" />
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
</component>
</module>

2
app/src/main/java/com/dfa/hubzilla_android/activity/DiasporaStreamFragment.java
View File

@ -102,7 +102,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.stream__menu_top, menu);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
menu.findItem(R.id.action_share_pdf).setVisible(true);

14
app/src/main/java/com/dfa/hubzilla_android/activity/MainActivity.java
View File

@ -707,15 +707,11 @@ public class MainActivity extends ThemedActivity
menu.findItem(R.id.action_pubstream).setVisible(_appSettings.isVisibleInPubstream());
menu.findItem(R.id.action_contacts).setVisible(_appSettings.isVisibleInContacts());
menu.findItem(R.id.action_directory).setVisible(_appSettings.isVisibleInDirectory());
// this doesn't work
//getMenuInflater().inflate(R.menu.stream__menu_top, menu);
//menu.findItem(R.id.action_search).setVisible(_appSettings.isVisibleInSearch());
//menu.findItem(R.id.action_suggestions).setVisible(_appSettings.isVisibleInSuggestions());
//menu.findItem(R.id.action_conversations).setVisible(_appSettings.isVisibleInConversations());
//menu.findItem(R.id.action_about).setVisible(_appSettings.isVisibleInAbout());
// doesn' work up to here
// menu.findItem(R.id.action_notifications).setVisible(!cache);
// menu.findItem(R.id.action_notifications_extended).setVisible(cache);
menu.findItem(R.id.action_search).setVisible(_appSettings.isVisibleInSearch());
menu.findItem(R.id.action_suggestions).setVisible(_appSettings.isVisibleInSuggestions());
menu.findItem(R.id.action_conversations).setVisible(_appSettings.isVisibleInConversations());
menu.findItem(R.id.action_about).setVisible(_appSettings.isVisibleInAbout());
menu.findItem(R.id.action_exit).setVisible(_appSettings.isVisibleInExit());
}
}

5
app/src/main/java/com/dfa/hubzilla_android/util/AppSettings.java
View File

@ -388,8 +388,13 @@ public class AppSettings extends SharedPreferencesPropertyBackend {
return getBool(R.string.pref_key__visibility_conversations, true);
}
public boolean isVisibleInAbout() {
return getBool(R.string.pref_key__visibility_about, true);
}
public boolean isVisibleInExit() {
return getBool(R.string.pref_key__visibility_exit, true);
}
// Nomad add for menu visibility
public String getScreenRotation() {
return getString(R.string.pref_key__screen_rotation, R.string.rotation_val_system);

72
app/src/main/res/menu/main__menu_top.xml
View File

@ -102,4 +102,76 @@
android:title="@string/action_compose_new_post"
app:showAsAction="always" />
-->
<item
android:icon="@drawable/ic_share_white_48px"
android:orderInCategory="1"
android:title="@string/action_share_dotdotdot"
app:showAsAction="never">
<menu>
<item
android:id="@+id/action_share_screenshot"
android:title="@string/share__share_screenshot" />
<item
android:id="@+id/action_take_screenshot"
android:title="@string/share__take_screenshot" />
<item
android:id="@+id/action_share_pdf"
android:title="@string/pdf"
android:visible="false" />
<item
android:id="@+id/action_share_link"
android:title="@string/share__share_link_as_text" />
<item
android:id="@+id/action_share_link_to_clipboard"
android:title="@string/copy_link_to_clipboard" />
<item
android:id="@+id/action_create_launcher_shortcut"
android:title="@string/launcher_shortcut" />
</menu>
</item>
<group
android:orderInCategory="101"
android:showAsAction="always">
<item
android:id="@+id/action_reload"
android:icon="@drawable/ic_refresh_white_48px"
android:title="@string/reload"/>
<item
android:id="@+id/action_go_to_top"
android:icon="@drawable/ic_arrow_upward_white_48px"
android:title="@string/action_go_to_top"/>
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_48px"
android:title="@string/action_search_by_tags_or_persons"/>
<item
android:id="@+id/action_suggestions"
android:icon="@drawable/ic_suggestions_white_48px"
android:title="@string/action_suggestions"/>
<item
android:id="@+id/action_conversations"
android:icon="@drawable/ic_mail_white_48px__layer"
android:title="@string/conversations"/>
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings_black_48px"
android:title="@string/settings"/>
<item
android:id="@+id/action_about"
android:icon="@drawable/ic_info_black_48px"
android:title="@string/nav_help_license"/>
<item
android:id="@+id/action_exit"
android:icon="@drawable/ic_cancel_black_48px"
android:title="@string/action_exit_app"/>
</group>
</menu>

84
app/src/main/res/menu/stream__menu_top.xml
View File

@ -1,84 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:icon="@drawable/ic_share_white_48px"
android:orderInCategory="300"
android:title="@string/action_share_dotdotdot"
app:showAsAction="never">
<menu>
<item
android:id="@+id/action_share_screenshot"
android:title="@string/share__share_screenshot" />
<item
android:id="@+id/action_take_screenshot"
android:title="@string/share__take_screenshot" />
<item
android:id="@+id/action_share_pdf"
android:title="@string/pdf"
android:visible="false" />
<item
android:id="@+id/action_share_link"
android:title="@string/share__share_link_as_text" />
<item
android:id="@+id/action_share_link_to_clipboard"
android:title="@string/copy_link_to_clipboard" />
<item
android:id="@+id/action_create_launcher_shortcut"
android:title="@string/launcher_shortcut" />
</menu>
</item>
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_48px"
android:title="@string/action_search_by_tags_or_persons"
app:showAsAction="never" />
<item
android:id="@+id/action_suggestions"
android:icon="@drawable/ic_suggestions_white_48px"
android:title="@string/action_suggestions"
app:showAsAction="never" />
<item
android:id="@+id/action_conversations"
android:icon="@drawable/ic_mail_white_48px__layer"
android:title="@string/conversations"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_top"
android:icon="@drawable/ic_arrow_upward_white_48px"
android:orderInCategory="400"
android:title="@string/action_go_to_top"
app:showAsAction="never" />
<item
android:id="@+id/action_reload"
android:icon="@drawable/ic_refresh_white_48px"
android:orderInCategory="1000"
android:title="@string/reload"
app:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_settings_black_48px"
android:title="@string/settings"
app:showAsAction="never" />
<item
android:id="@+id/action_about"
android:icon="@drawable/ic_info_black_48px"
android:title="@string/nav_help_license"
app:showAsAction="never" />
<item
android:id="@+id/action_exit"
android:icon="@drawable/ic_cancel_black_48px"
android:title="@string/action_exit_app"
app:showAsAction="never" />
</menu>

4
app/src/main/res/raw/readme.md
View File

@ -1,6 +1,6 @@
[![Chat - xmpp](https://img.shields.io/badge/chat-on%20xmpp-blue.svg)](xmpp:dishub@chat.disroot.org?join)
[![Donate](https://img.shields.io/badge/donate-appreciation-orange.svg)](https://disroot.org/en/donate)
[![Donate LiberaPay](https://liberapay.com/Disroot)
[![Donate LiberaPay](https://img.shields.io/badge/donate-liberapay-orange.svg)](https://liberapay.com/Disroot)
# Nomad - Hubzilla app for android
<img src="/app/src/main/ic_launcher-web.png" align="left" width="100" hspace="10" vspace="10">
@ -52,4 +52,4 @@ WIP
### Notice
#### Maintainers
- Disroot ([Framagit](https://framagit.org/disroot), [Web](https://disroot.org), [Hubzilla](https://hub.disroot.org/channel/disroot)
- Disroot ([Framagit](https://framagit.org/disroot), [Web](https://disroot.org), [Hubzilla](https://hub.disroot.org/channel/disroot))

2
app/src/main/res/values/strings-not_translatable.xml
View File

@ -160,4 +160,6 @@
<string name="pref_key__visibility_suggestions" translatable="false">pref_key__visibility_suggestions</string>
<string name="pref_key__visibility_conversations" translatable="false">pref_key__visibility_conversations</string>
<string name="pref_key__visibility_search" translatable="false">pref_key__visibility_search</string>
<string name="pref_key__visibility_exit" translatable="false">pref_key__visibility_exit</string>
</resources>

2
app/src/main/res/xml/preferences__menu_vis.xml
View File

@ -14,7 +14,7 @@
<com.dfa.hubzilla_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__exit"
android:key="@string/pref_key__visibility_exit"
android:title="@string/action_exit_app"/>
<com.dfa.hubzilla_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"

2
build.gradle
View File

@ -25,7 +25,7 @@ buildscript {
google()
}
dependencies {
classpath "com.android.tools.build:gradle:$version_gradle_tools"
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
if (project.enable_plugin_kotlin) {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$version_plugin_kotlin"