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

Fix merge conflicts

Browse source
This commit is contained in:
Ujjwal Agrawal 2018-02-28 00:47:10 +05:30
parent eeaa9a90ba
commit 6277272206
1 changed files with 4 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/src/main/res/layout/activity_about.xml
View file

@ -104,35 +104,6 @@
</LinearLayout> </LinearLayout>
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_privacy_policy" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_credits"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:gravity="center"
android:text="@string/about_credits" />
<TextView
android:id="@+id/about_uploads_to"
style="?android:textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/large_gap"
android:alpha="0.2"
android:gravity="center" />
</LinearLayout>
<TextView <TextView
android:id="@+id/about_rate_us" android:id="@+id/about_rate_us"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -142,20 +113,22 @@
android:textColor="@color/primaryColor" android:textColor="@color/primaryColor"
android:text="@string/about_rate_us" /> android:text="@string/about_rate_us" />
<fr.free.nrw.commons.ui.widget.HtmlTextView <TextView
android:id="@+id/about_privacy_policy" android:id="@+id/about_privacy_policy"
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:textColor="@color/primaryColor"
android:gravity="center" android:gravity="center"
android:text="@string/about_privacy_policy" /> android:text="@string/about_privacy_policy" />
<fr.free.nrw.commons.ui.widget.HtmlTextView <TextView
android:id="@+id/about_credits" android:id="@+id/about_credits"
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/primaryColor"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
android:text="@string/about_credits" /> android:text="@string/about_credits" />