Skip to content

Commit

Permalink
Merge branch 'release/1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
@benoitletondor
benoitletondor committed Feb 22, 2016
2 parents 2e33d27 + beb324e commit 97dfff9
Show file tree
Hide file tree
Showing 11 changed files with 140 additions and 123 deletions.
8 changes: 4 additions & 4 deletions Android/EasyBudget/app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/percent/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.batch.android/batch-sdk/1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.batch.android/batch-sdk/1.5.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.3.6/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.8/jars" />
Expand All @@ -88,7 +88,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-measurement/8.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.roomorama/caldroid/2.3.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.10/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.relex/circleindicator/1.1.7/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.relex/circleindicator/1.1.8/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
Expand All @@ -112,8 +112,8 @@
<orderEntry type="library" exported="" name="play-services-measurement-8.4.0" level="project" />
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-8.4.0" level="project" />
<orderEntry type="library" exported="" name="circleindicator-1.1.7" level="project" />
<orderEntry type="library" exported="" name="percent-23.1.1" level="project" />
<orderEntry type="library" exported="" name="circleindicator-1.1.8" level="project" />
<orderEntry type="library" exported="" name="hirondelle-date4j-1.5.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
Expand All @@ -123,7 +123,7 @@
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
<orderEntry type="library" exported="" name="batch-sdk-1.4" level="project" />
<orderEntry type="library" exported="" name="batch-sdk-1.5.2" level="project" />
<orderEntry type="library" exported="" name="fabric-1.3.10" level="project" />
</component>
</module>
12 changes: 6 additions & 6 deletions Android/EasyBudget/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}

dependencies {
classpath 'io.fabric.tools:gradle:1.21.2'
classpath 'io.fabric.tools:gradle:1.21.4'
}
}

