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

bugfix

This commit is contained in:
NudeDude 2018-09-04 11:24:07 +02:00
parent ea7c090718
commit 714a4b0376
16 changed files with 92 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/MainActivity.java
View File

@ -19,9 +19,9 @@ import android.widget.TabHost;
import android.widget.TabHost.OnTabChangeListener;
import android.widget.TabHost.TabSpec;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.MainPage;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.TrendAdapter;
import org.nuclearfog.twidda.window.AppSettings;

1
app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java
View File

@ -12,6 +12,7 @@ import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.listitems.Trend;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.database.DatabaseAdapter;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.TrendAdapter;

10
app/src/main/java/org/nuclearfog/twidda/backend/MessageLoader.java
View File

@ -9,6 +9,7 @@ import android.util.Log;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.listitems.Message;
import org.nuclearfog.twidda.database.DatabaseAdapter;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.MessageAdapter;
import org.nuclearfog.twidda.window.DirectMessage;
@ -42,18 +43,19 @@ public class MessageLoader extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... param) {
try {
List<Message> msg;
if (mAdapter.getItemCount() > 0) {
List<Message> msg = twitter.getMessages();
mAdapter.setData(msg);
msg = twitter.getMessages();
mData.storeMessage(msg);
msg = mData.getMessages();
} else {
List<Message> msg = mData.getMessages();
msg = mData.getMessages();
if (msg.size() == 0) {
msg = twitter.getMessages();
mData.storeMessage(msg);
}
mAdapter.setData(msg);
}
mAdapter.setData(msg);
} catch (Exception err) {
Log.e("Direct Message", err.getMessage());
}

1
app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
View File

@ -19,6 +19,7 @@ import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.DatabaseAdapter;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.window.UserProfile;

1
app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
View File

@ -23,6 +23,7 @@ import com.squareup.picasso.Picasso;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.database.DatabaseAdapter;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.window.SearchPage;
import org.nuclearfog.twidda.window.TweetDetail;

1
app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
View File

@ -8,6 +8,7 @@ import org.nuclearfog.twidda.backend.listitems.Message;
import org.nuclearfog.twidda.backend.listitems.Trend;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.GlobalSettings;
import java.io.File;
import java.util.ArrayList;

1
app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java
View File

@ -10,6 +10,7 @@ import android.widget.Toast;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.UserAdapter;
import org.nuclearfog.twidda.window.SearchPage;

1
app/src/main/java/org/nuclearfog/twidda/backend/UserLists.java
View File

@ -14,6 +14,7 @@ import android.widget.Toast;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.UserAdapter;
import org.nuclearfog.twidda.window.UserDetail;

1
app/src/main/java/org/nuclearfog/twidda/database/DatabaseAdapter.java
View File

@ -6,7 +6,6 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.support.annotation.Nullable;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.listitems.Message;
import org.nuclearfog.twidda.backend.listitems.Trend;
import org.nuclearfog.twidda.backend.listitems.Tweet;

148
app/src/main/java/org/nuclearfog/twidda/backend/GlobalSettings.java → app/src/main/java/org/nuclearfog/twidda/database/GlobalSettings.java
View File

@ -1,4 +1,4 @@
package org.nuclearfog.twidda.backend;
package org.nuclearfog.twidda.database;
import android.content.Context;
import android.content.SharedPreferences;
@ -33,39 +33,74 @@ public class GlobalSettings {
private GlobalSettings(Context context) {
settings = context.getSharedPreferences("settings",0);
woeId = settings.getInt("world_id",1);
settings = context.getSharedPreferences("settings", 0);
woeId = settings.getInt("world_id", 1);
customWorldId = settings.getBoolean("custom_woeId", false);
woeIdPos = settings.getInt("world_id_pos",0);
background_color = settings.getInt("background_color",0xff0f114a);
highlight_color = settings.getInt("highlight_color",0xffff00ff);
font_color = settings.getInt("font_color",0xffffffff);
tweet_color = settings.getInt("tweet_color",0xff19aae8);
row = settings.getInt("preload",20);
loadImage = settings.getBoolean("image_load",true);
loggedIn = settings.getBoolean("login",false);
key1 = settings.getString("key1","");
key2 = settings.getString("key2","");
userId = settings.getLong("userID",-1L);
woeIdPos = settings.getInt("world_id_pos", 0);
background_color = settings.getInt("background_color", 0xff0f114a);
highlight_color = settings.getInt("highlight_color", 0xffff00ff);
font_color = settings.getInt("font_color", 0xffffffff);
tweet_color = settings.getInt("tweet_color", 0xff19aae8);
row = settings.getInt("preload", 20);
loadImage = settings.getBoolean("image_load", true);
loggedIn = settings.getBoolean("login", false);
key1 = settings.getString("key1", "");
key2 = settings.getString("key2", "");
userId = settings.getLong("userID", -1L);
sdf = new SimpleDateFormat("dd.MM.yyyy, HH:mm:ss", Locale.GERMANY); // TODO editable date format
}
public static GlobalSettings getInstance(Context context) {
if (ourInstance == null) {
ourInstance = new GlobalSettings(context);
}
return ourInstance;
}
public int getBackgroundColor() {
return background_color;
}
public void setBackgroundColor(int color) {
Editor edit = settings.edit();
edit.putInt("background_color", color);
background_color = color;
edit.apply();
}
public int getFontColor() {
return font_color;
}
public void setFontColor(int color) {
Editor edit = settings.edit();
edit.putInt("font_color", color);
font_color = color;
edit.apply();
}
public int getHighlightColor() {
return highlight_color;
}
public void setHighlightColor(int color) {
Editor edit = settings.edit();
edit.putInt("highlight_color", color);
highlight_color = color;
edit.apply();
}
public int getTweetColor() {
return tweet_color;
}
public void setTweetColor(int color) {
Editor edit = settings.edit();
edit.putInt("tweet_color", color);
tweet_color = color;
edit.apply();
}
public boolean loadImages() {
return loadImage;
}
@ -74,18 +109,39 @@ public class GlobalSettings {
return woeId;
}
public void setWoeId(long id) {
Editor edit = settings.edit();
edit.putInt("world_id", (int) id);
woeId = (int) id;
edit.apply();
}
public boolean customWoeIdset() {
return customWorldId;
}
public int getWoeIdSelection(){
public int getWoeIdSelection() {
return woeIdPos;
}
public void setWoeIdSelection(int pos) {
Editor edit = settings.edit();
edit.putInt("world_id_pos", pos);
woeIdPos = pos;
edit.apply();
}
public int getRowLimit() {
return row;
}
public void setRowLimit(int limit) {
Editor edit = settings.edit();
edit.putInt("preload", limit);
row = limit;
edit.apply();
}
public boolean getLogin() {
return loggedIn;
}
@ -97,7 +153,7 @@ public class GlobalSettings {
return out;
}
public long getUserId(){
public long getUserId() {
return userId;
}
@ -105,49 +161,13 @@ public class GlobalSettings {
return sdf;
}
public void setBackgroundColor(int color) {
Editor edit = settings.edit();
edit.putInt("background_color",color);
background_color = color;
edit.apply();
}
public void setFontColor(int color) {
Editor edit = settings.edit();
edit.putInt("font_color",color);
font_color = color;
edit.apply();
}
public void setHighlightColor(int color) {
Editor edit = settings.edit();
edit.putInt("highlight_color",color);
highlight_color = color;
edit.apply();
}
public void setTweetColor(int color) {
Editor edit = settings.edit();
edit.putInt("tweet_color",color);
tweet_color = color;
edit.apply();
}
public void setImageLoad(boolean image) {
Editor edit = settings.edit();
Editor edit = settings.edit();
edit.putBoolean("image_load", image);
loadImage = image;
edit.apply();
}
public void setWoeId(long id) {
Editor edit = settings.edit();
edit.putInt("world_id",(int)id);
woeId = (int)id;
edit.apply();
}
public void setCustomWoeId(boolean customWoeId) {
Editor edit = settings.edit();
edit.putBoolean("custom_woeId", customWoeId);
@ -155,20 +175,6 @@ public class GlobalSettings {
edit.apply();
}
public void setRowLimit(int limit) {
Editor edit = settings.edit();
edit.putInt("preload", limit);
row = limit;
edit.apply();
}
public void setWoeIdSelection(int pos) {
Editor edit = settings.edit();
edit.putInt("world_id_pos", pos);
woeIdPos = pos;
edit.apply();
}
public void setConnection(String key1, String key2, Long userId) {
Editor e = settings.edit();
loggedIn = true;
@ -181,12 +187,4 @@ public class GlobalSettings {
e.putString("key2", key2);
e.apply();
}
public static GlobalSettings getInstance(Context context) {
if(ourInstance == null) {
ourInstance = new GlobalSettings(context);
}
return ourInstance;
}
}

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

@ -24,7 +24,7 @@ import com.flask.colorpicker.OnColorChangedListener;
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.WorldIdAdapter;
public class AppSettings extends AppCompatActivity implements OnClickListener,

2
app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java
View File

@ -20,10 +20,10 @@ import android.widget.TabHost;
import android.widget.TabHost.OnTabChangeListener;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.TwitterSearch;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter.OnItemClicked;
import org.nuclearfog.twidda.viewadapter.UserAdapter;

2
app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
View File

@ -23,11 +23,11 @@ import android.widget.TextView;
import android.widget.Toast;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.ImagePopup;
import org.nuclearfog.twidda.backend.StatusLoader;
import org.nuclearfog.twidda.backend.StatusLoader.OnMediaClick;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter.OnItemClicked;

2
app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
View File

@ -16,10 +16,10 @@ import android.widget.EditText;
import android.widget.TextView;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.ImagePopup;
import org.nuclearfog.twidda.backend.StatusUpload;
import org.nuclearfog.twidda.backend.StatusUpload.OnTweetSending;
import org.nuclearfog.twidda.database.GlobalSettings;
import java.util.ArrayList;
import java.util.List;

2
app/src/main/java/org/nuclearfog/twidda/window/UserDetail.java
View File

@ -11,9 +11,9 @@ import android.view.MenuItem;
import android.view.ViewGroup;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.UserLists;
import org.nuclearfog.twidda.backend.listitems.TwitterUser;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.UserAdapter;
import org.nuclearfog.twidda.viewadapter.UserAdapter.OnItemClicked;

2
app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java
View File

@ -20,9 +20,9 @@ import android.widget.TabHost;
import android.widget.TabHost.OnTabChangeListener;
import org.nuclearfog.twidda.R;
import org.nuclearfog.twidda.backend.GlobalSettings;
import org.nuclearfog.twidda.backend.ProfileLoader;
import org.nuclearfog.twidda.backend.listitems.Tweet;
import org.nuclearfog.twidda.database.GlobalSettings;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter;
import org.nuclearfog.twidda.viewadapter.TimelineAdapter.OnItemClicked;