forked from commons-app/apps-android-commons
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request commons-app#6 from commons-app/master
Update to latest upstream
- Loading branch information
Showing
15 changed files
with
338 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,8 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:orientation="vertical" | ||
<ImageView xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:id="@+id/pictureOfTheDay" | ||
android:layout_width="match_parent" | ||
android:layout_height="172dp" | ||
android:background="@android:color/darker_gray" | ||
android:layout_height="172dp"> | ||
|
||
<ImageView | ||
android:id="@+id/pictureOfTheDay" | ||
android:layout_width="match_parent" | ||
android:layout_height="0dp" | ||
android:layout_weight="0.8" | ||
android:paddingTop="5dp" | ||
android:src="@drawable/commons_logo_large" /> | ||
|
||
<TextView | ||
android:id="@+id/userNameText" | ||
style="?android:textAppearanceLargeInverse" | ||
android:layout_width="match_parent" | ||
android:layout_height="0dp" | ||
android:layout_weight="0.2" | ||
android:maxLines="1" | ||
android:textAlignment="center" | ||
android:text="@string/placeholder_place_name" | ||
android:textColor="@android:color/white" /> | ||
</LinearLayout> | ||
android:padding="16dp" | ||
android:src="@drawable/commons_logo_large"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="crash_dialog_title">Pókôza sã fela Commons.</string> | ||
<string name="crash_dialog_text">Wejle! Cos je lëchò pòszłé!</string> | ||
<string name="crash_dialog_comment_prompt">Dôj nam wiédzã ò tim co të zrobił/-a sélając e-mailã. To nama pómòże naprôwic nã felã.</string> | ||
<string name="crash_dialog_ok_toast">Dzãkùjemë!</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<string name="crash_dialog_title">Commons yeɣli</string> | ||
<string name="crash_dialog_text">Ihuh. Yella wayen yeḍran!</string> | ||
<string name="crash_dialog_comment_prompt">Ini-yaɣ-d ayen txeddmed, sakin bḍu-t s yimayl yid-neɣ. Aɣ-d-yefk afus akken ad t-nṣeggem.</string> | ||
<string name="crash_dialog_ok_toast">Tanemmirt!</string> | ||
</resources> |
Oops, something went wrong.