1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-16 01:01:11 +01:00

Refactoring; package movement;changed package name due to organisation name

This commit is contained in:
Gregor Santner 2016-03-26 01:14:17 +01:00
parent 30734f8f2a
commit 4482f09430
30 changed files with 205 additions and 173 deletions

View file

@ -1,8 +1,9 @@
package de.dfa.diaspora;
package de.dfa.diaspora_android;
import android.app.Application;
import de.dfa.diaspora.utils.AvatarImageLoader;
import de.dfa.diaspora_android.data.AppSettings;
import de.dfa.diaspora_android.util.AvatarImageLoader;
/**
* Created by gregor on 24.03.16.

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora;
package de.dfa.diaspora_android.activity;
import android.Manifest;
import android.annotation.SuppressLint;
@ -80,8 +80,13 @@ import java.util.Date;
import butterknife.Bind;
import butterknife.ButterKnife;
import de.dfa.diaspora.utils.Helpers;
import de.dfa.diaspora.utils.SoftKeyboardStateWatcher;
import de.dfa.diaspora_android.App;
import de.dfa.diaspora_android.R;
import de.dfa.diaspora_android.data.AppSettings;
import de.dfa.diaspora_android.data.WebUserProfile;
import de.dfa.diaspora_android.listener.SoftKeyboardStateWatcher;
import de.dfa.diaspora_android.listener.WebUserProfileChangedListener;
import de.dfa.diaspora_android.util.Helpers;
public class MainActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener, WebUserProfileChangedListener {
@ -138,7 +143,7 @@ public class MainActivity extends AppCompatActivity
app = (App) getApplication();
appSettings = app.getSettings();
webUserProfile = new WebUserProfile(app,uiHandler,this);
webUserProfile = new WebUserProfile(app, uiHandler, this);
// Setup toolbar
setSupportActionBar(toolbar);
@ -164,6 +169,7 @@ public class MainActivity extends AppCompatActivity
public void onSoftKeyboardOpened(int keyboardHeightInPx) {
fab.setVisibility(View.GONE);
}
@Override
public void onSoftKeyboardClosed() {
fab.setVisibility(View.VISIBLE);
@ -315,7 +321,7 @@ public class MainActivity extends AppCompatActivity
}
private void setupNavigationSlider(){
private void setupNavigationSlider() {
DrawerLayout drawer = ButterKnife.findById(this, R.id.drawer_layout);
ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
@ -326,19 +332,19 @@ public class MainActivity extends AppCompatActivity
navigationView.setNavigationItemSelectedListener(this);
View navHeader = navigationView.getHeaderView(0);
navheaderTitle = ButterKnife.findById(navHeader,R.id.navheader_title);
navheaderDescription = ButterKnife.findById(navHeader,R.id.navheader_description);
navheaderImage = ButterKnife.findById(navHeader,R.id.navheader_user_image);
navheaderTitle = ButterKnife.findById(navHeader, R.id.navheader_title);
navheaderDescription = ButterKnife.findById(navHeader, R.id.navheader_description);
navheaderImage = ButterKnife.findById(navHeader, R.id.navheader_user_image);
if(!appSettings.getName().equals("")) {
if (!appSettings.getName().equals("")) {
navheaderTitle.setText(appSettings.getName());
}
if(!appSettings.getPodDomain().equals("")){
if (!appSettings.getPodDomain().equals("")) {
navheaderDescription.setText(appSettings.getPodDomain());
}
if(!appSettings.getAvatarUrl().equals("")){
if (!appSettings.getAvatarUrl().equals("")) {
// Try to load image
if(!app.getAvatarImageLoader().loadToImageView(navheaderImage)){
if (!app.getAvatarImageLoader().loadToImageView(navheaderImage)) {
// If not yet loaded, start download
app.getAvatarImageLoader().startImageDownload(navheaderImage, appSettings.getAvatarUrl());
}
@ -803,7 +809,7 @@ public class MainActivity extends AppCompatActivity
@JavascriptInterface
public void setUserProfile(final String webMessage) throws JSONException {
if (webUserProfile.isRefreshNeeded()){
if (webUserProfile.isRefreshNeeded()) {
webUserProfile.parseJson(webMessage);
}
}

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora;
package de.dfa.diaspora_android.activity;
import android.annotation.TargetApi;
import android.app.AlertDialog;
@ -47,8 +47,10 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import de.dfa.diaspora.services.GetPodsService;
import de.dfa.diaspora.utils.Helpers;
import de.dfa.diaspora_android.App;
import de.dfa.diaspora_android.R;
import de.dfa.diaspora_android.task.GetPodsService;
import de.dfa.diaspora_android.util.Helpers;
public class PodsActivity extends AppCompatActivity {
@ -64,7 +66,7 @@ public class PodsActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_pods);
app = (App) getApplication();
filter = (EditText) findViewById(R.id.edtFilter);
lv = (ListView) findViewById(R.id.lstPods);
lv.setTextFilterEnabled(true);
@ -73,7 +75,7 @@ public class PodsActivity extends AppCompatActivity {
imgSelectPod.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (filter.getText().length() > 4 && filter.getText().toString().contains("."))
if (filter.getText().length() > 4 && filter.getText().toString().contains(""))
askConfirmation(filter.getText().toString());
else
Snackbar.make(lv, R.string.valid_pod, Snackbar.LENGTH_LONG).show();
@ -90,7 +92,7 @@ public class PodsActivity extends AppCompatActivity {
if (progressDialog != null)
progressDialog.dismiss();
if (pods != null && pods.length>0)
if (pods != null && pods.length > 0)
updateListview(pods);
else {
Snackbar.make(lv, R.string.podlist_error, Snackbar.LENGTH_LONG).show();
@ -117,7 +119,7 @@ public class PodsActivity extends AppCompatActivity {
@Override
protected void onResume() {
super.onResume();
Intent i= new Intent(PodsActivity.this, GetPodsService.class);
Intent i = new Intent(PodsActivity.this, GetPodsService.class);
startService(i);
}
@ -164,7 +166,7 @@ public class PodsActivity extends AppCompatActivity {
if (Helpers.isOnline(PodsActivity.this)) {
new AlertDialog.Builder(PodsActivity.this)
.setTitle(getString(R.string.confirmation))
.setMessage(getString(R.string.confirm_pod)+podDomain+"?")
.setMessage(getString(R.string.confirm_pod) + podDomain + "?")
.setPositiveButton(R.string.yes,
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
@ -238,7 +240,7 @@ public class PodsActivity extends AppCompatActivity {
if (id == R.id.action_reload) {
if (Helpers.isOnline(PodsActivity.this)) {
progressDialog.show();
Intent i= new Intent(PodsActivity.this, GetPodsService.class);
Intent i = new Intent(PodsActivity.this, GetPodsService.class);
startService(i);
return true;
} else {

View file

@ -17,10 +17,9 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora;
package de.dfa.diaspora_android.activity;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
@ -46,7 +45,9 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import de.dfa.diaspora.utils.Helpers;
import de.dfa.diaspora_android.App;
import de.dfa.diaspora_android.R;
import de.dfa.diaspora_android.util.Helpers;
public class ShareActivity extends MainActivity {
@ -68,7 +69,7 @@ public class ShareActivity extends MainActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
progressBar = (ProgressBar)findViewById(R.id.progressBar);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
swipeView = (SwipeRefreshLayout) findViewById(R.id.swipe);
swipeView.setEnabled(false);
@ -87,12 +88,12 @@ public class ShareActivity extends MainActivity {
});
podDomain = ((App)getApplication()).getSettings().getPodDomain();
podDomain = ((App) getApplication()).getSettings().getPodDomain();
fab = (com.getbase.floatingactionbutton.FloatingActionsMenu) findViewById(R.id.fab_menubutton);
fab.setVisibility(View.GONE);
webView = (WebView)findViewById(R.id.webView);
webView = (WebView) findViewById(R.id.webView);
webView.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
WebSettings wSettings = webView.getSettings();
@ -197,8 +198,6 @@ public class ShareActivity extends MainActivity {
});
Intent intent = getIntent();
final Bundle extras = intent.getExtras();
String action = intent.getAction();
@ -229,7 +228,7 @@ public class ShareActivity extends MainActivity {
webView.loadUrl("javascript:(function() { " +
"document.getElementsByTagName('textarea')[0].style.height='110px'; " +
"document.getElementsByTagName('textarea')[0].innerHTML = '> " +
String.format("%s %s'; ",extraText,getString(R.string.shared_by_diaspora_android)) +
String.format("%s %s'; ", extraText, getString(R.string.shared_by_diaspora_android)) +
" if(document.getElementById(\"main_nav\")) {" +
" document.getElementById(\"main_nav\").parentNode.removeChild(" +
" document.getElementById(\"main_nav\"));" +
@ -246,7 +245,7 @@ public class ShareActivity extends MainActivity {
if (savedInstanceState == null) {
if (Helpers.isOnline(ShareActivity.this)) {
webView.loadUrl("https://"+podDomain+"/status_messages/new");
webView.loadUrl("https://" + podDomain + "/status_messages/new");
} else {
Snackbar.make(getWindow().findViewById(R.id.drawer_layout), R.string.no_internet, Snackbar.LENGTH_LONG).show();
}
@ -256,15 +255,15 @@ public class ShareActivity extends MainActivity {
@Override
public void onActivityResult (int requestCode, int resultCode, Intent data) {
if(requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) {
super.onActivityResult(requestCode, resultCode, data);
return;
}
Uri[] results = null;
if(resultCode == Activity.RESULT_OK) {
if(data == null) {
if(mCameraPhotoPath != null) {
if (resultCode == RESULT_OK) {
if (data == null) {
if (mCameraPhotoPath != null) {
results = new Uri[]{Uri.parse(mCameraPhotoPath)};
}
} else {

View file

@ -17,10 +17,9 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora;
package de.dfa.diaspora_android.activity;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
@ -46,7 +45,9 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import de.dfa.diaspora.utils.Helpers;
import de.dfa.diaspora_android.App;
import de.dfa.diaspora_android.R;
import de.dfa.diaspora_android.util.Helpers;
public class ShareActivity2 extends MainActivity {
@ -68,7 +69,7 @@ public class ShareActivity2 extends MainActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
progressBar = (ProgressBar)findViewById(R.id.progressBar);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
swipeView = (SwipeRefreshLayout) findViewById(R.id.swipe);
swipeView.setEnabled(false);
@ -87,12 +88,12 @@ public class ShareActivity2 extends MainActivity {
});
podDomain = ((App)getApplication()).getSettings().getPodDomain();
podDomain = ((App) getApplication()).getSettings().getPodDomain();
fab = (com.getbase.floatingactionbutton.FloatingActionsMenu) findViewById(R.id.fab_expand_menu_button);
fab.setVisibility(View.GONE);
webView = (WebView)findViewById(R.id.webView);
webView = (WebView) findViewById(R.id.webView);
webView.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
WebSettings wSettings = webView.getSettings();
@ -197,8 +198,6 @@ public class ShareActivity2 extends MainActivity {
});
Intent intent = getIntent();
final Bundle extras = intent.getExtras();
String action = intent.getAction();
@ -246,7 +245,7 @@ public class ShareActivity2 extends MainActivity {
if (savedInstanceState == null) {
if (Helpers.isOnline(ShareActivity2.this)) {
webView.loadUrl("https://"+podDomain+"/status_messages/new");
webView.loadUrl("https://" + podDomain + "/status_messages/new");
} else {
Snackbar.make(getWindow().findViewById(R.id.drawer_layout), R.string.no_internet, Snackbar.LENGTH_SHORT).show();
}
@ -256,15 +255,15 @@ public class ShareActivity2 extends MainActivity {
@Override
public void onActivityResult (int requestCode, int resultCode, Intent data) {
if(requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode != INPUT_FILE_REQUEST_CODE || mFilePathCallback == null) {
super.onActivityResult(requestCode, resultCode, data);
return;
}
Uri[] results = null;
if(resultCode == Activity.RESULT_OK) {
if(data == null) {
if(mCameraPhotoPath != null) {
if (resultCode == RESULT_OK) {
if (data == null) {
if (mCameraPhotoPath != null) {
results = new Uri[]{Uri.parse(mCameraPhotoPath)};
}
} else {

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora;
package de.dfa.diaspora_android.activity;
import android.content.Intent;
import android.content.res.TypedArray;
@ -29,6 +29,9 @@ import android.widget.ImageView;
import java.util.Timer;
import java.util.TimerTask;
import de.dfa.diaspora_android.App;
import de.dfa.diaspora_android.R;
public class SplashActivity extends AppCompatActivity {
private App app;
@ -39,7 +42,7 @@ public class SplashActivity extends AppCompatActivity {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_splash);
app = (App)getApplication();
app = (App) getApplication();
ImageView imgSplash = (ImageView) findViewById(R.id.imgSplash);

View file

@ -1,4 +1,4 @@
package de.dfa.diaspora;
package de.dfa.diaspora_android.data;
import android.content.Context;
import android.content.SharedPreferences;
@ -6,7 +6,7 @@ import android.content.SharedPreferences;
/**
* Created by de-live-gdev on 20.03.16. Part of Diaspora WebApp.
*/
class AppSettings {
public class AppSettings {
private final SharedPreferences pref;
private final Context context;
@ -18,9 +18,11 @@ class AppSettings {
private void setString(String key, String value) {
pref.edit().putString(key, value).apply();
}
private void setInt(String key, int value) {
pref.edit().putInt(key, value).apply();
}
private void setBool(String key, boolean value) {
pref.edit().putBoolean(key, value).apply();
}
@ -36,7 +38,6 @@ class AppSettings {
private static final String PREF_PODDOMAIN = "podDomain";
/*
// Setters & Getters
*/
@ -74,19 +75,19 @@ class AppSettings {
setString(PREF_AVATAR_URL, avatarUrl);
}
public String getName(){
public String getName() {
return pref.getString(PREF_WEBUSERPROFILE_NAME, "");
}
public void setName(String name){
public void setName(String name) {
setString(PREF_WEBUSERPROFILE_NAME, name);
}
public String getPodDomain(){
public String getPodDomain() {
return pref.getString(PREF_PODDOMAIN, "");
}
public void setPodDomain(String podDomain){
public void setPodDomain(String podDomain) {
setString(PREF_PODDOMAIN, podDomain);
}

View file

@ -1,4 +1,4 @@
package de.dfa.diaspora;
package de.dfa.diaspora_android.data;
import android.os.Handler;
import android.util.Log;
@ -6,6 +6,9 @@ import android.util.Log;
import org.json.JSONException;
import org.json.JSONObject;
import de.dfa.diaspora_android.App;
import de.dfa.diaspora_android.listener.WebUserProfileChangedListener;
/**
* Created by de-live-gdev on 24.03.16. Part of Diaspora WebApp.
*/
@ -156,10 +159,3 @@ public class WebUserProfile {
* ? ?
*/
}
interface WebUserProfileChangedListener {
void onUserProfileNameChanged(String name);
void onUserProfileAvatarChanged(String avatarUrl);
void onNotificationCountChanged(int notificationCount);
void onUnreadMessageCountChanged(int unreadMessageCount);
}

View file

@ -1,4 +1,4 @@
package de.dfa.diaspora.utils;
package de.dfa.diaspora_android.listener;
/**
* Created by juergen on 25.03.16. Part of Diaspora WebApp.
@ -16,20 +16,21 @@ public class SoftKeyboardStateWatcher implements ViewTreeObserver.OnGlobalLayout
public interface SoftKeyboardStateListener {
void onSoftKeyboardOpened(int keyboardHeightInPx);
void onSoftKeyboardClosed();
}
private final List<SoftKeyboardStateListener> listeners = new LinkedList<>();
private final View activityRootView;
private int lastSoftKeyboardHeightInPx;
private boolean isSoftKeyboardOpened;
private int lastSoftKeyboardHeightInPx;
private boolean isSoftKeyboardOpened;
public SoftKeyboardStateWatcher(View activityRootView) {
this(activityRootView, false);
}
public SoftKeyboardStateWatcher(View activityRootView, boolean isSoftKeyboardOpened) {
this.activityRootView = activityRootView;
this.activityRootView = activityRootView;
this.isSoftKeyboardOpened = isSoftKeyboardOpened;
activityRootView.getViewTreeObserver().addOnGlobalLayoutListener(this);
}

View file

@ -0,0 +1,14 @@
package de.dfa.diaspora_android.listener;
/**
* Created by Gregor Santner (de-live-gdev) on 26.03.16.
*/
public interface WebUserProfileChangedListener {
void onUserProfileNameChanged(String name);
void onUserProfileAvatarChanged(String avatarUrl);
void onNotificationCountChanged(int notificationCount);
void onUnreadMessageCountChanged(int unreadMessageCount);
}

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora.services;
package de.dfa.diaspora_android.task;
import android.app.Service;
import android.content.Intent;
@ -46,7 +46,8 @@ public class GetPodsService extends Service {
private static final String TAG = "Diaspora Pod Service";
public GetPodsService() { }
public GetPodsService() {
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {

View file

@ -1,4 +1,4 @@
package de.dfa.diaspora;
package de.dfa.diaspora_android.task;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@ -11,6 +11,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import de.dfa.diaspora_android.App;
/**
* Created by Gregor Santner (de-live-gdev) on 24.03.16.
*/

View file

@ -1,13 +1,15 @@
package de.dfa.diaspora;
package de.dfa.diaspora_android.ui;
/**
* Created by juergen on 29.02.16. Part of Diaspora WebApp.
*/
import android.content.Context;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar.SnackbarLayout;
import android.util.AttributeSet;
import android.view.View;
import com.getbase.floatingactionbutton.FloatingActionsMenu;
public class FloatingActionsMenuBehavior extends CoordinatorLayout.Behavior<FloatingActionsMenu> {

View file

@ -1,4 +1,4 @@
package de.dfa.diaspora.utils;
package de.dfa.diaspora_android.util;
import android.content.Context;
import android.graphics.Bitmap;
@ -7,7 +7,7 @@ import android.widget.ImageView;
import java.io.File;
import de.dfa.diaspora.ImageDownloadTask;
import de.dfa.diaspora_android.task.ImageDownloadTask;
/**
* Created by Gregor Santner (de-live-gdev) on 24.03.16.
@ -15,11 +15,11 @@ import de.dfa.diaspora.ImageDownloadTask;
public class AvatarImageLoader {
private File avatarFile;
public AvatarImageLoader(Context context){
public AvatarImageLoader(Context context) {
avatarFile = new File(context.getFilesDir(), "avatar.png");
}
public void clearAvatarImage(){
public void clearAvatarImage() {
if (isAvatarDownloaded()) {
avatarFile.delete();
}
@ -39,7 +39,7 @@ public class AvatarImageLoader {
}
public void startImageDownload(ImageView imageView, String avatarUrl) {
if(!avatarUrl.equals("")) {
if (!avatarUrl.equals("")) {
new ImageDownloadTask(imageView, avatarFile.getAbsolutePath()).execute(avatarUrl);
}
}

View file

@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package de.dfa.diaspora.utils;
package de.dfa.diaspora_android.util;
import android.content.Context;
@ -27,7 +27,7 @@ import android.webkit.WebView;
public class Helpers {
public static boolean isOnline(Context context){
public static boolean isOnline(Context context) {
ConnectivityManager cnm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo ni = cnm.getActiveNetworkInfo();
return ni != null && ni.isConnectedOrConnecting();
@ -47,7 +47,7 @@ public class Helpers {
public static void getNotificationCount(final WebView wv) {
wv.loadUrl("javascript: ( function() {" +
"if (document.getElementById('notification')) {" +
"if (document.getElementById('notification')) {" +
" var count = document.getElementById('notification').innerHTML;" +
" AndroidBridge.setNotificationCount(count.replace(/(\\r\\n|\\n|\\r)/gm, \"\"));" +
" } else {" +