iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss-honeycomb

Browse Source
This commit is contained in:
Andrew Dolgov 2015-02-09 17:03:50 +03:00
commit 3ebea2351f
7 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/gradle.xml
View File

@ -5,7 +5,7 @@
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Users\fox\android-studio\gradle\gradle-2.2.1" />
<option name="gradleHome" value="C:\Users\Andrew\AppData\Local\Android\android-studio1\gradle\gradle-2.2.1" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

6
org.fox.ttrss/build.gradle
View File

@ -29,8 +29,8 @@ dependencies {
compile files('libs/universal-image-loader-1.9.3.jar')
compile 'com.viewpagerindicator:library:2.4.1'
compile 'com.android.support:cardview-v7:21.0.0'
compile 'com.android.support:support-v4:21.0.0'
compile 'com.google.code.gson:gson:2.2.4'
compile 'com.android.support:appcompat-v7:21.0.0'
compile 'com.android.support:support-v4:21.0.3'
compile 'com.google.code.gson:gson:2.3'
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.shamanland:fab:0.0.5'
}

8
org.fox.ttrss/org.fox.ttrss.iml
View File

@ -83,16 +83,16 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.6.1" level="project" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
<orderEntry type="library" exported="" name="library-2.4.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" />
<orderEntry type="library" exported="" name="dashclock-api-r1.1" level="project" />
<orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="module" module-name="taskerlocaleapi" exported="" />
</component>
</module>

16
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java
View File

