vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-10 10:49:42 +02:00
Code Issues Releases Wiki Activity

editando desde gl-translation

Browse source
This commit is contained in:
XoseM 2018-02-21 11:51:25 +01:00
commit cbb98f7c60
20 changed files with 609 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -18,8 +18,8 @@ android {
buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
applicationId "com.github.dfa.diaspora_android"
versionName "1.0.8"
versionCode 28
versionName "1.1.0"
versionCode 29
vectorDrawables.useSupportLibrary = true

7
app/src/main/AndroidManifest.xml
View file

@ -57,7 +57,14 @@
android:theme="@style/DiasporaLight.NoActionBar"
android:windowSoftInputMode="adjustResize">
<meta-data android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
<intent-filter>
<action android:name="sc_new_post" />
<action android:name="sc_nav_followed_tags" />
<action android:name="sc_aspects" />
<action android:name="sc_activities" />
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

10
app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
View file

@ -325,8 +325,16 @@ public class DiasporaStreamFragment extends BrowserFragment {
@SuppressWarnings("unused")
@JavascriptInterface
public void setUserProfile(final String webMessage) throws JSONException {
final DiasporaUserProfile pup = ((App) getActivity().getApplication()).getDiasporaUserProfile();
App app = ((App) getActivity().getApplication());
final DiasporaUserProfile pup = app.getDiasporaUserProfile();
if (pup.isRefreshNeeded()) {
try {
// Try to very fail-safe check if user information gets really loaded from correct pod
if (!webView.getUrl().startsWith(app.getSettings().getPod().getPodUrl().getBaseUrl())) {
return;
}
} catch (Exception ignored) {
}
AppLog.v(this, "DiasporaUserProfile needs refresh; Try to parse JSON");
pup.parseJson(webMessage);
getActivity().runOnUiThread(new Runnable() {

12
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -549,6 +549,18 @@ public class MainActivity extends ThemedActivity
} else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
/* TODO: Implement and add filter to manifest */
return;
} else if ("sc_new_post".equals(action)) {
openDiasporaUrl(urls.getNewPostUrl());
return;
} else if ("sc_nav_followed_tags".equals(action)) {
showFragment(getFragment(TagListFragment.TAG));
return;
} else if ("sc_aspects".equals(action)) {
showFragment(getFragment(AspectListFragment.TAG));
return;
} else if ("sc_activities".equals(action)) {
openDiasporaUrl(urls.getActivityUrl());
return;
}
//Catch split screen recreation
if (action != null && action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {

4
app/src/main/res/drawable/ic_mode_edit_black_48px.xml Normal file
View file

@ -0,0 +1,4 @@
<vector android:height="24dp" android:viewportHeight="24.0"
android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

15
app/src/main/res/drawable/sc_aspect.xml Normal file
View file

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#cfcfcf"
android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
<path
android:fillColor="#616161"
android:pathData="m 12,12 c 1.6575,0 3,-1.3425 3,-3 0,-1.6575 -1.3425,-3 -3,-3 -1.6575,0 -3,1.3425 -3,3 0,1.6575 1.3425,3 3,3 z m 0,1.5 c -2.0025,0 -6,1.005 -6,3 V 18 h 12 v -1.5 c 0,-1.995 -3.9975,-3 -6,-3 z" />
</vector>

15
app/src/main/res/drawable/sc_edit.xml Normal file
View file

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#cfcfcf"
android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
<path android:fillColor="#616161" android:pathData="M 6,15.500347 V 18 H 8.4996528 L 15.871962,10.627691 13.372309,8.128038 Z M 17.805027,8.694626 c 0.259964,-0.259964 0.259964,-0.679906 0,-0.93987 L 16.245244,6.1949729 c -0.259965,-0.2599639 -0.679906,-0.2599639 -0.93987,0 l -1.21983,1.2198301 2.499652,2.499653 z"/>
</vector>

15
app/src/main/res/drawable/sc_history.xml Normal file
View file

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#cfcfcf"
android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
<path android:fillColor="#616161" android:pathData="M 12.857143,6.857143 C 10.017143,6.857143 7.7142857,9.16 7.7142857,12 H 6 l 2.2228571,2.222857 0.04,0.08 L 10.571429,12 H 8.8571429 c 0,-2.211429 1.7885711,-4 4.0000001,-4 2.211428,0 4,1.788571 4,4 0,2.211428 -1.788572,4 -4,4 -1.102857,0 -2.102857,-0.451429 -2.822857,-1.177143 l -0.8114289,0.811429 c 0.9314289,0.931428 2.2114289,1.508571 3.6342859,1.508571 C 15.697143,17.142857 18,14.84 18,12 18,9.16 15.697143,6.857143 12.857143,6.857143 Z m -0.571429,2.857143 v 2.857142 l 2.445715,1.451429 0.411428,-0.691429 -2,-1.188571 V 9.714286 Z"/>
</vector>

15
app/src/main/res/drawable/sc_tags.xml Normal file
View file

@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#cfcfcf"
android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z M 12.610169,9.4237288 8,10 h 8 z" />
<path android:fillColor="#616161" android:pathData="m 17.646,11.748 -5.4,-5.4 C 12.03,6.132 11.73,6 11.4,6 H 7.2 C 6.54,6 6,6.54 6,7.2 v 4.2 c 0,0.33 0.132,0.63 0.354,0.852 l 5.4,5.4 C 11.97,17.868 12.27,18 12.6,18 c 0.33,0 0.63,-0.132 0.846,-0.354 l 4.2,-4.2 C 17.868,13.23 18,12.93 18,12.6 18,12.27 17.862,11.964 17.646,11.748 Z M 8.1,9 C 7.602,9 7.2,8.598 7.2,8.1 7.2,7.602 7.602,7.2 8.1,7.2 8.598,7.2 9,7.602 9,8.1 9,8.598 8.598,9 8.1,9 Z"/>
</vector>

2
app/src/main/res/raw/podlist.json
View file

@ -246,7 +246,7 @@
"id": 13165
},
{
"podUrls": [{"host": "diaspora.dorf-post.de"}],
"podUrls": [{"host": "dorf-post.de"}],
"name": "dorf-post.de",
"mainLangs": ["de"],
"id": 43137

2
app/src/main/res/values-gl/strings-about.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 1º modificación en github-->
<!-- editado con nano -->
<resources>
<string name="about_activity__title_about_app">Sobre</string>
<string name="about_activity__title_about_license">Licenza</string>

4
app/src/main/res/values-gl/strings-preferences.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- actualizado en github -->
<!-- Editado con nano -->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Operability -->
@ -33,7 +33,7 @@
<string name="pref_title__language">Idioma</string>
<string name="language_system">Idioma do sistema</string>
<!-- Font size -->
<string name="pref_desc__font_size">Estableza o tamaño do texto na VistaWeb</string>
<string name="pref_desc__font_size">Estableza o tamaño do texto na Vista Web</string>
<string name="pref_title__font_size">Tamaño do texto</string>
<string name="font_size_normal">Normal</string>
<string name="font_size_large">Grande</string>

6
app/src/main/res/values-gl/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- actualiza galego (gl) -->
<resources>
<!-- Application -->
<string name="reload">Actualizar</string>
@ -50,8 +49,13 @@
<string name="action_exit_app">Saír do app</string>
<string name="action_toggle_desktop_page">Vista móbil/escritorio</string>
<string name="action_share_dotdotdot">Compartir&#8230;</string>
<<<<<<< HEAD
<string name="search_alert_tag">Etiquetas</string>
<string name="search_alert_people">Persoas</string>
=======
<string name="search_alert_tag">etiquetas</string>
<string name="search_alert_people">persoas</string>
>>>>>>> gl-translation
<string name="search_alert_bypeople_validate_needsomedata">Por favor engada un nome</string>
<string name="context_menu_share_link">Compartir ligazón</string>
<string name="context_menu_save_image">Gardar imaxe</string>

73
app/src/main/res/xml-v25/shortcuts.xml Executable file
View file

@ -0,0 +1,73 @@
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:shortcutId="sc_new_post"
android:enabled="true"
android:icon="@drawable/sc_edit"
android:shortcutShortLabel="@string/new_post"
android:shortcutLongLabel="@string/new_post"
android:shortcutDisabledMessage="@string/new_post">
<intent
android:action="sc_new_post"
android:targetPackage="com.github.dfa.diaspora_android"
android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
<!-- If your shortcut is associated with multiple intents, include them
here. The last intent in the fragments is what the user sees when they
launch this shortcut. -->
<categories android:name="android.shortcut.conversation" />
</shortcut>
<shortcut
android:shortcutId="sc_activities"
android:enabled="true"
android:icon="@drawable/sc_history"
android:shortcutShortLabel="@string/activities"
android:shortcutLongLabel="@string/activities"
android:shortcutDisabledMessage="@string/activities">
<intent
android:action="sc_activities"
android:targetPackage="com.github.dfa.diaspora_android"
android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
<!-- If your shortcut is associated with multiple intents, include them
here. The last intent in the fragments is what the user sees when they
launch this shortcut. -->
<categories android:name="android.shortcut.conversation" />
</shortcut>
<shortcut
android:shortcutId="sc_aspects"
android:enabled="true"
android:icon="@drawable/sc_aspect"
android:shortcutShortLabel="@string/aspects"
android:shortcutLongLabel="@string/aspects"
android:shortcutDisabledMessage="@string/aspects">
<intent
android:action="sc_aspects"
android:targetPackage="com.github.dfa.diaspora_android"
android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
<!-- If your shortcut is associated with multiple intents, include them
here. The last intent in the fragments is what the user sees when they
launch this shortcut. -->
<categories android:name="android.shortcut.conversation" />
</shortcut>
<shortcut
android:shortcutId="sc_nav_followed_tags"
android:enabled="true"
android:icon="@drawable/sc_tags"
android:shortcutShortLabel="@string/nav_followed_tags"
android:shortcutLongLabel="@string/nav_followed_tags"
android:shortcutDisabledMessage="@string/nav_followed_tags">
<intent
android:action="sc_nav_followed_tags"
android:targetPackage="com.github.dfa.diaspora_android"
android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
<!-- If your shortcut is associated with multiple intents, include them
here. The last intent in the fragments is what the user sees when they
launch this shortcut. -->
<categories android:name="android.shortcut.conversation" />
</shortcut>
</shortcuts>