sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-17 19:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from HabitRPG/develop

Browse source 
Sync from main repo
This commit is contained in:
Jack Billings 2016-08-18 10:10:11 -05:00 committed by GitHub
commit 4e44a855c4
9 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Habitica/AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="114"
android:versionName="0.0.33.1"
android:versionCode="115"
android:versionName="0.0.33.2"
android:screenOrientation="portrait"
android:installLocation="auto" >

2
Habitica/res/layout/row_shopitem.xml
View file

@ -43,8 +43,6 @@
android:textColor="@color/white"
android:layout_gravity="center_vertical"
android:textSize="15sp"
android:drawableLeft="@drawable/ic_header_gold"
android:drawableStart="@drawable/ic_header_gold"
android:background="@drawable/rounded_purple_square"
android:paddingLeft="6dp"
android:paddingStart="6dp" />

1
Habitica/res/values-bg/strings.xml
View file

@ -350,7 +350,6 @@
<string name="hourglass">пясъчен часовник</string>
<string name="hourglasses">пясъчни часовници</string>
<string name="gold_singular">злато</string>
<string name="gems_plural">злато</string>
<string name="chat_message_copied">Съобщението е копирано</string>
<string name="copy_chat_message">Копиране</string>
</resources>

1
Habitica/res/values-de/strings.xml
View file

@ -350,7 +350,6 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
<string name="hourglass">Sanduhr</string>
<string name="hourglasses">Sanduhren</string>
<string name="gold_singular">Gold</string>
<string name="gems_plural">Gold</string>
<string name="chat_message_copied">Nachricht in Zwischenablage kopiert</string>
<string name="copy_chat_message">In Zwischenablage kopieren</string>
</resources>

1
Habitica/res/values-nl/strings.xml
View file

@ -350,7 +350,6 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
<string name="hourglass">zandloper</string>
<string name="hourglasses">zandlopers</string>
<string name="gold_singular">goud</string>
<string name="gems_plural">goud</string>
<string name="chat_message_copied">Bericht gekopieerd naar klembord</string>
<string name="copy_chat_message">Kopieer naar klembord</string>
</resources>

1
Habitica/res/values-pl/strings.xml
View file

@ -350,7 +350,6 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
<string name="hourglass">klepsydra</string>
<string name="hourglasses">klepsydry</string>
<string name="gold_singular">złoto</string>
<string name="gems_plural">złoto</string>
<string name="chat_message_copied">Wiadomość skopiowana do schowka</string>
<string name="copy_chat_message">Kopiuj do schowka</string>
</resources>

1
Habitica/res/values-pt-rBR/strings.xml
View file

@ -351,7 +351,6 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
<string name="hourglass">ampulheta</string>
<string name="hourglasses">ampulhetas</string>
<string name="gold_singular">ouro</string>
<string name="gems_plural">ouro</string>
<string name="chat_message_copied">Mensagem copiada para Área de Transferência</string>
<string name="copy_chat_message">Copiar para Área e Transferência
</string>

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
View file

@ -162,10 +162,6 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
});
}
private void canBuy() {
}
private void buyItem() {
BuyGemItemCommand command = new BuyGemItemCommand();
command.shopIdentifier = shopIdentifier;

2
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
View file

@ -197,7 +197,7 @@ public interface ApiService {
// Like returns the full chat list
@POST("groups/{gid}/chat/{mid}/like")
Observable<List<Void>> likeMessage(@Path("gid") String groupId, @Path("mid") String mid);
Observable<ChatMessage> likeMessage(@Path("gid") String groupId, @Path("mid") String mid);
@POST("groups/{gid}/chat/{mid}/flag")
Observable<Void> flagMessage(@Path("gid") String groupId, @Path("mid") String mid);