Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-02-10 00:50:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gradle plugin update, removed unnecessary code, renamed variables

Browse Source
This commit is contained in:
nuclearfog 2020-06-02 18:23:29 +02:00
parent ad262caf60
commit 9e64c0b26e
No known key found for this signature in database
GPG Key ID: ED35E22099354A64
13 changed files with 70 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/gradle.xml generated
View File

@ -4,11 +4,10 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="PLATFORM" /> <option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="LOCAL" /> <option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/opt/Gradle/gradle-6.0.1" /> <option name="gradleHome" value="/opt/Gradle/gradle-6.4.1" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

30
.idea/jarRepositories.xml generated Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
</component>
</project>

8
app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
View File

@ -49,8 +49,8 @@ import java.util.regex.Matcher;
import static android.os.AsyncTask.Status.RUNNING; import static android.os.AsyncTask.Status.RUNNING;
import static android.view.View.GONE; import static android.view.View.GONE;
import static org.nuclearfog.twidda.activity.MainActivity.APP_LOGOUT; import static org.nuclearfog.twidda.activity.MainActivity.RETURN_APP_LOGOUT;
import static org.nuclearfog.twidda.activity.MainActivity.DB_CLEARED; import static org.nuclearfog.twidda.activity.MainActivity.RETURN_DB_CLEARED;
public class AppSettings extends AppCompatActivity implements OnClickListener, OnDismissListener, public class AppSettings extends AppCompatActivity implements OnClickListener, OnDismissListener,
OnCheckedChangeListener, OnItemSelectedListener { OnCheckedChangeListener, OnItemSelectedListener {
@ -221,7 +221,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
DatabaseAdapter.deleteDatabase(getApplicationContext()); DatabaseAdapter.deleteDatabase(getApplicationContext());
setResult(DB_CLEARED); setResult(RETURN_DB_CLEARED);
} }
}) })
.show(); .show();
@ -237,7 +237,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
settings.logout(); settings.logout();
TwitterEngine.resetTwitter(); TwitterEngine.resetTwitter();
DatabaseAdapter.deleteDatabase(getApplicationContext()); DatabaseAdapter.deleteDatabase(getApplicationContext());
setResult(APP_LOGOUT); setResult(RETURN_APP_LOGOUT);
finish(); finish();
} }
}) })

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

