DT @12.01.2016: Bugfixes for 1.5.1
This commit is contained in:
@@ -13,6 +13,16 @@
|
|||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="com.android.vending.BILLING" />
|
<uses-permission android:name="com.android.vending.BILLING" />
|
||||||
|
|
||||||
|
<!-- Google Maps Android API V2 requires OpenGL ES version 2 -->
|
||||||
|
<uses-feature
|
||||||
|
android:glEsVersion="0x00020000"
|
||||||
|
android:required="true" />
|
||||||
|
|
||||||
|
<!-- Protect the map component of the application using application signature -->
|
||||||
|
<permission
|
||||||
|
android:name="org.deke.risk.riskahead.permission.MAPS_RECEIVE"
|
||||||
|
android:protectionLevel="signature" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".helper.AppController"
|
android:name=".helper.AppController"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@@ -20,15 +30,7 @@
|
|||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:theme="@style/MyRiskAheadTheme">
|
android:theme="@style/MyRiskAheadTheme">
|
||||||
|
|
||||||
<!-- Google Maps Android API V2 requires OpenGL ES version 2 -->
|
|
||||||
<uses-feature
|
|
||||||
android:glEsVersion="0x00020000"
|
|
||||||
android:required="true" />
|
|
||||||
|
|
||||||
<!-- Protect the map component of the application using application signature -->
|
|
||||||
<permission
|
|
||||||
android:name="org.deke.risk.riskahead.permission.MAPS_RECEIVE"
|
|
||||||
android:protectionLevel="signature" />
|
|
||||||
|
|
||||||
<!-- Google Maps Fragment API Key Data -->
|
<!-- Google Maps Fragment API Key Data -->
|
||||||
<meta-data
|
<meta-data
|
||||||
@@ -115,6 +117,7 @@
|
|||||||
android:screenOrientation="portrait" />
|
android:screenOrientation="portrait" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".ViewReportActivity"
|
android:name=".ViewReportActivity"
|
||||||
|
android:windowSoftInputMode="stateHidden"
|
||||||
android:label="@string/title_activity_view_report"
|
android:label="@string/title_activity_view_report"
|
||||||
android:screenOrientation="portrait" />
|
android:screenOrientation="portrait" />
|
||||||
<activity
|
<activity
|
||||||
|
|||||||
@@ -431,7 +431,6 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Map<String, String> getParams() {
|
protected Map<String, String> getParams() {
|
||||||
// Posting parameters to login url
|
|
||||||
Map<String, String> params = new HashMap<>();
|
Map<String, String> params = new HashMap<>();
|
||||||
params.put("tag", AppConfig.REST_LOGIN);
|
params.put("tag", AppConfig.REST_LOGIN);
|
||||||
params.put("email", email);
|
params.put("email", email);
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ public class ProfileActivity extends BaseActivity{
|
|||||||
private void initProfileFromUserID(String msg_intent) {
|
private void initProfileFromUserID(String msg_intent) {
|
||||||
TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
|
TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
|
||||||
|
|
||||||
tabLayout.addTab(tabLayout.newTab().setText("Statistics"));
|
tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_stats)));
|
||||||
tabLayout.addTab(tabLayout.newTab().setText("Reports"));
|
tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_reports)));
|
||||||
|
|
||||||
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
|
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
|
||||||
|
|
||||||
@@ -65,9 +65,9 @@ public class ProfileActivity extends BaseActivity{
|
|||||||
private void initOwnProfileView() {
|
private void initOwnProfileView() {
|
||||||
TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
|
TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
|
||||||
|
|
||||||
tabLayout.addTab(tabLayout.newTab().setText("Statistics"));
|
tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_stats)));
|
||||||
tabLayout.addTab(tabLayout.newTab().setText("Top 10"));
|
tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_top10)));
|
||||||
tabLayout.addTab(tabLayout.newTab().setText("Reports"));
|
tabLayout.addTab(tabLayout.newTab().setText(getResources().getString(R.string.lbl_profile_reports)));
|
||||||
|
|
||||||
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
|
tabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
|
||||||
|
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ public class ViewReportActivity extends BaseActivity {
|
|||||||
final String fromUid = Integer.toString(incident.getFidFromUser());
|
final String fromUid = Integer.toString(incident.getFidFromUser());
|
||||||
|
|
||||||
Drawable identityIcon = new IconicsDrawable(this)
|
Drawable identityIcon = new IconicsDrawable(this)
|
||||||
.icon(GoogleMaterial.Icon.gmd_perm_identity)
|
.icon(GoogleMaterial.Icon.gmd_account_circle)
|
||||||
.color(ContextCompat.getColor(getApplicationContext(), R.color.white))
|
.color(ContextCompat.getColor(getApplicationContext(), R.color.white))
|
||||||
.sizeDp(24);
|
.sizeDp(24);
|
||||||
|
|
||||||
|
|||||||
@@ -28,9 +28,6 @@ import org.json.JSONObject;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by Dennis on 13.12.2015.
|
|
||||||
*/
|
|
||||||
public class ProfileStatisticsFragment extends Fragment {
|
public class ProfileStatisticsFragment extends Fragment {
|
||||||
|
|
||||||
private final static String mActivityTitle = "User Statistics";
|
private final static String mActivityTitle = "User Statistics";
|
||||||
@@ -98,7 +95,7 @@ public class ProfileStatisticsFragment extends Fragment {
|
|||||||
points.setText(jObj.getString("points"));
|
points.setText(jObj.getString("points"));
|
||||||
ranking.setText(jObj.getString("rank"));
|
ranking.setText(jObj.getString("rank"));
|
||||||
posts.setText(jObj.getString("numberOfPosts"));
|
posts.setText(jObj.getString("numberOfPosts"));
|
||||||
txtMemberSince.setText(parent.user.get("created_at"));
|
txtMemberSince.setText(jObj.getString("created_at"));
|
||||||
|
|
||||||
JSONArray jSubs = jObj.getJSONArray("subs");
|
JSONArray jSubs = jObj.getJSONArray("subs");
|
||||||
boolean isPremium = false;
|
boolean isPremium = false;
|
||||||
|
|||||||
@@ -30,9 +30,6 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by Dennis on 13.12.2015.
|
|
||||||
*/
|
|
||||||
public class ReportListFragment extends Fragment{
|
public class ReportListFragment extends Fragment{
|
||||||
private final static String mActivityTitle = "ReportList";
|
private final static String mActivityTitle = "ReportList";
|
||||||
private final static String TAG = ReportListFragment.class.getSimpleName();
|
private final static String TAG = ReportListFragment.class.getSimpleName();
|
||||||
@@ -106,7 +103,6 @@ public class ReportListFragment extends Fragment{
|
|||||||
} else {
|
} else {
|
||||||
String errorMsg = jObj.getString("error_msg");
|
String errorMsg = jObj.getString("error_msg");
|
||||||
Log.e(TAG, "Error getting incident list (Server returned error): " + errorMsg);
|
Log.e(TAG, "Error getting incident list (Server returned error): " + errorMsg);
|
||||||
parent.showMessage(errorMsg);
|
|
||||||
}
|
}
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|||||||
@@ -127,6 +127,10 @@
|
|||||||
<string name="lbl_profile_ranking_someone">und sein Rang ist …</string>
|
<string name="lbl_profile_ranking_someone">und sein Rang ist …</string>
|
||||||
<string name="lbl_profile_membersince_someone">unterstützt RiskAhead seit</string>
|
<string name="lbl_profile_membersince_someone">unterstützt RiskAhead seit</string>
|
||||||
|
|
||||||
|
<string name="lbl_profile_top10">Top 10</string>
|
||||||
|
<string name="lbl_profile_stats">Statistik</string>
|
||||||
|
<string name="lbl_profile_reports">Meldungen</string>
|
||||||
|
|
||||||
<string name="lbl_membershiptype_premium">PREMIUM NUTZER</string>
|
<string name="lbl_membershiptype_premium">PREMIUM NUTZER</string>
|
||||||
<string name="lbl_membershiptype_free">FREE NUTZER</string>
|
<string name="lbl_membershiptype_free">FREE NUTZER</string>
|
||||||
<string name="lbl_membershiptype_addfree">ADD-FREE NUTZER</string>
|
<string name="lbl_membershiptype_addfree">ADD-FREE NUTZER</string>
|
||||||
|
|||||||
@@ -132,6 +132,10 @@
|
|||||||
<string name="lbl_profile_ranking_someone">and his/her rank is …</string>
|
<string name="lbl_profile_ranking_someone">and his/her rank is …</string>
|
||||||
<string name="lbl_profile_membersince_someone">is supporting RiskAhead since</string>
|
<string name="lbl_profile_membersince_someone">is supporting RiskAhead since</string>
|
||||||
|
|
||||||
|
<string name="lbl_profile_top10">Top 10</string>
|
||||||
|
<string name="lbl_profile_stats">Statistics</string>
|
||||||
|
<string name="lbl_profile_reports">Reports</string>
|
||||||
|
|
||||||
<string name="lbl_membershiptype_premium">PREMIUM MEMBER</string>
|
<string name="lbl_membershiptype_premium">PREMIUM MEMBER</string>
|
||||||
<string name="lbl_membershiptype_free">FREE MEMBER</string>
|
<string name="lbl_membershiptype_free">FREE MEMBER</string>
|
||||||
<string name="lbl_membershiptype_addfree">ADD-FREE MEMBER</string>
|
<string name="lbl_membershiptype_addfree">ADD-FREE MEMBER</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user