public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android'

Browse source 
* android:
  Bumped version number.
  Modified to remove default URL-encoding for GSON.
  Fixed email field not being visible on some smaller screen devices.
  Modified CSS to include max-width for divs, overriding inline styles and reduce max-width.
  Added padding to share button.
This commit is contained in:
Samuel Clay 2012-11-27 16:26:55 -08:00
commit 618570526f
9 changed files with 73 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/android/NewsBlur/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.newsblur"
android:versionCode="26"
android:versionName="1.0.2" >
android:versionCode="27"
android:versionName="1.0.4" >
<uses-sdk
android:minSdkVersion="8"

6
media/android/NewsBlur/assets/reading.css
View file

@ -6,9 +6,9 @@ p {
line-height: 1.4em;
}
img, video, embed, object, iframe {
max-width: 100%;
height: auto;
img, video, embed, object, iframe, div {
max-width: 95% !important;
height: auto !important;
}

7
media/android/NewsBlur/res/layout/activity_login.xml
View file

@ -3,15 +3,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/login_background"
android:orientation="vertical"
android:paddingBottom="30dp">
android:orientation="vertical">
<LinearLayout
android:id="@+id/login_logo_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:paddingBottom="25dp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:background="@color/item_background"
android:gravity="center_horizontal" >

96
media/android/NewsBlur/res/layout/fragment_loginregister.xml
View file

@ -5,11 +5,12 @@
android:layout_height="fill_parent"
android:inAnimation="@android:anim/fade_in"
android:outAnimation="@android:anim/fade_out" >
<RelativeLayout
android:id="@+id/login_form"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:paddingBottom="20dp">
<LinearLayout
android:id="@+id/login_button_container"
@ -60,7 +61,7 @@
android:id="@+id/login_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginTop="30dp"
android:hint="@string/login_password_hint"
android:imeOptions="actionDone"
android:inputType="textPassword"
@ -70,11 +71,12 @@
android:textSize="22dp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
<RelativeLayout
android:id="@+id/registration_form"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:paddingBottom="20dp">
<LinearLayout
android:id="@+id/registration_button_container"
@ -87,8 +89,8 @@
android:id="@+id/login_change_to_login"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="@string/need_to_login"
android:textColor="@color/lightorange"
android:textSize="15sp" />
@ -102,48 +104,56 @@
android:text="@string/login_registration_register" />
</LinearLayout>
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/registration_button_container"
android:gravity="center_vertical"
android:orientation="vertical">
android:layout_above="@id/registration_button_container" >
<EditText
android:id="@+id/registration_username"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/login_username_hint"
android:inputType="textEmailAddress"
android:textColor="@color/white"
android:textColorHint="@color/lightorange"
android:textSize="22dp" />
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:orientation="vertical" >
<EditText
android:id="@+id/registration_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:hint="@string/login_password_hint"
android:inputType="textPassword"
android:nextFocusDown="@+id/registration_email"
android:textColor="@color/white"
android:textColorHint="@color/lightorange"
android:textSize="22dp" />
<EditText
android:id="@+id/registration_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/login_username_hint"
android:inputType="textEmailAddress"
android:textColor="@color/white"
android:textColorHint="@color/lightorange"
android:textSize="22dp" >
<EditText
android:id="@+id/registration_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:hint="@string/login_registration_email_hint"
android:imeOptions="actionDone"
android:inputType="textEmailAddress"
android:nextFocusDown="@+id/registration_button"
android:textColor="@color/white"
android:textColorHint="@color/lightorange"
android:textSize="22dp" />
</LinearLayout>
</EditText>
<EditText
android:id="@+id/registration_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:hint="@string/login_password_hint"
android:inputType="textPassword"
android:nextFocusDown="@+id/registration_email"
android:textColor="@color/white"
android:textColorHint="@color/lightorange"
android:textSize="22dp" />
<EditText
android:id="@+id/registration_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:hint="@string/login_registration_email_hint"
android:imeOptions="actionDone"
android:inputType="textEmailAddress"
android:nextFocusDown="@+id/registration_button"
android:textColor="@color/white"
android:textColorHint="@color/lightorange"
android:textSize="22dp" />
</LinearLayout>
</ScrollView>
</RelativeLayout>
</ViewSwitcher>

3
media/android/NewsBlur/res/layout/include_reading_item_comment.xml
View file

@ -5,7 +5,8 @@
style="@style/shareButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginBottom="12dp"
android:layout_marginTop="12dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/selector_sharebutton_background"

2
media/android/NewsBlur/src/com/newsblur/activity/Main.java
View file

@ -4,6 +4,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentManager;
import android.util.Log;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
@ -124,6 +125,7 @@ public class Main extends SherlockFragmentActivity implements StateChangedListen
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == RESULT_OK) {
Log.d(TAG, "Has returned");
folderFeedList.hasUpdated();
}
}

2
media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java
View file

@ -571,7 +571,7 @@ public class MixedExpandableListAdapter extends BaseExpandableListAdapter{
@Override
public void onChanged() {
mDataValid = true;
notifyDataSetChanged();
notifyDataSetInvalidated();
}
@Override

10
media/android/NewsBlur/src/com/newsblur/domain/ValueMultimap.java
View file

@ -1,18 +1,16 @@
package com.newsblur.domain;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.gson.Gson;
import android.text.TextUtils;
import android.util.Log;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
public class ValueMultimap implements Serializable {
@ -61,7 +59,7 @@ public class ValueMultimap implements Serializable {
public String getJsonString() {
ArrayList<String> parameters = new ArrayList<String>();
Gson gson = new Gson();
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
for (String key : multimap.keySet()) {
StringBuilder builder = new StringBuilder();
builder.append("\"" + key + "\"");

4
media/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
View file

@ -116,7 +116,7 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
return v;
}
private void checkOpenFolderPreferences() {
public void checkOpenFolderPreferences() {
if (sharedPreferences == null) {
sharedPreferences = getActivity().getSharedPreferences(PrefConstants.PREFERENCES, 0);
}
@ -124,6 +124,8 @@ public class FolderListFragment extends Fragment implements OnGroupClickListener
long groupId = folderAdapter.getGroupId(i);
if (sharedPreferences.getBoolean(AppConstants.FOLDER_PRE + groupId, true)) {
list.expandGroup(i);
} else {
list.collapseGroup(i);
}
}
}