mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Conflicts

Browse source
This commit is contained in:
Neslihan 2017-03-21 01:03:20 +03:00
commit 235e2239c9
20 changed files with 187 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -78,6 +78,8 @@
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"/>
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout-land/welcome_dont_upload.xml
View file

@ -60,6 +60,8 @@
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"/>
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout-land/welcome_image_details.xml
View file

@ -45,6 +45,8 @@
android:layout_gravity="center"
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"/>
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

4
app/src/main/res/layout-land/welcome_wikipedia.xml
View file

@ -40,6 +40,8 @@
android:layout_gravity="center"
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"/>
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
</LinearLayout>
</LinearLayout>

1
app/src/main/res/layout/welcome_do_upload.xml
View file

@ -74,5 +74,6 @@
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>

1
app/src/main/res/layout/welcome_dont_upload.xml
View file

@ -53,5 +53,6 @@
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>

1
app/src/main/res/layout/welcome_image_details.xml
View file

@ -39,5 +39,6 @@
android:textAlignment="textStart"
android:paddingTop="16dp"
android:gravity="start"
android:textColor="@android:color/white"
/>
</LinearLayout>

1
app/src/main/res/layout/welcome_wikipedia.xml
View file

@ -37,5 +37,6 @@
android:textAlignment="center"
android:paddingTop="16dp"
android:gravity="center_horizontal"
android:textColor="@android:color/white"
/>
</LinearLayout>

2
app/src/main/res/xml/preferences.xml
View file

@ -21,7 +21,7 @@
<CheckBoxPreference
android:title="@string/preference_theme"
android:defaultValue="false"
android:defaultValue="true"
android:summary="@string/preference_theme_summary"
android:key="theme" />