From 69aed9886835daf19d6152b2b7d9f1c4c1569e88 Mon Sep 17 00:00:00 2001 From: NudeDude Date: Sun, 24 Dec 2017 16:43:55 +0100 Subject: [PATCH] Major Enhancements --- .../twidda/DataBase/TrendDatabase.java | 5 +- .../twidda/DataBase/TweetDatabase.java | 10 ++- .../twidda/Engine/ImageDownloader.java | 37 +++++++++ .../twidda/Engine/ProfileInformation.java | 68 ++++++++++++++++ .../twidda/Engine/RegisterAccount.java | 20 +---- .../twidda/Engine/TwitterStore.java | 5 +- .../org/nuclearfog/twidda/MainActivity.java | 47 +++++++++-- .../twidda/ViewAdapter/TimelineAdapter.java | 7 ++ .../org/nuclearfog/twidda/Window/Profile.java | 36 ++++----- .../nuclearfog/twidda/Window/Settings.java | 40 ++++++++-- .../nuclearfog/twidda/Window/TweetWindow.java | 7 +- .../res/drawable/{ic_back.xml => back.xml} | 0 app/src/main/res/drawable/chat.png | Bin 9528 -> 0 bytes app/src/main/res/drawable/chat.xml | 4 + app/src/main/res/drawable/favorite.xml | 4 + app/src/main/res/drawable/retweet.png | Bin 4590 -> 0 bytes app/src/main/res/drawable/retweet.xml | 4 + app/src/main/res/drawable/search.xml | 9 +++ app/src/main/res/drawable/star.png | Bin 10323 -> 0 bytes .../res/drawable/{ic_user.xml => user.xml} | 0 .../layout/{activity_login.xml => login.xml} | 0 .../layout/{main_layout.xml => mainpage.xml} | 1 - app/src/main/res/layout/profile.xml | 74 +++++++++++++----- app/src/main/res/layout/settings.xml | 7 ++ app/src/main/res/layout/tweet.xml | 19 +++-- .../{tweet_popup.xml => tweetwindow.xml} | 3 +- .../main/res/menu/{buttons.xml => home.xml} | 18 ++++- app/src/main/res/menu/setting.xml | 12 +++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 10486 -> 0 bytes 33 files changed, 337 insertions(+), 100 deletions(-) create mode 100644 app/src/main/java/org/nuclearfog/twidda/Engine/ImageDownloader.java create mode 100644 app/src/main/java/org/nuclearfog/twidda/Engine/ProfileInformation.java rename app/src/main/res/drawable/{ic_back.xml => back.xml} (100%) delete mode 100644 app/src/main/res/drawable/chat.png create mode 100644 app/src/main/res/drawable/chat.xml create mode 100644 app/src/main/res/drawable/favorite.xml delete mode 100644 app/src/main/res/drawable/retweet.png create mode 100644 app/src/main/res/drawable/retweet.xml create mode 100644 app/src/main/res/drawable/search.xml delete mode 100644 app/src/main/res/drawable/star.png rename app/src/main/res/drawable/{ic_user.xml => user.xml} (100%) rename app/src/main/res/layout/{activity_login.xml => login.xml} (100%) rename app/src/main/res/layout/{main_layout.xml => mainpage.xml} (96%) rename app/src/main/res/layout/{tweet_popup.xml => tweetwindow.xml} (92%) rename app/src/main/res/menu/{buttons.xml => home.xml} (55%) create mode 100644 app/src/main/res/menu/setting.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/java/org/nuclearfog/twidda/DataBase/TrendDatabase.java b/app/src/main/java/org/nuclearfog/twidda/DataBase/TrendDatabase.java index 98a818ec..87a9f77e 100644 --- a/app/src/main/java/org/nuclearfog/twidda/DataBase/TrendDatabase.java +++ b/app/src/main/java/org/nuclearfog/twidda/DataBase/TrendDatabase.java @@ -2,6 +2,7 @@ package org.nuclearfog.twidda.DataBase; import android.content.ContentValues; import android.content.Context; +import android.content.SharedPreferences; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; @@ -69,7 +70,6 @@ public class TrendDatabase { private void store(){ SQLiteDatabase db = dataHelper.getWritableDatabase(); - ContentValues trend = new ContentValues(); for(int pos = 0; pos < getSize(); pos++) { trend.put("trendpos", getTrendpos(pos)); @@ -87,6 +87,9 @@ public class TrendDatabase { } private void setup() { + SharedPreferences settings = c.getSharedPreferences("settings", 0); + SharedPreferences.Editor e = settings.edit(); + e.putString("location", trends.getLocation().getName()).apply(); for(Trend trend : trends.getTrends()) { trendName.add(trend.getName()); trendLink.add(trend.getURL()); diff --git a/app/src/main/java/org/nuclearfog/twidda/DataBase/TweetDatabase.java b/app/src/main/java/org/nuclearfog/twidda/DataBase/TweetDatabase.java index 708204b6..4ef88fe9 100644 --- a/app/src/main/java/org/nuclearfog/twidda/DataBase/TweetDatabase.java +++ b/app/src/main/java/org/nuclearfog/twidda/DataBase/TweetDatabase.java @@ -5,6 +5,7 @@ import org.nuclearfog.twidda.R; import android.content.ContentValues; import android.content.Context; +import android.content.SharedPreferences; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; @@ -25,6 +26,7 @@ public class TweetDatabase { private Context c; private int size = 0; private int mode = 0; + private SharedPreferences settings; /** * Store & Read Data @@ -35,7 +37,7 @@ public class TweetDatabase { this.c=c; this.mode=mode; dataHelper = AppDatabase.getInstance(c); - + settings = c.getSharedPreferences("settings", 0); initArray(); store(); load(); @@ -49,6 +51,7 @@ public class TweetDatabase { this.c=c; this.mode=mode; dataHelper = AppDatabase.getInstance(c); + settings = c.getSharedPreferences("settings", 0); initArray(); load(); } @@ -106,7 +109,7 @@ public class TweetDatabase { tweet.add( cursor.getString(index) ); index = cursor.getColumnIndex("retweet"); // retweet noRT.add( cursor.getString(index) ); - index = cursor.getColumnIndex("favorite"); // favorite + index = cursor.getColumnIndex("favorite"); // fav noFav.add( cursor.getString(index) ); index = cursor.getColumnIndex("answers"); // answers noAns.add( cursor.getString(index) ); @@ -140,6 +143,9 @@ public class TweetDatabase { public String getDate(int pos){return timeToString(getTime(pos));} public String getAnswer(int pos){return noAns.get(pos);} public String getPbImg (int pos){return pbLink.get(pos);} + public boolean loadImages(){ + return settings.getBoolean("image_load", false); + } /** * Convert Time to String diff --git a/app/src/main/java/org/nuclearfog/twidda/Engine/ImageDownloader.java b/app/src/main/java/org/nuclearfog/twidda/Engine/ImageDownloader.java new file mode 100644 index 00000000..4c10a4c5 --- /dev/null +++ b/app/src/main/java/org/nuclearfog/twidda/Engine/ImageDownloader.java @@ -0,0 +1,37 @@ +package org.nuclearfog.twidda.Engine; + +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.os.AsyncTask; +import android.widget.ImageView; + +import java.io.InputStream; +import java.net.URL; + + +public class ImageDownloader extends AsyncTask +{ + private ImageView imgView; + + public ImageDownloader( ImageView imgView){ + this.imgView = imgView; + } + + @Override + protected Bitmap doInBackground(String... links){ + Bitmap picture = null; + + try { + InputStream iStream = new URL(links[0]).openStream(); + picture = BitmapFactory.decodeStream(iStream); + } catch(Exception err) { + err.printStackTrace(); + } + return picture; + } + + @Override + protected void onPostExecute(Bitmap img){ + imgView.setImageBitmap(img); + } +} diff --git a/app/src/main/java/org/nuclearfog/twidda/Engine/ProfileInformation.java b/app/src/main/java/org/nuclearfog/twidda/Engine/ProfileInformation.java new file mode 100644 index 00000000..39c24282 --- /dev/null +++ b/app/src/main/java/org/nuclearfog/twidda/Engine/ProfileInformation.java @@ -0,0 +1,68 @@ +package org.nuclearfog.twidda.Engine; + +import android.content.Context; +import android.os.AsyncTask; +import android.widget.TextView; + +import org.nuclearfog.twidda.R; +import org.nuclearfog.twidda.Window.Profile; + +import twitter4j.Twitter; +import twitter4j.User; + +public class ProfileInformation extends AsyncTask +{ + private Context context,toClass; + private String screenName, username, description, location, follower, following; + private TextView txtUser,txtScrName, txtBio,txtLocation,txtFollowing,txtFollower; + + /** + * @param context "this" Context + */ + public ProfileInformation(Context context) { + this.context=context; + this.toClass = toClass; + } + + + @Override + protected void onPreExecute() { + txtUser = (TextView) ((Profile)context).findViewById(R.id.profile_username); + txtScrName =(TextView) ((Profile)context).findViewById(R.id.profile_screenname); + txtBio = (TextView)((Profile)context).findViewById(R.id.bio); + txtLocation = (TextView)((Profile)context).findViewById(R.id.location); + txtFollowing = (TextView)((Profile)context).findViewById(R.id.following); + txtFollower = (TextView)((Profile)context).findViewById(R.id.follower); + } + + + /** + * @param args [0] Username + */ + @Override + protected Void doInBackground(Long... args) { + TwitterStore mTwitter = TwitterStore.getInstance(context); + Twitter twitter = mTwitter.getTwitter(); + try { + User user = twitter.showUser(args[0]); + screenName = user.getScreenName(); + username = "@"+ user.getName(); + description = user.getDescription(); + location = user.getLocation(); + follower = "Follower: "+ user.getFollowersCount(); + following = "Following: "+user.getFriendsCount(); + } catch(Exception err){err.printStackTrace();} + return null; + } + + + @Override + protected void onPostExecute(Void v) { + txtUser.setText(username); + txtScrName.setText(screenName); + txtBio.setText(description); + txtLocation.setText(location); + txtFollower.setText(follower); + txtFollowing.setText(following); + } +} \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/Engine/RegisterAccount.java b/app/src/main/java/org/nuclearfog/twidda/Engine/RegisterAccount.java index 98d0dae7..cb6967ba 100644 --- a/app/src/main/java/org/nuclearfog/twidda/Engine/RegisterAccount.java +++ b/app/src/main/java/org/nuclearfog/twidda/Engine/RegisterAccount.java @@ -1,35 +1,19 @@ package org.nuclearfog.twidda.Engine; import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.net.Uri; import android.os.AsyncTask; import android.widget.Button; import android.widget.Toast; -import twitter4j.Twitter; import twitter4j.TwitterException; -import twitter4j.TwitterFactory; -import twitter4j.auth.AccessToken; -import twitter4j.auth.RequestToken; -import twitter4j.conf.Configuration; -import twitter4j.conf.ConfigurationBuilder; - -public class RegisterAccount extends AsyncTask { - - private final String TWITTER_CONSUMER_KEY = "GrylGIgQK3cDjo9mSTBqF1vwf"; - private final String TWITTER_CONSUMER_SECRET = "pgaWUlDVS5b7Q6VJQDgBzHKw0mIxJIX0UQBcT1oFJEivsCl5OV"; - +public class RegisterAccount extends AsyncTask +{ private TwitterStore mTwitter; - private Button loginButton, verifierButton; - private SharedPreferences einstellungen; private Context context; public RegisterAccount( Context context ){ this.context = context; - einstellungen = context.getSharedPreferences("settings", 0); } public void setButton( Button loginButton, Button verifierButton ) { diff --git a/app/src/main/java/org/nuclearfog/twidda/Engine/TwitterStore.java b/app/src/main/java/org/nuclearfog/twidda/Engine/TwitterStore.java index 9dc6c2a2..e5cbb548 100644 --- a/app/src/main/java/org/nuclearfog/twidda/Engine/TwitterStore.java +++ b/app/src/main/java/org/nuclearfog/twidda/Engine/TwitterStore.java @@ -119,6 +119,7 @@ public class TwitterStore { * @return Twitter Object */ public Twitter getTwitter(){ + init(); return twitter; } @@ -139,7 +140,7 @@ public class TwitterStore { /** * Store user id + keys into sqlite database - * @param username Screenname of User + * @param username Screen name of User * @param userId unique User ID * @param key1 First Key of Access-token * @param key2 Second Key of Access-Token @@ -161,7 +162,7 @@ public class TwitterStore { /** * Singleton - * @param context Main Thread Contet + * @param context Main Thread Context * @return TwitterStore Instance */ public static TwitterStore getInstance(Context context) { diff --git a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java index 31431c00..99073f4f 100644 --- a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java @@ -31,11 +31,14 @@ public class MainActivity extends AppCompatActivity { private Button linkButton, verifierButton, loginButton; private SwipeRefreshLayout refresh; + private SharedPreferences settings; private EditText pin; private Context con; private TabHost tabhost; private ListView list; + private Toolbar toolbar; private String currentTab = "timeline"; + private Menu menu; /** * Create Activity @@ -44,9 +47,9 @@ public class MainActivity extends AppCompatActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); con = getApplicationContext(); - SharedPreferences settings = con.getSharedPreferences("settings", 0); + settings = con.getSharedPreferences("settings", 0); if( !(settings.getBoolean("login", false)) ) { - setContentView(R.layout.activity_login); + setContentView(R.layout.login); pin = (EditText) findViewById(R.id.pin); linkButton = (Button) findViewById(R.id.linkButton); verifierButton = (Button) findViewById(R.id.verifier); @@ -65,7 +68,8 @@ public class MainActivity extends AppCompatActivity */ @Override public boolean onCreateOptionsMenu(Menu m) { - getMenuInflater().inflate(R.menu.buttons, m); + toolbar.inflateMenu(R.menu.home); + setToolbar(); return true; } @@ -80,7 +84,7 @@ public class MainActivity extends AppCompatActivity case R.id.action_profile: intent = new Intent(this, Profile.class); Bundle bundle = new Bundle(); - bundle.putString("username","home"); + bundle.putLong("userID",settings.getLong("userID", -1)); intent.putExtras(bundle); startActivity(intent); break; @@ -122,12 +126,12 @@ public class MainActivity extends AppCompatActivity * Login Handle */ private void login() { - setContentView(R.layout.main_layout); + setContentView(R.layout.mainpage); list = (ListView) findViewById(R.id.list); setRefreshListener(); setTabListener(); - Toolbar tool = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(tool); + toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); getSupportActionBar().setDisplayShowTitleEnabled(false); } @@ -152,8 +156,10 @@ public class MainActivity extends AppCompatActivity tabhost.setOnTabChangedListener(new TabHost.OnTabChangeListener() { @Override public void onTabChanged(String tabId) { + if(refresh.isRefreshing()){ refresh.setRefreshing(false);} currentTab = tabId; setTabContent(); + setToolbar(); } }); setTabContent(); @@ -212,4 +218,31 @@ public class MainActivity extends AppCompatActivity } }); } + + /** + * Toolbar Items + */ + private void setToolbar() { + MenuItem profile = toolbar.getMenu().findItem(R.id.action_profile); + MenuItem search = toolbar.getMenu().findItem(R.id.action_search); + MenuItem tweet = toolbar.getMenu().findItem(R.id.action_tweet); + + switch(currentTab){ + case "timeline": + profile.setVisible(true); + search.setVisible(false); + tweet.setVisible(true); + break; + case "trends": + profile.setVisible(false); + search.setVisible(true); + tweet.setVisible(false); + break; + case "mention": + profile.setVisible(false); + search.setVisible(false); + tweet.setVisible(false); + break; + } + } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/ViewAdapter/TimelineAdapter.java b/app/src/main/java/org/nuclearfog/twidda/ViewAdapter/TimelineAdapter.java index d5c3971b..c218f3e8 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ViewAdapter/TimelineAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/ViewAdapter/TimelineAdapter.java @@ -5,8 +5,10 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.ImageView; import android.widget.TextView; +import org.nuclearfog.twidda.Engine.ImageDownloader; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.DataBase.TweetDatabase; @@ -37,6 +39,11 @@ public class TimelineAdapter extends ArrayAdapter { ((TextView) v.findViewById(R.id.retweet_number)).setText(mTweets.getRetweet(position)); ((TextView) v.findViewById(R.id.favorite_number)).setText(mTweets.getFavorite(position)); ((TextView) v.findViewById(R.id.time)).setText(mTweets.getDate(position)); + if(mTweets.loadImages()) { + ImageView imgView = v.findViewById(R.id.tweetPb); + ImageDownloader imgDl = new ImageDownloader(imgView); + imgDl.execute(mTweets.getPbImg(position)); + } return v; } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/Window/Profile.java b/app/src/main/java/org/nuclearfog/twidda/Window/Profile.java index 92f312d3..f654b1f0 100644 --- a/app/src/main/java/org/nuclearfog/twidda/Window/Profile.java +++ b/app/src/main/java/org/nuclearfog/twidda/Window/Profile.java @@ -8,11 +8,13 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import android.view.View; import android.widget.ImageView; import android.widget.ListView; import android.widget.TabHost; import android.widget.TextView; +import org.nuclearfog.twidda.Engine.ProfileInformation; import org.nuclearfog.twidda.R; import org.nuclearfog.twidda.Engine.TwitterEngine; @@ -23,7 +25,7 @@ public class Profile extends AppCompatActivity { private TextView username, bio,link,following; private ImageView profile_img, profile_banner; private SwipeRefreshLayout refresh; - private String value; + private long userId; private Context context; @@ -34,23 +36,18 @@ public class Profile extends AppCompatActivity { Toolbar tool = (Toolbar) findViewById(R.id.profile_toolbar); setSupportActionBar(tool); getSupportActionBar().setDisplayShowTitleEnabled(false); - value = getIntent().getExtras().getString("username"); + userId = getIntent().getExtras().getLong("userID"); context = getApplicationContext(); initElements(); initTabs(); initSwipe(); + loadProfile(); - - } - - @Override - protected void onDestroy(){ - super.onDestroy(); } @Override public boolean onCreateOptionsMenu(Menu m) { - getMenuInflater().inflate(R.menu.buttons, m); + getMenuInflater().inflate(R.menu.home, m); m.findItem(R.id.action_profile).setVisible(false); return true; } @@ -103,13 +100,8 @@ public class Profile extends AppCompatActivity { * Profile Contents */ private void initElements() { - homeTl = (ListView) findViewById(R.id.home_tl); - username = (TextView) findViewById(R.id.my_username); - bio = (TextView) findViewById(R.id.bio); - link = (TextView) findViewById(R.id.links); - following = (TextView) findViewById(R.id.follow); - profile_img = (ImageView) findViewById(R.id.profile_img); - profile_banner = (ImageView) findViewById(R.id.banner); + ProfileInformation profile = new ProfileInformation(this); + profile.execute(userId); } /** @@ -120,23 +112,23 @@ public class Profile extends AppCompatActivity { refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { - getTweets(); - - } }); } private void getTweets(){ - TwitterEngine twitterEngine = new TwitterEngine(context, homeTl); twitterEngine.setRefresh(refresh); - switch(value) { + /*switch(value) { case "home": twitterEngine.execute(3); break; - } + }*/ + } + private void loadProfile() { + ImageView pb = (ImageView) findViewById(R.id.profile_img); + ImageView banner = (ImageView) findViewById(R.id.banner);//TODO } } diff --git a/app/src/main/java/org/nuclearfog/twidda/Window/Settings.java b/app/src/main/java/org/nuclearfog/twidda/Window/Settings.java index 9cc58859..ec60df29 100644 --- a/app/src/main/java/org/nuclearfog/twidda/Window/Settings.java +++ b/app/src/main/java/org/nuclearfog/twidda/Window/Settings.java @@ -5,6 +5,10 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; +import android.view.MenuItem; +import android.widget.CompoundButton; +import android.widget.EditText; +import android.widget.Switch; import org.nuclearfog.twidda.R; @@ -19,7 +23,22 @@ public class Settings extends AppCompatActivity { setContentView(R.layout.settings); Toolbar tool = (Toolbar) findViewById(R.id.toolbar_setting); setSupportActionBar(tool); - getSupportActionBar().setDisplayShowTitleEnabled(false); + + Switch toggleImg = (Switch) findViewById(R.id.toggleImg); + toggleImg.setChecked(settings.getBoolean("image_load",false)); + toggleImg.setOnCheckedChangeListener( + new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton b, boolean checked){ + SharedPreferences.Editor e = settings.edit(); + e.putBoolean("image_load", checked); + e.apply(); + } + }); + + EditText locationField = (EditText) findViewById(R.id.location_edit); + locationField.setText(settings.getString("location","")); + } /** @@ -27,12 +46,21 @@ public class Settings extends AppCompatActivity { */ @Override public boolean onCreateOptionsMenu(Menu m) { - getMenuInflater().inflate(R.menu.buttons, m); - m.findItem(R.id.action_profile).setVisible(false); - m.findItem(R.id.action_settings).setVisible(false); - m.findItem(R.id.action_tweet).setVisible(false); - + getMenuInflater().inflate(R.menu.setting, m); return true; } + /** + * Actionbar selection + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch(item.getItemId()) + { + case R.id.back_settings: + finish(); + break; + } + return true; + } } diff --git a/app/src/main/java/org/nuclearfog/twidda/Window/TweetWindow.java b/app/src/main/java/org/nuclearfog/twidda/Window/TweetWindow.java index cef57200..02472f1a 100644 --- a/app/src/main/java/org/nuclearfog/twidda/Window/TweetWindow.java +++ b/app/src/main/java/org/nuclearfog/twidda/Window/TweetWindow.java @@ -1,6 +1,5 @@ package org.nuclearfog.twidda.Window; -import android.content.Context; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.View; @@ -9,12 +8,8 @@ import android.widget.EditText; import android.widget.LinearLayout; import org.nuclearfog.twidda.Engine.SendStatus; -import org.nuclearfog.twidda.Engine.TwitterStore; import org.nuclearfog.twidda.R; -import twitter4j.Twitter; -import twitter4j.TwitterException; - public class TweetWindow extends AppCompatActivity { @@ -24,7 +19,7 @@ public class TweetWindow extends AppCompatActivity { protected void onCreate(Bundle SavedInstance){ super.onCreate(SavedInstance); getWindow().setLayout(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - setContentView(R.layout.tweet_popup); + setContentView(R.layout.tweetwindow); tweetfield = (EditText) findViewById(R.id.tweet_input); Button closeButton = (Button) findViewById(R.id.close); diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/back.xml similarity index 100% rename from app/src/main/res/drawable/ic_back.xml rename to app/src/main/res/drawable/back.xml diff --git a/app/src/main/res/drawable/chat.png b/app/src/main/res/drawable/chat.png deleted file mode 100644 index c1aee745eb0731b56ce9f98cc832205a15ea0049..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9528 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 + + diff --git a/app/src/main/res/drawable/favorite.xml b/app/src/main/res/drawable/favorite.xml new file mode 100644 index 00000000..7c95f1ca --- /dev/null +++ b/app/src/main/res/drawable/favorite.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/retweet.png b/app/src/main/res/drawable/retweet.png deleted file mode 100644 index 2986a65a0e008e94ade6ac01d0c39c9827422730..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4590 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 diff --git a/app/src/main/res/drawable/retweet.xml b/app/src/main/res/drawable/retweet.xml new file mode 100644 index 00000000..3cb8e786 --- /dev/null +++ b/app/src/main/res/drawable/retweet.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/search.xml b/app/src/main/res/drawable/search.xml new file mode 100644 index 00000000..47432c17 --- /dev/null +++ b/app/src/main/res/drawable/search.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/star.png b/app/src/main/res/drawable/star.png deleted file mode 100644 index 79868e2cb755ef89f87cc6393e7fcbf7aa349a34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10323 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 Zm?>iq>i#f+@7DmZwme`_v4?c}zW~5t|K|Vz diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/user.xml similarity index 100% rename from app/src/main/res/drawable/ic_user.xml rename to app/src/main/res/drawable/user.xml diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/login.xml similarity index 100% rename from app/src/main/res/layout/activity_login.xml rename to app/src/main/res/layout/login.xml diff --git a/app/src/main/res/layout/main_layout.xml b/app/src/main/res/layout/mainpage.xml similarity index 96% rename from app/src/main/res/layout/main_layout.xml rename to app/src/main/res/layout/mainpage.xml index 1be3e030..feaf651d 100644 --- a/app/src/main/res/layout/main_layout.xml +++ b/app/src/main/res/layout/mainpage.xml @@ -1,6 +1,5 @@ @@ -43,37 +42,72 @@ android:layout_weight="1" android:orientation="vertical"> - + android:orientation="horizontal"> + + + + + + android:layout_weight="1" /> - + android:orientation="horizontal"> + + + + + + + + + + + + + + - - + + diff --git a/app/src/main/res/layout/tweet.xml b/app/src/main/res/layout/tweet.xml index 378aa9b5..3c2b3a6a 100644 --- a/app/src/main/res/layout/tweet.xml +++ b/app/src/main/res/layout/tweet.xml @@ -12,7 +12,6 @@ android:id="@+id/user" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="1" android:orientation="horizontal"> @@ -53,7 +52,7 @@ + android:layout_width="16dp" + android:layout_height="16dp" + android:background="@drawable/favorite" /> + android:layout_height="160dp" + android:inputType="text" /> -

+ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cde69bcccec65160d92116f20ffce4fce0b5245c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3418 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 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4842 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7718 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 diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index aee44e138434630332d88b1680f33c4b24c70ab3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10486 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