Merge branch 'opticod-rtl'

BuildmLearn · Jul 2, 2016 · 521df3e · 521df3e
2 parents e2a92d1 + 0560216
commit 521df3e
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 9 deletions.
diff --git a/FlashCardsTemplate/source/FlashCardsTemplateApp/app/src/main/AndroidManifest.xml b/FlashCardsTemplate/source/FlashCardsTemplateApp/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme" 
+        android:supportsRtl="true" >
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name"

diff --git a/InfoTemplate/source/InfoTemplateApp/AndroidManifest.xml b/InfoTemplate/source/InfoTemplateApp/AndroidManifest.xml
@@ -11,7 +11,8 @@
     <application
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:supportsRtl="true"  >
         <activity
             android:name=".TFTActivity"
             android:label="@string/app_name"

diff --git a/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/AndroidManifest.xml b/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:supportsRtl="true" >
         <activity
             android:name="com.buildmlearn.spellingstemplate.MainActivity"
             android:label="@string/app_name"

diff --git a/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/res/layout/activity_main.xml b/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/res/layout/activity_main.xml
@@ -5,7 +5,9 @@
     android:background="@color/BlueBg"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingStart="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".MainActivity" >
 
@@ -49,7 +51,9 @@
         android:layout_centerHorizontal="true"
         android:text="@string/start"
         android:paddingLeft="15dp"
+        android:paddingStart="15dp"
         android:paddingRight="15dp"
+        android:paddingEnd="15dp"
         android:textAppearance="@android:style/TextAppearance.Large"
         android:textColor="@android:color/white" >
     </Button>

diff --git a/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/res/layout/activity_spelling.xml b/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/res/layout/activity_spelling.xml
@@ -40,7 +40,9 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="30dp"
         android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp" >
+        android:layout_marginStart="5dp"
+        android:layout_marginRight="5dp" 
+        android:layout_marginEnd="5dp" >
 
         <Button
             android:id="@+id/btn_ready"
@@ -72,12 +74,15 @@
         android:layout_above="@id/ll"
         android:layout_marginBottom="20dp"
         android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp" >
+        android:layout_marginStart="5dp"
+        android:layout_marginRight="5dp" 
+        android:layout_marginEnd="5dp" >
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
             android:layout_weight="1"
             android:gravity="start"
             android:text="@string/low"
@@ -97,6 +102,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginRight="5dp"
+            android:layout_marginEnd="5dp"
             android:layout_weight="1"
             android:gravity="end"
             android:text="@string/high"
@@ -119,7 +125,9 @@
         android:layout_height="wrap_content"
         android:layout_above="@id/sb_speech"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginRight="5dp"
+        android:layout_marginEnd="5dp"
         android:text="@string/speech_rate"
         android:textColor="@android:color/white"
         android:textSize="16sp" />
@@ -132,6 +140,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="30dp"
         android:drawableRight="@drawable/ic_action_device_access_volume_on"
+        android:drawableEnd="@drawable/ic_action_device_access_volume_on"
         android:onClick="click"
         android:text="@string/speak"
         android:textColor="@android:color/white" />

diff --git a/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/res/layout/activity_word_info.xml b/LearnSpellingsTemplate/source/LearnSpellingsTemplateApp/res/layout/activity_word_info.xml
@@ -30,7 +30,9 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="20dp"
         android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:layout_marginRight="5dp"
+        android:layout_marginEnd="5dp"
         android:layout_marginTop="20dp"
         android:textSize="22sp" />
 
@@ -50,7 +52,9 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="10dp"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginTop="20dp"
         android:textColor="#FE2E2E"
         android:textSize="18sp"
@@ -63,7 +67,9 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="10dp"
         android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginTop="20dp"
         android:textColor="@android:color/white"
         android:textSize="22sp"

diff --git a/QuizTemplate/source/QuizTemplateApp/app/src/main/AndroidManifest.xml b/QuizTemplate/source/QuizTemplateApp/app/src/main/AndroidManifest.xml
@@ -12,7 +12,8 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppBaseTheme" 
+        android:supportsRtl="true" >
         <activity
             android:name=".activities.TFTQuizActivity"
             android:label="@string/app_name"

diff --git a/QuizTemplate/source/QuizTemplateApp/build.gradle b/QuizTemplate/source/QuizTemplateApp/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-alpha3'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 

diff --git a/QuizTemplate/source/QuizTemplateApp/gradle/wrapper/gradle-wrapper.properties b/QuizTemplate/source/QuizTemplateApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 21 11:34:03 PDT 2015
+#Sat Jul 02 18:27:35 IST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip