Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added back answer load setting

This commit is contained in:
NudeDude 2019-06-09 17:03:41 +02:00
parent 8b0388c7be
commit 277c43c20d
7 changed files with 78 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
View File

@ -13,22 +13,18 @@ public class GlobalSettings {
private static GlobalSettings ourInstance;
private SharedPreferences settings;
private SimpleDateFormat sdf;
private boolean loadImage;
private boolean loadAnswer;
private boolean loggedIn;
private boolean customWorldId;
private int background_color;
private int font_color;
private int highlight_color;
private int tweet_color;
private boolean loadImage;
private boolean loggedIn;
private boolean customWorldId;
private int row;
private int woeId;
private int woeIdPos;
private String key1, key2;
private long userId;
@ -43,6 +39,7 @@ public class GlobalSettings {
tweet_color = settings.getInt("tweet_color", 0xff19aae8);
row = settings.getInt("preload", 20);
loadImage = settings.getBoolean("image_load", true);
loadAnswer = settings.getBoolean("answer_load", true);
loggedIn = settings.getBoolean("login", false);
key1 = settings.getString("key1", "");
key2 = settings.getString("key2", "");
@ -148,7 +145,7 @@ public class GlobalSettings {
}
/**
* image_add loading enabled
* image load loading enabled
*
* @return true if enabled
*/
@ -157,7 +154,7 @@ public class GlobalSettings {
}
/**
* enable/disable image_add load
* enable/disable image load load
*
* @param image true if enabled
*/
@ -168,6 +165,27 @@ public class GlobalSettings {
edit.apply();
}
/**
* answer loading enabled
*
* @return true if enabled
*/
public boolean getAnswerLoad() {
return loadAnswer;
}
/**
* enable/disable answer load load
*
* @param loadAnswer true if enabled
*/
public void setAnswerLoad(boolean loadAnswer) {
this.loadAnswer = loadAnswer;
Editor edit = settings.edit();
edit.putBoolean("answer_load", loadAnswer);
edit.apply();
}
/**
* get World ID for trends
*

17
app/src/main/java/org/nuclearfog/twidda/fragment/TweetListFragment.java
View File

@ -94,7 +94,7 @@ public class TweetListFragment extends Fragment implements OnRefreshListener, On
public void onStart() {
super.onStart();
if (tweetTask == null) {
load(false);
load();
}
}
@ -103,7 +103,7 @@ public class TweetListFragment extends Fragment implements OnRefreshListener, On
public void onResume() {
super.onResume();
if (tweetTask == null) {
load(false);
load();
}
}
@ -126,7 +126,7 @@ public class TweetListFragment extends Fragment implements OnRefreshListener, On
@Override
public void onRefresh() {
load(true);
load();
}
@ -167,7 +167,7 @@ public class TweetListFragment extends Fragment implements OnRefreshListener, On
}
private void load(boolean loadAnswer) {
private void load() {
switch (mode) {
case HOME:
tweetTask = new TweetLoader(root, Mode.TL_HOME);
@ -190,10 +190,13 @@ public class TweetListFragment extends Fragment implements OnRefreshListener, On
break;
case TWEET_ANSR:
if (loadAnswer) {
GlobalSettings settings = GlobalSettings.getInstance(getContext());
boolean loadAnswer = settings.getAnswerLoad();
if (tweetTask != null || loadAnswer)
tweetTask = new TweetLoader(root, Mode.TWEET_ANS);
tweetTask.execute(id, search);
}
else
tweetTask = new TweetLoader(root, Mode.DB_ANS);
tweetTask.execute(id, search);
break;
case SEARCH:

25
app/src/main/java/org/nuclearfog/twidda/fragment/backend/TweetLoader.java
View File

@ -1,7 +1,6 @@
package org.nuclearfog.twidda.fragment.backend;
import android.os.AsyncTask;
import android.util.Log;
import android.view.View;
import androidx.annotation.NonNull;
@ -30,6 +29,7 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
USR_TWEETS,
USR_FAVORS,
TWEET_ANS,
DB_ANS,
TWEET_SEARCH
}
@ -85,7 +85,7 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
db.storeHomeTimeline(tweets);
}
tweets.addAll(adapter.getData());
return true;
break;
case TL_MENT:
if (adapter.isEmpty()) {
@ -100,7 +100,7 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
db.storeMentions(tweets);
}
tweets.addAll(adapter.getData());
return true;
break;
case USR_TWEETS:
long tweetId = (long) param[0];
@ -116,7 +116,7 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
db.storeUserTweets(tweets);
}
tweets.addAll(adapter.getData());
return true;
break;
case USR_FAVORS:
tweetId = (long) param[0];
@ -132,7 +132,12 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
db.storeUserFavs(tweets, tweetId);
}
tweets.addAll(adapter.getData());
return true;
break;
case DB_ANS:
tweetId = (long) param[0];
tweets = db.getAnswers(tweetId);
break;
case TWEET_ANS:
tweetId = (long) param[0];
@ -151,7 +156,7 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
db.storeReplies(tweets);
}
tweets.addAll(adapter.getData());
return true;
break;
case TWEET_SEARCH:
search = (String) param[0];
@ -159,16 +164,16 @@ public class TweetLoader extends AsyncTask<Object, Void, Boolean> {
sinceId = adapter.getItemId(0);
tweets = mTwitter.searchTweets(search, sinceId);
tweets.addAll(adapter.getData());
return true;
break;
}
} catch (TwitterException err) {
this.err = err;
return false;
} catch (Exception err) {
if (err.getMessage() != null)
Log.e("TweetLoader", err.getMessage());
err.printStackTrace();
return false;
}
return false;
return true;
}

17
app/src/main/java/org/nuclearfog/twidda/window/AppSettings.java
View File

@ -47,7 +47,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
private GlobalSettings settings;
private Button colorButton1, colorButton2, colorButton3, colorButton4;
private CheckBox toggleImg;
private CheckBox toggleImg, toggleAns;
private EditText woeIdText;
private TextView link;
private Spinner woeId;
@ -68,6 +68,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
colorButton3 = findViewById(R.id.color_popup);
colorButton4 = findViewById(R.id.highlight_color);
toggleImg = findViewById(R.id.toggleImg);
toggleAns = findViewById(R.id.toggleAns);
woeIdText = findViewById(R.id.woe_id);
woeId = findViewById(R.id.woeid);
root = findViewById(R.id.settings_layout);
@ -89,6 +90,8 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
colorButton3.setOnClickListener(this);
colorButton4.setOnClickListener(this);
woeId.setOnItemSelectedListener(this);
toggleImg.setOnCheckedChangeListener(this);
toggleAns.setOnCheckedChangeListener(this);
}
@ -96,6 +99,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
protected void onStart() {
super.onStart();
toggleImg.setChecked(settings.getImageLoad());
toggleAns.setChecked(settings.getAnswerLoad());
woeId.setAdapter(new WorldIdAdapter(this));
woeId.setSelection(settings.getWoeIdSelection());
colorButton1.setBackgroundColor(settings.getBackgroundColor());
@ -108,7 +112,6 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
woeIdText.setVisibility(VISIBLE);
woeIdText.setText(text);
}
toggleImg.setOnCheckedChangeListener(this);
}
@ -257,8 +260,14 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
@Override
public void onCheckedChanged(CompoundButton c, boolean checked) {
if (c.getId() == R.id.toggleImg) {
settings.setImageLoad(checked);
switch (c.getId()) {
case R.id.toggleImg:
settings.setImageLoad(checked);
break;
case R.id.toggleAns:
settings.setAnswerLoad(checked);
break;
}
}

10
app/src/main/res/layout/page_settings.xml
View File

@ -123,6 +123,16 @@
android:text="@string/image"
android:textSize="@dimen/textsize_checkbox" />
<CheckBox
android:id="@+id/toggleAns"
android:layout_width="0dp"
android:layout_height="@dimen/button_dm"
android:layout_marginStart="@dimen/padding_side"
android:layout_marginLeft="@dimen/padding_side"
android:layout_weight="1"
android:text="@string/load_answer"
android:textSize="@dimen/textsize_checkbox" />
</LinearLayout>
<TextView

1
app/src/main/res/values-de-rDE/strings.xml
View File

@ -97,4 +97,5 @@
<string name="image_store_failure">Fehler beim Speichern!</string>
<string name="not_authorized">Keine Berechtigung!</string>
<string name="error_file_format">Dateiformat nicht unterstützt!</string>
<string name="load_answer">Antworten laden</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -106,4 +106,5 @@
<string name="image_store_failure">image save failed!</string>
<string name="not_authorized">Not authorized!</string>
<string name="error_file_format">file format not supported!</string>
<string name="load_answer">answer load</string>
</resources>