Some other improvements
This commit is contained in:
parent
13daa45747
commit
b6232b1203
|
@ -31,6 +31,8 @@ import android.widget.Button;
|
||||||
import android.widget.DatePicker;
|
import android.widget.DatePicker;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
import androidx.appcompat.app.ActionBar;
|
import androidx.appcompat.app.ActionBar;
|
||||||
import androidx.appcompat.widget.Toolbar;
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
@ -56,12 +58,14 @@ import java.util.Locale;
|
||||||
|
|
||||||
import app.fedilab.android.R;
|
import app.fedilab.android.R;
|
||||||
import app.fedilab.android.asynctasks.RetrieveChartsAsyncTask;
|
import app.fedilab.android.asynctasks.RetrieveChartsAsyncTask;
|
||||||
|
import app.fedilab.android.client.Entities.Account;
|
||||||
import app.fedilab.android.client.Entities.Charts;
|
import app.fedilab.android.client.Entities.Charts;
|
||||||
import app.fedilab.android.helper.Helper;
|
import app.fedilab.android.helper.Helper;
|
||||||
import app.fedilab.android.interfaces.OnRetrieveChartsInterface;
|
import app.fedilab.android.interfaces.OnRetrieveChartsInterface;
|
||||||
|
import app.fedilab.android.sqlite.AccountDAO;
|
||||||
import app.fedilab.android.sqlite.Sqlite;
|
import app.fedilab.android.sqlite.Sqlite;
|
||||||
import app.fedilab.android.sqlite.StatusCacheDAO;
|
import app.fedilab.android.sqlite.StatusCacheDAO;
|
||||||
|
import es.dmoral.toasty.Toasty;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -103,18 +107,37 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
|
||||||
if( actionBar != null ) {
|
if( actionBar != null ) {
|
||||||
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
|
LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
|
||||||
assert inflater != null;
|
assert inflater != null;
|
||||||
@SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_bar, null);
|
@SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_action_bar, null);
|
||||||
actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
|
actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
|
||||||
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
|
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
|
||||||
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
|
ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.close_conversation);
|
||||||
|
ImageView pp_actionBar = actionBar.getCustomView().findViewById(R.id.pp_actionBar);
|
||||||
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
|
TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
|
||||||
|
|
||||||
|
|
||||||
|
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
|
||||||
|
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
|
||||||
|
String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
|
||||||
|
Account account = new AccountDAO(getApplicationContext(),db).getUniqAccount(userId, instance);
|
||||||
|
if( account != null) {
|
||||||
|
String url = account.getAvatar();
|
||||||
|
if (url.startsWith("/")) {
|
||||||
|
url = Helper.getLiveInstanceWithProtocol(getApplicationContext()) + account.getAvatar();
|
||||||
|
}
|
||||||
|
Helper.loadGiF(getApplicationContext(), url, pp_actionBar);
|
||||||
|
}
|
||||||
|
|
||||||
toolbar_close.setOnClickListener(new View.OnClickListener() {
|
toolbar_close.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
toolbar_title.setText(R.string.action_about);
|
if( account != null) {
|
||||||
|
toolbar_title.setText(getString(R.string.owner_charts) + " - " + account.getUsername() + "@" + account.getInstance());
|
||||||
|
}else{
|
||||||
|
toolbar_title.setText(R.string.owner_charts);
|
||||||
|
}
|
||||||
if (theme == Helper.THEME_LIGHT){
|
if (theme == Helper.THEME_LIGHT){
|
||||||
Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
|
Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
|
||||||
Helper.colorizeToolbar(toolbar, R.color.black, OwnerChartsActivity.this);
|
Helper.colorizeToolbar(toolbar, R.color.black, OwnerChartsActivity.this);
|
||||||
|
@ -233,6 +256,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
|
||||||
dataSetBoosts.setDrawFilled(true);
|
dataSetBoosts.setDrawFilled(true);
|
||||||
dataSetBoosts.setDrawCircles(false);
|
dataSetBoosts.setDrawCircles(false);
|
||||||
dataSetBoosts.setDrawCircleHole(false);
|
dataSetBoosts.setDrawCircleHole(false);
|
||||||
|
dataSetBoosts.setLineWidth(2f);
|
||||||
dataSetBoosts.setMode(LineDataSet.Mode.CUBIC_BEZIER);
|
dataSetBoosts.setMode(LineDataSet.Mode.CUBIC_BEZIER);
|
||||||
|
|
||||||
LineDataSet dateSetReplies = new LineDataSet(repliesEntry, getString(R.string.replies));
|
LineDataSet dateSetReplies = new LineDataSet(repliesEntry, getString(R.string.replies));
|
||||||
|
@ -244,6 +268,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
|
||||||
dateSetReplies.setDrawFilled(true);
|
dateSetReplies.setDrawFilled(true);
|
||||||
dateSetReplies.setDrawCircles(false);
|
dateSetReplies.setDrawCircles(false);
|
||||||
dateSetReplies.setDrawCircleHole(false);
|
dateSetReplies.setDrawCircleHole(false);
|
||||||
|
dateSetReplies.setLineWidth(2f);
|
||||||
dateSetReplies.setMode(LineDataSet.Mode.CUBIC_BEZIER);
|
dateSetReplies.setMode(LineDataSet.Mode.CUBIC_BEZIER);
|
||||||
|
|
||||||
LineDataSet dataSetStatuses = new LineDataSet(statusesEntry, getString(R.string.statuses));
|
LineDataSet dataSetStatuses = new LineDataSet(statusesEntry, getString(R.string.statuses));
|
||||||
|
@ -255,6 +280,7 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
|
||||||
dataSetStatuses.setDrawFilled(true);
|
dataSetStatuses.setDrawFilled(true);
|
||||||
dataSetStatuses.setDrawCircles(false);
|
dataSetStatuses.setDrawCircles(false);
|
||||||
dataSetStatuses.setDrawCircleHole(false);
|
dataSetStatuses.setDrawCircleHole(false);
|
||||||
|
dataSetStatuses.setLineWidth(2f);
|
||||||
dataSetStatuses.setMode(LineDataSet.Mode.CUBIC_BEZIER);
|
dataSetStatuses.setMode(LineDataSet.Mode.CUBIC_BEZIER);
|
||||||
|
|
||||||
List<ILineDataSet> dataSets = new ArrayList<>();
|
List<ILineDataSet> dataSets = new ArrayList<>();
|
||||||
|
|
|
@ -19,6 +19,7 @@ import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.database.Cursor;
|
import android.database.Cursor;
|
||||||
import android.database.sqlite.SQLiteDatabase;
|
import android.database.sqlite.SQLiteDatabase;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
@ -484,7 +485,7 @@ public class StatusCacheDAO {
|
||||||
if(status.getCreated_at().after(targetDay) && status.getCreated_at().before(dateLimite)){
|
if(status.getCreated_at().after(targetDay) && status.getCreated_at().before(dateLimite)){
|
||||||
if( status.getReblog() != null){
|
if( status.getReblog() != null){
|
||||||
boostsCount++;
|
boostsCount++;
|
||||||
}else if( status.getIn_reply_to_id() != null){
|
}else if( status.getIn_reply_to_id() != null && !status.getIn_reply_to_id().trim().equals("null")){
|
||||||
repliesCount++;
|
repliesCount++;
|
||||||
}else {
|
}else {
|
||||||
statusesCount++;
|
statusesCount++;
|
||||||
|
|
|
@ -154,9 +154,9 @@
|
||||||
<color name="quick_reply_background_light">#E0E0E0</color>
|
<color name="quick_reply_background_light">#E0E0E0</color>
|
||||||
|
|
||||||
|
|
||||||
<color name="chart_boost">#7B1FA2</color>
|
<color name="chart_boost">#D32F2F</color>
|
||||||
<color name="chart_reply">#0097A7</color>
|
<color name="chart_reply">#388E3C</color>
|
||||||
<color name="chart_status">#1976D2</color>
|
<color name="chart_status">#0288D1</color>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue