Skip to content

Commit 394b82d

Browse files
committed
Merge pull request commons-app#27 from brion/rtl
Initial RTL layout flipping support - plus icon fix for 'send' on 2.3
2 parents 75f8370 + d8299d4 commit 394b82d

File tree

12 files changed

+12
-10
lines changed

12 files changed

+12
-10
lines changed

commons/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<uses-sdk
77
android:minSdkVersion="9"
8-
android:targetSdkVersion="15" />
8+
android:targetSdkVersion="17" />
99

1010
<uses-permission android:name="android.permission.INTERNET" />
1111
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
@@ -22,7 +22,8 @@
2222
android:name=".CommonsApplication"
2323
android:icon="@drawable/ic_launcher"
2424
android:label="@string/app_name"
25-
android:theme="@style/AppTheme" >
25+
android:theme="@style/AppTheme"
26+
android:supportsRtl="true" >
2627
<activity android:name="org.acra.CrashReportDialog"
2728
android:theme="@android:style/Theme.Dialog"
2829
android:launchMode="singleInstance"

commons/commons.iml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@
1919
<content url="file://$MODULE_DIR$">
2020
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
2121
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
22-
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
2322
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
2423
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
2524
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
2625
<excludeFolder url="file://$MODULE_DIR$/target/idea-classes" />
27-
<excludeFolder url="file://$MODULE_DIR$/target/idea-test-classes" />
28-
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
29-
<excludeFolder url="file://$MODULE_DIR$/target/unpack" />
3026
</content>
3127
<orderEntry type="sourceFolder" forTests="false" />
28+
<orderEntry type="jdk" jdkName="Maven Android 4.2.2 Platform" jdkType="Android SDK" />
3229
<orderEntry type="library" name="Maven: org.mediawiki:api:1.3" level="project" />
3330
<orderEntry type="library" name="Maven: in.yuvi:http.fluent:1.3" level="project" />
3431
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.2" level="project" />
@@ -41,7 +38,6 @@
4138
<orderEntry type="library" name="Maven: com.nostra13.universalimageloader:universal-image-loader:1.8.2" level="project" />
4239
<orderEntry type="library" name="Maven: ch.acra:acra:4.4.0" level="project" />
4340
<orderEntry type="library" name="Maven: de.keyboardsurfer.android.widget:crouton:1.7" level="project" />
44-
<orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
4541
<orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
4642
</component>
4743
</module>
1.42 KB
Loading
640 Bytes
Loading
489 Bytes
Loading
Loading
1.25 KB
Loading
1.63 KB
Loading

commons/res/layout/fragment_categorization.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
android:background="#AA000000"
88
android:paddingBottom="8dip"
99
android:paddingLeft="16dip"
10+
android:paddingStart="16dip"
1011
android:paddingRight="16dip"
12+
android:paddingEnd="16dip"
1113
android:paddingTop="8dip"
1214
>
1315

@@ -30,7 +32,8 @@
3032
android:indeterminate="true"
3133
android:indeterminateOnly="true"
3234
android:layout_marginRight="4dp"
33-
android:layout_gravity="center_vertical|right"
35+
android:layout_marginEnd="4dp"
36+
android:layout_gravity="center_vertical|right|end"
3437
style="?android:progressBarStyleSmall"
3538
android:visibility="gone"
3639
/>

commons/res/layout/fragment_single_upload.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
android:background="#AA000000"
99
android:paddingBottom="8dip"
1010
android:paddingLeft="16dip"
11+
android:paddingStart="16dip"
1112
android:paddingRight="16dip"
13+
android:paddingEnd="16dip"
1214
android:paddingTop="8dip"
1315
>
1416

commons/res/menu/activity_share.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android">
22
<item android:id="@+id/menu_upload_single"
33
android:title="@string/menu_upload_single"
4-
android:icon="@android:drawable/ic_menu_send"
4+
android:icon="@drawable/social_send_now"
55
android:enabled="false"
66
android:showAsAction="always" />
77
</menu>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<resourceDirectory>${project.basedir}/res</resourceDirectory>
4545
<nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
4646
<sdk>
47-
<platform>15</platform>
47+
<platform>17</platform>
4848
</sdk>
4949
<undeployBeforeDeploy>true</undeployBeforeDeploy>
5050
</configuration>

0 commit comments

Comments
 (0)