From 17d9083a4dd327a339ea322a731f788b9c0fd415 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Sat, 4 Nov 2017 14:07:57 +0200 Subject: [PATCH] AboutActivity displays debug version, reenabled quotes --- .../java/gr/thmmy/mthmmy/activities/AboutActivity.java | 8 +++++++- .../mthmmy/activities/main/recent/RecentFragment.java | 1 - app/src/main/res/layout-v21/activity_topic_post_row.xml | 1 - app/src/main/res/layout/activity_topic_post_row.xml | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/AboutActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/AboutActivity.java index 3f23909b..792a41d7 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/AboutActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/AboutActivity.java @@ -33,6 +33,7 @@ public class AboutActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); String versionName = BuildConfig.VERSION_NAME; + String buildType = BuildConfig.BUILD_TYPE; //Initialize appbar appBar = findViewById(R.id.appbar); @@ -54,7 +55,12 @@ public class AboutActivity extends BaseActivity { TextView tv = findViewById(R.id.version); if (tv != null) - tv.setText(getString(R.string.version, versionName)); + { + if(buildType.equals("debug")) + tv.setText(getString(R.string.version, versionName + "-debug")); + else + tv.setText(getString(R.string.version, versionName)); + } tv.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java index b1ee1500..b9ccb7b8 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java @@ -1,6 +1,5 @@ package gr.thmmy.mthmmy.activities.main.recent; -import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; diff --git a/app/src/main/res/layout-v21/activity_topic_post_row.xml b/app/src/main/res/layout-v21/activity_topic_post_row.xml index 82dcb9b8..7f384f10 100644 --- a/app/src/main/res/layout-v21/activity_topic_post_row.xml +++ b/app/src/main/res/layout-v21/activity_topic_post_row.xml @@ -96,7 +96,6 @@ android:clickable="true" android:contentDescription="@string/post_quote_button" android:focusable="true" - android:src="@drawable/ic_format_quote_unchecked" /> diff --git a/app/src/main/res/layout/activity_topic_post_row.xml b/app/src/main/res/layout/activity_topic_post_row.xml index 167053b6..cc004897 100644 --- a/app/src/main/res/layout/activity_topic_post_row.xml +++ b/app/src/main/res/layout/activity_topic_post_row.xml @@ -95,7 +95,6 @@ android:clickable="true" android:contentDescription="@string/post_quote_button" android:focusable="true" - android:visibility="gone" android:src="@drawable/ic_format_quote_unchecked" />