@ -35,10 +35,10 @@ import static org.nuclearfog.twidda.activity.UserProfile.KEY_PROFILE_ID;
*/ */
public class MainActivity extends AppCompatActivity implements OnTabSelectedListener { public class MainActivity extends AppCompatActivity implements OnTabSelectedListener {
public static final int DB_CLEARED = 3; public static final int RETURN_DB_CLEARED = 1;
public static final int APP_LOGOUT = 4; public static final int RETURN_APP_LOGOUT = 2;
private static final int LOGIN = 1; private static final int REQUEST_APP_LOGIN = 1;
private static final int SETTING = 2; private static final int REQUEST_APP_SETTINGS = 2;
@Nullable @Nullable
private FragmentAdapter adapter; private FragmentAdapter adapter;
@ -47,7 +47,6 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
private Dialog loadingCircle; private Dialog loadingCircle;
private ViewPager pager; private ViewPager pager;
private View root; private View root;
private long homeId;
static { static {
@ -86,12 +85,11 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
super.onStart(); super.onStart();
if (!settings.getLogin()) { if (!settings.getLogin()) {
Intent loginIntent = new Intent(this, LoginPage.class); Intent loginIntent = new Intent(this, LoginPage.class);
startActivityForResult(loginIntent, LOGIN); startActivityForResult(loginIntent, REQUEST_APP_LOGIN);
} else if (adapter == null) { } else if (adapter == null) {
adapter = new FragmentAdapter(getSupportFragmentManager()); adapter = new FragmentAdapter(getSupportFragmentManager());
adapter.setupForHomePage(); adapter.setupForHomePage();
pager.setAdapter(adapter); pager.setAdapter(adapter);
homeId = settings.getUserId();
Tab tlTab = tablayout.getTabAt(0); Tab tlTab = tablayout.getTabAt(0);
Tab trTab = tablayout.getTabAt(1); Tab trTab = tablayout.getTabAt(1);
@ -112,18 +110,18 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
@Override @Override
protected void onActivityResult(int reqCode, int returnCode, @Nullable Intent intent) { protected void onActivityResult(int reqCode, int returnCode, @Nullable Intent intent) {
switch (reqCode) { switch (reqCode) {
case LOGIN: case REQUEST_APP_LOGIN:
if (returnCode == RESULT_CANCELED) if (returnCode == RESULT_CANCELED)
finish(); finish();
break; break;
case SETTING: case REQUEST_APP_SETTINGS:
root.setBackgroundColor(settings.getBackgroundColor()); root.setBackgroundColor(settings.getBackgroundColor());
tablayout.setSelectedTabIndicatorColor(settings.getHighlightColor()); tablayout.setSelectedTabIndicatorColor(settings.getHighlightColor());
if (adapter != null) { if (adapter != null) {
if (returnCode == DB_CLEARED) if (returnCode == RETURN_DB_CLEARED)
adapter.clearData(); adapter.clearData();
else if (returnCode == APP_LOGOUT) else if (returnCode == RETURN_APP_LOGOUT)
adapter = null; adapter = null;
else else
adapter.notifySettingsChanged(); adapter.notifySettingsChanged();
@ -197,7 +195,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_profile: case R.id.action_profile:
Intent user = new Intent(this, UserProfile.class); Intent user = new Intent(this, UserProfile.class);
user.putExtra(KEY_PROFILE_ID, homeId); user.putExtra(KEY_PROFILE_ID, settings.getUserId());
startActivity(user); startActivity(user);
break; break;
@ -208,7 +206,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
case R.id.action_settings: case R.id.action_settings:
Intent settings = new Intent(this, AppSettings.class); Intent settings = new Intent(this, AppSettings.class);
startActivityForResult(settings, SETTING); startActivityForResult(settings, REQUEST_APP_SETTINGS);
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);

9
app/src/main/java/org/nuclearfog/twidda/activity/TweetDetail.java
View File

@ -60,6 +60,7 @@ import static org.nuclearfog.twidda.activity.UserDetail.KEY_USERDETAIL_MODE;
import static org.nuclearfog.twidda.activity.UserDetail.USERLIST_RETWEETS; import static org.nuclearfog.twidda.activity.UserDetail.USERLIST_RETWEETS;
import static org.nuclearfog.twidda.backend.engine.EngineException.ErrorType.NOT_AUTHORIZED; import static org.nuclearfog.twidda.backend.engine.EngineException.ErrorType.NOT_AUTHORIZED;
import static org.nuclearfog.twidda.backend.engine.EngineException.ErrorType.RESOURCE_NOT_FOUND; import static org.nuclearfog.twidda.backend.engine.EngineException.ErrorType.RESOURCE_NOT_FOUND;
import static org.nuclearfog.twidda.fragment.TweetFragment.INTENT_TWEET_REMOVED_ID;
import static org.nuclearfog.twidda.fragment.TweetFragment.RETURN_TWEET_CHANGED; import static org.nuclearfog.twidda.fragment.TweetFragment.RETURN_TWEET_CHANGED;
@ -430,7 +431,9 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
case DELETE: case DELETE:
Toast.makeText(this, R.string.info_tweet_removed, LENGTH_SHORT).show(); Toast.makeText(this, R.string.info_tweet_removed, LENGTH_SHORT).show();
setResult(RETURN_TWEET_CHANGED); Intent returnData = new Intent();
returnData.putExtra(INTENT_TWEET_REMOVED_ID, tweetID);
setResult(RETURN_TWEET_CHANGED, returnData);
finish(); finish();
break; break;
} }
@ -445,7 +448,9 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener,
ErrorHandler.handleFailure(this, error); ErrorHandler.handleFailure(this, error);
EngineException.ErrorType errorType = error.getErrorType(); EngineException.ErrorType errorType = error.getErrorType();
if (errorType == RESOURCE_NOT_FOUND || errorType == NOT_AUTHORIZED) { if (errorType == RESOURCE_NOT_FOUND || errorType == NOT_AUTHORIZED) {
setResult(RETURN_TWEET_CHANGED); Intent returnData = new Intent();
returnData.putExtra(INTENT_TWEET_REMOVED_ID, tweetID);
setResult(RETURN_TWEET_CHANGED, returnData);
finish(); finish();
} else if (tweet == null) { } else if (tweet == null) {
finish(); finish();

5
app/src/main/java/org/nuclearfog/twidda/backend/LinkContentLoader.java
View File

@ -1,5 +1,6 @@
package org.nuclearfog.twidda.backend; package org.nuclearfog.twidda.backend;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -111,9 +112,9 @@ public class LinkContentLoader extends AsyncTask<Uri, Void, LinkContentLoader.Da
class DataHolder { class DataHolder {
final Bundle data; final Bundle data;
final Class activity; final Class<? extends Activity> activity;
DataHolder(Bundle data, Class activity) { DataHolder(Bundle data, Class<? extends Activity> activity) {
this.data = data; this.data = data;
this.activity = activity; this.activity = activity;
} }

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

@ -32,7 +32,6 @@ import twitter4j.Location;
import twitter4j.Paging; import twitter4j.Paging;
import twitter4j.Query; import twitter4j.Query;
import twitter4j.QueryResult; import twitter4j.QueryResult;
import twitter4j.ResponseList;
import twitter4j.Status; import twitter4j.Status;
import twitter4j.StatusUpdate; import twitter4j.StatusUpdate;
import twitter4j.Trend; import twitter4j.Trend;
@ -814,7 +813,7 @@ public class TwitterEngine {
public List<TwitterList> getUserList(long userId) throws EngineException { public List<TwitterList> getUserList(long userId) throws EngineException {
try { try {
List<TwitterList> result = new LinkedList<>(); List<TwitterList> result = new LinkedList<>();
ResponseList<UserList> lists = twitter.getUserLists(userId); List<UserList> lists = twitter.getUserLists(userId);
for (UserList list : lists) for (UserList list : lists)
result.add(new TwitterList(list, twitterID)); result.add(new TwitterList(list, twitterID));
return result; return result;

10
app/src/main/java/org/nuclearfog/twidda/fragment/TrendFragment.java
View File

@ -39,8 +39,6 @@ public class TrendFragment extends Fragment implements OnRefreshListener, TrendC
private TrendAdapter adapter; private TrendAdapter adapter;
private GlobalSettings settings; private GlobalSettings settings;
private boolean notifyChange = false;
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle param) { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle param) {
Context context = inflater.getContext(); Context context = inflater.getContext();
@ -65,11 +63,6 @@ public class TrendFragment extends Fragment implements OnRefreshListener, TrendC
super.onStart(); super.onStart();
if (trendTask == null) if (trendTask == null)
load(); load();
if (notifyChange) {
list.setAdapter(adapter); // re-initialize List
notifyChange = false;
load();
}
reload.setProgressBackgroundColorSchemeColor(settings.getHighlightColor()); reload.setProgressBackgroundColorSchemeColor(settings.getHighlightColor());
} }
@ -101,8 +94,9 @@ public class TrendFragment extends Fragment implements OnRefreshListener, TrendC
@Override @Override
public void onSettingsChange() { public void onSettingsChange() {
list.setAdapter(adapter); // re-initialize List
adapter.clear(); adapter.clear();
notifyChange = true; load();
} }

20
app/src/main/java/org/nuclearfog/twidda/fragment/TweetFragment.java
View File

@ -39,6 +39,7 @@ public class TweetFragment extends Fragment implements OnRefreshListener, TweetC
public static final String KEY_FRAG_TWEET_MODE = "tweet_mode"; public static final String KEY_FRAG_TWEET_MODE = "tweet_mode";
public static final String KEY_FRAG_TWEET_SEARCH = "tweet_search"; public static final String KEY_FRAG_TWEET_SEARCH = "tweet_search";
public static final String KEY_FRAG_TWEET_ID = "tweet_id"; public static final String KEY_FRAG_TWEET_ID = "tweet_id";
public static final String INTENT_TWEET_REMOVED_ID = "tweet_removed_id";
public static final int TWEET_FRAG_HOME = 0; public static final int TWEET_FRAG_HOME = 0;
public static final int TWEET_FRAG_MENT = 1; public static final int TWEET_FRAG_MENT = 1;
@ -59,10 +60,9 @@ public class TweetFragment extends Fragment implements OnRefreshListener, TweetC
private TweetAdapter adapter; private TweetAdapter adapter;
private String search; private String search;
private long id, tweetId; private long id;
private int mode; private int mode;
private boolean notifyChange = false;
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle param) { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup parent, @Nullable Bundle param) {
@ -91,10 +91,6 @@ public class TweetFragment extends Fragment implements OnRefreshListener, TweetC
super.onStart(); super.onStart();
if (tweetTask == null) if (tweetTask == null)
load(); load();
if (notifyChange) {
list.setAdapter(adapter); // re-initialize List
notifyChange = false;
}
reload.setProgressBackgroundColorSchemeColor(settings.getHighlightColor()); reload.setProgressBackgroundColorSchemeColor(settings.getHighlightColor());
} }
@ -108,10 +104,11 @@ public class TweetFragment extends Fragment implements OnRefreshListener, TweetC
@Override @Override
public void onActivityResult(int reqCode, int returnCode, Intent i) { public void onActivityResult(int reqCode, int returnCode, @Nullable Intent intent) {
if (reqCode == REQUEST_TWEET_CHANGED && returnCode == RETURN_TWEET_CHANGED) if (intent != null && reqCode == REQUEST_TWEET_CHANGED && returnCode == RETURN_TWEET_CHANGED) {
adapter.remove(tweetId); adapter.remove(intent.getLongExtra(INTENT_TWEET_REMOVED_ID, 0));
super.onActivityResult(reqCode, returnCode, i); }
super.onActivityResult(reqCode, returnCode, intent);
} }
@ -125,7 +122,6 @@ public class TweetFragment extends Fragment implements OnRefreshListener, TweetC
@Override @Override
public void onTweetClick(Tweet tweet) { public void onTweetClick(Tweet tweet) {
if (reload != null && !reload.isRefreshing()) { if (reload != null && !reload.isRefreshing()) {
tweetId = tweet.getId(); // Mark tweet
if (tweet.getEmbeddedTweet() != null) if (tweet.getEmbeddedTweet() != null)
tweet = tweet.getEmbeddedTweet(); tweet = tweet.getEmbeddedTweet();
Intent tweetIntent = new Intent(getContext(), TweetDetail.class); Intent tweetIntent = new Intent(getContext(), TweetDetail.class);
@ -138,7 +134,7 @@ public class TweetFragment extends Fragment implements OnRefreshListener, TweetC
@Override @Override
public void onSettingsChange() { public void onSettingsChange() {
notifyChange = true; list.setAdapter(adapter); // re-initialize List
} }

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

@ -16,7 +16,6 @@
<string name="settings_clear_data">App Daten löschen</string> <string name="settings_clear_data">App Daten löschen</string>
<string name="twitter_search">Suche</string> <string name="twitter_search">Suche</string>
<string name="userlist_retweet">Tweet retweetet von</string> <string name="userlist_retweet">Tweet retweetet von</string>
<string name="userlist_favorite">Tweet favorisiert von</string>
<string name="background">Hintergrund</string> <string name="background">Hintergrund</string>
<string name="confirm_delete_tweet">Tweet löschen?</string> <string name="confirm_delete_tweet">Tweet löschen?</string>
<string name="error_enter_pin">PIN eingeben!</string> <string name="error_enter_pin">PIN eingeben!</string>
@ -109,7 +108,6 @@
<string name="proxy_authentication">Proxy Login</string> <string name="proxy_authentication">Proxy Login</string>
<string name="error_empty_port">Proxy port muss gesetzt werden!</string> <string name="error_empty_port">Proxy port muss gesetzt werden!</string>
<string name="error_empty_pass">Proxy Passort darf nicht leer sein!</string> <string name="error_empty_pass">Proxy Passort darf nicht leer sein!</string>
<string name="error_open_link">Fehler beim Öffnen des links!</string>
<string name="error_image_download">Bild konnte nicht geladen werden!</string> <string name="error_image_download">Bild konnte nicht geladen werden!</string>
<string name="error_dm_send">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string> <string name="error_dm_send">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string>
<string name="confirm_mute">User stummschalten?</string> <string name="confirm_mute">User stummschalten?</string>

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

@ -9,7 +9,6 @@
<string name="userlist_following">Following</string> <string name="userlist_following">Following</string>
<string name="userlist_follower">Follower</string> <string name="userlist_follower">Follower</string>
<string name="userlist_retweet">Tweet retweeted by</string> <string name="userlist_retweet">Tweet retweeted by</string>
<string name="userlist_favorite">Tweet favored by</string>
<string name="background">Background</string> <string name="background">Background</string>
<string name="settings_font">Font</string> <string name="settings_font">Font</string>
<string name="popup">Popup</string> <string name="popup">Popup</string>
@ -109,7 +108,6 @@
<string name="proxy_authentication">Proxy login</string> <string name="proxy_authentication">Proxy login</string>
<string name="error_empty_port">Port must be set!</string> <string name="error_empty_port">Port must be set!</string>
<string name="error_empty_pass">Proxy password should not be empty!</string> <string name="error_empty_pass">Proxy password should not be empty!</string>
<string name="error_open_link">Failed to open link!</string>
<string name="error_image_download">Image could not be loaded!</string> <string name="error_image_download">Image could not be loaded!</string>
<string name="error_dm_send">Cannot send direct message to this user!</string> <string name="error_dm_send">Cannot send direct message to this user!</string>
<string name="settings_info_link" translatable="false">https://github.com/nuclearfog/Shitter</string> <string name="settings_info_link" translatable="false">https://github.com/nuclearfog/Shitter</string>

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.android.tools.build:gradle:4.0.0'
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Feb 26 10:24:58 CET 2020 #Tue Jun 02 12:22:03 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip