yetangitu/photo-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some lint error fixes

Browse source 
Trovebox-Android-Common
- GuiUtils: fixed validateBasicTextData methods to add required string
parameter when requesting a resource
- res/layout/action_mode_sync.xml: removed duplicate xmlns:android
declaration
- res/layout/action_mode_sync2.xml: removed duplicate xmlns:android
declaration
- res/layout/fragment_photo_details.xml: removed image_details id
duplicate
- res/layout/fragment_sync_select_photos.xml: remved xmlns:app
declaration
- res/values/strings.xml: fixed notification_upload_multiple_title
constant
- res/values/styles.xml: fixed textSize attribute to be in sp units for
the button_text and TextTitle styles declaration
- res/values-ru/strings.xml: added few and many string plurals to the
sync_upload_selected_confirmation  and number_of_items_selected

Trovebox-Android-App
- ImageFragment: added FILL_PARENT constant usage for the API level 7
devicesto the onCreateView method
- Peferences: updated PREFERENCES_MODE constant to be MODE_PRIVATE
- res/layout/activity_account_signup.xml: removed
- res/layout/activity_upload.xml: remved app namespace delcaration
- res/layout/fragment_profile.xml: remved app namespace delcaration
- res/layout/fragment_sync_upload_settings.xml: remved app namespace
delcaration
- res/layout/fragment_tags.xml: added hint for the edit_search field
- res/layout/list_item_newest_photos.xml: removed
- res/values/strings.xml, res/values-ru/strings.xml: added
enter_tags_manually constant
- AndroidManifest.xml: added exported="false" for the UploadsProvider
declaration
This commit is contained in:
Eugene Popovich 2014-03-24 15:18:06 +02:00
parent 627d1870dc
commit 02de9e31f0
21 changed files with 40 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/AndroidManifest.xml
View file

@ -164,7 +164,8 @@
<provider <provider
android:name="com.trovebox.android.common.provider.UploadsProvider" android:name="com.trovebox.android.common.provider.UploadsProvider"
android:authorities="com.trovebox.android.app" /> android:authorities="com.trovebox.android.app"
android:exported="false" />
<!-- Required for the hi-res image processing --> <!-- Required for the hi-res image processing -->
<!-- authorities can have the value you prefer --> <!-- authorities can have the value you prefer -->
<provider <provider

67
app/res/layout/activity_account_signup.xml
View file

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/trovebox_site_padding"
android:fillViewport="true" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/login_logo" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical" >
<EditText
android:id="@+id/edit_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hint_username"
android:inputType="textEmailAddress" />
<EditText
android:id="@+id/edit_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hint_email"
android:inputType="textEmailAddress" />
<EditText
android:id="@+id/edit_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hint_password"
android:inputType="textPassword" />
<Button
android:id="@+id/button_create_account"
style="@style/Trovebox.YellowButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="createAccountButtonAction"
android:text="@string/account_create_button" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</RelativeLayout>

1
app/res/layout/activity_upload.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.trovebox.android.app"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"

3
app/res/layout/fragment_profile.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:app="http://schemas.android.com/apk/res/com.trovebox.android.app" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="@dimen/trovebox_site_padding" > android:padding="@dimen/trovebox_site_padding" >

1
app/res/layout/fragment_sync_upload_settings.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res/com.trovebox.android.app"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >

10
app/res/layout/fragment_tags.xml
View file

@ -7,7 +7,8 @@
<EditText <EditText
android:id="@+id/edit_search" android:id="@+id/edit_search"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:hint="@string/enter_tags_manually" />
<ListView <ListView
android:id="@+id/list_tags" android:id="@+id/list_tags"
@ -15,7 +16,10 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" /> android:layout_weight="1" />
<Button android:id="@+id/filterBtn" android:layout_width="match_parent" <Button
android:layout_height="wrap_content" android:text="@string/tags_view_in_gallery" /> android:id="@+id/filterBtn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tags_view_in_gallery" />
</LinearLayout> </LinearLayout>

99
app/res/layout/list_item_newest_photos.xml
View file

@ -1,99 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="@dimen/trovebox_site_padding_half"
android:paddingTop="@dimen/trovebox_site_padding_half" >
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" >
<com.trovebox.android.app.ui.widget.AspectRatioImageView
android:id="@+id/newest_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="0dp"
android:adjustViewBounds="true"
android:clickable="true"
android:padding="0dp"
android:scaleType="centerCrop"
android:src="@drawable/icon" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:padding="5dip" >
<ImageView
android:id="@+id/geo_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:clickable="true"
android:src="@drawable/button_nolocation_share" />
<ImageView
android:id="@+id/share_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/geo_button"
android:clickable="true"
android:src="@drawable/button_share" />
<ImageView
android:id="@+id/button_private"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@drawable/button_private" />
</RelativeLayout>
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:clickable="false"
android:longClickable="false"
android:orientation="vertical"
android:paddingTop="0dp" >
<TextView
android:id="@+id/newest_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:padding="2dp"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/newest_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="false"
android:padding="2dp"
android:text="@string/newest_this_photo_was_taken"
android:textColor="#545557"
android:textSize="12dp" />
<HorizontalScrollView
android:id="@+id/horizontalScrollView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<LinearLayout
android:id="@+id/newest_tag_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false" />
</HorizontalScrollView>
</LinearLayout>
</LinearLayout>

1
app/res/values-ru/strings.xml
View file

@ -104,6 +104,7 @@
<!-- Tags --> <!-- Tags -->
<string name="tags_view_in_gallery">Посмотреть отмеченные тегами фотографии</string> <string name="tags_view_in_gallery">Посмотреть отмеченные тегами фотографии</string>
<string name="enter_tags_manually">Введите теги</string>
<!-- SelectTagsActivity --> <!-- SelectTagsActivity -->
<string name="title_activity_select_tags">Выбор тегов</string> <string name="title_activity_select_tags">Выбор тегов</string>

1
app/res/values/strings.xml
View file

@ -104,6 +104,7 @@
<!-- Tags --> <!-- Tags -->
<string name="tags_view_in_gallery">View tagged photos</string> <string name="tags_view_in_gallery">View tagged photos</string>
<string name="enter_tags_manually">Enter tags</string>
<!-- SelectTagsActivity --> <!-- SelectTagsActivity -->
<string name="title_activity_select_tags">Select Tags</string> <string name="title_activity_select_tags">Select Tags</string>

10
app/src/com/trovebox/android/app/ImageFragment.java
View file

@ -12,6 +12,7 @@ import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView; import android.widget.TextView;
import com.trovebox.android.common.fragment.common.CommonFragment; import com.trovebox.android.common.fragment.common.CommonFragment;
import com.trovebox.android.common.util.CommonUtils;
public final class ImageFragment extends CommonFragment { public final class ImageFragment extends CommonFragment {
int imageResourceId; int imageResourceId;
@ -53,8 +54,13 @@ public final class ImageFragment extends CommonFragment {
LinearLayout layout = new LinearLayout(getActivity()); LinearLayout layout = new LinearLayout(getActivity());
layout.setOrientation(LinearLayout.VERTICAL); layout.setOrientation(LinearLayout.VERTICAL);
layout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, if (CommonUtils.isFroyoOrHigher()) {
LayoutParams.MATCH_PARENT)); layout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT));
} else {
layout.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
LayoutParams.FILL_PARENT));
}
layout.setGravity(Gravity.CENTER); layout.setGravity(Gravity.CENTER);
layout.addView(image); layout.addView(image);

2
app/src/com/trovebox/android/app/Preferences.java
View file

@ -24,7 +24,7 @@ import com.trovebox.android.common.net.TroveboxApi;
import com.trovebox.android.common.util.CommonUtils; import com.trovebox.android.common.util.CommonUtils;
public class Preferences { public class Preferences {
public final static int PREFERENCES_MODE = Context.MODE_MULTI_PROCESS; public final static int PREFERENCES_MODE = Context.MODE_PRIVATE;
public final static String PREFERENCES_NAME = "default"; public final static String PREFERENCES_NAME = "default";
public final static String LIMITS_PREFERENCES_NAME = "limits"; public final static String LIMITS_PREFERENCES_NAME = "limits";
public final static String SYSTEM_VERSION_PREFERENCES_NAME = "system_version"; public final static String SYSTEM_VERSION_PREFERENCES_NAME = "system_version";

1
common/res/layout/action_mode_sync.xml
View file

@ -22,7 +22,6 @@
android:orientation="horizontal" > android:orientation="horizontal" >
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" > android:layout_height="match_parent" >

1
common/res/layout/action_mode_sync2.xml
View file

@ -22,7 +22,6 @@
android:orientation="horizontal" > android:orientation="horizontal" >
<FrameLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" > android:layout_height="match_parent" >

1
common/res/layout/fragment_photo_details.xml
View file

@ -36,7 +36,6 @@
android:paddingTop="@dimen/trovebox_site_padding_half" > android:paddingTop="@dimen/trovebox_site_padding_half" >
<LinearLayout <LinearLayout
android:id="@+id/image_details"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"

1
common/res/layout/fragment_sync_select_photos.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:holo="http://schemas.android.com/apk/res-auto" xmlns:holo="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res/com.trovebox.android.app"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >

10
common/res/values-ru/strings.xml
View file

@ -36,9 +36,11 @@
<string name="sync_uploading_in_background">Ваши фотографии отправляются</string> <string name="sync_uploading_in_background">Ваши фотографии отправляются</string>
<plurals name="sync_upload_selected_confirmation"> <plurals name="sync_upload_selected_confirmation">
<item quantity="zero">Вы хотите загрузить %1$d выбранных изображения?</item> <item quantity="few">Вы хотите загрузить %1$d выбранных изображения?</item>
<item quantity="zero">Вы хотите загрузить %1$d выбранных изображений?</item>
<item quantity="other">Вы хотите загрузить %1$d выбранных изображений?</item>
<item quantity="many">Вы хотите загрузить %1$d выбранных изображений?</item>
<item quantity="one">Вы хотите загрузить выбранное изображение?</item> <item quantity="one">Вы хотите загрузить выбранное изображение?</item>
<item quantity="other">Вы хотите загрузить %1$d выбранных изображения?</item>
</plurals> </plurals>
<!-- Upload Manager screen --> <!-- Upload Manager screen -->
@ -59,7 +61,9 @@
--> -->
<plurals name="number_of_items_selected"> <plurals name="number_of_items_selected">
<item quantity="zero">%1$d выбрано</item> <item quantity="zero">%1$d выбрано</item>
<item quantity="one">%1$d выбрано</item> <item quantity="one">%1$d выбран</item>
<item quantity="few">%1$d выбрано</item>
<item quantity="many">%1$d выбрано</item>
<item quantity="other">%1$d выбрано</item> <item quantity="other">%1$d выбрано</item>
</plurals> </plurals>

2
common/res/values/strings.xml
View file

@ -76,7 +76,7 @@
<string name="notification_upload_success_title">Upload finished</string> <string name="notification_upload_success_title">Upload finished</string>
<string name="notification_upload_skipped_title">Upload skipped. Found same photo on the server.</string> <string name="notification_upload_skipped_title">Upload skipped. Found same photo on the server.</string>
<string name="notification_upload_success_text">%1$s</string> <string name="notification_upload_success_text">%1$s</string>
<string name="notification_upload_multiple_title">Successfull upload</string> <string name="notification_upload_multiple_title">Successful upload</string>
<string name="notification_upload_multiple_text">Uploaded: %1$d; skipped: %2$d</string> <string name="notification_upload_multiple_text">Uploaded: %1$d; skipped: %2$d</string>
<string name="notification_upload_multiple_details">Upload details</string> <string name="notification_upload_multiple_details">Upload details</string>
<string name="notification_upload_multiple_detail_skipped"><![CDATA[<b>%1$s</b> skipped]]></string> <string name="notification_upload_multiple_detail_skipped"><![CDATA[<b>%1$s</b> skipped]]></string>

4
common/res/values/styles.xml
View file

@ -136,7 +136,7 @@
</style> </style>
<style name="TextTitle"> <style name="TextTitle">
<item name="android:textSize">18dp</item> <item name="android:textSize">18sp</item>
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
@ -159,7 +159,7 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
<item name="android:layout_margin">4dp</item> <item name="android:layout_margin">4dp</item>
<item name="android:textSize">10dp</item> <item name="android:textSize">10sp</item>
</style> </style>
<style name="Trovebox.YellowButton" parent="Holo.Button"> <style name="Trovebox.YellowButton" parent="Holo.Button">

11
common/src/com/trovebox/android/common/util/GuiUtils.java
View file

@ -265,8 +265,9 @@ public class GuiUtils {
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
String value = values[i]; String value = values[i];
if (TextUtils.isEmpty(value)) { if (TextUtils.isEmpty(value)) {
String pleaseSpecifyFirst = activity.getString(R.string.pleaseSpecifyFirst); String pleaseSpecifyFirst = activity.getString(R.string.pleaseSpecifyFirst,
info(String.format(pleaseSpecifyFirst, titles[i]), activity); titles[i]);
info(pleaseSpecifyFirst, activity);
return false; return false;
} }
} }
@ -285,9 +286,9 @@ public class GuiUtils {
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
String value = values[i]; String value = values[i];
if (TextUtils.isEmpty(value)) { if (TextUtils.isEmpty(value)) {
String pleaseSpecifyFirst = CommonUtils String pleaseSpecifyFirst = CommonUtils.getStringResource(
.getStringResource(R.string.pleaseSpecifyFirst); R.string.pleaseSpecifyFirst, CommonUtils.getStringResource(titles[i]));
info(String.format(pleaseSpecifyFirst, CommonUtils.getStringResource(titles[i]))); info(pleaseSpecifyFirst);
return false; return false;
} }
} }

2
submodules/Android-Feather/project.properties
View file

@ -9,7 +9,7 @@
android.library=true android.library=true
# Project target. # Project target.
target=android-18 target=android-19
jar.libs.dir=libs jar.libs.dir=libs
android.library.reference.1=..\\HoloEverywhere\\library android.library.reference.1=..\\HoloEverywhere\\library
android.library.reference.2=../viewpagerindicator/library android.library.reference.2=../viewpagerindicator/library

2
submodules/google-play-services_lib/project.properties
View file

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-18 target=android-19
android.library=true android.library=true