@ -3,6 +3,7 @@ package org.fox.ttrss;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
@ -39,6 +40,10 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
GlobalState.getInstance().load(savedInstanceState);
if (isPortrait() && !isSmallScreen()) {
findViewById(R.id.headlines_fragment).setVisibility(View.GONE);
}
if (savedInstanceState == null) {
Intent i = getIntent();
@ -99,6 +104,15 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
}
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
if (!isSmallScreen()) {
findViewById(R.id.headlines_fragment).setVisibility(isPortrait() ? View.GONE : View.VISIBLE);
}
}
@Override
protected void refresh() {
super.refresh();
@ -223,7 +237,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL
}
public void showSidebar(boolean show) {
if (!isSmallScreen()) {
if (!isSmallScreen() && !isPortrait()) {
findViewById(R.id.headlines_fragment).setVisibility(show ? View.VISIBLE : View.GONE);
invalidateOptionsMenu();
}

36
org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
View File

@ -1,36 +0,0 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fitsSystemWindows="true">
<FrameLayout
android:id="@+id/sw600dp_port_anchor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" >
</FrameLayout>
<android.support.v4.widget.DrawerLayout
android:id="@+id/headlines_drawer"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/headlines_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?headlinesBackground">
</FrameLayout>
<FrameLayout
android:id="@+id/feeds_fragment"
android:layout_width="300dp"
android:layout_gravity="start"
android:background="?feedlistBackground"
android:layout_height="match_parent" >
</FrameLayout>
</android.support.v4.widget.DrawerLayout>
</FrameLayout>

37
org.fox.ttrss/src/main/res/layout-sw700dp-port/headlines_articles.xml → org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
View File

@ -1,9 +1,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main"
android:id="@+id/headlines"
android:fitsSystemWindows="true"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
android:orientation="vertical" >
<FrameLayout
android:id="@+id/sw600dp_anchor"
@ -12,25 +12,30 @@
android:visibility="gone" >
</FrameLayout>
<android.support.v4.widget.DrawerLayout
android:id="@+id/headlines_drawer"
<LinearLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal" >
<FrameLayout
android:paddingRight="4dp"
android:id="@+id/headlines_fragment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.4"
android:background="?headlinesBackground" >
</FrameLayout>
<FrameLayout
android:id="@+id/article_fragment"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:background="?articleBackground">
android:layout_weight="0.6"
android:elevation="4dp"
android:background="?articleBackground" >
</FrameLayout>
<FrameLayout
android:id="@+id/headlines_fragment"
android:layout_height="match_parent"
android:layout_width="500dp"
android:layout_gravity="start"
android:background="?headlinesBackground">
</FrameLayout>
</android.support.v4.widget.DrawerLayout>
</LinearLayout>
</LinearLayout>

18
org.fox.ttrss/src/main/res/values-it/strings.xml
View File

@ -47,8 +47,8 @@
<string name="context_selection_toggle_marked">(Non)Speciale</string>
<string name="context_selection_toggle_published">(De)Pubblica</string>
<string name="context_selection_toggle_unread">(Non)Letto</string>
<string name="article_set_unread">Imposta come Non letto</string>
<string name="article_mark_read_above">Segna gli articoli sopra questo come letti</string>
<string name="article_set_unread">Imposta come non letto</string>
<string name="article_mark_read_above">Segna sopra come letti</string>
<string name="http_login_summary">Opzionale. Compila questo solo se la tua installazione di tt-rss è protetta con autenticazione HTTP Basic</string>
<string name="login_summary">Il tuo nome utente per tt-rss. Non è necessario per la modalità utente singolo.</string>
<string name="ttrss_url_summary">URL della tua installazione di tt-rss, es. http://sito.it/tt-rss/</string>
@ -61,7 +61,7 @@
<string name="headlines_mark_as_read">Segna come letto</string>
<string name="error_unknown">Errore: errore sconosciuto (Vedi log)</string>
<string name="error_http_unauthorized">Errore: 401 non autorizzato</string>
<string name="error_http_forbidden">Errore: 403 proibit</string>
<string name="error_http_forbidden">Errore: 403 accesso negato</string>
<string name="error_http_not_found">Errore: 404 non trovato</string>
<string name="error_http_server_error">Errore: 500 errore del server</string>
<string name="error_http_other_error">Errore: altro errore HTTP (Vedi log)</string>
@ -122,7 +122,7 @@
<string name="close_feed">Chiudi feed</string>
<string name="close_article">Chiudi articolo</string>
<string name="dialog_open_preferences">Impostazioni</string>
<string name="dialog_need_configure_prompt">Compila le informazioni per l\'accesso al server tt-rss:URL, login, e password.</string>
<string name="dialog_need_configure_prompt">Compila le informazioni per l\'accesso al server tt-rss: URL, login, e password.</string>
<string name="notify_article_marked">Articolo reso speciale</string>
<string name="notify_article_unmarked">Articolo reso non-speciale</string>
<string name="notify_article_published">Articolo publicato</string>
@ -134,7 +134,7 @@
<string name="category_browse_headlines">Naviga titoli</string>
<string name="pref_default_view_mode">Modalità visualizzazione default</string>
<string name="pref_default_view_mode_long">Quale modalità di visualizzazione utilizzare come predefinita sugli smartphones</string>
<string name="donate_thanks">Donazione trovata, Grazie per il supporto!</string>
<string name="donate_thanks">Donazione trovata, grazie per il supporto!</string>
<string name="use_volume_keys">Usa pulsanti volume</string>
<string name="use_volume_keys_long">Sfoglia gli articoli usando i tasti volume</string>
<string name="ssl_trust_any_host">Nessuna validazione sull\'hostname</string>
@ -148,11 +148,13 @@
<string name="prefs_dim_status_bar_long">Oscura la barra di stato durante la lettura</string>
<plurals name="article_comments">
<item quantity="one">%1$d commento</item>
<item quantity="other">%1$d commenti</item>
</plurals>
<plurals name="trial_mode_prompt">
<item quantity="other">Modalità demo, %1$d giorno/i rimanenti.</item>
<item quantity="one">Modalità demo, %1$d giorno rimanente.</item>
<item quantity="other">Modalità demo, %1$d giorni rimanenti.</item>
</plurals>
<string name="trial_purchase">Sblocca versione completa</string>
<string name="trial_expired">Demo scaduta</string>
@ -201,11 +203,13 @@
<string name="pref_headlines_mark_read_scroll">Segna come letto quando si scorre</string>
<string name="pref_headlines_mark_read_scroll_long">Gli articoli verranno segnati come letti quando si scorre oltre</string>
<plurals name="mark_num_headlines_as_read">
<item quantity="other">Segni %1$d articolo/i come letti?</item>
<item quantity="one">Vuoi segnare %1$d articolo come letto?</item>
<item quantity="other">Vuoi segnare %1$d articoli come letti?</item>
</plurals>
<string name="prefs_confirm_headlines_catchup">Confermi la marcatura degli articoli come letti</string>
<string name="author_formatted">di %1$s</string>
<plurals name="n_unread_articles">
<item quantity="one">%1$d articolo non letto</item>
<item quantity="other">%1$d articoli non letti</item>
</plurals>
</resources>