Skip to content
Snippets Groups Projects
Commit 07f06523 authored by Shubham Maheshwari's avatar Shubham Maheshwari
Browse files

added links

parent 9d3a5a8a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 58 additions and 69 deletions
app/src/main/java/com/example/taskboxx/AnalyticsFragment.java
+ 0
− 2
View file @ 07f06523
......@@ -76,13 +76,11 @@ public class AnalyticsFragment extends Fragment {
Log.d(TAG, "Hashmap values: "+values);
Set mapSet = (Set) values.entrySet();
Iterator mapIterator = mapSet.iterator();
int i=0;
while(mapIterator.hasNext())
{
Map.Entry mapEntry = (Map.Entry) mapIterator.next();
xData.add(mapEntry.getKey().toString());
yData.add(Double.valueOf((Double)mapEntry.getValue()).floatValue());
i++;
}
Log.d(TAG, "String Tags: "+xData);
Log.d(TAG, "String Values: "+yData);
......
app/src/main/java/com/example/taskboxx/AyncTasks/BrowserDataGetter.java deleted 100644 → 0
+ 0
− 42
View file @ 9d3a5a8a
package com.example.taskboxx.AyncTasks;
import android.app.ProgressDialog;
import android.os.AsyncTask;
import android.util.Log;
import com.example.taskboxx.Dashboard;
import java.util.List;
import me.everything.providers.android.browser.BrowserProvider;
import static com.example.taskboxx.LoginActivity.TAG;
/**
* Created by Shubham Maheshwari on 18-04-2017.
*/
public class BrowserDataGetter extends AsyncTask<String,Boolean,Boolean>{
ProgressDialog pd = new ProgressDialog(Dashboard.getContext1());
@Override
protected void onPreExecute(){
pd.setMessage("Loading");
pd.show();
}
@Override
protected Boolean doInBackground(String... params) {
BrowserProvider browserProvider = new BrowserProvider(Dashboard.getContext1());
List list = browserProvider.getSearches().getList();
Log.d(TAG, "Browser Searches: " + list);
return true;
}
@Override
protected void onPostExecute(Boolean result){
pd.dismiss();
}
}
app/src/main/java/com/example/taskboxx/Dashboard.java
+ 22
− 17
View file @ 07f06523
......@@ -15,10 +15,7 @@ import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import com.example.taskboxx.AyncTasks.BrowserDataGetter;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
public class Dashboard extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener {
......@@ -64,8 +61,6 @@ public class Dashboard extends AppCompatActivity
Fragment DashboardFragment = new DashboardFragment();
fragmentManager.beginTransaction().replace(R.id.content_frame,DashboardFragment).commit();
new BrowserDataGetter().execute("");
}
public static Context getContext1(){
......@@ -114,18 +109,28 @@ public class Dashboard extends AppCompatActivity
FragmentManager fragmentManager = getFragmentManager();
if (id == R.id.nav_my_account) {
switch (id) {
case R.id.nav_my_account: {
Fragment myAccountFragment = new MyAccountFragment();
fragmentManager.beginTransaction().replace(R.id.content_frame, myAccountFragment).commit();
} else if (id == R.id.nav_analytics) {
break;
} case R.id.nav_analytics: {
Fragment AnalyticsFragment = new AnalyticsFragment();
fragmentManager.beginTransaction().replace(R.id.content_frame, AnalyticsFragment).commit();
} else if (id == R.id.nav_dashboard){
break;
} case R.id.nav_dashboard: {
Fragment DashboardFragment = new DashboardFragment();
fragmentManager.beginTransaction().replace(R.id.content_frame, DashboardFragment).commit();
} else if (id == R.id.nav_logout) {
break;
} case R.id.nav_logout: {
mAuth.getInstance().signOut();
finish();
break;
} default:{
Fragment AnalyticsFragment = new AnalyticsFragment();
fragmentManager.beginTransaction().replace(R.id.content_frame, AnalyticsFragment).commit();
break;
}
}
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
......
app/src/main/java/com/example/taskboxx/DashboardFragment.java
+ 23
− 6
View file @ 07f06523
package com.example.taskboxx;
import android.app.Fragment;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
......@@ -11,10 +13,15 @@ import android.widget.ListView;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
public class DashboardFragment extends Fragment {
ArrayList<String> bookmarks;
LinkedHashMap<String,String> bookmarkdetails;
ListView bookmarksView;
@Override
......@@ -24,6 +31,7 @@ public class DashboardFragment extends Fragment {
bookmarksView = (ListView) rootView.findViewById(R.id.bookmarks);
bookmarks = new ArrayList<>();
bookmarkdetails = new LinkedHashMap<>();
getBookmarks();
ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(),android.R.layout.simple_list_item_1,bookmarks);
......@@ -34,7 +42,11 @@ public class DashboardFragment extends Fragment {
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
String selectedbookmark = bookmarks.get(position);
String URL = bookmarkdetails.get(selectedbookmark);
Toast.makeText(getActivity().getApplicationContext(), "Bookmark selected: "+selectedbookmark, Toast.LENGTH_SHORT).show();
Uri uri = Uri.parse(URL);
Intent BrowserIntent = new Intent(Intent.ACTION_VIEW,uri);
startActivity(BrowserIntent);
}
});
......@@ -42,12 +54,17 @@ public class DashboardFragment extends Fragment {
}
public void getBookmarks(){
bookmarks.add("Google");
bookmarks.add("Facebook");
bookmarks.add("Youtube");
bookmarks.add("Gmail");
bookmarks.add("Tinder");
bookmarks.add("Twitch");
bookmarkdetails.put("Google","http://www.google.co.in");
bookmarkdetails.put("Facebook","http://www.facebook.com");
bookmarkdetails.put("Youtube","http://www.youtube.com");
bookmarkdetails.put("GitHub","http://www.github.com");
Set set = (Set) bookmarkdetails.entrySet();
Iterator iterator = set.iterator();
while(iterator.hasNext()){
Map.Entry mapEntry = (Map.Entry) iterator.next();
bookmarks.add(mapEntry.getKey().toString());
}
}
......
app/src/main/res/drawable/ic_analytics.xml 0 → 100644
+ 9
− 0
View file @ 07f06523
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>
app/src/main/res/layout/activity_login.xml
+ 2
− 1
View file @ 07f06523
......@@ -43,6 +43,7 @@
<EditText android:id="@+id/input_password_login"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/colorAccent"
android:drawableLeft="@drawable/ic_password"
android:layout_below="@+id/input_uname_login"
android:drawablePadding="10dp"
......@@ -56,7 +57,7 @@
android:id="@+id/Logo"
android:layout_width="160dp"
android:layout_height="160dp"
app:srcCompat="@mipmap/ic_launcher"
app:srcCompat="@mipmap/ic_launcher_round"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="35dp" />
......
app/src/main/res/menu/activity_dashboard_drawer.xml
+ 1
− 0
View file @ 07f06523
......@@ -12,6 +12,7 @@
android:title="Dashboard" />
<item
android:id="@+id/nav_analytics"
android:icon="@drawable/ic_analytics"
android:title="Analytics" />
</group>
......
app/src/main/res/values/colors.xml
+ 1
− 1
View file @ 07f06523
......@@ -2,5 +2,5 @@
<resources>
<color name="colorPrimary">#795548</color>
<color name="colorPrimaryDark">#5d4037</color>
<color name="colorAccent">#f9a825</color>
<color name="colorAccent">#ff8f00</color>
</resources>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment