diff --git a/res/values/strings.xml b/res/values/strings.xml index 428dd83364..eeb94728df 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,14 +1,6 @@ - Files - Music - Contacts - Calendar - Bookmarks - Settings - Setup Account - There is no account set up on your device. In order to use this App, you need to create one. %1$s Android App version %1$s Refresh account @@ -147,7 +139,6 @@ Trying to login… No network connection - Connect anyway Secure connection unavailable. Connection established Testing connection… @@ -201,7 +192,6 @@ Login with oAuth2. Connecting to oAuth2 server… - Warning The identity of the site could not be verified - The server certificate is not trusted - The server certificate expired diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java deleted file mode 100644 index 45ed279def..0000000000 --- a/src/com/owncloud/android/ui/activity/LandingActivity.java +++ /dev/null @@ -1,158 +0,0 @@ -/* ownCloud Android client application - * Copyright (C) 2011 Bartek Przybylski - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ -package com.owncloud.android.ui.activity; - -import com.actionbarsherlock.app.SherlockFragmentActivity; -import com.owncloud.android.ui.adapter.LandingScreenAdapter; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; -import android.widget.GridView; -import android.widget.Toast; - -import com.owncloud.android.MainApp; -import com.owncloud.android.R; - -/** - * This activity is used as a landing page when the user first opens this app. - * - * @author Lennart Rosam - * - */ -public class LandingActivity extends SherlockFragmentActivity implements - OnClickListener, OnItemClickListener { - - public static final int DIALOG_SETUP_ACCOUNT = 1; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.main); - - // Fill the grid view of the landing screen with icons - GridView landingScreenItems = (GridView) findViewById(R.id.homeScreenGrid); - landingScreenItems.setAdapter(new LandingScreenAdapter(this)); - landingScreenItems.setOnItemClickListener(this); - - // Check, if there are ownCloud accounts - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - } else { - // Start device tracking service - Intent locationServiceIntent = new Intent(); - locationServiceIntent - .setAction("com.owncloud.android.location.LocationLauncher"); - sendBroadcast(locationServiceIntent); - } - - } - - @Override - protected void onRestart() { - super.onRestart(); - // Check, if there are ownCloud accounts - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - } - } - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - // Check, if there are ownCloud accounts - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - } - } - - @Override - protected Dialog onCreateDialog(int id) { - Dialog dialog; - switch (id) { - case DIALOG_SETUP_ACCOUNT: - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.main_tit_accsetup); - builder.setMessage(R.string.main_wrn_accsetup); - builder.setCancelable(false); - builder.setPositiveButton(R.string.common_ok, this); - builder.setNegativeButton(R.string.common_cancel, this); - dialog = builder.create(); - break; - default: - dialog = null; - } - - return dialog; - } - - public void onClick(DialogInterface dialog, int which) { - // In any case - we won't need it anymore - dialog.dismiss(); - switch (which) { - case DialogInterface.BUTTON_POSITIVE: - Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT); - intent.putExtra("authorities", - new String[] { MainApp.getAuthTokenType() }); - startActivity(intent); - break; - case DialogInterface.BUTTON_NEGATIVE: - finish(); - } - - } - - @Override - /** - * Start an activity based on the selection - * the user made - */ - public void onItemClick(AdapterView parent, View view, int position, - long id) { - Intent intent; - intent = (Intent) parent.getAdapter().getItem(position); - if (intent != null) { - startActivity(intent); - } else { - // TODO: Implement all of this and make this text go away ;-) - Toast toast = Toast.makeText(this, "Not yet implemented!", - Toast.LENGTH_SHORT); - toast.show(); - } - } - - /** - * Checks, whether or not there are any ownCloud accounts setup. - * - * @return true, if there is at least one account. - */ - private boolean accountsAreSetup() { - AccountManager accMan = AccountManager.get(this); - Account[] accounts = accMan - .getAccountsByType(MainApp.getAccountType()); - return accounts.length > 0; - } - -} diff --git a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java deleted file mode 100644 index f77ce52094..0000000000 --- a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java +++ /dev/null @@ -1,112 +0,0 @@ -/* ownCloud Android client application - * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ -package com.owncloud.android.ui.adapter; - -import com.owncloud.android.authentication.AccountUtils; -import com.owncloud.android.ui.activity.FileDisplayActivity; -import com.owncloud.android.ui.activity.Preferences; - -import android.content.Context; -import android.content.Intent; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; -import com.owncloud.android.R; - -/** - * Populates the landing screen icons. - * - * @author Lennart Rosam - * - */ -public class LandingScreenAdapter extends BaseAdapter { - - private Context mContext; - - private final Integer[] mLandingScreenIcons = { R.drawable.home, - R.drawable.music, R.drawable.contacts, R.drawable.calendar, - android.R.drawable.ic_menu_agenda, R.drawable.settings }; - - private final Integer[] mLandingScreenTexts = { R.string.main_files, - R.string.main_music, R.string.main_contacts, - R.string.main_calendar, R.string.main_bookmarks, - R.string.main_settings }; - - public LandingScreenAdapter(Context context) { - mContext = context; - } - - @Override - public int getCount() { - return mLandingScreenIcons.length; - } - - @Override - /** - * Returns the Intent associated with this object - * or null if the functionality is not yet implemented - */ - public Object getItem(int position) { - Intent intent = new Intent(); - - switch (position) { - case 0: - /* - * The FileDisplayActivity requires the ownCloud account as an - * parcableExtra. We will put in the one that is selected in the - * preferences - */ - intent.setClass(mContext, FileDisplayActivity.class); - intent.putExtra("ACCOUNT", - AccountUtils.getCurrentOwnCloudAccount(mContext)); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - break; - case 5: - intent.setClass(mContext, Preferences.class); - break; - default: - intent = null; - } - return intent; - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - if (convertView == null) { - LayoutInflater inflator = LayoutInflater.from(mContext); - convertView = inflator.inflate(R.layout.landing_page_item, null); - - ImageView icon = (ImageView) convertView - .findViewById(R.id.gridImage); - TextView iconText = (TextView) convertView - .findViewById(R.id.gridText); - - icon.setImageResource(mLandingScreenIcons[position]); - iconText.setText(mLandingScreenTexts[position]); - } - return convertView; - } -} diff --git a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java deleted file mode 100644 index 9d87a45ad2..0000000000 --- a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java +++ /dev/null @@ -1,58 +0,0 @@ -/* ownCloud Android client application - * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2012-2013 ownCloud Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ -package com.owncloud.android.ui.fragment; - -import com.actionbarsherlock.app.SherlockFragment; -import com.owncloud.android.ui.activity.LandingActivity; -import com.owncloud.android.ui.adapter.LandingScreenAdapter; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ListView; -import com.owncloud.android.R; - -/** - * Used on the Landing page to display what Components of the ownCloud there - * are. Like Files, Music, Contacts, etc. - * - * @author Lennart Rosam - * - */ -public class LandingPageFragment extends SherlockFragment { - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View root = inflater.inflate(R.layout.landing_page_fragment, container); - return root; - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - - ListView landingScreenItems = (ListView) getView().findViewById( - R.id.homeScreenList); - landingScreenItems.setAdapter(new LandingScreenAdapter(getActivity())); - landingScreenItems - .setOnItemClickListener((LandingActivity) getActivity()); - } - -}