Expand All @@ -43,8 +43,8 @@ android {
applicationId "com.benoitletondor.easybudgetapp"
minSdkVersion 16
targetSdkVersion 23
versionCode 37
versionName "1.3b1"
versionCode 39
versionName "1.3"
}
buildTypes {
debug {
Expand All @@ -61,7 +61,7 @@ android {
buildConfigField "boolean", "CRASHLYTICS_ACTIVATED", "true"
buildConfigField "String", "BATCH_API_KEY", batch_livekey
buildConfigField "boolean", "ANALYTICS_ACTIVATED", "true"
buildConfigField "boolean", "DEV_PREFERENCES", "true"
buildConfigField "boolean", "DEV_PREFERENCES", "false"
buildConfigField "String", "LICENCE_KEY", licence_key
buildConfigField "String", "GCM_SENDER_ID", gcm_sender_id

Expand All @@ -83,7 +83,7 @@ dependencies {
compile 'com.google.android.gms:play-services-appinvite:8.4.0'
compile 'com.roomorama:caldroid:2.3.1'
compile 'com.getbase:floatingactionbutton:1.10.1'
compile 'me.relex:circleindicator:1.1.7@aar'
compile 'me.relex:circleindicator:1.1.8@aar'
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') { transitive = true; }
compile 'com.batch.android:batch-sdk:1.4'
compile 'com.batch.android:batch-sdk:1.5.2'
}
2 changes: 1 addition & 1 deletion Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/BuildVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ public class BuildVersion
* Add monthly report
* TODO
*/
public final static int VERSION_1_3 = 37;
public final static int VERSION_1_3 = 39;

}
2 changes: 1 addition & 1 deletion Android/EasyBudget/app/src/main/java/com/benoitletondor/easybudgetapp/view/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ else if( id == R.id.action_balance )

View dialogView = getLayoutInflater().inflate(R.layout.dialog_adjust_balance, null);
final EditText amountEditText = (EditText) dialogView.findViewById(R.id.balance_amount);
amountEditText.setText(currentBalance == 0 ? "0" : String.valueOf(currentBalance));
amountEditText.setText(currentBalance == 0 ? "0" : CurrencyHelper.getFormattedAmountValue(currentBalance));
UIHelper.preventUnsupportedInputForDecimals(amountEditText);
amountEditText.setSelection(amountEditText.getText().length()); // Put focus at the end of the text

Expand Down
20 changes: 19 additions & 1 deletion ...app/src/main/java/com/benoitletondor/easybudgetapp/view/report/MonthlyReportFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@

import com.benoitletondor.easybudgetapp.R;
import com.benoitletondor.easybudgetapp.helper.CurrencyHelper;
import com.benoitletondor.easybudgetapp.helper.DateHelper;
import com.benoitletondor.easybudgetapp.model.Expense;
import com.benoitletondor.easybudgetapp.model.db.DB;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

Expand Down Expand Up @@ -70,14 +72,30 @@ public MonthlyReportFragment(@NonNull Date date)

public MonthlyReportFragment()
{
throw new RuntimeException("You should not use this fragment in XML");
// This is just in case the fragment get instanciated by the OS after activity got killed...
// This will probably lead to a badly configured fragment but it's better than a crash...
// I guess :/
// FIXME find a better solution!
Calendar cal = Calendar.getInstance();

cal.set(Calendar.MILLISECOND, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.DAY_OF_MONTH, 1);

date = cal.getTime();
}

// ---------------------------------->

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
// Reset totals
expensesAmount = 0.0d;
revenuesAmount = 0.0d;

// Inflate the layout for this fragment
final View v = inflater.inflate(R.layout.fragment_monthly_report, container, false);

Expand Down
89 changes: 44 additions & 45 deletions Android/EasyBudget/app/src/main/res/layout/fragment_monthly_report.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,64 +40,63 @@
android:paddingLeft="20dp"
android:paddingRight="20dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="3dp"
android:baselineAligned="false">

<TextView
android:layout_width="0dip"
android:layout_weight="0.5"
android:layout_marginRight="10dp"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="18dp"
android:gravity="center"
android:layout_gravity="center_vertical"
android:text="@string/revenues_total"/>

<TextView
android:layout_width="0dip"
android:layout_weight="0.5"
android:layout_marginLeft="10dp"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="18dp"
android:gravity="center"
android:layout_gravity="center_vertical"
android:text="@string/expenses_total"/>

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_horizontal"
android:layout_marginBottom="20dp">

<LinearLayout
<TextView android:id="@+id/monthly_report_fragment_revenues_total_tv"
android:layout_width="0dip"
android:layout_weight="0.5"
android:layout_marginRight="10dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="10dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="18dp"
android:gravity="center"
android:text="@string/revenues_total"
android:maxLines="1"/>

<TextView android:id="@+id/monthly_report_fragment_revenues_total_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="22dp"
android:textStyle="bold"
android:gravity="center" />

</LinearLayout>

<LinearLayout
android:textColor="@android:color/white"
android:textSize="22dp"
android:textStyle="bold"
android:gravity="center" />

<TextView android:id="@+id/monthly_report_fragment_expenses_total_tv"
android:layout_width="0dip"
android:layout_weight="0.5"
android:layout_marginLeft="10dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="10dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="18dp"
android:gravity="center"
android:text="@string/expenses_total"
android:maxLines="1"/>

<TextView android:id="@+id/monthly_report_fragment_expenses_total_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textSize="22dp"
android:textStyle="bold"
android:gravity="center" />

</LinearLayout>
android:textColor="@android:color/white"
android:textSize="22dp"
android:textStyle="bold"
android:gravity="center" />

</LinearLayout>

Expand Down
30 changes: 15 additions & 15 deletions Android/EasyBudget/app/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<string name="title_activity_settings">Einstellungen</string>
<string name="title_activity_welcome">EasyBudget</string>
<string name="title_activity_premium">Premium</string>
<string name="title_activity_monthly_report">Monthly report</string>
<string name="title_activity_monthly_report">Monatliche Zusammenfassung</string>
<string name="cancel">Abbrechen</string>
<string name="undo">RÜCKGÄNGIG</string>
<string name="ok">OK</string>
Expand Down Expand Up @@ -139,17 +139,17 @@
<string name="setting_category_notifications_daily_message">Erhalten Sie eine Benachrichtigung am Ende des Tages, wenn Sie Ihre Ausgaben noch nicht eingetragen haben</string>
<string name="setting_category_not_premium_status_title">Premium-Nutzer werden</string>
<string name="setting_category_not_premium_status_message">Auf alle Premium-Features zugreifen</string>
<string name="setting_category_notifications_monthly_title">Monthly report notification</string>
<string name="setting_category_notifications_monthly_message">Receive a notification when a new monthly report is complete</string>
<string name="setting_category_notifications_monthly_title">Monatliche Zusammenfassung</string>
<string name="setting_category_notifications_monthly_message">Erhalten Sie eine Benachrichtigung, wenn eine neue monatl. Zusammenfassung vollständig ist</string>

<string name="premium_popup_premium_title">Sie sind Premium-Nutzer!</string>
<string name="premium_popup_premium_message">Sie haben Zugriff auf Premium-Features:\n\n- Tägliche Erinnerungen, wenn Sie vergessen Ihre Ausgaben einzutragen\n… und mehr Premium-Features, die in Kürze hinzugefügt werden!</string>
<string name="premium_popup_not_premium_title">Premium-Nutzer werden</string>
<string name="premium_popup_not_premium_message">Auf alle Premium-Features zugreifen!</string>
<string name="premium_popup_not_premium_feature1_title">2. Tägliche Erinnerung</string>
<string name="premium_popup_not_premium_feature1_message">Erhalten Sie eine Benachrichtigung am Ende des Tages, wenn Sie Ihre Ausgaben noch nicht eingetragen haben.</string>
<string name="premium_popup_not_premium_feature2_title">1. Monthly report</string>
<string name="premium_popup_not_premium_feature2_message">Get a sum-up of your expenses and incomes of the month and see how much you saved.</string>
<string name="premium_popup_not_premium_feature2_title">1. Monatliche Zusammenfassung</string>
<string name="premium_popup_not_premium_feature2_message">Greifen Sie auf eine monatliche Zusammenfassung Ihrer Ausgaben und Einnahmen zu, um zu sehen, wie viel Sie gespart haben.</string>
<string name="premium_popup_not_premium_feature_more_title">… und mehr Premium-Features, die in Kürze hinzugefügt werden!</string>
<string name="premium_popup_not_premium_cta">Kaufen</string>
<string name="premium_popup_become_title">Premium-Nutzer werden</string>
Expand Down Expand Up @@ -220,15 +220,15 @@
<string name="app_invite_welcome_message">Es sieht aus, als hätte Ihnen ein Freund diese App empfohlen. Willkommen an Bord und vergessen Sie nicht Ihrem Freund für diesen super Tipp zu danken ;)</string>
<string name="app_invite_welcome_cta">Los geht\'s!</string>

<string name="monthly_report_button_title">Monthly report</string>
<string name="monthly_report_button_title">Monatliche Zusammenfassung</string>
<string name="monthly_report_month_title_format">MMMM yyyy</string>
<string name="expenses">Expenses</string>
<string name="revenues">Revenues</string>
<string name="expenses_total">Expenses total</string>
<string name="revenues_total">Revenues total</string>
<string name="balance">Balance</string>
<string name="monthly_report_no_entries_placeholder">Nothing for this month.</string>
<string name="monthly_report_notif_notpremium_text">New feature for premium users: Monthly report.\nGet a sum-up of your expenses and incomes of the month. Discover premium?</string>
<string name="monthly_report_notif_premium_text">New feature available: Monthly report.\nGet a sum-up of your expenses and incomes of the month. Tap to try</string>
<string name="monthly_report_hint">Psst: You can access monthly reports from this button!</string>
<string name="expenses">Ausgaben</string>
<string name="revenues">Einnahmen</string>
<string name="expenses_total">Gesamte Ausgaben</string>
<string name="revenues_total">Gesamte Einnahmen</string>
<string name="balance">Kontostand</string>
<string name="monthly_report_no_entries_placeholder">Nichts für diesen Monat.</string>
<string name="monthly_report_notif_notpremium_text">Neues Feature für Premium-Nutzer: Monatliche Zusammenfassung.\nErhalten Sie eine Zusammenfassung Ihrer monatlichen Einnahmen und Ausgaben. Premium entdecken?</string>
<string name="monthly_report_notif_premium_text">Neues Feature: Monatliche Zusammenfassung.\nErhalten Sie eine Zusammenfassung Ihrer monatl. Einnahmen und Ausgaben. Antippen und ausprobieren</string>
<string name="monthly_report_hint">Psst: Von hier aus können Sie auf monatliche Zusammenfassungen zugreifen!</string>
</resources>
Loading

0 comments on commit 97dfff9

Please sign in to comment.